Got rid of hairset.dat and playerset.dat.

2 files changed, 20 insertions, 17 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index eaada80d..0bc49084 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -24,6 +24,7 @@
 #include "char_select.h"
 #include "textfield.h"
 #include "../graphic/graphic.h"
+#include "../main.h"
 
 CharSelectDialog::CharSelectDialog(gcn::Container *parent)
     : Window(parent, "Select Character")
@@ -230,16 +231,16 @@ void charSelect()
         gui_update(NULL);
 
         // Draw character
-        const int pX = 16, pY = 32;
+        const int pX = 8, pY = 16;
         if (n_character > 0) {
-            masked_blit(playerset, buffer, 0, 0,
-                    pX + sel->getDimension().x,
-                    pY + sel->getDimension().y, 80, 60);
-            masked_blit(hairset, buffer,
-                    20 * (char_info->hair_color - 1),
-                    20 * 4 * (char_info->hair_style - 1),
-                    pX + 31 + sel->getDimension().x,
-                    pY + 15 + sel->getDimension().y, 20, 20);
+            playerset->spriteset[0]->draw(buffer,
+                    pX + sel->getX() - 31,
+                    pY + sel->getY() - 15);
+
+            int hf = char_info->hair_color + 40 * (char_info->hair_style) - 41;
+            hairset->spriteset[hf]->draw(buffer,
+                    pX + 31 + sel->getX(),
+                    pY + 15 + sel->getY());
         }
 
         // Draw to screen
@@ -318,12 +319,14 @@ void charCreate()
 
         // Draw character
         const int pX = 96, pY = 40;
-        masked_blit(playerset, buffer, 0, 0,
-                pX + create->getDimension().x,
-                pY + create->getDimension().y, 80, 60);
-        masked_blit(hairset, buffer, 20 * curHairColor, 20 * 4 * curHairStyle,
-                pX + 31 + create->getDimension().x,
-                pY + 15 + create->getDimension().y, 20, 20);
+        playerset->spriteset[0]->draw(buffer,
+                pX + create->getX() - 31,
+                pY + create->getY() - 15);
+
+        int hf = curHairColor + 40 * (curHairStyle);
+        hairset->spriteset[hf]->draw(buffer,
+                pX + 31 + create->getX(),
+                pY + 15 + create->getY());
 
         // Draw to screen
         blit(buffer, screen, 0, 0, 0, 0, 800, 600);
diff --git a/src/gui/inventory.cpp b/src/gui/inventory.cpp
index d506d8ed..1a8f59d7 100644
--- a/src/gui/inventory.cpp
+++ b/src/gui/inventory.cpp
@@ -101,7 +101,7 @@ void InventoryWindow::draw(gcn::Graphics *graphics)
         }
         else {
             textprintf_ex(buffer, font, x + itemMeny_x,
-                    y + itemMeny_y, MAKECOL_BLACK, -1, "Use item");
+                    y + itemMeny_y, makecol(0,0,0), -1, "Use item");
         }
         if (y + itemMeny_y + 10 < mouse_y && y + itemMeny_y + 20 > mouse_y) {
             if (mouse_b & 1) {
@@ -114,7 +114,7 @@ void InventoryWindow::draw(gcn::Graphics *graphics)
         }
         else {
             textprintf_ex(buffer, font, x + itemMeny_x,
-                    y + itemMeny_y + 10, MAKECOL_BLACK, -1, "Del item");
+                    y + itemMeny_y + 10, makecol(0,0,0), -1, "Del item");
         }
     }
     */