From e2297c73625aff1fd6d809b1da8879f0ae0af633 Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Tue, 1 Jul 2008 15:05:10 +0000 Subject: Updated project files. --- ChangeLog | 1 + data/graphics/gui/Makefile.am | 6 +- src/Makefile.am | 4 + tmw.cbp | 678 +++++++++++++++++++++--------------------- 4 files changed, 351 insertions(+), 338 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5720df66..dfc5c292 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ src/gui/itemcontainer.cpp, src/gui/itemcontainer.h: Item descriptions are now shown in a separate GUI window when the mouse cursor hovers over them (ported from Legend of Mazzeroth). + * tmw.cbp, src/Makefile.am, data/graphics/gui/Makefile.am: Updated project files. 2008-06-27 Roderic Morris diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 724631fe..6b3ad6ae 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -11,8 +11,10 @@ gui_DATA = \ checkbox.png \ close_button.png \ deepbox.png \ - equip_bg.png \ + default.png \ + equip_bg.png \ fixedfont.png \ + gui.xml \ hits_blue.png \ hits_red.png \ hits_yellow.png \ @@ -36,6 +38,8 @@ gui_DATA = \ sansserif8.png \ selection.png \ slider.png \ + speech_bubble.png \ + speechbubble.xml \ target-cursor-blue-l.png \ target-cursor-blue-m.png \ target-cursor-blue-s.png \ diff --git a/src/Makefile.am b/src/Makefile.am index 0bbfdc20..a64cd502 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,6 +65,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \ gui/inventorywindow.h \ gui/itemcontainer.cpp \ gui/itemcontainer.h \ + gui/itempopup.cpp \ + gui/itempopup.h gui/itemshortcutcontainer.cpp \ gui/itemshortcutcontainer.h \ gui/itemshortcutwindow.cpp \ @@ -135,6 +137,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \ gui/skill.h \ gui/slider.cpp \ gui/slider.h \ + gui/speechbubble.cpp \ + gui/speechbubble.h \ gui/status.cpp \ gui/status.h \ gui/textbox.cpp \ diff --git a/tmw.cbp b/tmw.cbp index 92ff00ae..6a822fba 100644 --- a/tmw.cbp +++ b/tmw.cbp @@ -74,679 +74,683 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - + - + - - + + - + - + - - - - + + + + - + - - + + - + -- cgit v1.2.3-70-g09d2