Fix typo in dumpweapons description.

Minor indentation fixes and cleanups on a couple files

diff --git a/qcsrc/common/mapobjects/misc/keys.qc b/qcsrc/common/mapobjects/misc/keys.qc
index 6c52e6a1e7a4b0493cf8096fd4fbe5e2c2f42da3..95c15563d4e224b934152e7cfea30b873cd7a574 100644 (file)
--- a/qcsrc/common/mapobjects/misc/keys.qc
+++ b/qcsrc/common/mapobjects/misc/keys.qc
@@ -37,7 +37,8 @@ bool item_keys_usekey(entity l, entity p)
        }
 }
 
-string item_keys_keylist(float keylist) {
+string item_keys_keylist(float keylist)
+{
        // no keys
        if (!keylist)
                return "";
@@ -48,15 +49,16 @@ string item_keys_keylist(float keylist) {
 
        string n = "";
        int base = 0;
-       while (keylist) {
+       while (keylist)
+       {
                int l = lowestbit(keylist);
                if (n)
                        n = strcat(n, ", the ", item_keys_names[base + l]);
                else
                        n = strcat("the ", item_keys_names[base + l]);
 
-               keylist = bitshift(keylist,  -(l + 1));
-               base+= l + 1;
+               keylist = bitshift(keylist, -(l + 1));
+               base += l + 1;
        }
 
        return n;

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 46d5eab17f1c66ae90c64b6e1de417415cb313db..82494c3a1ffdc504fa3a5ae385c81631e8945ccf 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -48,7 +48,7 @@ WepSet _WepSet_FromWeapon(int i);
 
 #define DEFAULT_FILENAME "weapons_dump.cfg"
 // NOTE: dumpeffectinfo, dumpnotifs, dumpturrets and dumpweapons use similar code
-GENERIC_COMMAND(dumpweapons, "Dump all turrets into " DEFAULT_FILENAME, false) // WEAPONTODO: make this work with other progs than just server
+GENERIC_COMMAND(dumpweapons, "Dump all weapons into " DEFAULT_FILENAME, false) // WEAPONTODO: make this work with other progs than just server
 {
        switch(request)
        {

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 5fecde38c739237edb04ca3b5d0af09515ad58c1..ee5e58efd3256066fe7ea1a1ef8d367a85f93a77 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -263,15 +263,15 @@ bool PlayerScore_SendEntity(entity this, entity to, float sendflags)
 
        int longflags = 0;
        FOREACH(Scores, true, {
-           int p = BIT(i % 16);
+               int p = BIT(i % 16);
                if (this.(scores(it)) > 127 || this.(scores(it)) <= -128)
                        longflags |= p;
-    });
+       });
 
        WriteShort(MSG_ENTITY, sendflags);
        WriteShort(MSG_ENTITY, longflags);
        FOREACH(Scores, true, {
-           int p = BIT(i % 16);
+               int p = BIT(i % 16);
                if (sendflags & p)
                {
                        if(longflags & p)
@@ -279,7 +279,7 @@ bool PlayerScore_SendEntity(entity this, entity to, float sendflags)
                        else
                                WriteChar(MSG_ENTITY, this.(scores(it)));
                }
-    });
+       });
 
        return true;
 }
@@ -636,7 +636,7 @@ string GetPlayerScoreString(entity pl, float shortString)
                                l = scores_label(it);
                                out = strcat(out, GetScoreLogLabel(l, f), ",");
                        }
-        });
+               });
                if(shortString < 2)
                FOREACH(Scores, true, {
                        if((scores_flags(it) & SFL_SORT_PRIO_MASK) == SFL_SORT_PRIO_SECONDARY)
@@ -645,7 +645,7 @@ string GetPlayerScoreString(entity pl, float shortString)
                                l = scores_label(it);
                                out = strcat(out, GetScoreLogLabel(l, f), ",");
                        }
-        });
+               });
                if(shortString < 1)
                FOREACH(Scores, true, {
                        if((scores_flags(it) & SFL_SORT_PRIO_MASK) != SFL_SORT_PRIO_PRIMARY)
@@ -655,7 +655,7 @@ string GetPlayerScoreString(entity pl, float shortString)
                                l = scores_label(it);
                                out = strcat(out, GetScoreLogLabel(l, f), ",");
                        }
-        });
+               });
                out = substring(out, 0, strlen(out) - 1);
        }
        else if((sk = CS(pl).scorekeeper))
@@ -663,18 +663,18 @@ string GetPlayerScoreString(entity pl, float shortString)
                FOREACH(Scores, true, {
                        if ((scores_flags(it) & SFL_SORT_PRIO_MASK) == SFL_SORT_PRIO_PRIMARY)
                                out = strcat(out, ftos(sk.(scores(it))), ",");
-        });
+               });
                if(shortString < 2)
                FOREACH(Scores, true, {
                        if ((scores_flags(it) & SFL_SORT_PRIO_MASK) == SFL_SORT_PRIO_SECONDARY)
                                out = strcat(out, ftos(sk.(scores(it))), ",");
-        });
+               });
                if(shortString < 1)
                FOREACH(Scores, true, {
                        if((scores_flags(it) & SFL_SORT_PRIO_MASK) != SFL_SORT_PRIO_PRIMARY)
                        if((scores_flags(it) & SFL_SORT_PRIO_MASK) != SFL_SORT_PRIO_SECONDARY)
                                out = strcat(out, ftos(sk.(scores(it))), ",");
-        });
+               });
                out = substring(out, 0, strlen(out) - 1);
        }
        return out;