diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 145 | ||||
| -rw-r--r-- | src/main.cpp | 10 |
2 files changed, 105 insertions, 50 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9635b08d..8068a6b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,53 +1,102 @@ bin_PROGRAMS = tmw tmw_SOURCES = sound/sound.cpp \ - graphic/graphic.cpp \ - graphic/spriteset.cpp \ - gui/button.cpp \ - gui/buy.cpp \ - gui/buysell.cpp \ - gui/char_server.cpp \ - gui/char_select.cpp \ - gui/chat.cpp \ - gui/checkbox.cpp \ - gui/confirm_dialog.cpp \ - gui/equipment.cpp \ - gui/gui.cpp \ - gui/inventory.cpp \ - gui/itemcontainer.cpp \ - gui/listbox.cpp \ - gui/login.cpp \ - gui/minimap.cpp \ - gui/npc.cpp \ - gui/npc_text.cpp \ - gui/ok_dialog.cpp \ - gui/passwordfield.cpp \ - gui/playerbox.cpp \ - gui/progressbar.cpp \ - gui/radiobutton.cpp \ - gui/scrollarea.cpp \ - gui/sell.cpp \ - gui/setup.cpp \ - gui/shop.cpp \ - gui/skill.cpp \ - gui/slider.cpp \ - gui/status.cpp \ - gui/stats.cpp \ - gui/textbox.cpp \ - gui/textfield.cpp \ - gui/window.cpp \ - gui/windowcontainer.cpp \ - net/network.cpp \ - net/protocol.cpp \ - resources/image.cpp \ - resources/resource.cpp \ - resources/resourcemanager.cpp \ - base64.cpp \ - being.cpp \ - configuration.cpp \ - game.cpp \ - log.cpp \ - main.cpp \ - map.cpp + sound/sound.h \ + graphic/graphic.cpp \ + graphic/graphic.h \ + graphic/spriteset.cpp \ + graphic/spriteset.h \ + gui/button.cpp \ + gui/button.h \ + gui/buy.cpp \ + gui/buy.h \ + gui/buysell.cpp \ + gui/buysell.h \ + gui/char_server.cpp \ + gui/char_server.h \ + gui/char_select.cpp \ + gui/char_select.h \ + gui/chat.cpp \ + gui/chat.h \ + gui/checkbox.cpp \ + gui/checkbox.h \ + gui/confirm_dialog.cpp \ + gui/confirm_dialog.h \ + gui/equipment.cpp \ + gui/equipment.h \ + gui/gui.cpp \ + gui/gui.h \ + gui/inventory.cpp \ + gui/inventory.h \ + gui/itemcontainer.cpp \ + gui/itemcontainer.h \ + gui/listbox.cpp \ + gui/listbox.h \ + gui/login.cpp \ + gui/login.h \ + gui/minimap.cpp \ + gui/minimap.h \ + gui/npc.cpp \ + gui/npc.h \ + gui/npc_text.cpp \ + gui/npc_text.h \ + gui/ok_dialog.cpp \ + gui/ok_dialog.h \ + gui/passwordfield.cpp \ + gui/passwordfield.h \ + gui/playerbox.cpp \ + gui/playerbox.h \ + gui/progressbar.cpp \ + gui/progressbar.h \ + gui/radiobutton.cpp \ + gui/radiobutton.h \ + gui/scrollarea.cpp \ + gui/scrollarea.h \ + gui/sell.cpp \ + gui/sell.h \ + gui/setup.cpp \ + gui/setup.h \ + gui/shop.cpp \ + gui/shop.h \ + gui/skill.cpp \ + gui/skill.h \ + gui/slider.cpp \ + gui/slider.h \ + gui/status.cpp \ + gui/status.h \ + gui/stats.cpp \ + gui/stats.h \ + gui/textbox.cpp \ + gui/textbox.h \ + gui/textfield.cpp \ + gui/textfield.h \ + gui/window.cpp \ + gui/window.h \ + gui/windowcontainer.cpp \ + gui/windowcontainer.h \ + net/network.cpp \ + net/network.h \ + net/protocol.cpp \ + net/protocol.h \ + resources/image.cpp \ + resources/image.h \ + resources/resource.cpp \ + resources/resource.h \ + resources/resourcemanager.cpp \ + resources/resourcemanager.h \ + base64.cpp \ + base64.h \ + being.cpp \ + being.h \ + configuration.cpp \ + configuration.h \ + game.cpp \ + game.h \ + log.cpp \ + log.h \ + main.cpp \ + main.h \ + map.cpp\ + map.h # set the include path found by configure INCLUDES= $(all_includes) diff --git a/src/main.cpp b/src/main.cpp index 99458bad..243c0d01 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,9 +29,11 @@ #include "./sound/sound.h" #include "./graphic/graphic.h" #include "resources/resourcemanager.h" + #include <iostream> #include <guichan.hpp> #include <SDL.h> +#include <libxml/xmlversion.h> #ifdef __USE_UNIX98 #include <sys/stat.h> @@ -58,7 +60,6 @@ char map_name[16]; unsigned char state; unsigned short x, y; unsigned char direction; -//unsigned short job, hair, hair_color; unsigned char screen_mode; char *dir; @@ -97,7 +98,12 @@ void request_exit() { /** * Do all initialization stuff */ -void init_engine() { +void init_engine() +{ + // Initialize libxml2 and check for potential ABI mismatches between + // compiled version and the shared library actually used. + LIBXML_TEST_VERSION + // Initialize SDL if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0) { std::cerr << "Could not initialize SDL: " << |