]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix some more weird stuff
authorRudolf Polzer <divverent@alientrap.org>
Sun, 29 Apr 2012 19:47:46 +0000 (21:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 29 Apr 2012 19:47:46 +0000 (21:47 +0200)
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/csqcprojectile.qc
qcsrc/server/mutators/gamemode_keyhunt.qc

index 12b369390c1b30e8a1e3081085730f8ac60dfa79..cbbe3d547ff4bcabedf3c6a1e8086fc8415f153f 100644 (file)
@@ -558,7 +558,6 @@ void CL_Weaponentity_Think()
 
        self.angles = '0 0 0';
        float f;
-       f = 0;
        if (self.state == WS_RAISE && !intermission_running)
        {
                f = (self.owner.weapon_nextthink - time) * g_weaponratefactor / autocvar_g_balance_weaponswitchdelay;
index fea89005aa980cf3ba4cf3316c453c18f83cc446..3554f1ff67235142f837507183b772c41c841c09 100644 (file)
@@ -80,9 +80,9 @@ void CSQCProjectile(entity e, float clientanimate, float type, float docull)
        else
                e.gravity = 0;
 
-       e.csqcprojectile_type = type;
        if(!sound_allowed(MSG_BROADCAST, e))
                type |= 0x80;
+       e.csqcprojectile_type = type;
 }
 
 void UpdateCSQCProjectile(entity e)
index d6413d33fab9d1500219fbd0e934d6357aa27507..252f1abdad07ab37dd7bcf7542ae8d3ce40f8e49 100644 (file)
@@ -32,11 +32,11 @@ float kh_no_radar_circles;
 .float siren_time;  //  time delay the siren
 //.float stuff_time;  //  time delay to stuffcmd a cvar
 
-float test[17] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-//test[0] = status of dropped keys, test[1 - 16] = player #
+float kh_keystatus[17];
+//kh_keystatus[0] = status of dropped keys, kh_keystatus[1 - 16] = player #
 //replace 17 with cvar("maxplayers") or similar !!!!!!!!!
 //for(i = 0; i < maxplayers; ++i)
-//     test[i] = "0";
+//     kh_keystatus[i] = "0";
 
 float kh_Team_ByID(float t)
 {
@@ -342,7 +342,7 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
                        key.kh_next.kh_prev = key;
 
                float i;
-               i = test[key.owner.playerid];
+               i = kh_keystatus[key.owner.playerid];
                        if(key.netname == "^1red key")
                                i += 1;
                        if(key.netname == "^4blue key")
@@ -351,7 +351,7 @@ void kh_Key_AssignTo(entity key, entity player)  // runs every time a key is pic
                                i += 4;
                        if(key.netname == "^6pink key")
                                i += 8;
-               test[key.owner.playerid] = i;
+               kh_keystatus[key.owner.playerid] = i;
 
                kh_Key_Attach(key);