diff options
| -rw-r--r-- | src/engine.cpp | 3 | ||||
| -rw-r--r-- | src/game.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index e20e453e..e120e026 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -274,6 +274,7 @@ void Engine::logic() void Engine::draw() { + player_node->speed = 150; // Get the current mouse position int mouseX, mouseY; SDL_GetMouseState(&mouseX, &mouseY); @@ -473,7 +474,7 @@ void Engine::draw() std::stringstream debugStream; debugStream << "[" << fps << " fps] " << (mouseX / 32 + camera_x) << ", " << (mouseY / 32 + camera_y) << " " - << player_node->weapon; + << (int)player_node->frame; debugInfo->setCaption(debugStream.str()); debugInfo->adjustSize(); } diff --git a/src/game.cpp b/src/game.cpp index 62f15abe..e330be4c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -144,6 +144,7 @@ void do_init() pathDir.insert(pathDir.size(), ".tmx"); tiledMap = Map::load(pathDir); + if (!tiledMap) { // Try .tmx.gz map file @@ -833,6 +834,7 @@ void do_parse() { strncat(map_path, RFIFOP(2), 497 - strlen(map_path)); logger.log("Warping to %s (%d, %d)\n", map_path, RFIFOW(18), RFIFOW(20)); + strcpy(strrchr(map_path, '.') + 1, "tmx.gz"); if (tiledMap) delete tiledMap; tiledMap = Map::load(map_path); |