Don't load the weapon set, doesn't seem to be used at the moment even.

3 files changed, 4 insertions, 11 deletions

diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 7b29ea66..e05842d6 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -202,12 +202,12 @@ GraphicEngine::GraphicEngine() {
     // Initialize the gui bitmap to the page that will be drawn first
     gui_bitmap = this->buffer;
     
-    tileset = new Spriteset("./data/graphic/tileset.dat");
-    hairset = new Spriteset("./data/graphic/hairset.dat");
     emotionset = new Spriteset("./data/graphic/emotionset.dat");
+    hairset = new Spriteset("./data/graphic/hairset.dat");
+    monsterset = new Spriteset("./data/graphic/monsterset.dat");
     npcset = new Spriteset("./data/graphic/npcset.dat");
     playerset = new Spriteset("./data/graphic/playerset.dat");
-    monsterset = new Spriteset("./data/graphic/monsterset.dat");
+    tileset = new Spriteset("./data/graphic/tileset.dat");
 }
 
 GraphicEngine::~GraphicEngine() {
diff --git a/src/main.cpp b/src/main.cpp
index c6690fea..a73f65eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,7 +73,6 @@ SERVER_INFO *server_info;
 PLAYER_INFO *char_info = new PLAYER_INFO;
 
 BITMAP *playerset, *hairset, *login_wallpaper;
-DATAFILE *weaponset;
 
 char username[LEN_USERNAME];
 char password[LEN_PASSWORD];
@@ -280,12 +279,6 @@ void init_engine() {
         error("Unable to load hairset bitmap");
     }
 
-    // TODO: Remove datafile usage
-    weaponset = load_datafile("./data/graphic/weapon.dat");
-    if (weaponset == NULL) {
-        error("Unable to load weaponset datafile");
-    }
-
     // TODO: Remove Allegro config file usage from GUI look
     init_gui(buffer, "./data/Skin/aqua.skin");
     state = LOGIN;
diff --git a/src/main.h b/src/main.h
index 96714cbb..d46953ba 100644
--- a/src/main.h
+++ b/src/main.h
@@ -85,7 +85,7 @@ typedef struct {
 } PLAYER_INFO;
 
 extern BITMAP *playerset, *login_wallpaper;
-extern DATAFILE *emotions, *weaponset;
+extern DATAFILE *emotions;
 extern char username[25];
 extern char password[25];
 extern int map_address, char_ID;