From a294e49ed9994902251b536ffba853f056453ddd Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 2 Jan 2005 14:46:48 +0000
Subject: Removed Allegro datafile graphic.dat

---
 src/main.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 583e90d6..c6690fea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,8 +72,8 @@ char sex, n_server, n_character;
 SERVER_INFO *server_info;
 PLAYER_INFO *char_info = new PLAYER_INFO;
 
-BITMAP *playerset, *hairset;
-DATAFILE *graphic, *weaponset;
+BITMAP *playerset, *hairset, *login_wallpaper;
+DATAFILE *weaponset;
 
 char username[LEN_USERNAME];
 char password[LEN_PASSWORD];
@@ -267,14 +267,14 @@ void init_engine() {
         error("Not enough memory to create buffer");
     }
 
-    // TODO: Remove datafile usage
-    graphic = load_datafile("./data/graphic/graphic.dat");
-    if (graphic == NULL) {
-        error("Unable to load graphic datafile");
-    }
+    login_wallpaper = load_bitmap("./data/graphic/login.bmp", NULL);
+    if (!login_wallpaper) error("Couldn't load login.bmp");
+
+    playerset = load_bitmap("./data/graphic/playerset.bmp", NULL);
+    if (!playerset) error("Couldn't load playerset.bmp");
 
-    playerset = (BITMAP*)graphic[PLAYERSET_BMP].dat;
     hairset = load_bitmap("./data/graphic/hairset.bmp", NULL);
+    if (!hairset) error("Couldn't load hairset.bmp");
 
     if (hairset == NULL) {
         error("Unable to load hairset bitmap");
-- 
cgit v1.2.3-70-g09d2