Merge branch 'amade/small-fixes' into 'master'

Amade/small fixes

See merge request !412

diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc
index af81942a2001753c36e9fb1cebdadc6ae283b2bb..d3efe77e844a498365a55ce6c264c5a554df0dd7 100644 (file)
--- a/qcsrc/common/campaign_file.qc
+++ b/qcsrc/common/campaign_file.qc
@@ -89,8 +89,7 @@ void CampaignFile_Unload()
        if(campaign_title)
        {
                strunzone(campaign_title);
-               int i;
-               for(i = 0; i < campaign_entries; ++i)
+               for(int i = 0; i < campaign_entries; ++i)
                {
                        strunzone(campaign_gametype[i]);
                        strunzone(campaign_mapname[i]);

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 92ed2b9f112d9527936c6339cec6c81c9434d675..f6a14814bcbab1ac1982ec4f0b9905b0eced93af 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -231,16 +231,13 @@ string MapInfo_BSPName_ByID(float i)
 
 string unquote(string s)
 {
-       float i, j, l;
-       l = strlen(s);
-       j = -1;
-       for(i = 0; i < l; ++i)
+       float l = strlen(s);
+       for(float i = 0; i < l; ++i)
        {
-               string ch;
-               ch = substring(s, i, 1);
-               if(ch != " ") if(ch != "\"")
+               string ch = substring(s, i, 1);
+               if((ch != " ") && (ch != "\""))
                {
-                       for(j = strlen(s) - i - 1; j > 0; --j)
+                       for(float j = l - i - 1; j > 0; --j)
                        {
                                ch = substring(s, i+j, 1);
                                if(ch != " ") if(ch != "\"")
@@ -1205,14 +1202,13 @@ void MapInfo_LoadMap(string s, float reinit)
 string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbiddenFlags)
 {
        string out;
-       float i;
 
        // to make absolutely sure:
        MapInfo_Enumerate();
        MapInfo_FilterGametype(type, MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);
 
        out = "";
-       for(i = 0; i < MapInfo_count; ++i)
+       for(float i = 0; i < MapInfo_count; ++i)
                out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i)));
        return substring(out, 1, strlen(out) - 1);
 }
@@ -1220,14 +1216,13 @@ string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbi
 string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
 {
        string out;
-       float i;
 
        // to make absolutely sure:
        MapInfo_Enumerate();
        _MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, pRequiredFlags, pForbiddenFlags, 0);
 
        out = "";
-       for(i = 0; i < MapInfo_count; ++i)
+       for(float i = 0; i < MapInfo_count; ++i)
                out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i)));
 
        MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 5490478baf425071a9a94f2b3495c1be1d483879..3151d7cdb1c86fb696128d439ef6a38213cff553 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -58,8 +58,7 @@ void Item_SetAlpha(entity this)
                        this.alpha = -1;
        }
 
-       if(!veh_hud)
-       if(this.ItemStatus & ITS_STAYWEP)
+       if((!veh_hud) && (this.ItemStatus & ITS_STAYWEP))
        {
                this.colormod = this.glowmod = autocvar_cl_weapon_stay_color;
                this.alpha = autocvar_cl_weapon_stay_alpha;
@@ -449,28 +448,30 @@ void Item_Show (entity e, float mode)
                e.spawnshieldtime = 1;
                e.ItemStatus &= ~ITS_AVAILABLE;
        }
-       else {
-       bool nostay = def.instanceOfWeaponPickup ? !!(def.m_weapon.weapons & WEPSET_SUPERWEAPONS) : false // no weapon-stay on superweapons
-               || e.team // weapon stay isn't supported for teamed weapons
-               ;
-       if(def.instanceOfWeaponPickup && !nostay && g_weapon_stay)
-       {
-               // make the item translucent and not touchable
-               e.model = e.mdl;
-               e.solid = SOLID_TRIGGER; // can STILL be picked up!
-               e.effects |= EF_STARDUST;
-               e.spawnshieldtime = 0; // field indicates whether picking it up may give you anything other than the weapon
-               e.ItemStatus |= (ITS_AVAILABLE | ITS_STAYWEP);
-       }
        else
        {
-               //setmodel(e, "null");
-               e.solid = SOLID_NOT;
-               e.colormod = '0 0 0';
-               //e.glowmod = e.colormod;
-               e.spawnshieldtime = 1;
-               e.ItemStatus &= ~ITS_AVAILABLE;
-       }}
+               bool nostay = def.instanceOfWeaponPickup ? !!(def.m_weapon.weapons & WEPSET_SUPERWEAPONS) : false // no weapon-stay on superweapons
+                       || e.team // weapon stay isn't supported for teamed weapons
+                       ;
+               if(def.instanceOfWeaponPickup && !nostay && g_weapon_stay)
+               {
+                       // make the item translucent and not touchable
+                       e.model = e.mdl;
+                       e.solid = SOLID_TRIGGER; // can STILL be picked up!
+                       e.effects |= EF_STARDUST;
+                       e.spawnshieldtime = 0; // field indicates whether picking it up may give you anything other than the weapon
+                       e.ItemStatus |= (ITS_AVAILABLE | ITS_STAYWEP);
+               }
+               else
+               {
+                       //setmodel(e, "null");
+                       e.solid = SOLID_NOT;
+                       e.colormod = '0 0 0';
+                       //e.glowmod = e.colormod;
+                       e.spawnshieldtime = 1;
+                       e.ItemStatus &= ~ITS_AVAILABLE;
+               }
+       }
 
        if (def.m_glow)
                e.ItemStatus |= ITS_GLOW;
