diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-07-19 15:12:06 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-07-19 15:12:06 +0000 |
| commit | 4050f8c0bced625a95d542d30647c3f8bbf2267b (patch) | |
| tree | 420d65a5ed6a2155762b4e13a4c90ab2df9f888e /src/main.cpp | |
| parent | da3a1fd114dd7b8e5e8c880bd987506acc16ac42 (diff) | |
| download | mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.gz mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.bz2 mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.xz mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.zip | |
Merged new_animation branch until r2415 into trunk.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index a4ef390e..5ecb4f35 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,6 +43,7 @@ #define NOGDI #endif +#include "animation.h" #include "configuration.h" #include "game.h" #include "graphics.h" @@ -84,7 +85,6 @@ char n_server, n_character; std::vector<Spriteset *> hairset; Spriteset *playerset[2]; -Spriteset *equipmentset[2]; Graphics *graphics; // TODO Anyone knows a good location for this? Or a way to make it non-global? @@ -250,12 +250,6 @@ void init_engine() playerset[1] = resman->createSpriteset( "graphics/sprites/player_female_base.png", 64, 64); if (!playerset[1]) logger->error("Couldn't load female player spriteset!"); - equipmentset[0] = resman->createSpriteset( - "graphics/sprites/item001.png", 64, 64); - if (!equipmentset[0]) logger->error("Couldn't load player equipmentset!"); - equipmentset[1] = resman->createSpriteset( - "graphics/sprites/item002.png", 64, 64); - if (!equipmentset[1]) logger->error("Couldn't load player equipmentset!"); for (int i=0; i < NR_HAIR_STYLES; i++) @@ -298,8 +292,6 @@ void exit_engine() hairset.clear(); delete playerset[0]; delete playerset[1]; - delete equipmentset[0]; - delete equipmentset[1]; // Shutdown libxml xmlCleanupParser(); @@ -685,10 +677,12 @@ int main(int argc, char *argv[]) break; case CHAR_CONNECT_STATE: + printf("Char: %i\n", loginData.sex); charLogin(network, &loginData); break; case ACCOUNT_STATE: + printf("Account: %i\n", loginData.sex); accountLogin(network, &loginData); break; |