Miscellaneous stuff

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

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index dc75e176432a20f4d320a8426be92c5c4828cb6d..b05e8da3c8368ff90506dfbfbbd281a080b6229e 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -566,12 +566,10 @@ void ctf_CheckStalemate(void)
                if not(wpforenemy_announced)
                {
                        FOR_EACH_REALPLAYER(tmp_entity)
-                       {
                                if(tmp_entity.flagcarried)
                                        centerprint(tmp_entity, "Stalemate! Enemies can now see you on radar!");
                                else
                                        centerprint(tmp_entity, "Stalemate! Flag carriers can now be seen by enemies on radar!");
-                       }
                        
                        wpforenemy_announced = TRUE;
                }
@@ -587,7 +585,6 @@ void ctf_FlagDamage(entity inflictor, entity attacker, float damage, float death
                ctf_CheckFlagReturn(self, RETURN_NEEDKILL);
                return;
        }
-       
        if(autocvar_g_ctf_flag_return_damage) 
        {
                // reduce health and check if it should be returned
@@ -646,7 +643,7 @@ void ctf_FlagThink()
                case FLAG_DROPPED:
                {
                        if(autocvar_g_ctf_flag_dropped_floatinwater && (self.flags & FL_INWATER))
-                                       self.velocity_z = autocvar_g_ctf_flag_dropped_floatinwater;
+                               self.velocity_z = autocvar_g_ctf_flag_dropped_floatinwater;
                
                        if(autocvar_g_ctf_flag_return_dropped)
                        {
@@ -791,12 +788,6 @@ void ctf_FlagTouch()
                        }
                        break;
                }
-               
-               default: // this should never happen
-               {
-                       dprint("Touch: Flag exists with no status?\n");
-                       break;
-               }
        }
 }