]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix a couple of minor things that have been bugging me for a while
authorMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 02:42:36 +0000 (13:42 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 02:42:36 +0000 (13:42 +1100)
qcsrc/client/View.qc
qcsrc/common/stats.qh
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutator_overkill.qc

index 8a725774e144fae6b64122a34330100013073d17..310b47d70def78e40a15d8873b5e964f7f0ba6b4 100644 (file)
@@ -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);
index f0570299794f72d698269b62ac7133a0951258a5..2954917100df08dd739aaf3e3d5a496dbb8364ec 100644 (file)
@@ -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?
index 95d85d793963181309ad6e63f182106c055717cb..1c33e39739af41cf886143ee6aacdce77ec75b98 100644 (file)
@@ -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
 
index 22cd79cff3f537a6eb1c367c750a7cb7e3e46b48..7a5e62a7e5189c55e725579376425aa167ce89ca 100644 (file)
@@ -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;