Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / sv_main.qc

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 282916b26a3a635ae35dbf37a1a34358a492f67c..623b54651cb2c588d2cbb3c90cd6924661f83fb7 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -126,7 +126,7 @@ void CreatureFrame (void)
                                        else
                                                dprint(ftos(trace_dphitq3surfaceflags), "\n");
                                        */
                                        else
                                                dprint(ftos(trace_dphitq3surfaceflags), "\n");
                                        */

-                                       if not(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS)
+                                       if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS))

                                        {
                                                if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)
                                                        GlobalSound(globalsound_metalstep, CH_PLAYER, VOICETYPE_PLAYERSOUND);
                                        {
                                                if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)
                                                        GlobalSound(globalsound_metalstep, CH_PLAYER, VOICETYPE_PLAYERSOUND);


@@ -250,7 +250,7 @@ void SV_OnEntityPreSpawnFunction()
 {
        if (self)
        if (self.gametypefilter != "")
 {
        if (self)
        if (self.gametypefilter != "")

-       if not(isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter))
+       if (!isGametypeInFilter(MapInfo_LoadedGametype, teamplay, have_team_spawns, self.gametypefilter))

        {
                remove(self);
                return;
        {
                remove(self);
                return;


@@ -350,14 +350,14 @@ void SV_OnEntityPreSpawnFunction()
                        else
                        {
                                k = s;
                        else
                        {
                                k = s;

-                               if not(cvar(k))
+                               if (!cvar(k))

                                        goto cvar_fail;
                        }
                }
                inv = !inv;
 :cvar_fail
                // now inv is 1 if we want to keep the item, and 0 if we want to get rid of it
                                        goto cvar_fail;
                        }
                }
                inv = !inv;
 :cvar_fail
                // now inv is 1 if we want to keep the item, and 0 if we want to get rid of it

-               if not(inv)
+               if (!inv)

                {
                        //print("cvarfilter fail\n");
                        remove(self);
                {
                        //print("cvarfilter fail\n");
                        remove(self);