Moved clothes loop to Person, got rid of globals tintr,tintg,tintb

[lugaru.git] / Source / ConsoleCmds.cpp

diff --git a/Source/ConsoleCmds.cpp b/Source/ConsoleCmds.cpp
index c31eed784b3ed3fe03e56a5dca669574979d46d5..32e9c1cb6a8a3f174f48a52bb39a2177c53c14e1 100644 (file)
--- a/Source/ConsoleCmds.cpp
+++ b/Source/ConsoleCmds.cpp
@@ -70,6 +70,8 @@ extern float viewdistance;
 
 extern int whichlevel;
 
+float tintr = 1, tintg = 1, tintb = 1;
+
 /* Helpers used in console commands */
 
 /* Return true if PFX is a prefix of STR (case-insensitive).  */
@@ -141,15 +143,17 @@ static void set_clothes(int pnum, const char *args)
     char buf[64];
     snprintf(buf, 63, ":Data:Textures:%s.png", args);
 
-    if (!Person::players[pnum]->addClothes(buf))
+    int id = Person::players[pnum]->numclothes;
+    strcpy(Person::players[pnum]->clothes[id], buf);
+    Person::players[pnum]->clothestintr[id] = tintr;
+    Person::players[pnum]->clothestintg[id] = tintg;
+    Person::players[pnum]->clothestintb[id] = tintb;
+    Person::players[pnum]->numclothes++;
+
+    if (!Person::players[pnum]->addClothes(id))
         return;
 
     Person::players[pnum]->DoMipmaps();
-    strcpy(Person::players[pnum]->clothes[Person::players[pnum]->numclothes], buf);
-    Person::players[pnum]->clothestintr[Person::players[pnum]->numclothes] = tintr;
-    Person::players[pnum]->clothestintg[Person::players[pnum]->numclothes] = tintg;
-    Person::players[pnum]->clothestintb[Person::players[pnum]->numclothes] = tintb;
-    Person::players[pnum]->numclothes++;
 }
 
 /* Console commands themselves */