diff options
-rw-r--r-- | src/engine.cpp | 10 | ||||
-rw-r--r-- | src/gui/playerbox.cpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index 2dca09e2..bdb2ebcd 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -329,7 +329,7 @@ void Engine::draw() std::list<FloorItem*>::iterator floorItemIterator = floorItems.begin(); while (floorItemIterator != floorItems.end()) { - FloorItem *floorItem = (*floorItemIterator); + FloorItem *floorItem = (*floorItemIterator); unsigned short x = floorItem->x; unsigned short y = floorItem->y; int sx = x - camera_x; @@ -343,8 +343,8 @@ void Engine::draw() } floorItemIterator++; - } - + } + // Draw nodes std::list<Being*>::iterator beingIterator = beings.begin(); while (beingIterator != beings.end()) @@ -383,7 +383,7 @@ void Engine::draw() } playerset->spriteset[4 * pf + dir]->draw(screen, - being->text_x - 64, being->text_y - 80); + being->text_x - 16, being->text_y - 80); if (being->weapon != 0 && being->action == ATTACK) { weaponset->spriteset[4 * being->frame + dir]->draw(screen, being->text_x - 64, being->text_y - 80); @@ -407,7 +407,7 @@ void Engine::draw() being->emotion = 0; } } - + graphics->drawText(being->name, being->text_x + 15, being->text_y + 30, gcn::Graphics::CENTER); diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index ffabe057..c8493c79 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -59,7 +59,7 @@ void PlayerBox::draw(gcn::Graphics *graphics) getAbsolutePosition(x, y); // Draw character - playerset->spriteset[0]->draw(screen, x - 25, y - 25); + playerset->spriteset[0]->draw(screen, x + 23, y - 25); // Draw his hair if (hairColor >= 0 && hairStyle >= 0 && diff --git a/src/main.cpp b/src/main.cpp index b6a3b4fa..9becaaf7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -278,12 +278,12 @@ void init_engine() "graphics/sprites/player_male_base.png"); Image *hairImg = resman->getImage( "graphics/sprites/player_male_hair.png"); - + if (!login_wallpaper) logger.error("Couldn't load login_wallpaper.png"); if (!playerImg) logger.error("Couldn't load player_male_base.png"); if (!hairImg) logger.error("Couldn't load player_male_hair.png"); - playerset = new Spriteset(playerImg, 160, 120); + playerset = new Spriteset(playerImg, 64, 120); hairset = new Spriteset(hairImg, 40, 40); gui = new Gui(graphics); |