diff options
| -rw-r--r-- | ChangeLog | 50 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gui/itemshortcutcontainer.h | 3 |
4 files changed, 42 insertions, 23 deletions
@@ -1,38 +1,46 @@ -2007-08-22 Philipp Sehmisch <tmw@crushnet.org> +2007-08-22 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/itemshortcutcontainer.h: Fixed compiler warning. + * src/CMakeLists.txt, src/Makefile.am: Updated source lists. + +2007-08-22 Philipp Sehmisch <tmw@crushnet.org> * data/graphics/sprites/chest-lightplatemail-male.png, data/graphics/sprites/chest-lightplatemail-female.png, data/graphics/items/armor-chest-lightplatemail.png, - data/graphics/tiles/woodland_indoor_x2.png: Another color - correction at the light platemail (looks more metalic now) - * data/maps/new_18-1.tmx.gz, data/maps/new_19-1.tmx.gz, + data/graphics/tiles/woodland_indoor_x2.png: Another color correction + at the light platemail (looks more metalic now) + * data/maps/new_18-1.tmx.gz, data/maps/new_19-1.tmx.gz, data/images/minimap_new_18-1.png, data/images/minimap_new_19-1.png: Removed a tree that prevented people from sitting on one of the - benches properly. Added correct minimap to woodland village and surrounding. + benches properly. Added correct minimap to woodland village and + surrounding. 2007-08-22 Joshua Langley <joshlangley[at]optusnet.com.au> - * data/graphics/gui/item_shortcut_bgr.png, src/game.cpp, src/gui/gui.cpp, - src/gui/itemcontainer.cpp, src/gui/itemshortcutcontainer.cpp, - src/gui/itemshortcutcontainer.h, src/gui/itemshortcutwindow.cpp, - src/gui/itemshortcutwindow.h, src/gui/menuwindow.cpp, - src/gui/setup_keyboard.cpp, src/gui/window.h, src/itemshortcut.cpp, - src/itemshortcut.h, src/keyboardconfig.cpp, src/keyboardconfig.h, - src/localplayer.cpp, src/localplayer.h, src/main.cpp, - src/net/inventoryhandler.cpp, src/utils/tostring.h, tmw.cbp: Added Item - Shortcut Bar. + * data/graphics/gui/item_shortcut_bgr.png, src/game.cpp, + src/gui/gui.cpp, src/gui/itemcontainer.cpp, + src/gui/itemshortcutcontainer.cpp, src/gui/itemshortcutcontainer.h, + src/gui/itemshortcutwindow.cpp, src/gui/itemshortcutwindow.h, + src/gui/menuwindow.cpp, src/gui/setup_keyboard.cpp, src/gui/window.h, + src/itemshortcut.cpp, src/itemshortcut.h, src/keyboardconfig.cpp, + src/keyboardconfig.h, src/localplayer.cpp, src/localplayer.h, + src/main.cpp, src/net/inventoryhandler.cpp, src/utils/tostring.h, + tmw.cbp: Added item shortcut bar. 2007-08-20 Joshua Langley <joshlangley[at]optusnet.com.au> - * data/graphics/gui/mouse.png, src/gui/equipmentwindow.cpp, src/gui/gui.cpp, - src/gui/gui.h, src/gui/inventorywindow.cpp, src/gui/setup.cpp, - src/gui/skill.cpp, src/gui/skill.h, src/gui/status.cpp, src/gui/window.cpp, - src/gui/window.h, data/graphics/gui/close_button.png: Added close button - functionality, resize cursor cues. + * data/graphics/gui/mouse.png, src/gui/equipmentwindow.cpp, + src/gui/gui.cpp, src/gui/gui.h, src/gui/inventorywindow.cpp, + src/gui/setup.cpp, src/gui/skill.cpp, src/gui/skill.h, + src/gui/status.cpp, src/gui/window.cpp, src/gui/window.h, + data/graphics/gui/close_button.png: Added close button functionality, + resize cursor cues. * data/graphics/gui/hits_yellow.png, src/being.cpp, src/being.h, src/gui/gui.cpp, src/localplayer.cpp, src/localplayer.h, - src/net/charserverhandler.cpp, src/net/playerhandler.cpp, src/particle.cpp - src/particle.h: Added monster killed xp notification effect. + src/net/charserverhandler.cpp, src/net/playerhandler.cpp, + src/particle.cpp, src/particle.h: Added monster killed xp notification + effect. 2007-08-19 Bjørn Lindeijer <bjorn@lindeijer.nl> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1342e8c..6bdaeb68 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -94,6 +94,10 @@ SET(SRCS gui/inventorywindow.h gui/itemcontainer.cpp gui/itemcontainer.h + gui/itemshortcutcontainer.cpp + gui/itemshortcutcontainer.h + gui/itemshortcutwindow.cpp + gui/itemshortcutwindow.h gui/item_amount.cpp gui/item_amount.h gui/linkhandler.h @@ -293,6 +297,8 @@ SET(SRCS inventory.h item.cpp item.h + itemshortcut.cpp + itemshortcut.h joystick.cpp joystick.h keyboardconfig.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 3d801721..9189e973 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,10 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \ gui/inventorywindow.h \ gui/itemcontainer.cpp \ gui/itemcontainer.h \ + gui/itemshortcutcontainer.cpp \ + gui/itemshortcutcontainer.h \ + gui/itemshortcutwindow.cpp \ + gui/itemshortcutwindow.h \ gui/item_amount.cpp \ gui/item_amount.h \ gui/linkhandler.h \ @@ -242,6 +246,8 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \ inventory.h \ item.cpp \ item.h \ + itemshortcut.cpp \ + itemshortcut.h \ joystick.cpp \ joystick.h \ keyboardconfig.cpp \ diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index a1ad53b7..4b154cbb 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -98,8 +98,7 @@ class ItemShortcutContainer : public gcn::Widget, public gcn::MouseListener * @param pointY Y coordinate of the point. * @return index on success, -1 on failure. */ - int ItemShortcutContainer::getIndexFromGrid( - int pointX, int pointY) const; + int getIndexFromGrid(int pointX, int pointY) const; Image *mBackgroundImg; |