summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--The Mana World.dev2
-rw-r--r--src/engine.cpp4
-rw-r--r--src/game.cpp16
-rw-r--r--src/gui/char_select.cpp1
4 files changed, 13 insertions, 10 deletions
diff --git a/The Mana World.dev b/The Mana World.dev
index 5039443b..ed961a29 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -11,7 +11,7 @@ PrivateResource=The_Mana_World_private.rc
ResourceIncludes=
MakeIncludes=
Compiler=-Dmain=SDL_main_@@_
-CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_-D__DEBUG_@@_
+CppCompiler=-funroll-loops_@@_-ffast-math_@@_-fomit-frame-pointer_@@_-pipe_@@_
Linker=-lguichan_@@_-lguichan_sdl_@@_-lguichan_opengl_@@_-lwsock32_@@_-lSDL_image_@@_-lSDL_mixer_@@_-lmingw32_@@_-lSDLmain_@@_-lSDL_@@_-llibxml2_@@_-lopengl32_@@_-lphysfs_static_@@_
IsCpp=1
Icon=The Mana World.ico
diff --git a/src/engine.cpp b/src/engine.cpp
index 48aa9d31..c15d1964 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -371,11 +371,11 @@ void Engine::draw()
int mf = being->frame + being->action;
if (being->action == MONSTER_DEAD) {
- monsterset->spriteset[sprnum + 16 * MONSTER_DEAD]->draw(screen,
+ monsterset->spriteset[sprnum + 20 * MONSTER_DEAD]->draw(screen,
being->text_x + 30, being->text_y + 40);
}
else {
- monsterset->spriteset[sprnum + 16 * mf]->draw(screen,
+ monsterset->spriteset[sprnum + 20 * mf]->draw(screen,
being->text_x + 30, being->text_y + 40);
}
diff --git a/src/game.cpp b/src/game.cpp
index 041274d2..b7fd9f86 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -125,14 +125,16 @@ void game() {
void do_init()
{
- //tiledMap = Map::load(map_path);
- //std::string path(map_path);
-
- /*std::string pathDir = path.substr(0, path.rfind(".") + 1);
- pathDir.insert(pathDir.size(), "tmx.gz");*/
-
+ /*tiledMap = Map::load(map_path);
+ std::cout << map_path << std::endl;*/
+ std::string path(map_path);
+
+ std::string pathDir = path.substr(0, path.rfind(".") + 1);
+ pathDir.insert(pathDir.size(), "tmx");
+
+ //tiledMap = Map::load("data/maps/new_3-1.tmx.gz");
+ //std::cout << pathDir << std::endl;
tiledMap = Map::load(map_path);
- std::cout << map_path << std::endl;
if (!tiledMap) {
logger.error("Could not find map file");
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index d8071ac2..41e27a89 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -104,6 +104,7 @@ CharSelectDialog::CharSelectDialog():
selectButton->requestFocus();
setLocationRelativeTo(getParent());
+
}
CharSelectDialog::~CharSelectDialog()