@@ -1012,7 +1013,6 @@ float ammo_pickupevalfunc(entity player, entity item)
 
                        switch(it.ammo_field)
                        {
-                               case ammo_shells:  need_shells  = true; break;
                                case ammo_shells:  need_shells  = true; break;
                                case ammo_nails:   need_nails   = true; break;
                                case ammo_rockets: need_rockets = true; break;
@@ -1024,29 +1024,22 @@ float ammo_pickupevalfunc(entity player, entity item)
                rating = item.bot_pickupbasevalue;
        }
 
-       if (need_shells)
-       if (item.ammo_shells)
-       if (player.ammo_shells < g_pickup_shells_max)
+       if ((need_shells) && (item.ammo_shells) && (player.ammo_shells < g_pickup_shells_max))
                c = item.ammo_shells / player.ammo_shells;
-       if (need_nails)
-       if (item.ammo_nails)
-       if (player.ammo_nails < g_pickup_nails_max)
+
+       if ((need_nails) && (item.ammo_nails) && (player.ammo_nails < g_pickup_nails_max))
                c = item.ammo_nails / player.ammo_nails;
-       if (need_rockets)
-       if (item.ammo_rockets)
-       if (player.ammo_rockets < g_pickup_rockets_max)
+
+       if ((need_rockets) && (item.ammo_rockets) && (player.ammo_rockets < g_pickup_rockets_max))
                c = item.ammo_rockets / player.ammo_rockets;
-       if (need_cells)
-       if (item.ammo_cells)
-       if (player.ammo_cells < g_pickup_cells_max)
+
+       if ((need_cells) && (item.ammo_cells) && (player.ammo_cells < g_pickup_cells_max))
                c = item.ammo_cells / player.ammo_cells;
-       if (need_plasma)
-       if (item.ammo_plasma)
-       if (player.ammo_plasma < g_pickup_plasma_max)
+
+       if ((need_plasma) && (item.ammo_plasma) && (player.ammo_plasma < g_pickup_plasma_max))
                c = item.ammo_plasma / player.ammo_plasma;
-       if (need_fuel)
-       if (item.ammo_fuel)
-       if (player.ammo_fuel < g_pickup_fuel_max)
+
+       if ((need_fuel) && (item.ammo_fuel) && (player.ammo_fuel < g_pickup_fuel_max))
                c = item.ammo_fuel / player.ammo_fuel;
 
        rating *= min(2, c);
@@ -1064,16 +1057,17 @@ float healtharmor_pickupevalfunc(entity player, entity item)
 
        float itemarmor = item.armorvalue;
        float itemhealth = item.health;
+
        if(item.item_group)
        {
                itemarmor *= min(4, item.item_group_count);
                itemhealth *= min(4, item.item_group_count);
        }
-       if (itemarmor)
-       if (player.armorvalue < item.max_armorvalue)
+
+       if (itemarmor && (player.armorvalue < item.max_armorvalue))
                c = itemarmor / max(1, player.armorvalue * 2/3 + player.health * 1/3);
-       if (itemhealth)
-       if (player.health < item.max_health)
+
+       if (itemhealth && (player.health < item.max_health))
                c = itemhealth / max(1, player.health);
 
        rating *= min(2, c);
