diff options
| author | Ira Rice <irarice@gmail.com> | 2008-11-18 06:45:46 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-11-18 06:45:46 +0000 |
| commit | 40f2ec0582932bb21952cb58c5e51ca508206cae (patch) | |
| tree | 7512211b9766729743fc0403db960fa229d3ecc2 | |
| parent | 717e8babd1124a4c6c685a6386a84f58148d4931 (diff) | |
| download | mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.gz mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.bz2 mana-40f2ec0582932bb21952cb58c5e51ca508206cae.tar.xz mana-40f2ec0582932bb21952cb58c5e51ca508206cae.zip | |
Pedantic fixes to the client, where I alphabetized all of the include
statements, as well as removing the new skill dialog, which we do not,
nor will we use (if we do, it'd be a new one that we'd make).
WARNING!!! This, and all other previous builds have a linker error for
the Gnome libraries version 4.3.2 on my setup. It's assumed that this is
also the case for other users of this library as well. I'm currently
assuming that there's a bug in the compiler itself, and will look into
reporting this, but in the mean time, it doesn't build for these users,
unfortunately. Sorry about this.
314 files changed, 320 insertions, 1252 deletions
diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp index 50881830..ec4940ac 100644 --- a/AethyraLin2WinXcompile.cbp +++ b/AethyraLin2WinXcompile.cbp @@ -168,8 +168,6 @@ <Unit filename="src\gui\minimap.h" /> <Unit filename="src\gui\ministatus.cpp" /> <Unit filename="src\gui\ministatus.h" /> - <Unit filename="src\gui\newskill.cpp" /> - <Unit filename="src\gui\newskill.h" /> <Unit filename="src\gui\npc_text.cpp" /> <Unit filename="src\gui\npc_text.h" /> <Unit filename="src\gui\npclistdialog.cpp" /> diff --git a/debian/control b/debian/control index b845ba94..0d94b4fd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Homepage: http://www.aethyra.org/ Maintainer: Aethyra Project <www.aethyra.org> -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan-dev (>= 0.8.1-3), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev Standards-Version: 3.7.3 Package: aethyra diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 01aa13f7..00000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/themanaworld/tmw-(.*)\.tar\.gz diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d5021823..e4803230 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,8 +118,6 @@ SET(SRCS gui/minimap.h gui/ministatus.cpp gui/ministatus.h - gui/newskill.cpp - gui/newskill.h gui/npclistdialog.cpp gui/npclistdialog.h gui/npc_text.cpp @@ -286,6 +284,7 @@ SET(SRCS engine.h equipment.cpp equipment.h + extensions.h floor_item.cpp floor_item.h flooritemmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 17445ddf..5c759135 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -70,8 +70,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/minimap.h \ gui/ministatus.cpp \ gui/ministatus.h \ - gui/newskill.cpp \ - gui/newskill.h \ gui/npclistdialog.cpp \ gui/npclistdialog.h \ gui/npc_text.cpp \ @@ -248,6 +246,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ engine.h \ equipment.cpp \ equipment.h \ + extensions.h \ floor_item.cpp \ floor_item.h \ flooritemmanager.cpp \ diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 92c4e3f3..c86c5392 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animatedsprite.cpp 3752 2007-11-20 10:50:00Z b_lindeijer $ */ #include "animatedsprite.h" - #include "graphics.h" #include "log.h" diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 1fac5220..405bf42e 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animatedsprite.h 3752 2007-11-20 10:50:00Z b_lindeijer $ */ #ifndef _TMW_ANIMATEDSPRITE_H diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp index c79a5bc4..59eacb05 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -17,11 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #include "animationparticle.h" - #include "graphics.h" #include "simpleanimation.h" diff --git a/src/animationparticle.h b/src/animationparticle.h index 054b1b73..eabc2742 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #ifndef _ANIMATION_PARTICLE diff --git a/src/being.cpp b/src/being.cpp index 7fb63a7c..27bd0c57 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: being.cpp 4301 2008-05-28 16:06:48Z peaveydk $ */ -#include "being.h" #include <cassert> #include <cmath> #include "animatedsprite.h" +#include "being.h" #include "configuration.h" #include "equipment.h" #include "game.h" @@ -37,17 +35,16 @@ #include "sound.h" #include "text.h" -#include "resources/resourcemanager.h" -#include "resources/itemdb.h" #include "resources/imageset.h" +#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/resourcemanager.h" #include "gui/gui.h" #include "gui/speechbubble.h" #include "utils/dtor.h" #include "utils/tostring.h" - #include "utils/xml.h" #define BEING_EFFECTS_FILE "effects.xml" diff --git a/src/being.h b/src/being.h index 62a1c937..325ec51a 100644 --- a/src/being.h +++ b/src/being.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: being.h 4321 2008-06-02 11:42:26Z b_lindeijer $ */ #ifndef _TMW_BEING_H @@ -26,8 +24,8 @@ #include <list> #include <memory> -#include <string> #include <SDL_types.h> +#include <string> #include <vector> #include "animatedsprite.h" diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index f0ce9bd3..ada1ddfa 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beingmanager.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #include <cassert> #include "beingmanager.h" - #include "localplayer.h" #include "monster.h" #include "npc.h" diff --git a/src/beingmanager.h b/src/beingmanager.h index 6942ff54..0179bed8 100644 --- a/src/beingmanager.h +++ b/src/beingmanager.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beingmanager.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_BEINGMANAGER_H diff --git a/src/configlistener.h b/src/configlistener.h index bf00f3ef..9fbc4544 100644 --- a/src/configlistener.h +++ b/src/configlistener.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configlistener.h 1673 2005-08-29 22:00:35Z der_doener $ */ #ifndef _TMW_CONFIGLISTENER_H @@ -26,7 +24,6 @@ #include <iosfwd> - /** * The listener interface for receiving notifications about changes to * configuration options. diff --git a/src/configuration.cpp b/src/configuration.cpp index e9c8db7a..8e80de18 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -17,16 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configuration.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ - -#include "configuration.h" - #include <libxml/xmlwriter.h> #include "configlistener.h" +#include "configuration.h" #include "log.h" #include "utils/tostring.h" diff --git a/src/configuration.h b/src/configuration.h index 7dadb083..197e1a41 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configuration.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_CONFIGURATION_H #define _TMW_CONFIGURATION_H -#include <map> -#include <list> -#include <string> #include <cassert> #include <libxml/xmlwriter.h> +#include <list> +#include <map> +#include <string> class ConfigListener; class ConfigurationObject; diff --git a/src/engine.cpp b/src/engine.cpp index c8fee995..b51f4852 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -17,21 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: engine.cpp 4000 2008-03-23 11:47:52Z b_lindeijer $ */ -#include "engine.h" - #include <list> #include "being.h" #include "beingmanager.h" #include "configuration.h" +#include "engine.h" #include "flooritemmanager.h" #include "game.h" #include "graphics.h" -#include "main.h" #include "localplayer.h" #include "log.h" #include "main.h" diff --git a/src/engine.h b/src/engine.h index 52f1e63a..8d387f80 100644 --- a/src/engine.h +++ b/src/engine.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _ENGINE_H diff --git a/src/equipment.cpp b/src/equipment.cpp index 984df74d..f1d1d4f2 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipment.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include <algorithm> diff --git a/src/floor_item.cpp b/src/floor_item.cpp index 399a4149..0b114e14 100644 --- a/src/floor_item.cpp +++ b/src/floor_item.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: floor_item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "floor_item.h" - #include "map.h" FloorItem::FloorItem(unsigned int id, diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp index fe64779b..7445b1e9 100644 --- a/src/flooritemmanager.cpp +++ b/src/flooritemmanager.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: flooritemmanager.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ -#include "flooritemmanager.h" - #include "floor_item.h" +#include "flooritemmanager.h" #include "utils/dtor.h" diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h index a6bfbdc3..3dbaf988 100644 --- a/src/flooritemmanager.h +++ b/src/flooritemmanager.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: flooritemmanager.h 2150 2006-02-06 02:56:48Z der_doener $ */ #ifndef _TMW_FLOORITEMMANAGER_H diff --git a/src/game.cpp b/src/game.cpp index eb200f4a..34fb4622 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: game.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #include "game.h" @@ -28,8 +26,8 @@ #include <sstream> #include <string> -#include <guichan/sdl/sdlinput.hpp> #include <guichan/exception.hpp> +#include <guichan/sdl/sdlinput.hpp> #include "beingmanager.h" #include "configuration.h" @@ -69,19 +67,19 @@ #include "gui/trade.h" #include "gui/viewport.h" -#include "net/protocol.h" #include "net/beinghandler.h" #include "net/buysellhandler.h" #include "net/chathandler.h" #include "net/equipmenthandler.h" #include "net/inventoryhandler.h" #include "net/itemhandler.h" +#include "net/messageout.h" #include "net/network.h" #include "net/npchandler.h" #include "net/playerhandler.h" +#include "net/protocol.h" #include "net/skillhandler.h" #include "net/tradehandler.h" -#include "net/messageout.h" #include "resources/imagewriter.h" @@ -115,7 +113,6 @@ InventoryWindow *inventoryWindow; NpcListDialog *npcListDialog; NpcTextDialog *npcTextDialog; SkillDialog *skillDialog; -//NewSkillDialog *newSkillWindow; Setup* setupWindow; Minimap *minimap; EquipmentWindow *equipmentWindow; @@ -199,7 +196,6 @@ void createGuiWindows(Network *network) npcTextDialog = new NpcTextDialog(); npcListDialog = new NpcListDialog(); skillDialog = new SkillDialog(); - //newSkillWindow = new NewSkillDialog(); setupWindow = new Setup(); minimap = new Minimap(); equipmentWindow = new EquipmentWindow(player_node->mEquipment.get()); @@ -256,7 +252,6 @@ void destroyGuiWindows() delete minimap; delete equipmentWindow; //delete chargeDialog; - //delete newSkillWindow; delete tradeWindow; //delete buddyWindow; delete helpWindow; @@ -609,7 +604,6 @@ void Game::handleInput() case SDLK_F8: requestedWindow = itemShortcutWindow; break; case SDLK_F9: requestedWindow = setupWindow; break; case SDLK_F10: requestedWindow = debugWindow; break; - //case SDLK_F11: requestedWindow = newSkillWindow; break; case SDLK_RETURN: // Input chat window @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: game.h 3859 2008-01-26 19:38:43Z b_lindeijer $ */ #ifndef _TMW_GAME_ diff --git a/src/graphics.cpp b/src/graphics.cpp index 0433678f..6920bcb0 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: graphics.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #include <cassert> diff --git a/src/graphics.h b/src/graphics.h index 0cf58141..efdd1ac1 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: graphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _GRAPHICS_H diff --git a/src/gui/box.cpp b/src/gui/box.cpp index f53bc18e..59d8c135 100644 --- a/src/gui/box.cpp +++ b/src/gui/box.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $ */ #include "box.h" diff --git a/src/gui/box.h b/src/gui/box.h index 280fd3e2..46654b48 100644 --- a/src/gui/box.h +++ b/src/gui/box.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: box.h 2529 2006-08-13 10:20:19Z b_lindeijer $ */ diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index b7d08cab..430a2aa2 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: browserbox.cpp 4348 2008-06-14 12:42:49Z the_enemy $ */ #include <algorithm> @@ -28,8 +26,8 @@ #include <guichan/mouseinput.hpp> #include "browserbox.h" -#include "linkhandler.h" #include "colour.h" +#include "linkhandler.h" #ifdef USE_OPENGL #include "../configuration.h" diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h index c671d835..267e0fea 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: browserbox.h 3687 2007-10-26 00:22:12Z crush_tmw $ */ #ifndef __TMW_BROWSERBOX_H__ @@ -27,8 +25,8 @@ #include <iosfwd> #include <vector> -#include <guichan/widget.hpp> #include <guichan/mouselistener.hpp> +#include <guichan/widget.hpp> #include "../guichanfwd.h" #include "../main.h" diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 1243d798..40ecd1b7 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: button.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include <algorithm> diff --git a/src/gui/button.h b/src/gui/button.h index bbd26010..eecd0dc0 100644 --- a/src/gui/button.h +++ b/src/gui/button.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: button.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_BUTTON_H diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp index 592cb92a..903d971d 100644 --- a/src/gui/buttonbox.cpp +++ b/src/gui/buttonbox.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buttonbox.cpp */ -#include "buttonbox.h" - #include "button.h" +#include "buttonbox.h" ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt, ButtonBoxListener *listener) : diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h index 5fc9f88d..edde4aa4 100644 --- a/src/gui/buttonbox.h +++ b/src/gui/buttonbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buttonbox.h */ #ifndef _TMW_BUTTONBOX_H @@ -28,10 +26,10 @@ #include <guichan/actionlistener.hpp> -#include "../guichanfwd.h" - #include "window.h" +#include "../guichanfwd.h" + class ButtonBoxListener { public: diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp index 8e2a7a7a..a4574eb7 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buy.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buy.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "buy.h" - #include <guichan/widgets/label.hpp> #include "button.h" +#include "buy.h" #include "scrollarea.h" #include "shop.h" #include "shoplistbox.h" diff --git a/src/gui/buy.h b/src/gui/buy.h index 6f75cab5..0915385a 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buy.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef _TMW_BUY_H diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp index 9cc3b297..57c95841 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buysell.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysell.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "buysell.h" - #include "button.h" +#include "buysell.h" #include "../npc.h" diff --git a/src/gui/buysell.h b/src/gui/buysell.h index 0966ec03..d73205b6 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysell.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_BUYSELL_H @@ -26,10 +24,10 @@ #include <guichan/actionlistener.hpp> -#include "../guichanfwd.h" - #include "window.h" +#include "../guichanfwd.h" + /** * A dialog to choose between buying or selling at a shop. * diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index ca4d8608..93783ded 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -17,17 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_select.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $ */ -#include "char_select.h" - #include <string> #include <guichan/widgets/label.hpp> #include "button.h" +#include "char_select.h" #include "confirm_dialog.h" #include "ok_dialog.h" #include "playerbox.h" diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 182600d1..63630736 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -17,23 +17,21 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_select.h 3752 2007-11-20 10:50:00Z b_lindeijer $ */ #ifndef _CHAR_SELECT_H #define _CHAR_SELECT_H +#include <guichan/actionlistener.hpp> + #include "window.h" #include "../guichanfwd.h" #include "../lockedarray.h" -#include <guichan/actionlistener.hpp> - -class Player; class LocalPlayer; class Network; +class Player; class PlayerBox; /** diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index 3465fb69..8f68e6e1 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_server.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "char_server.h" - #include "button.h" +#include "char_server.h" #include "listbox.h" #include "scrollarea.h" diff --git a/src/gui/char_server.h b/src/gui/char_server.h index 32a0645f..bb81d3a5 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_server.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _CHAR_SEL_SERVER_H diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp index 862378ae..1733c7eb 100644 --- a/src/gui/chargedialog.cpp +++ b/src/gui/chargedialog.cpp @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ /* The window supported by this class shows player stats and keeps a charging @@ -25,7 +24,6 @@ */ #include "chargedialog.h" - #include "progressbar.h" #include "../localplayer.h" diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h index 222fb3b5..53998ab8 100644 --- a/src/gui/chargedialog.h +++ b/src/gui/chargedialog.h @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #ifndef _TMW_CHARGE_H diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 6a74d19e..dd11cebb 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -17,29 +17,27 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chat.cpp 4227 2008-05-08 00:39:29Z peaveydk $ */ #include <algorithm> #include <fstream> + #include <guichan/focushandler.hpp> #include <guichan/key.hpp> -#include "chat.h" - #include "browserbox.h" +#include "chat.h" #include "chatinput.h" #include "scrollarea.h" #include "windowcontainer.h" +#include "../beingmanager.h" #include "../configuration.h" +#include "../extensions.h" #include "../game.h" #include "../localplayer.h" -#include "../beingmanager.h" -#include "../recorder.h" #include "../party.h" -#include "../extensions.h" +#include "../recorder.h" #include "../net/messageout.h" #include "../net/protocol.h" diff --git a/src/gui/chat.h b/src/gui/chat.h index 5e5ca110..437dc115 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chat.h 4227 2008-05-08 00:39:29Z peaveydk $ */ #ifndef _TMW_CHAT_H #define _TMW_CHAT_H +#include <fstream> #include <list> #include <string> -#include <fstream> #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> @@ -37,9 +35,9 @@ class BrowserBox; class Network; -class ScrollArea; class Recorder; class Party; +class ScrollArea; #define BY_GM 0 // those should be self-explanatory =) #define BY_PLAYER 1 diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp index b403a03e..afe7f037 100644 --- a/src/gui/chatinput.cpp +++ b/src/gui/chatinput.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chatinput.cpp 3361 2007-07-07 20:12:58Z b_lindeijer $ */ #include "chatinput.h" diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h index 043244b9..44e22956 100644 --- a/src/gui/chatinput.h +++ b/src/gui/chatinput.h @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chatinput.h 3361 2007-07-07 20:12:58Z b_lindeijer $ */ #ifndef _TMW_CHATINPUT_H #define _TMW_CHATINPUT_H +#include <guichan/focuslistener.hpp> + #include "textfield.h" #include "../guichanfwd.h" -#include <guichan/focuslistener.hpp> - /** * The chat input hides when it loses focus. It is also invisible by default. */ diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp index b530bbea..20e24dee 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: checkbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include "checkbox.h" diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h index 160a2bf4..f6d8f2e5 100644 --- a/src/gui/checkbox.h +++ b/src/gui/checkbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: checkbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef _TMW_CHECKBOX_H diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp index d1782e1c..4c3782a4 100644 --- a/src/gui/colour.cpp +++ b/src/gui/colour.cpp @@ -19,10 +19,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "colour.h" - #include <cstdio> +#include "colour.h" + #include "../configuration.h" Colour::Colour() diff --git a/src/gui/colour.h b/src/gui/colour.h index ac75f08b..1e8ba3db 100644 --- a/src/gui/colour.h +++ b/src/gui/colour.h @@ -21,9 +21,10 @@ #ifndef _COLOUR_H #define _COLOUR_H + #include <cstdio> -#include <vector> #include <string> +#include <vector> #include <guichan/listmodel.hpp> diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp index 848c4767..732f5769 100644 --- a/src/gui/confirm_dialog.cpp +++ b/src/gui/confirm_dialog.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: confirm_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "confirm_dialog.h" - #include <guichan/font.hpp> +#include "confirm_dialog.h" + ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg, Window *parent): Window(title, true, parent) diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h index 65f33cac..109dcea0 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: confirm_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_OPTION_DIALOG_H diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp index 0b62ca3c..1204b203 100644 --- a/src/gui/connection.cpp +++ b/src/gui/connection.cpp @@ -17,17 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: connection.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "connection.h" - #include <guichan/actionlistener.hpp> #include <guichan/widgets/label.hpp> #include "button.h" +#include "connection.h" #include "progressbar.h" #include "../main.h" diff --git a/src/gui/connection.h b/src/gui/connection.h index 86b688a3..c3a6208f 100644 --- a/src/gui/connection.h +++ b/src/gui/connection.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: connection.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_CONNECTION_H diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 1e7d5b35..7fc63096 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -17,22 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: debugwindow.cpp 3509 2007-08-23 13:43:17Z b_lindeijer $ */ -#include "debugwindow.h" - #include <SDL_mouse.h> #include <guichan/widgets/label.hpp> #include "button.h" +#include "debugwindow.h" #include "gui.h" #include "viewport.h" -#include "../game.h" #include "../engine.h" +#include "../game.h" #include "../particle.h" #include "../map.h" diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index 59ae765c..ae1d8b14 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: debugwindow.h 3509 2007-08-23 13:43:17Z b_lindeijer $ */ #ifndef _TMW_DEBUGWINDOW_H diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 727ac732..bf85f033 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmentwindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "equipmentwindow.h" diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 6a7a4944..7aacfc1e 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmentwindow.h 2545 2006-08-17 19:11:28Z crush_tmw $ */ #ifndef _TMW_EQUIPMENT_H diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp index 966d2013..f9ea8b7d 100644 --- a/src/gui/focushandler.cpp +++ b/src/gui/focushandler.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: focushandler.cpp 2239 2006-03-09 05:16:27Z der_doener $ */ #include "focushandler.h" - void FocusHandler::requestModalFocus(gcn::Widget *widget) { /* If there is another widget with modal focus, remove its modal focus diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 5fde09f1..a5218485 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: focushandler.h 2239 2006-03-09 05:16:27Z der_doener $ */ #ifndef _TMW_FOCUSHANDLER_H diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp index 8095be61..ec3c8a5c 100644 --- a/src/gui/gccontainer.cpp +++ b/src/gui/gccontainer.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gccontainer.cpp 4208 2008-04-29 11:25:26Z b_lindeijer $ */ #include "gccontainer.h" diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h index 660111fc..2af7f6ad 100644 --- a/src/gui/gccontainer.h +++ b/src/gui/gccontainer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gccontainer.h 4208 2008-04-29 11:25:26Z b_lindeijer $ */ #ifndef _TMW_GUI_GCCONTAINER_H diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index f72f544c..fcc7ed77 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gui.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $ */ -#include "gui.h" - #include <guichan/exception.hpp> #include <guichan/image.hpp> #include <guichan/imagefont.hpp> @@ -31,6 +27,7 @@ #include <guichan/sdl/sdlinput.hpp> #include "focushandler.h" +#include "gui.h" #include "viewport.h" #include "window.h" #include "windowcontainer.h" @@ -41,8 +38,8 @@ #include "../log.h" #include "../resources/imageset.h" -#include "../resources/resourcemanager.h" #include "../resources/imageloader.h" +#include "../resources/resourcemanager.h" // Guichan stuff Gui *gui; diff --git a/src/gui/gui.h b/src/gui/gui.h index f250a8e3..8cf91915 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gui.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _TMW_GUI @@ -28,8 +26,8 @@ #include "../guichanfwd.h" -class GuiConfigListener; class Graphics; +class GuiConfigListener; class ImageSet; class Viewport; diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp index dc909195..020e85c6 100644 --- a/src/gui/hbox.cpp +++ b/src/gui/hbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: hbox.cpp 1881 2005-10-18 21:40:25Z der_doener $ */ #include "hbox.h" diff --git a/src/gui/hbox.h b/src/gui/hbox.h index 93ac270d..da70a53c 100644 --- a/src/gui/hbox.h +++ b/src/gui/hbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: hbox.h 1881 2005-10-18 21:40:25Z der_doener $ */ #ifndef HBOX_H diff --git a/src/gui/help.cpp b/src/gui/help.cpp index 56a5e70e..19413a08 100644 --- a/src/gui/help.cpp +++ b/src/gui/help.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: help.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "help.h" - #include "button.h" #include "browserbox.h" +#include "help.h" #include "scrollarea.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/help.h b/src/gui/help.h index 3b45283c..bd200ccf 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: help.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_HELP_H @@ -26,8 +24,8 @@ #include <guichan/actionlistener.hpp> -#include "window.h" #include "linkhandler.h" +#include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp index 7a39c2df..858a3fcb 100644 --- a/src/gui/inttextbox.cpp +++ b/src/gui/inttextbox.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inttextbox.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "inttextbox.h" - #include <guichan/key.hpp> +#include "inttextbox.h" + #include "../utils/tostring.h" IntTextBox::IntTextBox(int i): diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h index 6ade7e71..922ef4c5 100644 --- a/src/gui/inttextbox.h +++ b/src/gui/inttextbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inttextbox.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef INTTEXTBOX_H diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 1b2e5c63..cbce0ee3 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventorywindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "inventorywindow.h" - #include <string> #include <guichan/mouseinput.hpp> #include "button.h" #include "gui.h" +#include "inventorywindow.h" #include "item_amount.h" #include "itemcontainer.h" #include "scrollarea.h" diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 055bfad9..2e589471 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventorywindow.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_INVENTORYWINDOW_H diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp index 40e2e121..4ce8ac6c 100644 --- a/src/gui/item_amount.cpp +++ b/src/gui/item_amount.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item_amount.cpp 3718 2007-11-11 14:46:33Z b_lindeijer $ */ -#include "item_amount.h" - #include "button.h" #include "inttextbox.h" +#include "item_amount.h" #include "slider.h" #include "trade.h" diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h index 668dfe3b..2005094d 100644 --- a/src/gui/item_amount.h +++ b/src/gui/item_amount.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item_amount.h 3718 2007-11-11 14:46:33Z b_lindeijer $ */ #ifndef _TMW_ITEM_AMOUNT_WINDOW_H diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 186a2da6..30cb1d6d 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "itemcontainer.h" @@ -30,8 +28,8 @@ #include "../inventory.h" #include "../item.h" #include "../itemshortcut.h" -#include "../log.h" #include "../localplayer.h" +#include "../log.h" #include "../resources/image.h" #include "../resources/iteminfo.h" diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h index 5562023f..54e0c1ca 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemcontainer.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_ITEMCONTAINER_H__ #define _TMW_ITEMCONTAINER_H__ +#include <list> + #include <guichan/mouselistener.hpp> #include <guichan/widget.hpp> #include <guichan/widgetlistener.hpp> -#include <list> - #include "../guichanfwd.h" class Image; diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index aab9fd9d..055cbe44 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -18,23 +18,21 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "itempopup.h" #include <guichan/widgets/label.hpp> -#include "widgets/layout.h" #include "gui.h" +#include "itempopup.h" + +#include "widgets/layout.h" #include "../resources/image.h" -#include "../resources/resourcemanager.h" #include "../resources/iteminfo.h" +#include "../resources/resourcemanager.h" #include "../utils/gettext.h" #include "../utils/strprintf.h" - ItemPopup::ItemPopup() { diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 499b2e0a..0082ec2c 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -19,15 +19,13 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _LOM_ITEMPOPUP_H__ #define _LOM_ITEMPOPUP_H__ -#include "textbox.h" #include "scrollarea.h" +#include "textbox.h" #include "window.h" #include "../item.h" diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp index 5899abd1..86a53aca 100644 --- a/src/gui/itemshortcutcontainer.cpp +++ b/src/gui/itemshortcutcontainer.cpp @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "itemshortcutcontainer.h" -#include "../localplayer.h" #include "../graphics.h" #include "../inventory.h" #include "../item.h" #include "../itemshortcut.h" #include "../keyboardconfig.h" +#include "../localplayer.h" #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index cc4e830a..a8daca0b 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutcontainer.h 4076 2008-04-12 18:36:15Z b_lindeijer $ */ #ifndef _TMW_ITEMSHORTCUTCONTAINER_H__ diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp index 394fcbb7..5a4dfacd 100644 --- a/src/gui/itemshortcutwindow.cpp +++ b/src/gui/itemshortcutwindow.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutwindow.cpp 4076 2008-04-12 18:36:15Z b_lindeijer $ */ -#include "itemshortcutwindow.h" - #include "itemshortcutcontainer.h" +#include "itemshortcutwindow.h" #include "scrollarea.h" static const int SCROLL_PADDING = 0; diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h index 112c39d9..587f15c8 100644 --- a/src/gui/itemshortcutwindow.h +++ b/src/gui/itemshortcutwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutwindow.h 4076 2008-04-12 18:36:15Z b_lindeijer $ */ #ifndef _TMW_ITEMSHORTCUTWINDOW_H diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h index 93a8c000..44f906db 100644 --- a/src/gui/linkhandler.h +++ b/src/gui/linkhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: linkhandler.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_LINK_HANDLER_H_ diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index cf941be1..4dca66a0 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "listbox.h" - #include <guichan/font.hpp> #include <guichan/graphics.hpp> #include <guichan/listmodel.hpp> #include <guichan/mouseinput.hpp> +#include "listbox.h" + ListBox::ListBox(gcn::ListModel *listModel): gcn::ListBox(listModel) { diff --git a/src/gui/listbox.h b/src/gui/listbox.h index 2f501a6c..30eb4c79 100644 --- a/src/gui/listbox.h +++ b/src/gui/listbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef _TMW_LISTBOX_H diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 0cdb4656..fa47af32 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -17,26 +17,24 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: login.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "login.h" - #include <string> #include <vector> #include <guichan/widgets/label.hpp> -#include "../main.h" -#include "../logindata.h" -#include "../configuration.h" - #include "button.h" #include "checkbox.h" +#include "login.h" #include "ok_dialog.h" #include "passwordfield.h" #include "textfield.h" + +#include "../main.h" +#include "../logindata.h" +#include "../configuration.h" + #include "../utils/tostring.h" static const int MAX_SERVER_LIST_SIZE = 5; diff --git a/src/gui/login.h b/src/gui/login.h index 3550d82b..3b911424 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -17,24 +17,24 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: login.h 3234 2007-03-24 13:05:27Z b_lindeijer $ */ #ifndef _TMW_LOGIN_H #define _TMW_LOGIN_H #include <iosfwd> -#include <vector> #include <string> +#include <vector> #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> +#include "scrollarea.h" #include "window.h" -#include "../guichanfwd.h" + #include "widgets/dropdown.h" -#include "scrollarea.h" + +#include "../guichanfwd.h" class LoginData; diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp index 2d07e632..79281631 100644 --- a/src/gui/menuwindow.cpp +++ b/src/gui/menuwindow.cpp @@ -17,26 +17,23 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: menuwindow.cpp 4060 2008-04-09 14:49:07Z b_lindeijer $ */ -#include "menuwindow.h" - #include <string> #include <guichan/actionlistener.hpp> #include "button.h" +#include "menuwindow.h" #include "windowcontainer.h" -extern Window *setupWindow; -extern Window *inventoryWindow; +extern Window *chatWindow; extern Window *equipmentWindow; +extern Window *inventoryWindow; +extern Window *itemShortcutWindow; +extern Window *setupWindow; extern Window *skillDialog; extern Window *statusWindow; -extern Window *itemShortcutWindow; -extern Window *chatWindow; namespace { struct MenuWindowListener : public gcn::ActionListener diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h index add04095..03ec3380 100644 --- a/src/gui/menuwindow.h +++ b/src/gui/menuwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: menuwindow.h 2417 2006-07-19 15:12:06Z umperio $ */ #ifndef _TMW_MENU_H diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 8404e52a..728f61e4 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: minimap.cpp 4116 2008-04-17 12:48:43Z peaveydk $ */ #include "minimap.h" diff --git a/src/gui/minimap.h b/src/gui/minimap.h index a3b14729..7897ebdb 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: minimap.h 2417 2006-07-19 15:12:06Z umperio $ */ #ifndef _TMW_MINIMAP_H diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 1bdabbfe..59dca0e1 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ministatus.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $ */ -#include "ministatus.h" - #include <guichan/widgets/label.hpp> #include "gui.h" +#include "ministatus.h" #include "progressbar.h" -#include "../localplayer.h" #include "../configuration.h" #include "../graphics.h" +#include "../localplayer.h" #include "../utils/tostring.h" diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h index d4002d93..d7f6f68c 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatus.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ministatus.h 2581 2006-08-25 22:04:17Z b_lindeijer $ */ #ifndef _TMW_MINISTATUS_H diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp deleted file mode 100644 index c2088e75..00000000 --- a/src/gui/newskill.cpp +++ /dev/null @@ -1,195 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: newskill.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ - */ - - /* This file implements the new skill dialog for use under the latest - * version of the skill system as of 2005/02/20 - */ - -#include "newskill.h" - -#include <guichan/widgets/label.hpp> - -#include "button.h" -#include "progressbar.h" - -#include "../graphics.h" - -const char *skill_name[] = { - // 0-99 - // weapon skills 0-9 - "Short Blades", "Long Blades", "Hammers", "Archery", "Whip", - "Staves", "Throwing", "Piercing", "Hand to Hand", NULL, - // magic skills 10-19 - "Epyri (Fire)", "Merene (Water)", "Geon (Earth)", "Izurial (Air)", - "Lumine (Light)", "Tenebrae (Dark)", "Chronos (Time)", "Teless (Space)", - "Gen (Mana)", NULL, - // craft skills 20-29 - "Metalworking", "Woodworking", "Jeweler", "Cook", "Tailor", - "Alchemist", "Artisan", "Synthesis", NULL, NULL, - // general skills 30-39 - "Running", "Searching", "Sneak", "Trading", "Intimidate", - "Athletics", NULL, NULL, NULL,NULL, - // combat skills 40-49 - "Dodge", "Accuracy", "Critical", "Block", "Parry", "Diehard", "Magic Aura", - "Counter", NULL, NULL, - // resistance skills 50-59 - "Poison", "Silence", "Petrify", "Paralyze", "Blind", "Slow", "Zombie", - "Critical", NULL, NULL, - // element reistance 60-69 - "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)", - "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", NULL, - NULL, - // hunting skills 70-79 - "Insects", "Birds", "Lizards", "Amorphs", "Undead", "Machines", "Arcana", - "Humanoids", "Plantoids", NULL, - // stats 80-89 - "Strength", "Fortitude", "Vitality", "Menality", "Awareness", "Mana", - "Dexterity", NULL, NULL, NULL, - // unused (reserved) 90-99 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL -}; - - -NewSkillDialog::NewSkillDialog(): - Window("Skills") -{ - startPoint = 0; - for (int i = 0; i < N_SKILL_CAT_SIZE; i++) - { - mSkillLabel[i] = new gcn::Label("Empty "); - mSkillLevel[i] = new gcn::Label("00000"); - mSkillbar[i] = new ProgressBar(0.0f,100,15,0,0,255); - mSkillLevel[i]->setAlignment(Graphics::RIGHT); - add(mSkillLabel[i],40,5+i*25); - add(mSkillLevel[i],150,5+i*25); - add(mSkillbar[i],180,5+i*25); - } - // initialize the skills - for (int i = 0; i < N_SKILL; i++) - { - mPlayerSkill[i].level = 0; - mPlayerSkill[i].exp = 0; - } - resetNSD(); - - // create controls - Button *catButton[N_SKILL_CAT]; - catButton[0] = new Button("Weapons", "g1", this); - catButton[1] = new Button("Magic", "g2", this); - catButton[2] = new Button("Craft", "g3", this); - catButton[3] = new Button("General", "g4", this); - catButton[4] = new Button("Combat", "g5", this); - catButton[5] = new Button("E. Resist", "g6", this); - catButton[6] = new Button("S. Resist", "g7", this); - catButton[7] = new Button("Hunting", "g8", this); - catButton[8] = new Button("Stat", "g9", this); - - setContentSize(350, 250); - - for (int i = 0; i < 9; ++i) { - catButton[i]->setDimension(gcn::Rectangle(0, 0, 60, 20)); - catButton[i]->setPosition(290, 20 * i); - add(catButton[i]); - } - - Button *closeButton = new Button("Close", "close", this); - closeButton->setDimension(gcn::Rectangle(0,0,60,20)); - closeButton->setPosition(290, 230); - add(closeButton); - - // finsihing touches - setLocationRelativeTo(getParent()); -} - -void NewSkillDialog::action(const gcn::ActionEvent &event) -{ - int osp = startPoint; - if (event.getId() == "close") - { - setVisible(false); - } - else if (event.getId() == "g1") // weapons group 0-9 - { - startPoint =0; - } - else if (event.getId() == "g2") // magic group 10-19 - { - startPoint =10; - } - else if (event.getId() == "g3") // craft group 20-29 - { - startPoint =20; - } - else if (event.getId() == "g4") // general group 30-39 - { - startPoint =30; - } - else if (event.getId() == "g5") // combat group 40-49 - { - startPoint =40; - } - else if (event.getId() == "g6") // e. resist group 50-59 - { - startPoint =50; - } - else if (event.getId() == "g7") // s resist group 60-69 - { - startPoint =60; - } - else if (event.getId() == "g8") // hunting group 70-79 - { - startPoint =70; - } - else if (event.getId() == "g9") // stats group 80-89 - { - startPoint =80; - } - if (osp != startPoint) - { - resetNSD(); - } -} - -void NewSkillDialog::resetNSD() -{ - for (int a = 0; a < N_SKILL_CAT_SIZE; a++) - { - if (skill_name[a + startPoint]) - { - mSkillLabel[a]->setCaption(skill_name[a + startPoint]); - mSkillLabel[a]->setVisible(true); - char tmp[5]; - sprintf(tmp, "%d", mPlayerSkill[a+startPoint].level); - mSkillLevel[a]->setCaption(tmp); - mSkillLevel[a]->setVisible(true); - mSkillbar[a]->setProgress(0.0f); - mSkillbar[a]->setVisible(true); - } - else - { - mSkillLevel[a]->setVisible(false); - mSkillLabel[a]->setVisible(false); - mSkillbar[a]->setVisible(false); - } - } -} diff --git a/src/gui/newskill.h b/src/gui/newskill.h deleted file mode 100644 index c553ab1d..00000000 --- a/src/gui/newskill.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: newskill.h 3035 2007-01-14 14:54:39Z b_lindeijer $ - */ - -#ifndef _TMW_NSKILL_H -#define _TMW_NSKILL_H - -#include <guichan/actionlistener.hpp> - -#include "window.h" - -#include "../guichanfwd.h" - -class ProgressBar; - -#define N_SKILL 100 // skill count constant -#define N_SKILL_CAT 9 // skill category count -#define N_SKILL_CAT_SIZE 10 // skill category maximum size - -struct nSkill { - short level; - short exp; -}; - -/** - * Dialog showing the skills in the planned skill model. - * - * \ingroup Interface - */ -class NewSkillDialog : public Window, public gcn::ActionListener -{ - public: - /** - * Constructor. - */ - NewSkillDialog(); - - // action listener - void action(const gcn::ActionEvent &event); - - private: - void resetNSD(); // updates the values in the dialog box - - // members - int startPoint; // starting point of skill listing - ProgressBar *mSkillbar[N_SKILL_CAT_SIZE]; - gcn::Label *mSkillLabel[N_SKILL_CAT_SIZE]; - gcn::Label *mSkillLevel[N_SKILL_CAT_SIZE]; - nSkill mPlayerSkill[N_SKILL]; // pointer to an array of skill values -}; - -#endif diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp index d74b3ddd..052b5f33 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npc_text.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc_text.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $ */ -#include "npc_text.h" - #include <string> +#include "npc_text.h" #include "textbox.h" #include "../npc.h" diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index 3773950a..e26dd870 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -17,18 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc_text.h 4096 2008-04-16 08:39:59Z b_lindeijer $ */ #ifndef _TMW_NPC_TEXT_H #define _TMW_NPC_TEXT_H #include <iosfwd> + #include <guichan/actionlistener.hpp> -#include "scrollarea.h" #include "button.h" +#include "scrollarea.h" #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp index 3203ba84..ba9e3d58 100644 --- a/src/gui/npclistdialog.cpp +++ b/src/gui/npclistdialog.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npclistdialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "npclistdialog.h" - #include <sstream> #include "listbox.h" +#include "npclistdialog.h" #include "../npc.h" diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h index 4e9d4b3b..77f0c177 100644 --- a/src/gui/npclistdialog.h +++ b/src/gui/npclistdialog.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npclistdialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_GUI_NPCLISTDIALOG_H diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp index b8d3c7ba..421c873e 100644 --- a/src/gui/ok_dialog.cpp +++ b/src/gui/ok_dialog.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ok_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #include "ok_dialog.h" diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h index 426da538..a06ddd7c 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/ok_dialog.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ok_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _OK_DIALOG_H diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp index 710eb767..01c7e15d 100644 --- a/src/gui/passwordfield.cpp +++ b/src/gui/passwordfield.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: passwordfield.cpp 2132 2006-02-01 14:53:10Z der_doener $ */ #include "passwordfield.h" diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index 8228bfe2..9aa6ab49 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: passwordfield.h 2895 2006-12-09 01:44:18Z b_lindeijer $ */ #ifndef _TMW_PASSWORDFIELD_H_ diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index 6d39ce05..79c5676f 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include <algorithm> #include "playerbox.h" -#include "../player.h" #include "../graphics.h" +#include "../player.h" #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h index 86cdf064..7aec87bf 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef __TMW_PLAYERBOX_H__ diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 7e40abed..c0feb68d 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: popupmenu.cpp 4243 2008-05-16 15:48:52Z the_enemy $ */ -#include "popupmenu.h" - #include <cassert> #include <iostream> @@ -31,6 +27,7 @@ #include "browserbox.h" #include "inventorywindow.h" #include "item_amount.h" +#include "popupmenu.h" #include "windowcontainer.h" #include "../being.h" @@ -43,8 +40,8 @@ #include "../net/messageout.h" #include "../net/protocol.h" -#include "../resources/iteminfo.h" #include "../resources/itemdb.h" +#include "../resources/iteminfo.h" extern std::string tradePartnerName; diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 601fa2ae..3cf949b3 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -17,22 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: popupmenu.h 2239 2006-03-09 05:16:27Z der_doener $ */ #ifndef _TMW_POPUP_MENU_H #define _TMW_POPUP_MENU_H -#include "window.h" #include "linkhandler.h" +#include "window.h" class Being; class BrowserBox; class FloorItem; class Item; - /** * Window showing popup menu. */ diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 6dbc3b85..708a2991 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: progressbar.cpp 4008 2008-03-27 14:51:10Z b_lindeijer $ */ #include "progressbar.h" diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h index df825a5d..a20c901f 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: progressbar.h 2240 2006-03-09 12:24:36Z der_doener $ */ #ifndef _TMW_PROGRESSBAR_H @@ -32,7 +30,6 @@ class ImageRect; - /** * A progress bar. * diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp index cbab4d2d..5f929e62 100644 --- a/src/gui/radiobutton.cpp +++ b/src/gui/radiobutton.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: radiobutton.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include "radiobutton.h" diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h index ef87dccd..8fb6d832 100644 --- a/src/gui/radiobutton.h +++ b/src/gui/radiobutton.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: radiobutton.h 1584 2005-08-13 12:49:52Z der_doener $ */ #ifndef _TMW_RADIOBUTTON_H diff --git a/src/gui/register.cpp b/src/gui/register.cpp index e0b663b8..ec6a9756 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: register.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "register.h" - #include <string> #include <sstream> @@ -36,10 +32,11 @@ #include "button.h" #include "checkbox.h" #include "login.h" +#include "ok_dialog.h" #include "passwordfield.h" #include "radiobutton.h" +#include "register.h" #include "textfield.h" -#include "ok_dialog.h" #include "../utils/tostring.h" diff --git a/src/gui/register.h b/src/gui/register.h index 6f997b75..87a11bb9 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -17,18 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: register.h 3234 2007-03-24 13:05:27Z b_lindeijer $ */ #ifndef _TMW_REGISTER_H #define _TMW_REGISTER_H #include <iosfwd> + #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> #include "window.h" + #include "../guichanfwd.h" class LoginData; diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index a3aef702..032e3f78 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: scrollarea.cpp 4204 2008-04-28 18:29:04Z b_lindeijer $ */ #include <algorithm> diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index 32a192fc..ebe2c77b 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: scrollarea.h 4204 2008-04-28 18:29:04Z b_lindeijer $ */ #ifndef __TMW_SCROLLAREA_H__ diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index 9fed52f3..63af1aaa 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sell.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "sell.h" - #include <cassert> #include <guichan/widgets/label.hpp> @@ -30,17 +26,18 @@ #include "button.h" #include "shoplistbox.h" #include "scrollarea.h" +#include "sell.h" #include "shop.h" #include "slider.h" #include "../item.h" #include "../npc.h" -#include "../resources/iteminfo.h" - #include "../net/messageout.h" #include "../net/protocol.h" +#include "../resources/iteminfo.h" + #include "../utils/tostring.h" SellDialog::SellDialog(Network *network): diff --git a/src/gui/sell.h b/src/gui/sell.h index 11528f89..48961efc 100644 --- a/src/gui/sell.h +++ b/src/gui/sell.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sell.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_SELL_H diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 4faa8a86..b8fdb7de 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -17,33 +17,30 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup.cpp 4306 2008-05-28 20:22:37Z crush_tmw $ */ #include <algorithm> - -#include "setup.h" +#include <iostream> #include "button.h" +#include "setup.h" #include "setup_audio.h" +#include "setup_colours.h" #include "setup_joystick.h" -#include "setup_video.h" #include "setup_keyboard.h" #include "setup_players.h" -#include "setup_colours.h" +#include "setup_video.h" #include "tabbedcontainer.h" #include "../utils/dtor.h" -#include <iostream> -extern Window *statusWindow; -extern Window *minimap; extern Window *chatWindow; -extern Window *inventoryWindow; extern Window *equipmentWindow; extern Window *helpWindow; +extern Window *inventoryWindow; +extern Window *minimap; extern Window *skillDialog; +extern Window *statusWindow; Setup::Setup(): Window("Setup") diff --git a/src/gui/setup.h b/src/gui/setup.h index c24b8cb9..fd200f4c 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_SETUP_H diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index 09357cce..70b34a31 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_audio.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "setup_audio.h" - #include <guichan/widgets/label.hpp> #include "checkbox.h" #include "ok_dialog.h" +#include "setup_audio.h" #include "slider.h" #include "../configuration.h" diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 76420101..9835a8fb 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_audio.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_GUI_SETUP_AUDIO_H #define _TMW_GUI_SETUP_AUDIO_H -#include "setuptab.h" - #include <guichan/actionlistener.hpp> +#include "setuptab.h" + #include "../guichanfwd.h" class Setup_Audio : public SetupTab, public gcn::ActionListener diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp index 2c6d7aa9..0becd48f 100644 --- a/src/gui/setup_colours.cpp +++ b/src/gui/setup_colours.cpp @@ -19,8 +19,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "setup_colours.h" - #include <vector> #include <guichan/listmodel.hpp> @@ -29,6 +27,7 @@ #include "colour.h" #include "scrollarea.h" +#include "setup_colours.h" #include "slider.h" #include "../configuration.h" diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h index 566bed37..3bd87848 100644 --- a/src/gui/setup_colours.h +++ b/src/gui/setup_colours.h @@ -22,17 +22,17 @@ #ifndef _SETUP_COLOURS_H #define _SETUP_COLOURS_H -#include <vector> #include <string> +#include <vector> #include <guichan/actionlistener.hpp> -#include <guichan/widgets/listbox.hpp> #include <guichan/widgets/label.hpp> +#include <guichan/widgets/listbox.hpp> +#include "scrollarea.h" #include "setuptab.h" #include "slider.h" #include "textfield.h" -#include "scrollarea.h" #include "../guichanfwd.h" diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 41e91595..723d0597 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_joystick.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "setup_joystick.h" - #include <guichan/widgets/label.hpp> #include "button.h" #include "checkbox.h" +#include "setup_joystick.h" + #include "../configuration.h" #include "../joystick.h" diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index 399156d8..d2973a89 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_joystick.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_GUI_SETUP_JOYSTICK_H #define _TMW_GUI_SETUP_JOYSTICK_H -#include "setuptab.h" - #include <guichan/actionlistener.hpp> +#include "setuptab.h" + #include "../guichanfwd.h" class Setup_Joystick : public SetupTab, public gcn::ActionListener diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 704fc691..007fcb52 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -17,11 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_keyboard.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ -#include "setup_keyboard.h" +#include <SDL_keyboard.h> #include <guichan/widgets/label.hpp> #include <guichan/listmodel.hpp> @@ -30,14 +28,13 @@ #include "listbox.h" #include "ok_dialog.h" #include "scrollarea.h" +#include "setup_keyboard.h" #include "../configuration.h" #include "../keyboardconfig.h" #include "../utils/tostring.h" -#include <SDL_keyboard.h> - /** * The list model for key function list. * diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h index 7f945181..937790af 100644 --- a/src/gui/setup_keyboard.h +++ b/src/gui/setup_keyboard.h @@ -17,21 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_keyboard.h 4255 2008-05-21 21:44:27Z crush_tmw $ */ #ifndef _TMW_GUI_SETUP_KEYBOARD_H #define _TMW_GUI_SETUP_KEYBOARD_H -#include "setuptab.h" -#include "button.h" -#include "../guichanfwd.h" +#include <string> #include <guichan/actionlistener.hpp> +#include "button.h" +#include "setuptab.h" -#include <string> +#include "../guichanfwd.h" class Setup_Keyboard : public SetupTab, public gcn::ActionListener { diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index ed1facc7..d07a9685 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -17,23 +17,21 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_players.cpp 4353 2008-06-16 07:04:46Z b_lindeijer $ */ -#include "setup_players.h" - #include <vector> + #include <guichan/widgets/dropdown.hpp> #include <guichan/widgets/label.hpp> #include "button.h" #include "checkbox.h" #include "ok_dialog.h" +#include "setup_players.h" -#include "../player_relations.h" #include "../configuration.h" #include "../log.h" +#include "../player_relations.h" #include "../sound.h" #define COLUMNS_NR 2 // name plus listbox diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index b04023ab..b693a952 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -22,15 +22,14 @@ #ifndef _TMW_GUI_SETUP_PLAYERS_H #define _TMW_GUI_SETUP_PLAYERS_H -#include "setuptab.h" +#include <guichan/actionlistener.hpp> -#include "scrollarea.h" #include "button.h" +#include "scrollarea.h" +#include "setuptab.h" #include "table.h" -#include <guichan/actionlistener.hpp> #include "../guichanfwd.h" - #include "../player_relations.h" class PlayerTableModel; diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 879a3066..ec5b1d0a 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -17,15 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_video.cpp 4338 2008-06-05 18:41:39Z crush_tmw $ */ -#include "setup_video.h" - +#include <SDL.h> #include <string> #include <vector> -#include <SDL.h> #include <guichan/key.hpp> #include <guichan/listmodel.hpp> @@ -36,6 +32,7 @@ #include "listbox.h" #include "ok_dialog.h" #include "scrollarea.h" +#include "setup_video.h" #include "slider.h" #include "textfield.h" diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index d0a19cb6..4103c5ef 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_video.h 4306 2008-05-28 20:22:37Z crush_tmw $ */ #ifndef _TMW_GUI_SETUP_VIDEO_H #define _TMW_GUI_SETUP_VIDEO_H -#include "setuptab.h" - #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> +#include "setuptab.h" + #include "../guichanfwd.h" class Setup_Video : public SetupTab, public gcn::ActionListener, diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h index bbfe4fac..6c276c35 100644 --- a/src/gui/setuptab.h +++ b/src/gui/setuptab.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setuptab.h 2273 2006-03-19 00:48:10Z der_doener $ */ #ifndef _TMW_GUI_SETUPTAB_H diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index e7619547..a4478a62 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shop.cpp 4348 2008-06-14 12:42:49Z the_enemy $ */ #include "shop.h" diff --git a/src/gui/shop.h b/src/gui/shop.h index 8dfda67e..97b8d173 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shop.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _SHOP_H @@ -29,10 +27,10 @@ #include <guichan/listmodel.hpp> -#include "../resources/image.h" - -#include "../shopitem.h" #include "../guichanfwd.h" +#include "../shopitem.h" + +#include "../resources/image.h" class ShopItems : public gcn::ListModel { diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp index 7a8b52ed..e31eee58 100644 --- a/src/gui/shoplistbox.cpp +++ b/src/gui/shoplistbox.cpp @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.cpp 2655 2006-09-03 21:25:02Z b_lindeijer $ */ -#include "shoplistbox.h" - +#include <guichan/basiccontainer.hpp> #include <guichan/font.hpp> #include <guichan/graphics.hpp> +#include <guichan/imagefont.hpp> #include <guichan/listmodel.hpp> #include <guichan/mouseinput.hpp> -#include <guichan/imagefont.hpp> -#include <guichan/basiccontainer.hpp> + +#include "shoplistbox.h" #include "../graphics.h" diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h index 5840e47f..e856c076 100644 --- a/src/gui/shoplistbox.h +++ b/src/gui/shoplistbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.h 2655 2006-09-03 21:25:02Z b_lindeijer $ */ #ifndef _TMW_SHOPLISTBOX_H diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp index 5a23e2a8..36c3a305 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -17,25 +17,22 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include <algorithm> #include <guichan/widgets/label.hpp> -#include "skill.h" - #include "button.h" #include "listbox.h" +#include "skill.h" #include "windowcontainer.h" #include "../localplayer.h" +#include "../log.h" #include "../utils/dtor.h" #include "../utils/xml.h" -#include "../log.h" #define SKILLS_FILE "skills.xml" diff --git a/src/gui/skill.h b/src/gui/skill.h index 92badc8a..ee579dd5 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_SKILL_H diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp index a1ae6acc..afeecf17 100644 --- a/src/gui/slider.cpp +++ b/src/gui/slider.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: slider.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include "slider.h" diff --git a/src/gui/slider.h b/src/gui/slider.h index 5700d64d..36bfe698 100644 --- a/src/gui/slider.h +++ b/src/gui/slider.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: slider.h 1584 2005-08-13 12:49:52Z der_doener $ */ #ifndef _TMW_SLIDER_H @@ -30,7 +28,6 @@ class Image; - /** * Slider widget. Same as the Guichan slider but with custom look. * diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 0ccbebc0..2ab80bd9 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -18,8 +18,6 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include <guichan/font.hpp> diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 7a2a73b8..9b8eab70 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -18,15 +18,13 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _LOM_SPEECHBUBBLE_H__ #define _LOM_SPEECHBUBBLE_H__ -#include "textbox.h" #include "scrollarea.h" +#include "textbox.h" #include "window.h" class SpeechBubble : public Window diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 79b3aec7..9d6760d0 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: status.cpp 3510 2007-08-23 14:14:51Z b_lindeijer $ */ -#include "status.h" - #include <guichan/widgets/label.hpp> #include "button.h" #include "progressbar.h" +#include "status.h" #include "windowcontainer.h" #include "../localplayer.h" diff --git a/src/gui/status.h b/src/gui/status.h index 4d082148..55ed393e 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: status.h 3538 2007-08-28 00:01:38Z b_lindeijer $ */ #ifndef _TMW_STATUS_H diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp index fc3efbd5..8e95aa7c 100644 --- a/src/gui/tabbedcontainer.cpp +++ b/src/gui/tabbedcontainer.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tabbedcontainer.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include <algorithm> -#include "tabbedcontainer.h" - #include "button.h" +#include "tabbedcontainer.h" -#include "../utils/tostring.h" #include "../utils/dtor.h" +#include "../utils/tostring.h" TabbedContainer::TabbedContainer(int width, int padX, int buttonHeight, int height, int padY, int buttonsPerRow): diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h index b004edc2..2fc41247 100644 --- a/src/gui/tabbedcontainer.h +++ b/src/gui/tabbedcontainer.h @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tabbedcontainer.h 3152 2007-02-27 16:31:34Z crush_tmw $ */ #ifndef _TMW_TABPANE_H #define _TMW_TABPANE_H #include <iosfwd> -#include <vector> #include <map> +#include <vector> #include <guichan/actionlistener.hpp> diff --git a/src/gui/table.cpp b/src/gui/table.cpp index 8d2ab86a..e4d7812e 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -19,12 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <guichan/graphics.hpp> -#include <guichan/actionlistener.hpp> -#include "table.h" #include <cassert> +#include <guichan/graphics.hpp> +#include <guichan/actionlistener.hpp> +#include "table.h" class GuiTableActionListener : public gcn::ActionListener { diff --git a/src/gui/table.h b/src/gui/table.h index cef82d5d..b4c607ae 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -31,6 +31,7 @@ #include <guichan/widget.hpp> #include "table_model.h" + #include "../guichanfwd.h" class GuiTableActionListener; diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp index 57da29d9..e1afef96 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -19,8 +19,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <guichan/widget.hpp> #include <cstdlib> + +#include <guichan/widget.hpp> + #include "table_model.h" void diff --git a/src/gui/table_model.h b/src/gui/table_model.h index 69e41cd3..4022e369 100644 --- a/src/gui/table_model.h +++ b/src/gui/table_model.h @@ -22,9 +22,11 @@ #ifndef TMW_TABLE_MODEL_H_ #define TMW_TABLE_MODEL_H_ -#include <guichan/gui.hpp> #include <set> #include <vector> + +#include <guichan/gui.hpp> + #include "../guichanfwd.h" class TableModelListener diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp index 2a496a1f..d7b589fa 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textbox.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $ */ -#include "textbox.h" - #include <sstream> #include <guichan/basiccontainer.hpp> #include <guichan/font.hpp> +#include "textbox.h" + TextBox::TextBox(): gcn::TextBox() { diff --git a/src/gui/textbox.h b/src/gui/textbox.h index 6f4db7dd..a0f0f947 100644 --- a/src/gui/textbox.h +++ b/src/gui/textbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textbox.h 4096 2008-04-16 08:39:59Z b_lindeijer $ */ #ifndef __TMW_TEXTBOX_H__ diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp index b128701b..bd016a8d 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -17,13 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textfield.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include <algorithm> #include <guichan/font.hpp> + #include <guichan/sdl/sdlinput.hpp> #include "textfield.h" diff --git a/src/gui/textfield.h b/src/gui/textfield.h index 60766676..6def784d 100644 --- a/src/gui/textfield.h +++ b/src/gui/textfield.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textfield.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef __TMW_TEXTFIELD_H__ diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 2831fc46..8c02ab01 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id $ */ -#include "trade.h" - #include <sstream> #include <guichan/widgets/label.hpp> @@ -34,6 +30,7 @@ #include "itemcontainer.h" #include "scrollarea.h" #include "textfield.h" +#include "trade.h" #include "../inventory.h" #include "../item.h" diff --git a/src/gui/trade.h b/src/gui/trade.h index 7adf9575..5d587991 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id $ */ #ifndef _TMW_TRADE_H diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 5e9baa32..64f02f54 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: updatewindow.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $ */ -#include "updatewindow.h" - #include <iostream> #include <SDL.h> #include <SDL_thread.h> @@ -34,6 +30,7 @@ #include "button.h" #include "progressbar.h" #include "scrollarea.h" +#include "updatewindow.h" // Curl should be included after Guichan to avoid Windows redefinitions #include <curl/curl.h> @@ -42,10 +39,10 @@ #include "../log.h" #include "../main.h" -#include "../utils/tostring.h" - #include "../resources/resourcemanager.h" +#include "../utils/tostring.h" + /** * Calculates the Alder-32 checksum for the given file. */ diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h index b669f829..4c302e85 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -17,14 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: updatewindow.h 4332 2008-06-05 07:33:12Z b_lindeijer $ */ #ifndef _UPDATERWINDOW_H #define _UPDATERWINDOW_H #include <guichan/actionlistener.hpp> + #include <string> #include <vector> diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp index 6f36dc9c..2ec1112d 100644 --- a/src/gui/vbox.cpp +++ b/src/gui/vbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: vbox.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #include "vbox.h" diff --git a/src/gui/vbox.h b/src/gui/vbox.h index fd029143..4538338f 100644 --- a/src/gui/vbox.h +++ b/src/gui/vbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: vbox.h 1881 2005-10-18 21:40:25Z der_doener $ */ #ifndef VBOX_H diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 6f89f639..3f0f546e 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -17,16 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: viewport.cpp 4098 2008-04-16 11:36:41Z b_lindeijer $ */ -#include "viewport.h" +#include <cassert> #include <guichan/sdl/sdlinput.hpp> #include "gui.h" #include "popupmenu.h" +#include "viewport.h" #include "../beingmanager.h" #include "../configuration.h" @@ -40,15 +39,13 @@ #include "../textmanager.h" #include "../resources/animation.h" -#include "../resources/monsterinfo.h" -#include "../resources/resourcemanager.h" #include "../resources/image.h" #include "../resources/imageset.h" +#include "../resources/monsterinfo.h" +#include "../resources/resourcemanager.h" #include "../utils/tostring.h" -#include <cassert> - extern volatile int tick_time; Viewport::Viewport(): diff --git a/src/gui/viewport.h b/src/gui/viewport.h index c7b3c0e7..3120de91 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_VIEWPORT_H_ @@ -28,8 +26,8 @@ #include "windowcontainer.h" -#include "../configlistener.h" #include "../being.h" +#include "../configlistener.h" #include "../guichanfwd.h" class Map; diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 9bf7452d..88a12d68 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include <algorithm> diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 9f6491b7..25ae05f8 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef DROPDOWN_H @@ -27,8 +25,10 @@ #include <iosfwd> #include <guichan/widgets/dropdown.hpp> -#include "../scrollarea.h" + #include "../listbox.h" +#include "../scrollarea.h" + #include "../../guichanfwd.h" class Image; diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index e13493bb..e8b50dc9 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resizegrip.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ */ -#include "resizegrip.h" - #include <guichan/graphics.hpp> +#include "resizegrip.h" + #include "../../graphics.h" #include "../../resources/image.h" diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index 03a9228f..5f3a09a4 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resizegrip.h 3270 2007-04-15 01:22:17Z b_lindeijer $ */ #ifndef _TMW_RESIZEGRIP_H diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 1a6f1ac6..4ace032b 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -17,21 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include <algorithm> -#include <climits> #include <cassert> +#include <climits> #include <guichan/exception.hpp> -#include <guichan/widgets/icon.hpp> -#include "window.h" +#include <guichan/widgets/icon.hpp> #include "gui.h" #include "gccontainer.h" +#include "window.h" #include "windowcontainer.h" #include "widgets/resizegrip.h" diff --git a/src/gui/window.h b/src/gui/window.h index 228cc37b..3bb41a95 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -17,24 +17,23 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_WINDOW_H__ #define _TMW_WINDOW_H__ -#include <guichan/widgets/window.hpp> #include <guichan/widgetlistener.hpp> +#include <guichan/widgets/window.hpp> + #include "../guichanfwd.h" class ConfigListener; class GCContainer; +class Image; class ImageRect; class ResizeGrip; class WindowContainer; -class Image; /** * A window. This window can be dragged around and has a title bar. Windows are diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp index 05c2b5e9..d8535f73 100644 --- a/src/gui/windowcontainer.cpp +++ b/src/gui/windowcontainer.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: windowcontainer.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ #include "windowcontainer.h" diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h index c9728230..d783fefd 100644 --- a/src/gui/windowcontainer.h +++ b/src/gui/windowcontainer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: windowcontainer.h 2884 2006-12-04 11:20:54Z b_lindeijer $ */ #ifndef _TMW_WINDOWCONTAINER_H_ diff --git a/src/guichanfwd.h b/src/guichanfwd.h index 0a2560bf..4fb7ea3e 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: guichanfwd.h 2907 2006-12-12 15:33:46Z b_lindeijer $ */ #ifndef _TMW_GUICHANFWD_H diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp index 965434b0..6d74801e 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "imageparticle.h" - #include "graphics.h" +#include "imageparticle.h" #include "resources/image.h" diff --git a/src/imageparticle.h b/src/imageparticle.h index ef663473..91c5426c 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageparticle.h 3567 2007-09-07 09:13:17Z b_lindeijer $ */ #ifndef _IMAGEPARTICLE_H diff --git a/src/inventory.cpp b/src/inventory.cpp index 0b1b9613..764d7fee 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventory.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "inventory.h" - #include <algorithm> #include <cassert> +#include "inventory.h" #include "item.h" #include "log.h" diff --git a/src/inventory.h b/src/inventory.h index 42b0d86a..87d09567 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventory.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _INVENTORY_H diff --git a/src/item.cpp b/src/item.cpp index 2e33a9de..bc6b7cc7 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "item.h" @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _ITEM_H_ diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 5379f0eb..a3812042 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcut.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "itemshortcut.h" - #include "configuration.h" #include "inventory.h" #include "item.h" +#include "itemshortcut.h" #include "localplayer.h" #include "utils/tostring.h" diff --git a/src/itemshortcut.h b/src/itemshortcut.h index bbf21332..a0c52468 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcut.h 4180 2008-04-24 20:49:30Z peaveydk $ */ #ifndef _TMW_ITEMSHORTCUT_H__ diff --git a/src/joystick.cpp b/src/joystick.cpp index ebae5c3a..f009ebc4 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: joystick.cpp 2595 2006-08-26 20:19:39Z b_lindeijer $ */ -#include "joystick.h" - #include "configuration.h" +#include "joystick.h" #include "log.h" int Joystick::joystickCount = 0; diff --git a/src/joystick.h b/src/joystick.h index 5c6f7c86..4cc1babd 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: joystick.h 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #ifndef _TMW_JOYSTICK_H diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 46fea458..f67c9534 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "keyboardconfig.h" +#include <guichan/sdl/sdlinput.hpp> + #include "configuration.h" +#include "keyboardconfig.h" #include "log.h" -#include <guichan/sdl/sdlinput.hpp> - #include "gui/setup_keyboard.h" struct KeyData diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index a4329b09..158252d4 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_KEYBOARDCONFIG_H @@ -26,10 +24,10 @@ #include <string> -#include "gui/setup_keyboard.h" - #include <guichan/sdl/sdlinput.hpp> +#include "gui/setup_keyboard.h" + /** * Each key represents a key function. Such as 'Move up', 'Attack' etc. */ diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 9475fcbb..68999787 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include <cassert> -#include "localplayer.h" - #include "equipment.h" #include "floor_item.h" #include "game.h" #include "inventory.h" #include "item.h" +#include "localplayer.h" #include "main.h" #include "monster.h" #include "particle.h" @@ -39,8 +36,8 @@ #include "net/messageout.h" #include "net/protocol.h" -#include "resources/resourcemanager.h" #include "resources/imageset.h" +#include "resources/resourcemanager.h" #include "utils/tostring.h" diff --git a/src/localplayer.h b/src/localplayer.h index 1eebabb6..ad59d138 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_LOCALPLAYER_H diff --git a/src/lockedarray.h b/src/lockedarray.h index bbb72520..a3e5dc0a 100644 --- a/src/lockedarray.h +++ b/src/lockedarray.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: lockedarray.h 2277 2006-03-19 21:40:21Z der_doener $ */ #ifndef _TMW_LOCKEDARRAY_H diff --git a/src/main.cpp b/src/main.cpp index db7b16d4..42a504fe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,50 +17,51 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: main.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $ */ -#include "main.h" - #include <getopt.h> #include <iostream> #include <physfs.h> +#include <SDL_image.h> #include <unistd.h> #include <vector> -#include <SDL_image.h> #include <guichan/actionlistener.hpp> + #include <guichan/sdl/sdlinput.hpp> + #include <guichan/widgets/label.hpp> #include <libxml/parser.h> -#ifndef WIN32 -#include <cerrno> -#include <sys/stat.h> +#ifdef __APPLE__ +#include <CoreFoundation/CFBundle.h> #endif #ifdef __MINGW32__ #include <windows.h> #define usleep(usec) (Sleep ((usec) / 1000), 0) #endif -#if defined __APPLE__ -#include <CoreFoundation/CFBundle.h> +#ifdef WIN32 +#include <SDL_syswm.h> +#else +#include <cerrno> +#include <sys/stat.h> #endif #include "configuration.h" -#include "keyboardconfig.h" -#include "player_relations.h" #include "game.h" #include "graphics.h" #include "itemshortcut.h" -#include "lockedarray.h" +#include "keyboardconfig.h" #include "localplayer.h" +#include "lockedarray.h" #include "log.h" #include "logindata.h" +#include "main.h" #ifdef USE_OPENGL #include "openglgraphics.h" #endif +#include "player_relations.h" #include "serverinfo.h" #include "sound.h" @@ -72,8 +73,8 @@ #include "gui/ok_dialog.h" #include "gui/progressbar.h" #include "gui/register.h" -#include "gui/updatewindow.h" #include "gui/textfield.h" +#include "gui/updatewindow.h" #include "net/charserverhandler.h" #include "net/loginhandler.h" @@ -91,10 +92,6 @@ #include "utils/dtor.h" #include "utils/tostring.h" -#ifdef WIN32 -#include <SDL_syswm.h> -#endif - // Account infos char n_server, n_character; @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: main.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _TMW_MAIN_H diff --git a/src/map.cpp b/src/map.cpp index 15d5e5f3..612d9020 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: map.cpp 4171 2008-04-22 18:42:21Z b_lindeijer $ */ -#include "map.h" - #include <queue> #include "beingmanager.h" @@ -30,13 +26,14 @@ #include "game.h" #include "graphics.h" #include "localplayer.h" +#include "map.h" #include "particle.h" #include "sprite.h" #include "tileset.h" -#include "resources/resourcemanager.h" #include "resources/ambientoverlay.h" #include "resources/image.h" +#include "resources/resourcemanager.h" #include "utils/dtor.h" #include "utils/tostring.h" @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_MAP_H_ diff --git a/src/monster.cpp b/src/monster.cpp index be22bed3..62be513d 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monster.cpp 3823 2007-12-28 18:36:58Z crush_tmw $ */ -#include "monster.h" - #include "animatedsprite.h" #include "game.h" -#include "sound.h" +#include "monster.h" #include "particle.h" +#include "sound.h" #include "text.h" #include "gui/gui.h" diff --git a/src/monster.h b/src/monster.h index 4839966a..0906dff3 100644 --- a/src/monster.h +++ b/src/monster.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monster.h 3690 2007-10-26 12:50:49Z crush_tmw $ */ #ifndef _TMW_MONSTER_H diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index b9686e39..8a7e61a1 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beinghandler.cpp 4321 2008-06-02 11:42:26Z b_lindeijer $ */ -#include "beinghandler.h" - #include <iostream> #include <SDL_types.h> +#include "beinghandler.h" #include "messagein.h" #include "protocol.h" @@ -35,10 +32,10 @@ #include "../localplayer.h" #include "../log.h" #include "../main.h" +#include "../npc.h" #include "../particle.h" -#include "../sound.h" #include "../player_relations.h" -#include "../npc.h" +#include "../sound.h" const int EMOTION_TIME = 150; /**< Duration of emotion icon */ diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index 8f58a397..9e736751 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beinghandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_BEINGHANDLER_H diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp index b4e2cf30..b464e69f 100644 --- a/src/net/buysellhandler.cpp +++ b/src/net/buysellhandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysellhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "buysellhandler.h" - #include <SDL_types.h> +#include "buysellhandler.h" #include "messagein.h" #include "protocol.h" @@ -39,8 +36,8 @@ #include "../gui/sell.h" extern BuyDialog *buyDialog; -extern SellDialog *sellDialog; extern Window *buySellDialog; +extern SellDialog *sellDialog; BuySellHandler::BuySellHandler() { diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index 4da52c95..49984840 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysellhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_BUYSELLHANDLER_H diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index 2af3fe07..833732db 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -17,25 +17,22 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: charserverhandler.cpp 4330 2008-06-04 08:53:01Z b_lindeijer $ */ #include "charserverhandler.h" - #include "messagein.h" #include "network.h" #include "protocol.h" +#include "../extensions.h" #include "../game.h" #include "../localplayer.h" #include "../log.h" #include "../logindata.h" #include "../main.h" -#include "../extensions.h" -#include "../gui/ok_dialog.h" #include "../gui/char_select.h" +#include "../gui/ok_dialog.h" /* * Yeah, this is a global. Get over it. diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 663de94d..05f547d0 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: charserverhandler.h 3228 2007-03-22 23:53:13Z b_lindeijer $ */ #ifndef _TMW_NET_CHARSERVERHANDLER_H diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp index bee19112..b73b86b4 100644 --- a/src/net/chathandler.cpp +++ b/src/net/chathandler.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chathandler.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ -#include "chathandler.h" - #include <SDL_types.h> #include <string> +#include "chathandler.h" #include "messagein.h" #include "protocol.h" diff --git a/src/net/chathandler.h b/src/net/chathandler.h index 08a560f3..53ea61d8 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chathandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_CHATHANDLER_H diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp index 5464fa55..4775371a 100644 --- a/src/net/equipmenthandler.cpp +++ b/src/net/equipmenthandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmenthandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "equipmenthandler.h" - #include "messagein.h" #include "protocol.h" diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h index 0121e6ad..31a747c3 100644 --- a/src/net/equipmenthandler.h +++ b/src/net/equipmenthandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmenthandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_EQUIPMENTHANDLER_H diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp index 44a3256e..12b7d5ef 100644 --- a/src/net/inventoryhandler.cpp +++ b/src/net/inventoryhandler.cpp @@ -17,26 +17,24 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventoryhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "inventoryhandler.h" - #include <SDL_types.h> +#include "inventoryhandler.h" #include "messagein.h" #include "protocol.h" -#include "../resources/iteminfo.h" +#include "../inventory.h" #include "../item.h" #include "../itemshortcut.h" #include "../localplayer.h" #include "../log.h" -#include "../inventory.h" #include "../gui/chat.h" +#include "../resources/iteminfo.h" + #include "../utils/tostring.h" InventoryHandler::InventoryHandler() diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 64ef8464..002fa938 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventoryhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_INVENTORYHANDLER_H diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp index 9af2be10..9cf85ce7 100644 --- a/src/net/itemhandler.cpp +++ b/src/net/itemhandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemhandler.cpp 2150 2006-02-06 02:56:48Z der_doener $ */ #include "itemhandler.h" - #include "messagein.h" #include "protocol.h" diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h index 702e193a..99fc6b62 100644 --- a/src/net/itemhandler.h +++ b/src/net/itemhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_ITEMHANDLER_H diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp index 946f4a21..9a7aaabd 100644 --- a/src/net/loginhandler.cpp +++ b/src/net/loginhandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: loginhandler.cpp 3233 2007-03-24 01:57:39Z b_lindeijer $ */ #include "loginhandler.h" - #include "messagein.h" #include "network.h" #include "protocol.h" diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 797655c3..1e087619 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -17,16 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: loginhandler.h 2137 2006-02-04 16:54:35Z der_doener $ */ #ifndef _TMW_NET_LOGINHANDLER_H #define _TMW_NET_LOGINHANDLER_H -#include "messagehandler.h" #include <string> +#include "messagehandler.h" + struct LoginData; class LoginHandler : public MessageHandler diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp index 15f70baf..bc08d5d6 100644 --- a/src/net/maploginhandler.cpp +++ b/src/net/maploginhandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: maploginhandler.cpp 2239 2006-03-09 05:16:27Z der_doener $ */ #include "maploginhandler.h" - #include "messagein.h" #include "protocol.h" diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h index 6ff6bc00..4d9fa75b 100644 --- a/src/net/maploginhandler.h +++ b/src/net/maploginhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: maploginhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_MAPLOGINHANDLER_H diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp index 370a01ab..7a41e1ad 100644 --- a/src/net/messagehandler.cpp +++ b/src/net/messagehandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagehandler.cpp 2112 2006-01-22 13:31:13Z der_doener $ */ -#include "messagehandler.h" - #include <cassert> +#include "messagehandler.h" #include "network.h" MessageHandler::MessageHandler(): diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index 90ffa489..952e76a9 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagehandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_MESSAGEHANDLER_H diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index bec47a5a..345e02fc 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -17,21 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagein.cpp 2369 2006-06-26 21:32:52Z b_lindeijer $ */ -#include "messagein.h" - #include <cassert> #include <SDL.h> #include <SDL_endian.h> +#include "messagein.h" + #define MAKEWORD(low,high) \ ((unsigned short)(((unsigned char)(low)) | \ ((unsigned short)((unsigned char)(high))) << 8)) - MessageIn::MessageIn(const char *data, unsigned int length): mData(data), mLength(length), diff --git a/src/net/messagein.h b/src/net/messagein.h index 0a6b8b8b..81db6cdc 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagein.h 1879 2005-10-16 21:18:11Z der_doener $ */ #ifndef _TMW_MESSAGEIN_ #define _TMW_MESSAGEIN_ -#include <string> #include <SDL_types.h> +#include <string> /** * Used for parsing an incoming message. diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index f5f3dad9..6aa25411 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messageout.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ #include <cstring> -#include <string> #include <SDL.h> #include <SDL_endian.h> - -#include "network.h" +#include <string> #include "messageout.h" +#include "network.h" MessageOut::MessageOut(Network *network): mNetwork(network), diff --git a/src/net/messageout.h b/src/net/messageout.h index 33deb1bb..3c4cc241 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messageout.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_MESSAGEOUT_ diff --git a/src/net/network.cpp b/src/net/network.cpp index efb11708..c9f8d1bd 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -17,19 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: network.cpp 3550 2007-08-30 16:46:21Z b_lindeijer $ */ -#include "network.h" +#include <sstream> #include "messagehandler.h" #include "messagein.h" +#include "network.h" #include "../log.h" -#include <sstream> - /** Warning: buffers and other variables are shared, so there can be only one connection active at a time */ diff --git a/src/net/network.h b/src/net/network.h index 826e6776..856808a2 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: network.h 3234 2007-03-24 13:05:27Z b_lindeijer $ */ #ifndef _TMW_NETWORK_ diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index 70f04271..65259959 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npchandler.cpp 2883 2006-12-03 17:00:07Z b_lindeijer $ */ -#include "npchandler.h" - #include "messagein.h" +#include "npchandler.h" #include "protocol.h" #include "../beingmanager.h" #include "../npc.h" -#include "../gui/npclistdialog.h" #include "../gui/npc_text.h" +#include "../gui/npclistdialog.h" extern NpcListDialog *npcListDialog; extern NpcTextDialog *npcTextDialog; diff --git a/src/net/npchandler.h b/src/net/npchandler.h index 7abd7495..abb16b7a 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npchandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_NPCHANDLER_H diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp index c1f2ba2e..9b5f3080 100644 --- a/src/net/partyhandler.cpp +++ b/src/net/partyhandler.cpp @@ -17,23 +17,20 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: partyhandler.cpp */ -#include "partyhandler.h" +#include <guichan/actionlistener.hpp> +#include "partyhandler.h" #include "protocol.h" #include "messagein.h" #include "../gui/chat.h" #include "../gui/confirm_dialog.h" +#include "../beingmanager.h" #include "../game.h" #include "../party.h" -#include "../beingmanager.h" - -#include <guichan/actionlistener.hpp> PartyHandler::PartyHandler(Party *party) : mParty(party) { diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index de97d084..daabc52f 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: partyhandler.h */ #ifndef _TMW_NET_PARTYHANDLER_H diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index ea561a81..c8442a89 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -17,20 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerhandler.cpp 4190 2008-04-26 17:37:03Z peaveydk $ */ -#include "playerhandler.h" - #include "messagein.h" +#include "playerhandler.h" #include "protocol.h" #include "../engine.h" #include "../localplayer.h" #include "../log.h" #include "../npc.h" -#include "../utils/tostring.h" #include "../gui/buy.h" #include "../gui/chat.h" @@ -42,6 +38,8 @@ #include "../gui/skill.h" #include "../gui/viewport.h" +#include "../utils/tostring.h" + // TODO Move somewhere else OkDialog *weightNotice = NULL; OkDialog *deathNotice = NULL; diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index f7c0672d..ec22e704 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_PLAYERHANDLER_H diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp index 791b7fe5..a0e21d2e 100644 --- a/src/net/protocol.cpp +++ b/src/net/protocol.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: protocol.cpp 2158 2006-02-07 10:37:54Z der_doener $ */ #include "protocol.h" diff --git a/src/net/protocol.h b/src/net/protocol.h index 5e1d3c62..fabe6911 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: protocol.h 4321 2008-06-02 11:42:26Z b_lindeijer $ */ #ifndef _TMW_PROTOCOL_ diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp index 3685d04b..b9a232fb 100644 --- a/src/net/skillhandler.cpp +++ b/src/net/skillhandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: skillhandler.cpp 2832 2006-11-05 20:57:59Z b_lindeijer $ */ -#include "skillhandler.h" - #include "messagein.h" #include "protocol.h" +#include "skillhandler.h" #include "../log.h" diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h index 734772b4..80095bd3 100644 --- a/src/net/skillhandler.h +++ b/src/net/skillhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: skillhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_SKILLHANDLER_H diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 9174d846..11fe2c19 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tradehandler.cpp 4354 2008-06-17 16:52:44Z the_enemy $ */ -#include "tradehandler.h" - #include "messagein.h" #include "protocol.h" +#include "tradehandler.h" #include "../inventory.h" #include "../item.h" diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index 22e01f48..37ec5024 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tradehandler.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_NET_TRADEHANDLER_H diff --git a/src/npc.cpp b/src/npc.cpp index 82b68af4..78670581 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ -#include "npc.h" - #include "animatedsprite.h" #include "graphics.h" +#include "npc.h" #include "particle.h" #include "text.h" #include "net/messageout.h" #include "net/protocol.h" + #include "resources/npcdb.h" #include "gui/gui.h" @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc.h 2883 2006-12-03 17:00:07Z b_lindeijer $ */ #ifndef _TMW_NPC_H diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 6ffc5668..8f47bc1f 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: openglgraphics.cpp 4130 2008-04-18 20:39:29Z the_enemy $ */ -#include "main.h" - #ifdef USE_OPENGL #ifndef GL_TEXTURE_RECTANGLE_ARB @@ -30,8 +26,6 @@ #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 #endif -#include "openglgraphics.h" - #include <cstring> #include <SDL.h> @@ -43,6 +37,7 @@ #include <guichan/image.hpp> #include "log.h" +#include "openglgraphics.h" #include "resources/image.h" diff --git a/src/openglgraphics.h b/src/openglgraphics.h index c3dc794c..7d39e306 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: openglgraphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _TMW_OPENGLGRAPHICS_H diff --git a/src/particle.cpp b/src/particle.cpp index af54a4b5..f1896ae2 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include <algorithm> #include <cmath> -#include "particle.h" - #include "animationparticle.h" #include "configuration.h" #include "imageparticle.h" #include "log.h" #include "map.h" +#include "particle.h" #include "particleemitter.h" #include "textparticle.h" diff --git a/src/particle.h b/src/particle.h index a21fe88b..0a53f5af 100644 --- a/src/particle.h +++ b/src/particle.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _PARTICLE_H diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index edd7bf4f..03fe4672 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -17,21 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "particleemitter.h" - #include "animationparticle.h" #include "imageparticle.h" #include "log.h" #include "particle.h" +#include "particleemitter.h" #include "resources/animation.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/imageset.h" +#include "resources/resourcemanager.h" #include <cmath> diff --git a/src/particleemitter.h b/src/particleemitter.h index 31346401..809a6ded 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _PARTICLEEMITTER_H diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h index e645c169..f9c329a9 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -17,12 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include <cstdlib> #include <cmath> +#include <cstdlib> /** * Returns a random numeric value that is larger than or equal min and smaller diff --git a/src/party.cpp b/src/party.cpp index 39c39352..3df2eedc 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: party.cpp */ -#include "party.h" - #include "beingmanager.h" -#include "localplayer.h" #include "game.h" +#include "localplayer.h" +#include "party.h" #include "gui/chat.h" #include "gui/confirm_dialog.h" diff --git a/src/party.h b/src/party.h index d4f51b5a..0e1afc3c 100644 --- a/src/party.h +++ b/src/party.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: party.h */ #ifndef _TMW_PARTY_H diff --git a/src/player.cpp b/src/player.cpp index 5fb5ffe9..1a7480db 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -17,25 +17,23 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: player.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ -#include "player.h" +#include <iostream> #include "animatedsprite.h" #include "game.h" #include "graphics.h" #include "log.h" +#include "player.h" + +#include "gui/gui.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" #include "utils/strprintf.h" -#include "gui/gui.h" -#include <iostream> - static const int NAME_X_OFFSET = 15; static const int NAME_Y_OFFSET = 30; diff --git a/src/player.h b/src/player.h index 6def34a5..8b1c8dcb 100644 --- a/src/player.h +++ b/src/player.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: player.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_PLAYER_H diff --git a/src/player_relations.cpp b/src/player_relations.cpp index 8abc9848..157cc09b 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -19,12 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <algorithm> + #include "beingmanager.h" -#include "player_relations.h" #include "graphics.h" -#include "gui/gui.h" +#include "player_relations.h" -#include <algorithm> +#include "gui/gui.h" #define PLAYER_IGNORE_STRATEGY_NOP "nop" #define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0" diff --git a/src/player_relations.h b/src/player_relations.h index ec93b4dc..56f3d5a4 100644 --- a/src/player_relations.h +++ b/src/player_relations.h @@ -22,13 +22,14 @@ #ifndef TMW_PLAYER_RELATIONS_H_ #define TMW_PLAYER_RELATIONS_H_ -#include "being.h" -#include "player.h" -#include "configuration.h" -#include <string> +#include <list> #include <map> +#include <string> #include <vector> -#include <list> + +#include "being.h" +#include "configuration.h" +#include "player.h" struct PlayerRelation { diff --git a/src/properties.h b/src/properties.h index 9ebead66..86fffea3 100644 --- a/src/properties.h +++ b/src/properties.h @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: properties.h 3754 2007-11-20 15:19:50Z b_lindeijer $ */ #ifndef _TMW_PROPERTIES_H_ #define _TMW_PROPERTIES_H_ #include <map> -#include <string> #include <sstream> +#include <string> /** * A class holding a set of properties. diff --git a/src/recorder.cpp b/src/recorder.cpp index 48ecb837..7bf618c5 100644 --- a/src/recorder.cpp +++ b/src/recorder.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: record.cpp */ #include "recorder.h" -#include "gui/chat.h" #include "gui/buttonbox.h" +#include "gui/chat.h" #include "utils/trim.h" diff --git a/src/recorder.h b/src/recorder.h index 75d86f88..9f30184f 100644 --- a/src/recorder.h +++ b/src/recorder.h @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: record.h */ #ifndef _TMW_RECORD_H #define _TMW_RECORD_H -#include <string> #include <fstream> +#include <string> #include "gui/buttonbox.h" diff --git a/src/resources/action.cpp b/src/resources/action.cpp index 8ed099ea..f40d3109 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -17,17 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: action.cpp 3676 2007-10-23 08:02:22Z b_lindeijer $ */ #include "action.h" - #include "animation.h" #include "../utils/dtor.h" - Action::Action() { } diff --git a/src/resources/action.h b/src/resources/action.h index 61307652..09eb066e 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: action.h 2905 2006-12-12 15:06:06Z b_lindeijer $ */ #ifndef _TMW_ACTION_H diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp index 654cbb32..38d8fc46 100644 --- a/src/resources/ambientoverlay.cpp +++ b/src/resources/ambientoverlay.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ambientoverlay.cpp 2727 2006-10-07 20:01:34Z b_lindeijer $ */ #include "ambientoverlay.h" - #include "image.h" #include "../graphics.h" diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h index c0b18600..56c70066 100644 --- a/src/resources/ambientoverlay.h +++ b/src/resources/ambientoverlay.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ambientoverlay.h 2727 2006-10-07 20:01:34Z b_lindeijer $ */ #ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_ diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index b740b9b5..596c5fac 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animation.cpp 2905 2006-12-12 15:06:06Z b_lindeijer $ */ -#include "animation.h" - #include <algorithm> +#include "animation.h" + #include "../utils/dtor.h" Animation::Animation(): diff --git a/src/resources/animation.h b/src/resources/animation.h index 53420ecd..8dfe8614 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animation.h 3301 2007-05-23 21:35:01Z b_lindeijer $ */ #ifndef _TMW_ANIMATION_H diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index c917a45e..1bd98680 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buddylist.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $ */ #include <algorithm> #include <cstring> -#include <iostream> #include <fstream> +#include <iostream> #include "buddylist.h" -#include "../main.h" #include "../configuration.h" +#include "../main.h" BuddyList::BuddyList() { diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h index 5a8f2324..6a3de8c4 100644 --- a/src/resources/buddylist.h +++ b/src/resources/buddylist.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buddylist.h 2239 2006-03-09 05:16:27Z der_doener $ */ #ifndef _TMW_BUDDYLIST_H diff --git a/src/resources/colordb.h b/src/resources/colordb.h index 1f8b191c..2b750fa3 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -22,8 +22,8 @@ #ifndef _AETHYRA_COLOR_MANAGER_H #define _AETHYRA_COLOR_MANAGER_H -#include <string> #include <map> +#include <string> /** * The class that holds the color information. diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 195d5dd1..3be105d8 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: dye.cpp 3708 2007-11-04 11:52:44Z gmelquio $ */ #include <algorithm> diff --git a/src/resources/dye.h b/src/resources/dye.h index fe8669bb..4fb8fd40 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -17,13 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: dye.h 3706 2007-11-03 21:04:51Z gmelquio $ */ #ifndef _TMW_DYE_H #define _TMW_DYE_H +#include <string> #include <vector> /** @@ -38,7 +37,7 @@ class Palette * The string is either a file name or a sequence of hexadecimal RGB * values separated by ',' and starting with '#'. */ - Palette(std::string const &); + Palette(std::string const &pallete); /** * Gets a pixel color depending on its intensity. @@ -65,7 +64,7 @@ class Dye * The parts of string are separated by semi-colons. Each part starts * by an uppercase letter, followed by a colon and then a palette name. */ - Dye(std::string const &); + Dye(std::string const &dye); /** * Destroys the associated palettes. diff --git a/src/resources/image.cpp b/src/resources/image.cpp index dc22a69b..35b9c254 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: image.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $ */ #include <SDL_image.h> -#include "image.h" - #include "dye.h" +#include "image.h" #include "../log.h" diff --git a/src/resources/image.h b/src/resources/image.h index 6f10f858..6eb33ed9 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -17,16 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: image.h 3760 2007-11-21 19:43:11Z b_lindeijer $ */ #ifndef _TMW_IMAGE_H #define _TMW_IMAGE_H +#include <SDL.h> + #include "../main.h" -#include <SDL.h> #ifdef USE_OPENGL /* The definition of OpenGL extensions by SDL is giving problems with recent diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index d6539b05..a7e813d7 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageloader.cpp 3515 2007-08-25 16:56:52Z gmelquio $ */ #include <cassert> #include <string> + #include <guichan/color.hpp> #include <guichan/sdl/sdlpixel.hpp> -#include "imageloader.h" - #include "image.h" +#include "imageloader.h" #include "resourcemanager.h" ProxyImage::ProxyImage(SDL_Surface *s): diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h index 89f38eda..7979fd2f 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageloader.h 3515 2007-08-25 16:56:52Z gmelquio $ */ #ifndef _TMW_IMAGELOADER_H diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp index b7263ec3..b321439a 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $ */ +#include "image.h" #include "imageset.h" #include "../log.h" -#include "image.h" - #include "../utils/dtor.h" ImageSet::ImageSet(Image *img, int width, int height) diff --git a/src/resources/imageset.h b/src/resources/imageset.h index e276dd06..c7915212 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageset.h 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #ifndef _TMW_IMAGESET_H @@ -30,7 +28,6 @@ class Image; - /** * Stores a set of subimages originating from a single image. */ diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index f11cad24..36805646 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imagewriter.cpp 2417 2006-07-19 15:12:06Z umperio $ */ -#include "imagewriter.h" - #include <png.h> -#include <string> #include <SDL.h> +#include <string> + +#include "imagewriter.h" #include "../log.h" diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index c7968d30..632e2ae4 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imagewriter.h 1766 2005-09-18 01:31:33Z bertram25 $ */ #include <iosfwd> diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 8b73f646..3f8dadce 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemdb.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include <cassert> + #include <libxml/tree.h> #include "itemdb.h" - #include "iteminfo.h" #include "resourcemanager.h" diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 1ee1b5f0..9b661a60 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemdb.h 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #ifndef _TMW_ITEM_MANAGER_H #define _TMW_ITEM_MANAGER_H -#include "iteminfo.h" - #include <map> +#include "iteminfo.h" + /** * The namespace that holds the item information. */ diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 64f5c37e..5daeafe6 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: iteminfo.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "iteminfo.h" - #include "itemdb.h" +#include "iteminfo.h" const std::string& ItemInfo::getSprite(int gender) const diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 85f79263..4678bc08 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: iteminfo.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_ITEMINFO_H_ diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index f3d78ae9..d6154ee0 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: mapreader.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ -#include "mapreader.h" - #include <cassert> #include <iostream> #include <zlib.h> -#include "resourcemanager.h" #include "image.h" +#include "mapreader.h" +#include "resourcemanager.h" #include "../log.h" #include "../map.h" diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index eb0d4873..ef52564e 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: mapreader.h 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #ifndef _TMW_MAPREADER_H_ @@ -28,8 +26,8 @@ #include <libxml/tree.h> -class Properties; class Map; +class Properties; class Tileset; /** diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 8d8dd133..4d52b8ad 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ #include "monsterdb.h" - #include "resourcemanager.h" #include "../log.h" diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index 43865bb3..f1d69e72 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterdb.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_MONSTER_DB_H diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 19f2990b..4a71a122 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $ */ #include "monsterinfo.h" diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index c5345bd8..05a78c5a 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -17,21 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $ */ #ifndef _TMW_MONSTERINFO_H_ #define _TMW_MONSTERINFO_H_ +#include <list> #include <map> #include <string> #include <vector> -#include <list> #include "../being.h" - enum MonsterSoundEvent { MONSTER_EVENT_HIT, diff --git a/src/resources/music.cpp b/src/resources/music.cpp index 0e327218..2386aa43 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: music.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #include "music.h" diff --git a/src/resources/music.h b/src/resources/music.h index a15d22c1..d50150b8 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: music.h 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #ifndef _TMW_MUSIC_H diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index c310d6e3..3ae58067 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npcdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ #include "npcdb.h" - #include "resourcemanager.h" #include "../log.h" diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index e1240c5e..b4539866 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npcdb.h 4255 2008-05-21 21:44:27Z crush_tmw $ */ #ifndef _TMW_NPC_DB_H #define _TMW_NPC_DB_H -#include <map> #include <list> +#include <map> #include <string> struct NPCsprite diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index 2bb60e56..e9310905 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resource.cpp 3808 2007-12-22 21:33:47Z b_lindeijer $ */ #include <cassert> #include "resource.h" - #include "resourcemanager.h" Resource::~Resource() diff --git a/src/resources/resource.h b/src/resources/resource.h index 9c70f6c0..e85e3147 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resource.h 3808 2007-12-22 21:33:47Z b_lindeijer $ */ #ifndef _TMW_RESOURCE_H diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 16a2c470..310982af 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -17,29 +17,25 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resourcemanager.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include <cassert> -#include <sstream> -#include <sys/time.h> - #include <physfs.h> #include <SDL_image.h> +#include <sstream> -#include "resourcemanager.h" +#include <sys/time.h> #include "dye.h" #include "image.h" +#include "imageset.h" #include "music.h" +#include "resourcemanager.h" #include "soundeffect.h" -#include "imageset.h" #include "spritedef.h" #include "../log.h" - ResourceManager *ResourceManager::instance = NULL; ResourceManager::ResourceManager() diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 3f0f1704..c814d752 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resourcemanager.h 3839 2008-01-13 16:28:50Z the_enemy $ */ #ifndef _TMW_RESOURCE_MANAGER_H @@ -29,11 +27,11 @@ #include <string> #include <vector> -class Resource; class Image; +class ImageSet; class Music; +class Resource; class SoundEffect; -class ImageSet; class SpriteDef; struct SDL_Surface; diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index 03fa337e..e21fd2b0 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: soundeffect.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #include "soundeffect.h" diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 0a574e7d..c3ff6668 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: soundeffect.h 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #ifndef _TMW_SOUND_EFFECT_H diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index a6d8891e..b4193fd3 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include <set> -#include "spritedef.h" - #include "action.h" #include "animation.h" #include "dye.h" #include "image.h" #include "imageset.h" #include "resourcemanager.h" +#include "spritedef.h" #include "../log.h" #include "../utils/xml.h" diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 72c2566f..4b712340 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_SPRITEDEF_H @@ -27,10 +25,10 @@ #include <map> #include <string> -#include "resource.h" - #include <libxml/tree.h> +#include "resource.h" + class Action; class ImageSet; diff --git a/src/serverinfo.h b/src/serverinfo.h index 9a9eef1d..4d2bb525 100644 --- a/src/serverinfo.h +++ b/src/serverinfo.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: serverinfo.h 1735 2005-09-13 22:56:29Z der_doener $ */ #ifndef _TMW_SERVERINFO_ diff --git a/src/shopitem.cpp b/src/shopitem.cpp index 8bd79cc1..9888f829 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shopitem.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "shopitem.h" diff --git a/src/shopitem.h b/src/shopitem.h index 4e6fd3a3..f0c00ef0 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shopitem.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _SHOPITEM_H_ diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index a75a3392..544d02b5 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -17,19 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: simpleanimation.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ */ -#include "simpleanimation.h" - #include "graphics.h" #include "log.h" +#include "simpleanimation.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/imageset.h" - +#include "resources/resourcemanager.h" SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode): mAnimationTime(0), diff --git a/src/simpleanimation.h b/src/simpleanimation.h index dfca33e2..577268a8 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: simpleanimation.h 3301 2007-05-23 21:35:01Z b_lindeijer $ */ #ifndef _TMW_SIMPLEANIMAION_H diff --git a/src/sound.cpp b/src/sound.cpp index f0101442..6d440134 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sound.cpp 3892 2008-02-18 10:00:45Z umperio $ */ -#include "sound.h" - #include <SDL.h> #include "log.h" +#include "sound.h" + #include "resources/resourcemanager.h" #include "resources/soundeffect.h" diff --git a/src/sound.h b/src/sound.h index ebcd6442..72180607 100644 --- a/src/sound.h +++ b/src/sound.h @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_SOUND_H #define _TMW_SOUND_H #include <SDL_mixer.h> - #include <string> /** Sound engine diff --git a/src/sprite.h b/src/sprite.h index cbe32186..0e0a95db 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sprite.h 3292 2007-05-07 16:22:54Z crush_tmw $ */ #ifndef _TMW_SPRITE_H_ diff --git a/src/text.cpp b/src/text.cpp index 545c1c0e..4d36b8fc 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -19,12 +19,11 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "text.h" - #include <cstring> #include <guichan/font.hpp> +#include "text.h" #include "textmanager.h" int Text::mInstances = 0; diff --git a/src/textmanager.cpp b/src/textmanager.cpp index 54d44c2a..cb5d0bf2 100644 --- a/src/textmanager.cpp +++ b/src/textmanager.cpp @@ -19,11 +19,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "textmanager.h" - #include <cstring> #include "text.h" +#include "textmanager.h" TextManager *textManager = 0; diff --git a/src/textparticle.cpp b/src/textparticle.cpp index 89466006..ed9d5717 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "textparticle.h" - #include "graphics.h" +#include "textparticle.h" TextParticle::TextParticle(Map *map, const std::string &text, int colorR, int colorG, int colorB, diff --git a/src/textparticle.h b/src/textparticle.h index 5f81abff..f662621f 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textparticle.h 3539 2007-08-28 16:42:47Z b_lindeijer $ */ #ifndef _TEXTPARTICLE_H #define _TEXTPARTICLE_H -#include "particle.h" - #include <guichan/color.hpp> #include "guichanfwd.h" +#include "particle.h" class TextParticle : public Particle { diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index e98216d4..9d8ba836 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -26,10 +26,9 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.cpp 2906 2006-12-12 15:18:30Z b_lindeijer $ */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include "base64.h" diff --git a/src/utils/base64.h b/src/utils/base64.h index 3356debf..c802207b 100644 --- a/src/utils/base64.h +++ b/src/utils/base64.h @@ -26,7 +26,6 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.h 2906 2006-12-12 15:18:30Z b_lindeijer $ */ #ifndef _TMW_BASE64_H #define _TMW_BASE64_H diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 29cde178..514ea9e7 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: dtor.h 2271 2006-03-18 15:15:33Z der_doener $ */ #ifndef _TMW_UTILS_DTOR_H diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h index 4513a79d..8da1d354 100644 --- a/src/utils/fastsqrt.h +++ b/src/utils/fastsqrt.h @@ -5,8 +5,6 @@ * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
*
* Unfortunately the original creator of this function seems to be unknown.
- *
- * $Id: fastsqrt.h 3508 2007-08-22 16:32:52Z b_lindeijer $
*/
float fastInvSqrt(float x)
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp index 48fc3814..c532dd0d 100644 --- a/src/utils/strprintf.cpp +++ b/src/utils/strprintf.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: strprintf.cpp 3416 2007-08-06 06:20:14Z gmelquio $ */ #include <cstdarg> diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h index 66d753fa..382ab6e0 100644 --- a/src/utils/strprintf.h +++ b/src/utils/strprintf.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: strprintf.h 3417 2007-08-06 11:14:45Z gmelquio $ */ #ifndef _TMW_UTILS_STRPRINTF_H diff --git a/src/utils/tostring.h b/src/utils/tostring.h index 3cbeef27..d2dd941a 100644 --- a/src/utils/tostring.h +++ b/src/utils/tostring.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tostring.h 3500 2007-08-21 15:11:19Z joshlangley $ */ #ifndef _TMW_UTILS_TOSTRING_H diff --git a/src/utils/trim.h b/src/utils/trim.h index 7b236730..a7c40ca2 100644 --- a/src/utils/trim.h +++ b/src/utils/trim.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: trim.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_UTILS_TRIM_H_ diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index c0b921b8..e511ced3 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -17,12 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: xml.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ #include "xml.h" + #include "../log.h" + #include "../resources/resourcemanager.h" namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index c64c1204..9e691963 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: xml.h 4255 2008-05-21 21:44:27Z crush_tmw $ */ #ifndef _TMW_XML_H #define _TMW_XML_H -#include <libxml/tree.h> - #include <string> +#include <libxml/tree.h> + /** * XML helper functions. */ diff --git a/src/vector.h b/src/vector.h index 379c50e1..b19f6c64 100644 --- a/src/vector.h +++ b/src/vector.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: vector.h 3541 2007-08-29 00:31:59Z b_lindeijer $ */ #ifndef _TMW_VECTOR_H_ |