From: Mario Date: Wed, 17 Apr 2013 10:27:26 +0000 (+1000) Subject: Remove useless ifdef check X-Git-Tag: xonotic-v0.8.0~241^2^2~364 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a35ebd4ef710c370da6538ed4582098304352047;p=xonotic%2Fxonotic-data.pk3dir.git Remove useless ifdef check --- diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc index 0fa58bfd8..89911d57f 100644 --- a/qcsrc/server/monsters/lib/monsters.qc +++ b/qcsrc/server/monsters/lib/monsters.qc @@ -13,9 +13,9 @@ void M_Item_Touch () void monster_item_spawn() { self.monster_delayedattack(); - - self.think = monster_item_spawn; - self.nextthink = time + 0.1; + + self.think = SUB_Remove; + self.nextthink = time + 5; self.gravity = 1; self.velocity = randomvec() * 175 + '0 0 325'; self.touch = M_Item_Touch; @@ -40,7 +40,6 @@ void Monster_DropItem (string itype, string itemsize) case "large": e.monster_delayedattack = spawnfunc_item_armor_big; break; case "medium": e.monster_delayedattack = spawnfunc_item_armor_medium; break; case "small": e.monster_delayedattack = spawnfunc_item_armor_small; break; - default: break; } break; // break here? } @@ -52,7 +51,6 @@ void Monster_DropItem (string itype, string itemsize) case "large": e.monster_delayedattack = spawnfunc_item_health_large; break; case "medium": e.monster_delayedattack = spawnfunc_item_health_medium; break; case "small": e.monster_delayedattack = spawnfunc_item_health_small; break; - default: break; } break; // break here? } @@ -65,11 +63,9 @@ void Monster_DropItem (string itype, string itemsize) case "rockets": e.monster_delayedattack = spawnfunc_item_rockets; break; case "bullets": case "nails": e.monster_delayedattack = spawnfunc_item_bullets; break; - default: break; } break; } - default: break; } if(g_minstagib) @@ -92,7 +88,7 @@ void monsters_setframe(float _frame) float monster_isvalidtarget (entity targ, entity ent) { if(!targ || !ent) - return FALSE; // this check should fix a crash + return FALSE; // someone doesn't exist if(time < game_starttime) return FALSE; // monsters do nothing before the match has started diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc index e60a26b43..6f45f4662 100644 --- a/qcsrc/server/monsters/monster/demon.qc +++ b/qcsrc/server/monsters/monster/demon.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector DEMON_MIN = '-32 -32 -24'; const vector DEMON_MAX = '32 32 24'; @@ -6,8 +5,6 @@ const vector DEMON_MAX = '32 32 24'; // model string DEMON_MODEL = "models/monsters/demon.mdl"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_demon; diff --git a/qcsrc/server/monsters/monster/dog.qc b/qcsrc/server/monsters/monster/dog.qc index fbf82b2df..638e4cd51 100644 --- a/qcsrc/server/monsters/monster/dog.qc +++ b/qcsrc/server/monsters/monster/dog.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector DOG_MAX = '16 16 12'; const vector DOG_MIN = '-16 -16 -24'; @@ -6,8 +5,6 @@ const vector DOG_MIN = '-16 -16 -24'; // model string DOG_MODEL = "models/monsters/dog.dpm"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_dog; diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc index f5c15f5e3..7a01b50f5 100644 --- a/qcsrc/server/monsters/monster/fish.qc +++ b/qcsrc/server/monsters/monster/fish.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector FISH_MIN = '-16 -16 -24'; const vector FISH_MAX = '16 16 16'; @@ -6,8 +5,6 @@ const vector FISH_MAX = '16 16 16'; // model string FISH_MODEL = "models/monsters/fish.mdl"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_fish; diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc index e4b97ad66..215cf8a5f 100644 --- a/qcsrc/server/monsters/monster/hknight.qc +++ b/qcsrc/server/monsters/monster/hknight.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector HELLKNIGHT_MIN = '-16 -16 -24'; const vector HELLKNIGHT_MAX = '16 16 32'; @@ -6,8 +5,6 @@ const vector HELLKNIGHT_MAX = '16 16 32'; // model string HELLKNIGHT_MODEL = "models/monsters/hknight.mdl"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_hellknight; diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc index 17b38658d..742194521 100644 --- a/qcsrc/server/monsters/monster/knight.qc +++ b/qcsrc/server/monsters/monster/knight.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector KNIGHT_MIN = '-16 -16 -24'; const vector KNIGHT_MAX = '16 16 32'; @@ -6,8 +5,6 @@ const vector KNIGHT_MAX = '16 16 32'; // model string KNIGHT_MODEL = "models/monsters/knight.mdl"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_knight; diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc index d92852757..64128af78 100644 --- a/qcsrc/server/monsters/monster/ogre.qc +++ b/qcsrc/server/monsters/monster/ogre.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector OGRE_MIN = '-36 -36 -20'; const vector OGRE_MAX = '36 36 50'; @@ -6,8 +5,6 @@ const vector OGRE_MAX = '36 36 50'; // model string OGRE_MODEL = "models/monsters/ogre.dpm"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_ogre; diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc index ee4c1f99b..e7eff4cfe 100644 --- a/qcsrc/server/monsters/monster/shalrath.qc +++ b/qcsrc/server/monsters/monster/shalrath.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector SHALRATH_MIN = '-36 -36 -24'; const vector SHALRATH_MAX = '36 36 50'; @@ -6,8 +5,6 @@ const vector SHALRATH_MAX = '36 36 50'; // model string SHALRATH_MODEL = "models/monsters/mage.dpm"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_shalrath; diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc index 3fa9b6401..72f02fee4 100644 --- a/qcsrc/server/monsters/monster/shambler.qc +++ b/qcsrc/server/monsters/monster/shambler.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector SHAMBLER_MIN = '-32 -32 -24'; const vector SHAMBLER_MAX = '32 32 50'; @@ -6,8 +5,6 @@ const vector SHAMBLER_MAX = '32 32 50'; // model string SHAMBLER_MODEL = "models/monsters/shambler.mdl"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_shambler; diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc index 6c23bbb58..6a6130dba 100644 --- a/qcsrc/server/monsters/monster/soldier.qc +++ b/qcsrc/server/monsters/monster/soldier.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector SOLDIER_MIN = '-16 -16 -30'; const vector SOLDIER_MAX = '16 16 24'; @@ -6,8 +5,6 @@ const vector SOLDIER_MAX = '16 16 24'; // model string SOLDIER_MODEL = "models/monsters/soldier.zym"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_soldier; diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc index 3fafa1851..f41ee4469 100644 --- a/qcsrc/server/monsters/monster/spider.qc +++ b/qcsrc/server/monsters/monster/spider.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector SPIDER_MIN = '-18 -18 -25'; const vector SPIDER_MAX = '18 18 30'; @@ -6,8 +5,6 @@ const vector SPIDER_MAX = '18 18 30'; // model string SPIDER_MODEL = "models/monsters/spider.dpm"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_spider; diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc index 9bc21817c..ff51ac628 100644 --- a/qcsrc/server/monsters/monster/tarbaby.qc +++ b/qcsrc/server/monsters/monster/tarbaby.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector TARBABY_MIN = '-16 -16 -24'; const vector TARBABY_MAX = '16 16 16'; @@ -6,8 +5,6 @@ const vector TARBABY_MAX = '16 16 16'; // model string TARBABY_MODEL = "models/monsters/tarbaby.mdl"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_tarbaby; diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc index f584e8411..b8095b4e8 100644 --- a/qcsrc/server/monsters/monster/wizard.qc +++ b/qcsrc/server/monsters/monster/wizard.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector WIZARD_MIN = '-16 -16 -45'; const vector WIZARD_MAX = '16 16 16'; @@ -6,8 +5,6 @@ const vector WIZARD_MAX = '16 16 16'; // model string WIZARD_MODEL = "models/monsters/wizard.mdl"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_wizard; diff --git a/qcsrc/server/monsters/monster/zombie.qc b/qcsrc/server/monsters/monster/zombie.qc index 1770cbd80..35855bf89 100644 --- a/qcsrc/server/monsters/monster/zombie.qc +++ b/qcsrc/server/monsters/monster/zombie.qc @@ -1,4 +1,3 @@ -#ifndef MENUQC // size const vector ZOMBIE_MIN = '-18 -18 -25'; const vector ZOMBIE_MAX = '18 18 47'; @@ -6,8 +5,6 @@ const vector ZOMBIE_MAX = '18 18 47'; // model string ZOMBIE_MODEL = "models/monsters/zombie.dpm"; -#endif - #ifdef SVQC // cvars float autocvar_g_monster_zombie;