diff options
| -rw-r--r-- | data/core/graphics/images/login_wallpaper.png | bin | 0 -> 124342 bytes | |||
| -rw-r--r-- | src/graphic/graphic.cpp | 22 | ||||
| -rw-r--r-- | src/main.cpp | 21 |
3 files changed, 22 insertions, 21 deletions
diff --git a/data/core/graphics/images/login_wallpaper.png b/data/core/graphics/images/login_wallpaper.png Binary files differnew file mode 100644 index 00000000..3154e78b --- /dev/null +++ b/data/core/graphics/images/login_wallpaper.png diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index e444ba7a..c5fd63eb 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -268,15 +268,19 @@ Engine::Engine() // Load the sprite sets ResourceManager *resman = ResourceManager::getInstance(); - Image *npcbmp = resman->getImage("graphic/npcset.bmp"); - Image *emotionbmp = resman->getImage("graphic/emotionset.bmp"); - Image *tilesetbmp = resman->getImage("graphic/tileset.bmp"); - Image *monsterbitmap = resman->getImage("graphic/monsterset.bmp"); - - if (!npcbmp) error("Unable to load npcset.bmp"); - if (!emotionbmp) error("Unable to load emotionset.bmp"); - if (!tilesetbmp) error("Unable to load tileset.bmp"); - if (!monsterbitmap) error("Unable to load monsterset.bmp"); + Image *npcbmp = resman->getImage( + "core/graphics/sprites/npcs.png"); + Image *emotionbmp = resman->getImage( + "core/graphics/sprites/emotions.png"); + Image *tilesetbmp = resman->getImage( + "core/graphics/tiles/desert.png"); + Image *monsterbitmap = resman->getImage( + "core/graphics/sprites/monsters.png"); + + if (!npcbmp) error("Unable to load npcs.png"); + if (!emotionbmp) error("Unable to load emotions.png"); + if (!tilesetbmp) error("Unable to load desert.png"); + if (!monsterbitmap) error("Unable to load monsters.png"); npcset = new Spriteset(npcbmp, 50, 80); emotionset = new Spriteset(emotionbmp, 19, 19); diff --git a/src/main.cpp b/src/main.cpp index 17307209..4d6651b6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -210,22 +210,19 @@ void init_engine() { ResourceManager *resman = ResourceManager::getInstance(); - login_wallpaper = resman->getImage("graphic/login.bmp"); - Image *playerImg = resman->getImage("graphic/playerset.bmp"); - Image *hairImg = resman->getImage("graphic/hairset.bmp"); + login_wallpaper = resman->getImage( + "core/graphics/images/login_wallpaper.png"); + Image *playerImg = resman->getImage( + "core/graphics/sprites/player_male_base.png"); + Image *hairImg = resman->getImage( + "core/graphics/sprites/player_male_hair.png"); if (!login_wallpaper) error("Couldn't load login.bmp"); - if (!playerImg) error("Couldn't load playerset.bmp"); + if (!playerImg) error("Couldn't load playerset.png"); if (!hairImg) error("Couldn't load hairset.bmp"); - // Stretch some bitmaps while they haven't been replaced with higher res - Image *scaledPlayerImg = playerImg->getScaledInstance( - playerImg->getWidth() * 2, playerImg->getHeight() * 2); - Image *scaledHairImg = hairImg->getScaledInstance( - hairImg->getWidth() * 2, hairImg->getHeight() * 2); - - playerset = new Spriteset(scaledPlayerImg, 160, 120); - hairset = new Spriteset(scaledHairImg, 40, 40); + playerset = new Spriteset(playerImg, 160, 120); + hairset = new Spriteset(hairImg, 40, 40); init_gui(graphics); state = LOGIN; |
