summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2004-12-11 17:39:25 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2004-12-11 17:39:25 +0000
commit3fcde31ec23e0bb8f5403e2dcba6ac030fb310a2 (patch)
tree81fc3e70dc98a9ed9f1f86614df8b886508abcfc /src/main.cpp
parentaf7060d953e1c0f54a7d5bf46894191d41d853ff (diff)
downloadmana-3fcde31ec23e0bb8f5403e2dcba6ac030fb310a2.tar.gz
mana-3fcde31ec23e0bb8f5403e2dcba6ac030fb310a2.tar.bz2
mana-3fcde31ec23e0bb8f5403e2dcba6ac030fb310a2.tar.xz
mana-3fcde31ec23e0bb8f5403e2dcba6ac030fb310a2.zip
Core sprite classes of the new graphic engine
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index fbccd95c..907c1e39 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -76,7 +76,7 @@ SERVER_INFO *server_info;
PLAYER_INFO *char_info = new PLAYER_INFO;
BITMAP *playerset, *hairset;
-DATAFILE *graphic, *emotions, *weaponset;
+DATAFILE *graphic, *weaponset;
char username[LEN_USERNAME];
char password[LEN_PASSWORD];
@@ -259,9 +259,6 @@ void init_engine() {
if(graphic==NULL)
error("Unable to load graphic datafile");
playerset = (BITMAP*)graphic[PLAYERSET_BMP].dat;
- emotions = load_datafile("./data/graphic/emotions.dat");
- if(emotions==NULL)
- error("Unable to load emotions datafile");
hairset = load_bitmap("./data/graphic/hairset.bmp", NULL);
if(hairset==NULL)
error("Unable to load hairset bitmap");