summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2005-04-03 13:07:05 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2005-04-03 13:07:05 +0000
commit7f1a9e781e530b5143127e84b15dcc57f273b844 (patch)
treeb442d8242305e65669f1235d8e606f36c515c019 /src
parent6f7b9380b8ed0b19cdb84e578ea8652cd2e7a640 (diff)
downloadmana-7f1a9e781e530b5143127e84b15dcc57f273b844.tar.gz
mana-7f1a9e781e530b5143127e84b15dcc57f273b844.tar.bz2
mana-7f1a9e781e530b5143127e84b15dcc57f273b844.tar.xz
mana-7f1a9e781e530b5143127e84b15dcc57f273b844.zip
some fixes
Diffstat (limited to 'src')
-rw-r--r--src/engine.cpp3
-rw-r--r--src/game.cpp2
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);