diff options
| -rw-r--r-- | The Mana World.dev | 8 | ||||
| -rw-r--r-- | src/being.cpp | 2 | ||||
| -rw-r--r-- | src/engine.cpp | 6 | ||||
| -rw-r--r-- | src/game.cpp | 5 | ||||
| -rw-r--r-- | src/gui/skill.cpp | 6 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
6 files changed, 12 insertions, 17 deletions
diff --git a/The Mana World.dev b/The Mana World.dev index 032b633d..00ff4e92 100644 --- a/The Mana World.dev +++ b/The Mana World.dev @@ -11,7 +11,7 @@ PrivateResource=The_Mana_World_private.rc ResourceIncludes= MakeIncludes= Compiler= -CppCompiler=_@@_ +CppCompiler=-DUSE_OPENGL_@@_ Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-llibxml2_@@_-lopengl32_@@_-lz_@@_-lphysfs_@@_-lcurl_@@_ IsCpp=1 Icon=The Mana World.ico @@ -32,19 +32,19 @@ CompilerSettings=0010001001001000001101 [VersionInfo] Major=0 Minor=0 -Release=14 +Release=15 Build=0 LanguageID=1033 CharsetID=1252 CompanyName=The Mana World Development Team -FileVersion=0.0.14 +FileVersion=0.0.15 FileDescription=The Mana World InternalName=tmw.exe LegalCopyright=2004-2005 (C) LegalTrademarks= OriginalFilename=tmw.exe ProductName=The Mana World MMORPG -ProductVersion=0.0.14 +ProductVersion=0.0.15 AutoIncBuildNr=0 [Unit8] diff --git a/src/being.cpp b/src/being.cpp index b4f1e042..5faa3974 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -351,7 +351,7 @@ void Being::drawSpeech(Graphics *graphics) if (showSpeech) { graphics->setFont(speechFont); graphics->drawText(speech, - text_x + 20, text_y - 60, + text_x + 18, text_y - 60, gcn::Graphics::CENTER); } if (showDamage) { diff --git a/src/engine.cpp b/src/engine.cpp index f290747e..f2140f40 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -236,7 +236,7 @@ Engine::Engine(): if (!itembitmap) logger->error("Unable to load items.png"); npcset = new Spriteset(npcbmp, 50, 80); - emotionset = new Spriteset(emotionbmp, 19, 19); + emotionset = new Spriteset(emotionbmp, 30, 32); weaponset = new Spriteset(weaponbitmap, 160, 120); itemset = new Spriteset(itembitmap, 32, 32); @@ -443,8 +443,8 @@ void Engine::draw() if (being->emotion != 0) { guiGraphics->drawImage( emotionset->spriteset[being->emotion - 1], - sx * 32 + 5 + get_x_offset(being) - offset_x, - sy * 32 - 65 + get_y_offset(being) - offset_y); + sx * 32 + 3 + get_x_offset(being) - offset_x, + sy * 32 - 90 + get_y_offset(being) - offset_y); } graphics->setFont(speechFont); diff --git a/src/game.cpp b/src/game.cpp index 9711b5e7..16addcd4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1258,11 +1258,6 @@ void do_parse() } if (oldMap) delete oldMap; break; - // Skill ... - case 0x011a: - break; - case 0x01a4: - break; // Action failed (ex. sit because you have not reached the right level) case 0x0110: CHATSKILL action; diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp index b4315d3e..b10ecda8 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -30,11 +30,11 @@ char *skill_db[] = { // 0-99 - "", "Basic", "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", "", "", "", + "", "Basic", "Sword", "", "HP regeneration", "", "", "", "", "MP regeneration", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", + "", "", "", "", "", "", "MAX weight", "Discount", "Overcharge", "", + "Identify", "", "", "", "", "", "", "", "Double", "Miss", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", diff --git a/src/main.cpp b/src/main.cpp index f99e781c..ed6e9427 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -406,7 +406,6 @@ int main(int argc, char *argv[]) switch (state) { case LOGIN: logger->log("State: LOGIN"); - sound.playMusic(TMW_DATADIR "data/music/Ivano(de)Jeanette.ogg"); login(); break; case CHAR_SERVER: @@ -441,6 +440,7 @@ int main(int argc, char *argv[]) graphics->updateScreen(); break; case UPDATE: + sound.playMusic(TMW_DATADIR "data/music/Magick - Real.ogg"); uw = new UpdaterWindow(); uw->updateData(); delete uw; |