From: Mario Date: Tue, 20 Jan 2015 02:42:36 +0000 (+1100) Subject: Fix a couple of minor things that have been bugging me for a while X-Git-Tag: xonotic-v0.8.1~155 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=017f6ab3e374687d6edfdaec69cb1a86bda7934b;p=xonotic%2Fxonotic-data.pk3dir.git Fix a couple of minor things that have been bugging me for a while --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 8a725774e..310b47d70 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -784,7 +784,7 @@ void UpdateCrosshair() float ok_ammo_charge, ok_ammo_chargepool; ok_ammo_charge = getstatf(STAT_OK_AMMO_CHARGE); - ok_ammo_chargepool = getstatf(STAT_OK_AMMO_CHARGEPOOl); + ok_ammo_chargepool = getstatf(STAT_OK_AMMO_CHARGEPOOL); float vortex_charge, vortex_chargepool; vortex_charge = getstatf(STAT_VORTEX_CHARGE); diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index f05702997..295491710 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -88,7 +88,7 @@ const float STAT_HEALING_ORB = 82; const float STAT_HEALING_ORB_ALPHA = 83; const float STAT_PLASMA = 84; const float STAT_OK_AMMO_CHARGE = 85; -const float STAT_OK_AMMO_CHARGEPOOl = 86; +const float STAT_OK_AMMO_CHARGEPOOL = 86; // 87 empty? // 88 empty? // 89 empty? diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh index 95d85d793..1c33e3973 100644 --- a/qcsrc/server/mutators/base.qh +++ b/qcsrc/server/mutators/base.qh @@ -158,26 +158,26 @@ MUTATOR_HOOKABLE(EditProjectile); // INPUT: entity self; entity other; - + MUTATOR_HOOKABLE(MonsterSpawn); // called when a monster spawns - + MUTATOR_HOOKABLE(MonsterDies); // called when a monster dies // INPUT: entity frag_attacker; - + MUTATOR_HOOKABLE(MonsterRespawn); // called when a monster wants to respawn // INPUT: entity other; - + MUTATOR_HOOKABLE(MonsterDropItem); // called when a monster is dropping loot // INPUT, OUTPUT: .void() monster_loot; entity other; - + MUTATOR_HOOKABLE(MonsterMove); // called when a monster moves // returning TRUE makes the monster stop @@ -185,10 +185,10 @@ MUTATOR_HOOKABLE(MonsterMove); float monster_speed_run; float monster_speed_walk; entity monster_target; - + MUTATOR_HOOKABLE(MonsterFindTarget); // called when a monster looks for another target - + MUTATOR_HOOKABLE(MonsterCheckBossFlag); // called to change a random monster to a miniboss diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc index 22cd79cff..7a5e62a7e 100644 --- a/qcsrc/server/mutators/mutator_overkill.qc +++ b/qcsrc/server/mutators/mutator_overkill.qc @@ -321,7 +321,7 @@ void ok_Initialize() precache_sound("weapons/dryfire.wav"); addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge); - addstat(STAT_OK_AMMO_CHARGEPOOl, AS_FLOAT, ok_ammo_charge); + addstat(STAT_OK_AMMO_CHARGEPOOL, AS_FLOAT, ok_ammo_charge); (get_weaponinfo(WEP_RPC)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; (get_weaponinfo(WEP_HMG)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;