diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/being.cpp | 2 | ||||
| -rw-r--r-- | src/gui/equipmentwindow.cpp | 4 | ||||
| -rw-r--r-- | src/player.cpp | 3 |
4 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2006-06-27 Eugenio Favalli <elvenprogrammer@gmail.com> + + * src/being.cpp, src/gui/equipmentwindow.cpp, src/player.cpp: Equipment + window now show all the slots, and adapted visible shirts to head + (middle) equipments. + 2006-06-27 Frode Lindeijer <f.lindeijer@gmail.com> * /tmw/trunk/data/graphics/sprites/player_male_base.png: diff --git a/src/being.cpp b/src/being.cpp index 8963ed3c..f5d03563 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -304,7 +304,7 @@ void Being::setWeaponById(Uint16 weapon) break; default: - logger->log("unknown item equiped : %d", weapon); + logger->log("Not a weapon: %d", weapon); } } diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 1b9cfc55..fd979beb 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -39,7 +39,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment): Window("Equipment"), mEquipment(equipment) { setWindowName("Equipment"); - setDefaultSize(5, 230, 200, 90); + setDefaultSize(5, 230, 200, 120); loadWindowState(); mItemset = ResourceManager::getInstance()->createSpriteset( @@ -63,7 +63,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) // Rectangles around items are black graphics->setColor(gcn::Color(0, 0, 0)); - for (int i = 0; i < 8; i++) { + for (int i = 0; i < EQUIPMENT_SIZE; i++) { graphics->drawRectangle(gcn::Rectangle(10 + 36 * (i % 4), 36 * (i / 4) + 25, 32, 32)); diff --git a/src/player.cpp b/src/player.cpp index 830c92aa..847137e0 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -131,7 +131,8 @@ void Player::draw(Graphics *graphics, int offsetX, int offsetY) graphics->drawImage(playerset[mSex]->get(frame + 18 * dir), px - 16, py - 32); - Item *item = mEquipment->getEquipment(3); + // Display a shirt if equipped + Item *item = mEquipment->getEquipment(8); if (item) { graphics->drawImage(equipmentset->get(frame + 18 * dir), |