@@ -1370,9 +1364,8 @@ spawnfunc(item_rockets)
 
 spawnfunc(item_bullets)
 {
-       if(!weaponswapping)
-       if(autocvar_sv_q3acompat_machineshotgunswap)
-       if(this.classname != "droppedweapon")
+       if(!weaponswapping && autocvar_sv_q3acompat_machineshotgunswap && 
+          (this.classname != "droppedweapon"))
        {
                weaponswapping = true;
                spawnfunc_item_shells(this);
@@ -1395,9 +1388,8 @@ spawnfunc(item_plasma)
 
 spawnfunc(item_shells)
 {
-       if(!weaponswapping)
-       if(autocvar_sv_q3acompat_machineshotgunswap)
-       if(this.classname != "droppedweapon")
+       if(!weaponswapping && autocvar_sv_q3acompat_machineshotgunswap &&
+          (this.classname != "droppedweapon"))
        {
                weaponswapping = true;
                spawnfunc_item_bullets(this);
@@ -1479,10 +1471,9 @@ void target_items_use(entity this, entity actor, entity trigger)
                return;
        }
 
-       if (!IS_PLAYER(actor))
-               return;
-       if(IS_DEAD(actor))
+       if (!IS_PLAYER(actor) || IS_DEAD(actor))
                return;
+
        if(trigger.solid == SOLID_TRIGGER)
        {
                EXACTTRIGGER_TOUCH(this, trigger);
@@ -1499,7 +1490,7 @@ void target_items_use(entity this, entity actor, entity trigger)
 
 spawnfunc(target_items)
 {
-       int n, j;
+       int n;
        string s;
 
        this.use = target_items_use;
@@ -1517,7 +1508,7 @@ spawnfunc(target_items)
        }
        else
        {
-               for(j = 0; j < n; ++j)
+               for(int j = 0; j < n; ++j)
                {
                        if     (argv(j) == "unlimited_ammo")         this.items |= IT_UNLIMITED_AMMO;
                        else if(argv(j) == "unlimited_weapon_ammo")  this.items |= IT_UNLIMITED_WEAPON_AMMO;
@@ -1601,7 +1592,7 @@ spawnfunc(target_items)
        //print(this.netname, "\n");
 
        n = tokenize_console(this.netname);
-       for(j = 0; j < n; ++j)
+       for(int j = 0; j < n; ++j)
        {
                FOREACH(Weapons, it != WEP_Null && W_UndeprecateName(argv(j)) == it.netname, {
             it.wr_init(it);

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index c0997bf73aaed554f81ee316fc2cd4f14667f1e6..91d68f1ba1313cb0a7eb543dd7b6406fafd26d7e 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -24,10 +24,9 @@
 */
 vector real_origin(entity ent)
 {
-       entity e;
        vector v = ((ent.absmin + ent.absmax) * 0.5);
+       entity e = ent.tag_entity;
 
-       e = ent.tag_entity;
        while(e)
        {
                v = v + ((e.absmin + e.absmax) * 0.5);
@@ -414,11 +413,11 @@ string fixPriorityList(string order, float from, float to, float subtract, float
 string mapPriorityList(string order, string(string) mapfunc)
 {
        string neworder;
-       float i, n;
+       float n;
 
        n = tokenize_console(order);
        neworder = "";
-       for(i = 0; i < n; ++i)
+       for(float i = 0; i < n; ++i)
                neworder = strcat(neworder, mapfunc(argv(i)), " ");
 
        return substring(neworder, 0, strlen(neworder) - 1);
@@ -426,15 +425,12 @@ string mapPriorityList(string order, string(string) mapfunc)
 
 string swapInPriorityList(string order, float i, float j)
 {
-       string s;
-       float w, n;
-
-       n = tokenize_console(order);
+       float n = tokenize_console(order);
 
        if(i >= 0 && i < n && j >= 0 && j < n && i != j)
        {
-               s = "";
-               for(w = 0; w < n; ++w)
+               string s = "";
+               for(float w = 0; w < n; ++w)
                {
                        if(w == i)
                                s = strcat(s, argv(j), " ");
@@ -672,7 +668,6 @@ bool isCaretEscaped(string theText, float pos)
 
 int skipIncompleteTag(string theText, float pos, int len)
 {
-       int i = 0, ch = 0;
        int tag_start = -1;
 
        if(substring(theText, pos - 1, 1) == "^")
@@ -680,7 +675,7 @@ int skipIncompleteTag(string theText, float pos, int len)
                if(isCaretEscaped(theText, pos - 1) || pos >= len)
                        return 0;
 
-               ch = str2chr(theText, pos);
+               int ch = str2chr(theText, pos);
                if(ch >= '0' && ch <= '9')
                        return 1; // ^[0-9] color code found
                else if (ch == 'x')
@@ -690,7 +685,7 @@ int skipIncompleteTag(string theText, float pos, int len)
        }
        else
        {
-               for(i = 2; pos - i >= 0 && i <= 4; ++i)
+               for(int i = 2; pos - i >= 0 && i <= 4; ++i)
                {
                        if(substring(theText, pos - i, 2) == "^x")
                        {
@@ -784,8 +779,7 @@ string find_last_color_code(string s)
        if (start == -1) // no caret found
                return "";
        int len = strlen(s)-1;
-       int i;
-       for(i = len; i >= start; --i)
+       for(int i = len; i >= start; --i)
        {
                if(substring(s, i, 1) != "^")
                        continue;