diff options
| author | Alexander Baldeck <alexander@archlinux.org> | 2004-09-26 18:09:31 +0000 |
|---|---|---|
| committer | Alexander Baldeck <alexander@archlinux.org> | 2004-09-26 18:09:31 +0000 |
| commit | 96cd54889ccfc98170e9e790e3179ad90c93eaf7 (patch) | |
| tree | c4f7bce102154dddc6c2fdb71c7318eacb347f5c | |
| parent | 41f57120092aaa4bdd061f54838728daba096a8f (diff) | |
| download | mana-96cd54889ccfc98170e9e790e3179ad90c93eaf7.tar.gz mana-96cd54889ccfc98170e9e790e3179ad90c93eaf7.tar.bz2 mana-96cd54889ccfc98170e9e790e3179ad90c93eaf7.tar.xz mana-96cd54889ccfc98170e9e790e3179ad90c93eaf7.zip | |
upcase bugfixes for gui-related things
| -rw-r--r-- | src/gui/gui.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 93bc3188..022d0ece 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -61,7 +61,7 @@ void init_gui(BITMAP *bitmap, const char *skin) { gui_bitmap = bitmap; gui_load_skin(skin); //alfont_init(); - gui_font = alfont_load_font("./data/skin/arial.ttf"); + gui_font = alfont_load_font("./data/Skin/arial.ttf"); alfont_set_font_size(gui_font, 14); drag = false; show_mouse(NULL); diff --git a/src/main.cpp b/src/main.cpp index 3741b680..b9b791ab 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,6 +25,8 @@ #include "./sound/sound.h" #include "./graphic/graphic.h" +#include <iostream> + /* Account infos */ int account_ID, session_ID1, session_ID2; char sex, n_server, n_character; @@ -54,7 +56,7 @@ void request_exit() { /** Do all initialization stuff */ void init_engine() { - allegro_init(); + allegro_init(); init_log(); set_close_button_callback(request_exit); // we should not use set_window_close_hook() since it's deprecated and might be gone in the future /-kth5 set_config_file("tmw.ini"); @@ -85,16 +87,16 @@ void init_engine() { buffer = create_bitmap(800, 600); if(!buffer) error("Not enough memory to create buffer"); + graphic = load_datafile("./data/graphic/graphic.dat"); if(graphic==NULL) error("Unable to load graphic datafile"); - playerset = (BITMAP*)graphic[PLAYERSET_BMP].dat; + playerset = (BITMAP*)graphic[PLAYERSET_BMP].dat; emotions = load_datafile("./data/graphic/emotions.dat"); if(emotions==NULL) error("Unable to load emotions datafile"); - init_gui(buffer, "./data/skin/aqua.skin"); - + init_gui(buffer, "./data/Skin/aqua.skin"); state = LOGIN; } @@ -108,8 +110,7 @@ void exit_engine() { /** Main */ int main() { - init_engine(); - + init_engine(); // initialize sound-engine and start playing intro-theme /-kth5 try{ if(get_config_int("settings", "sound", 0)==1) |