From d067d7da8e6ee333a4941d4fe6ee9eb926d37f00 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 10 Feb 2009 17:24:57 -0700 Subject: Added two more options for displaying speech overhead (don't show it at all and show speech bubbles without names). Since a checkbox won't work any more for all of these modes, it's now a slider. Signed-off-by: Ira Rice --- src/gui/setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/setup.cpp') diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 19575cfb..e165ba57 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -49,8 +49,8 @@ Setup::Setup(): Window(_("Setup")) { setCloseButton(true); - int width = 310; - int height = 310; + int width = 340; + int height = 340; setContentSize(width, height); static const char *buttonNames[] = { -- cgit v1.2.3-70-g09d2 From d268447e18c6e3edd80658f8f8d4317740c33af9 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 10 Feb 2009 20:09:33 -0700 Subject: Fixed header files, as well as removed the unused buddy list class (not useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice --- aethyra.cbp | 2 - src/CMakeLists.txt | 2 - src/Makefile.am | 2 - src/animatedsprite.cpp | 5 +- src/animatedsprite.h | 5 +- src/animationparticle.cpp | 5 +- src/animationparticle.h | 5 +- src/being.cpp | 5 +- src/being.h | 5 +- src/beingmanager.cpp | 5 +- src/beingmanager.h | 5 +- src/configlistener.h | 5 +- src/configuration.cpp | 5 +- src/configuration.h | 5 +- src/effectmanager.cpp | 3 +- src/effectmanager.h | 3 +- src/emoteshortcut.cpp | 3 +- src/emoteshortcut.h | 3 +- src/engine.cpp | 5 +- src/engine.h | 3 +- src/equipment.cpp | 5 +- src/equipment.h | 5 +- src/floor_item.cpp | 5 +- src/floor_item.h | 5 +- src/flooritemmanager.cpp | 5 +- src/flooritemmanager.h | 3 +- src/game.cpp | 5 +- src/game.h | 5 +- src/graphics.cpp | 5 +- src/graphics.h | 5 +- src/gui/browserbox.cpp | 5 +- src/gui/browserbox.h | 5 +- src/gui/button.cpp | 5 +- src/gui/button.h | 5 +- src/gui/buy.cpp | 5 +- src/gui/buy.h | 5 +- src/gui/buysell.cpp | 5 +- src/gui/buysell.h | 5 +- src/gui/char_select.cpp | 5 +- src/gui/char_select.h | 5 +- src/gui/char_server.cpp | 5 +- src/gui/char_server.h | 5 +- src/gui/chat.cpp | 5 +- src/gui/chat.h | 5 +- src/gui/chatinput.cpp | 5 +- src/gui/chatinput.h | 5 +- src/gui/checkbox.cpp | 5 +- src/gui/checkbox.h | 5 +- src/gui/colour.cpp | 2 +- src/gui/colour.h | 2 +- src/gui/confirm_dialog.cpp | 5 +- src/gui/confirm_dialog.h | 5 +- src/gui/connection.cpp | 5 +- src/gui/connection.h | 5 +- src/gui/debugwindow.cpp | 5 +- src/gui/debugwindow.h | 5 +- src/gui/emotecontainer.cpp | 3 +- src/gui/emotecontainer.h | 3 +- src/gui/emoteshortcutcontainer.cpp | 3 +- src/gui/emoteshortcutcontainer.h | 3 +- src/gui/emotewindow.cpp | 2 +- src/gui/emotewindow.h | 2 +- src/gui/equipmentwindow.cpp | 5 +- src/gui/equipmentwindow.h | 5 +- src/gui/focushandler.cpp | 5 +- src/gui/focushandler.h | 5 +- src/gui/gccontainer.cpp | 5 +- src/gui/gccontainer.h | 5 +- src/gui/gui.cpp | 5 +- src/gui/gui.h | 5 +- src/gui/help.cpp | 5 +- src/gui/help.h | 5 +- src/gui/inttextfield.cpp | 6 +- src/gui/inttextfield.h | 6 +- src/gui/inventorywindow.cpp | 5 +- src/gui/inventorywindow.h | 5 +- src/gui/item_amount.cpp | 5 +- src/gui/item_amount.h | 5 +- src/gui/itemcontainer.cpp | 5 +- src/gui/itemcontainer.h | 5 +- src/gui/itemlinkhandler.cpp | 5 +- src/gui/itemlinkhandler.h | 5 +- src/gui/itempopup.cpp | 11 ++-- src/gui/itempopup.h | 11 ++-- src/gui/itemshortcutcontainer.cpp | 5 +- src/gui/itemshortcutcontainer.h | 5 +- src/gui/linkhandler.h | 5 +- src/gui/listbox.cpp | 5 +- src/gui/listbox.h | 5 +- src/gui/login.cpp | 5 +- src/gui/login.h | 5 +- src/gui/menuwindow.cpp | 5 +- src/gui/menuwindow.h | 5 +- src/gui/minimap.cpp | 5 +- src/gui/minimap.h | 5 +- src/gui/ministatus.cpp | 5 +- src/gui/ministatus.h | 5 +- src/gui/npc_text.cpp | 5 +- src/gui/npc_text.h | 5 +- src/gui/npcintegerdialog.cpp | 5 +- src/gui/npcintegerdialog.h | 5 +- src/gui/npclistdialog.cpp | 5 +- src/gui/npclistdialog.h | 5 +- src/gui/npcstringdialog.cpp | 5 +- src/gui/npcstringdialog.h | 5 +- src/gui/ok_dialog.cpp | 5 +- src/gui/ok_dialog.h | 5 +- src/gui/passwordfield.cpp | 5 +- src/gui/passwordfield.h | 5 +- src/gui/playerbox.cpp | 5 +- src/gui/playerbox.h | 5 +- src/gui/popupmenu.cpp | 5 +- src/gui/popupmenu.h | 5 +- src/gui/progressbar.cpp | 5 +- src/gui/progressbar.h | 5 +- src/gui/radiobutton.cpp | 5 +- src/gui/radiobutton.h | 5 +- src/gui/register.cpp | 5 +- src/gui/register.h | 5 +- src/gui/scrollarea.cpp | 5 +- src/gui/scrollarea.h | 5 +- src/gui/sell.cpp | 5 +- src/gui/sell.h | 5 +- src/gui/setup.cpp | 5 +- src/gui/setup.h | 5 +- src/gui/setup_audio.cpp | 5 +- src/gui/setup_audio.h | 5 +- src/gui/setup_colours.cpp | 2 +- src/gui/setup_colours.h | 2 +- src/gui/setup_joystick.cpp | 5 +- src/gui/setup_joystick.h | 5 +- src/gui/setup_keyboard.cpp | 5 +- src/gui/setup_keyboard.h | 5 +- src/gui/setup_players.cpp | 6 +- src/gui/setup_players.h | 6 +- src/gui/setup_video.cpp | 5 +- src/gui/setup_video.h | 5 +- src/gui/setuptab.h | 5 +- src/gui/shop.cpp | 5 +- src/gui/shop.h | 5 +- src/gui/shoplistbox.cpp | 5 +- src/gui/shoplistbox.h | 5 +- src/gui/shortcutcontainer.cpp | 11 ++-- src/gui/shortcutcontainer.h | 11 ++-- src/gui/shortcutwindow.cpp | 7 +- src/gui/shortcutwindow.h | 7 +- src/gui/skill.cpp | 5 +- src/gui/skill.h | 5 +- src/gui/slider.cpp | 5 +- src/gui/slider.h | 5 +- src/gui/speechbubble.cpp | 12 ++-- src/gui/speechbubble.h | 12 ++-- src/gui/status.cpp | 5 +- src/gui/status.h | 5 +- src/gui/table.cpp | 7 +- src/gui/table.h | 7 +- src/gui/table_model.cpp | 5 +- src/gui/table_model.h | 5 +- src/gui/textbox.cpp | 5 +- src/gui/textbox.h | 5 +- src/gui/textfield.cpp | 5 +- src/gui/textfield.h | 5 +- src/gui/trade.cpp | 5 +- src/gui/trade.h | 5 +- src/gui/truetypefont.cpp | 5 +- src/gui/truetypefont.h | 5 +- src/gui/updatewindow.cpp | 5 +- src/gui/updatewindow.h | 5 +- src/gui/viewport.cpp | 5 +- src/gui/viewport.h | 5 +- src/gui/widgets/dropdown.cpp | 12 ++-- src/gui/widgets/dropdown.h | 12 ++-- src/gui/widgets/layout.cpp | 5 +- src/gui/widgets/layout.h | 5 +- src/gui/widgets/layouthelper.cpp | 5 +- src/gui/widgets/layouthelper.h | 5 +- src/gui/widgets/resizegrip.cpp | 5 +- src/gui/widgets/resizegrip.h | 5 +- src/gui/widgets/tab.cpp | 5 +- src/gui/widgets/tab.h | 5 +- src/gui/widgets/tabbedarea.cpp | 5 +- src/gui/widgets/tabbedarea.h | 5 +- src/gui/window.cpp | 5 +- src/gui/window.h | 5 +- src/gui/windowcontainer.cpp | 5 +- src/gui/windowcontainer.h | 5 +- src/guichanfwd.h | 5 +- src/imageparticle.cpp | 5 +- src/imageparticle.h | 5 +- src/inventory.cpp | 5 +- src/inventory.h | 5 +- src/item.cpp | 5 +- src/item.h | 5 +- src/itemshortcut.cpp | 5 +- src/itemshortcut.h | 5 +- src/joystick.cpp | 5 +- src/joystick.h | 5 +- src/keyboardconfig.cpp | 5 +- src/keyboardconfig.h | 5 +- src/localplayer.cpp | 5 +- src/localplayer.h | 5 +- src/lockedarray.h | 5 +- src/log.cpp | 5 +- src/log.h | 5 +- src/logindata.h | 5 +- src/main.cpp | 5 +- src/main.h | 5 +- src/map.cpp | 5 +- src/map.h | 5 +- src/monster.cpp | 5 +- src/monster.h | 5 +- src/net/beinghandler.cpp | 5 +- src/net/beinghandler.h | 5 +- src/net/buysellhandler.cpp | 5 +- src/net/buysellhandler.h | 5 +- src/net/charserverhandler.cpp | 5 +- src/net/charserverhandler.h | 5 +- src/net/chathandler.cpp | 5 +- src/net/chathandler.h | 5 +- src/net/equipmenthandler.cpp | 5 +- src/net/equipmenthandler.h | 5 +- src/net/inventoryhandler.cpp | 5 +- src/net/inventoryhandler.h | 5 +- src/net/itemhandler.cpp | 5 +- src/net/itemhandler.h | 5 +- src/net/loginhandler.cpp | 5 +- src/net/loginhandler.h | 5 +- src/net/maploginhandler.cpp | 5 +- src/net/maploginhandler.h | 5 +- src/net/messagehandler.cpp | 5 +- src/net/messagehandler.h | 5 +- src/net/messagein.cpp | 5 +- src/net/messagein.h | 5 +- src/net/messageout.cpp | 5 +- src/net/messageout.h | 5 +- src/net/network.cpp | 5 +- src/net/network.h | 5 +- src/net/npchandler.cpp | 5 +- src/net/npchandler.h | 5 +- src/net/partyhandler.cpp | 10 +-- src/net/partyhandler.h | 10 +-- src/net/playerhandler.cpp | 5 +- src/net/playerhandler.h | 5 +- src/net/protocol.cpp | 5 +- src/net/protocol.h | 5 +- src/net/skillhandler.cpp | 5 +- src/net/skillhandler.h | 5 +- src/net/tradehandler.cpp | 5 +- src/net/tradehandler.h | 5 +- src/npc.cpp | 5 +- src/npc.h | 5 +- src/openglgraphics.cpp | 5 +- src/openglgraphics.h | 5 +- src/particle.cpp | 5 +- src/particle.h | 5 +- src/particlecontainer.cpp | 5 +- src/particlecontainer.h | 5 +- src/particleemitter.cpp | 5 +- src/particleemitter.h | 5 +- src/particleemitterprop.h | 5 +- src/party.cpp | 12 ++-- src/party.h | 12 ++-- src/player.cpp | 5 +- src/player.h | 5 +- src/player_relations.cpp | 5 +- src/player_relations.h | 5 +- src/position.cpp | 5 +- src/position.h | 5 +- src/properties.h | 5 +- src/resources/action.cpp | 5 +- src/resources/action.h | 5 +- src/resources/ambientoverlay.cpp | 5 +- src/resources/ambientoverlay.h | 5 +- src/resources/animation.cpp | 5 +- src/resources/animation.h | 5 +- src/resources/buddylist.cpp | 128 ------------------------------------- src/resources/buddylist.h | 80 ----------------------- src/resources/colordb.cpp | 8 +-- src/resources/colordb.h | 8 +-- src/resources/dye.cpp | 5 +- src/resources/dye.h | 5 +- src/resources/emotedb.cpp | 8 +-- src/resources/emotedb.h | 8 +-- src/resources/image.cpp | 5 +- src/resources/image.h | 5 +- src/resources/imageloader.cpp | 5 +- src/resources/imageloader.h | 5 +- src/resources/imageset.cpp | 5 +- src/resources/imageset.h | 5 +- src/resources/imagewriter.cpp | 5 +- src/resources/imagewriter.h | 5 +- src/resources/itemdb.cpp | 5 +- src/resources/itemdb.h | 5 +- src/resources/iteminfo.cpp | 5 +- src/resources/iteminfo.h | 5 +- src/resources/mapreader.cpp | 5 +- src/resources/mapreader.h | 5 +- src/resources/monsterdb.cpp | 5 +- src/resources/monsterdb.h | 5 +- src/resources/monsterinfo.cpp | 5 +- src/resources/monsterinfo.h | 5 +- src/resources/music.cpp | 5 +- src/resources/music.h | 5 +- src/resources/npcdb.cpp | 5 +- src/resources/npcdb.h | 5 +- src/resources/resource.cpp | 5 +- src/resources/resource.h | 5 +- src/resources/resourcemanager.cpp | 5 +- src/resources/resourcemanager.h | 5 +- src/resources/soundeffect.cpp | 5 +- src/resources/soundeffect.h | 5 +- src/resources/spritedef.cpp | 5 +- src/resources/spritedef.h | 5 +- src/serverinfo.h | 5 +- src/shopitem.cpp | 5 +- src/shopitem.h | 5 +- src/simpleanimation.cpp | 5 +- src/simpleanimation.h | 5 +- src/sound.cpp | 5 +- src/sound.h | 5 +- src/sprite.h | 5 +- src/textparticle.cpp | 5 +- src/textparticle.h | 5 +- src/tileset.h | 5 +- src/utils/dtor.h | 5 +- src/utils/gettext.h | 5 +- src/utils/mutex.h | 5 +- src/utils/strprintf.cpp | 5 +- src/utils/strprintf.h | 5 +- src/utils/tostring.h | 7 +- src/utils/trim.h | 5 +- src/utils/xml.cpp | 5 +- src/utils/xml.h | 5 +- src/vector.cpp | 5 +- src/vector.h | 5 +- 335 files changed, 1010 insertions(+), 918 deletions(-) delete mode 100644 src/resources/buddylist.cpp delete mode 100644 src/resources/buddylist.h (limited to 'src/gui/setup.cpp') diff --git a/aethyra.cbp b/aethyra.cbp index c383dff3..795e179a 100644 --- a/aethyra.cbp +++ b/aethyra.cbp @@ -363,8 +363,6 @@ - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86deec0c..5e26ff97 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -255,8 +255,6 @@ SET(SRCS resources/ambientoverlay.h resources/animation.cpp resources/animation.h - resources/buddylist.cpp - resources/buddylist.h resources/colordb.cpp resources/colordb.h resources/dye.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 4a6461dd..b6b052f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -205,8 +205,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ resources/ambientoverlay.h \ resources/animation.cpp \ resources/animation.h \ - resources/buddylist.cpp \ - resources/buddylist.h \ resources/colordb.cpp \ resources/colordb.h \ resources/dye.cpp \ diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index aa2fb4ee..108f5166 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/animatedsprite.h b/src/animatedsprite.h index b196b990..756d9aed 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp index 9c1f7ccb..4e1c348b 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/animationparticle.h b/src/animationparticle.h index 03065eb7..444703f3 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/being.cpp b/src/being.cpp index 869cc970..1acbdb50 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/being.h b/src/being.h index 1d39e726..7fd0c7ef 100644 --- a/src/being.h +++ b/src/being.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index a417ee50..b4ffa76c 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/beingmanager.h b/src/beingmanager.h index 11721709..59a7c76a 100644 --- a/src/beingmanager.h +++ b/src/beingmanager.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/configlistener.h b/src/configlistener.h index ec7d6a2c..edd9e90a 100644 --- a/src/configlistener.h +++ b/src/configlistener.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/configuration.cpp b/src/configuration.cpp index f6c74428..2224a6c7 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/configuration.h b/src/configuration.h index da12e1e4..3e201dcb 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index f004a450..567e692b 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -3,7 +3,8 @@ * Copyright (C) 2008 Fate * Copyright (C) 2008 Chuck Miller * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/effectmanager.h b/src/effectmanager.h index a06ecbc7..0d694f4a 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -3,7 +3,8 @@ * Copyright (C) 2008 Fate * Copyright (C) 2008 Chuck Miller * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp index 807fa3a2..c1ca3c2c 100644 --- a/src/emoteshortcut.cpp +++ b/src/emoteshortcut.cpp @@ -2,7 +2,8 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h index ceb51a9b..3fe911dd 100644 --- a/src/emoteshortcut.h +++ b/src/emoteshortcut.h @@ -2,7 +2,8 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/engine.cpp b/src/engine.cpp index 39b9b3ec..d491b3ff 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/engine.h b/src/engine.h index 7ad6d894..e2fec2f6 100644 --- a/src/engine.h +++ b/src/engine.h @@ -2,7 +2,8 @@ * The Mana World * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/equipment.cpp b/src/equipment.cpp index cb7acd44..558df216 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/equipment.h b/src/equipment.h index ace76e63..d75069dc 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/floor_item.cpp b/src/floor_item.cpp index fbe606b4..232c1aee 100644 --- a/src/floor_item.cpp +++ b/src/floor_item.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/floor_item.h b/src/floor_item.h index 444c756a..8485172c 100644 --- a/src/floor_item.h +++ b/src/floor_item.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp index 65556abb..dbb93526 100644 --- a/src/flooritemmanager.cpp +++ b/src/flooritemmanager.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h index 3f96b587..5ff8fe5c 100644 --- a/src/flooritemmanager.h +++ b/src/flooritemmanager.h @@ -2,7 +2,8 @@ * The Mana World * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/game.cpp b/src/game.cpp index f8903ed2..99888c73 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/game.h b/src/game.h index d7d2a562..85bb9c07 100644 --- a/src/game.h +++ b/src/game.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/graphics.cpp b/src/graphics.cpp index 4af7b723..3c507f4b 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/graphics.h b/src/graphics.h index 172032dc..3ad3b85c 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 65659df6..f0c77e46 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h index 5dde402e..500c9fba 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 1d3a04e4..dbb5f568 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/button.h b/src/gui/button.h index abaf5c43..f21d2661 100644 --- a/src/gui/button.h +++ b/src/gui/button.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp index 0c8c4d9d..a2485ca1 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buy.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/buy.h b/src/gui/buy.h index 0f1cfede..b05608c0 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp index d060db85..7d63f184 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buysell.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/buysell.h b/src/gui/buysell.h index e3cdc52a..c12e3c9b 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 8de4f5a7..6e7548e8 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 23de061d..037b809f 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index bc096379..60f8f5dd 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/char_server.h b/src/gui/char_server.h index 49a5b47b..207fb86e 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 92dd46d7..49df0f9d 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/chat.h b/src/gui/chat.h index 2fadb014..45d0c92f 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp index 43f3cde4..42c6d4de 100644 --- a/src/gui/chatinput.cpp +++ b/src/gui/chatinput.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h index a4a50502..96c30b3f 100644 --- a/src/gui/chatinput.h +++ b/src/gui/chatinput.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp index 511ed34c..7a3e2fde 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h index 20adb43c..260ed3a1 100644 --- a/src/gui/checkbox.h +++ b/src/gui/checkbox.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp index cdb5a3fd..095662ef 100644 --- a/src/gui/colour.cpp +++ b/src/gui/colour.cpp @@ -2,7 +2,7 @@ * Configurable text colors * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/colour.h b/src/gui/colour.h index 6ea02840..820c319d 100644 --- a/src/gui/colour.h +++ b/src/gui/colour.h @@ -2,7 +2,7 @@ * Configurable text colors * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp index 38697f3a..2287a195 100644 --- a/src/gui/confirm_dialog.cpp +++ b/src/gui/confirm_dialog.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h index 3fa2b90d..493e9dda 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp index a69698e9..f6033cd7 100644 --- a/src/gui/connection.cpp +++ b/src/gui/connection.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/connection.h b/src/gui/connection.h index 3caa611f..f91a0ad1 100644 --- a/src/gui/connection.h +++ b/src/gui/connection.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 5a5acfad..2d8bb826 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index e089de27..95e8b5e4 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp index 94ce9736..721a0ebd 100644 --- a/src/gui/emotecontainer.cpp +++ b/src/gui/emotecontainer.cpp @@ -2,7 +2,8 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h index fefce793..260f1754 100644 --- a/src/gui/emotecontainer.h +++ b/src/gui/emotecontainer.h @@ -2,7 +2,8 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp index b66592c1..af83a743 100644 --- a/src/gui/emoteshortcutcontainer.cpp +++ b/src/gui/emoteshortcutcontainer.cpp @@ -2,7 +2,8 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h index d32a9f79..4c4b3614 100644 --- a/src/gui/emoteshortcutcontainer.h +++ b/src/gui/emoteshortcutcontainer.h @@ -2,7 +2,8 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp index f4a8999a..8cf1d730 100644 --- a/src/gui/emotewindow.cpp +++ b/src/gui/emotewindow.cpp @@ -2,7 +2,7 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h index 8af24a7b..81ee4f05 100644 --- a/src/gui/emotewindow.h +++ b/src/gui/emotewindow.h @@ -2,7 +2,7 @@ * Extended support for activating emotes * Copyright (C) 2009 Aethyra Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index a2be6b00..10784be8 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 4ae3300f..7fdbaac8 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from 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 diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp index dd605be6..cb52ae9f 100644 --- a/src/gui/focushandler.cpp +++ b/src/gui/focushandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index b0639bd8..fc5dd240 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp index 8325ccd4..7aebed15 100644 --- a/src/gui/gccontainer.cpp +++ b/src/gui/gccontainer.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h index da584a42..2071955d 100644 --- a/src/gui/gccontainer.h +++ b/src/gui/gccontainer.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 7779a503..a8a2a72f 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/gui.h b/src/gui/gui.h index 5c0c24f7..0c6529bd 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/help.cpp b/src/gui/help.cpp index ece2dce4..fec39199 100644 --- a/src/gui/help.cpp +++ b/src/gui/help.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/help.h b/src/gui/help.h index 98e3aa67..93d32c18 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/inttextfield.cpp b/src/gui/inttextfield.cpp index fcbe938d..adade3b9 100644 --- a/src/gui/inttextfield.cpp +++ b/src/gui/inttextfield.cpp @@ -1,8 +1,8 @@ /* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/inttextfield.h b/src/gui/inttextfield.h index add78084..f2e294ca 100644 --- a/src/gui/inttextfield.h +++ b/src/gui/inttextfield.h @@ -1,8 +1,8 @@ /* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index af3b29a2..52aea2d3 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 78d30461..a46a3fbb 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp index 92be3d6e..8ab36df0 100644 --- a/src/gui/item_amount.cpp +++ b/src/gui/item_amount.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h index 618d7d51..6bec86b3 100644 --- a/src/gui/item_amount.h +++ b/src/gui/item_amount.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 5693d001..e84c79ca 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h index 23b9e5e1..fba4656f 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/itemlinkhandler.cpp b/src/gui/itemlinkhandler.cpp index 97c0b94f..4a64d53f 100644 --- a/src/gui/itemlinkhandler.cpp +++ b/src/gui/itemlinkhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright 2009 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from 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 diff --git a/src/gui/itemlinkhandler.h b/src/gui/itemlinkhandler.h index cd6fd900..e4c3ea4a 100644 --- a/src/gui/itemlinkhandler.h +++ b/src/gui/itemlinkhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright 2009 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from 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 diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index ddce449a..9c0bd65c 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -1,22 +1,23 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Legend of Mazzeroth. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 1d37346e..a91d8c6f 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -1,22 +1,23 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Legend of Mazzeroth. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp index d3cc2c22..324e1b6c 100644 --- a/src/gui/itemshortcutcontainer.cpp +++ b/src/gui/itemshortcutcontainer.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index 22d94ec2..f6137af0 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h index ecc05b13..ea1b25c8 100644 --- a/src/gui/linkhandler.h +++ b/src/gui/linkhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index b63d6424..97b3bbd0 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/listbox.h b/src/gui/listbox.h index 12fcb955..e783083f 100644 --- a/src/gui/listbox.h +++ b/src/gui/listbox.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 3c8e7cb3..14370485 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/login.h b/src/gui/login.h index c0d6e755..cfe4443b 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp index 0dcc999f..65bd7082 100644 --- a/src/gui/menuwindow.cpp +++ b/src/gui/menuwindow.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h index 9bb54e29..f70a332e 100644 --- a/src/gui/menuwindow.h +++ b/src/gui/menuwindow.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 55cd8b5d..5c52b38e 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004-2005 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/minimap.h b/src/gui/minimap.h index 3ce0aacd..6e88f821 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004-2005 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 13351915..629cf45c 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h index 832475f1..33ee548d 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatus.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp index b4313b70..88db46b3 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npc_text.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index a07aa04f..1f2abd42 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp index c58fc460..9db71d67 100644 --- a/src/gui/npcintegerdialog.cpp +++ b/src/gui/npcintegerdialog.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h index 10ec60b9..858bce5b 100644 --- a/src/gui/npcintegerdialog.h +++ b/src/gui/npcintegerdialog.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp index 7d8a362a..59bf0716 100644 --- a/src/gui/npclistdialog.cpp +++ b/src/gui/npclistdialog.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h index 30167a5e..8d8b6545 100644 --- a/src/gui/npclistdialog.h +++ b/src/gui/npclistdialog.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp index 718c416f..8d66d9bc 100644 --- a/src/gui/npcstringdialog.cpp +++ b/src/gui/npcstringdialog.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h index 1933e0f1..71d1f15c 100644 --- a/src/gui/npcstringdialog.h +++ b/src/gui/npcstringdialog.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp index 2c67e71f..23c4d465 100644 --- a/src/gui/ok_dialog.cpp +++ b/src/gui/ok_dialog.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h index 3a438513..c84cf4c4 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/ok_dialog.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp index 345ee1c3..073f5e36 100644 --- a/src/gui/passwordfield.cpp +++ b/src/gui/passwordfield.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index 42f8d187..adad54fe 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index 60003fb5..e05288cc 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h index 7c08defd..ee25520a 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 53c24960..d10faa0d 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 715a9bb5..c62014f9 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 867477e0..10e8f1f1 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h index 2c1b22da..ff146745 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp index de8d4d9d..2e48f78a 100644 --- a/src/gui/radiobutton.cpp +++ b/src/gui/radiobutton.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h index 3d952b3f..cd501126 100644 --- a/src/gui/radiobutton.h +++ b/src/gui/radiobutton.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/register.cpp b/src/gui/register.cpp index cf12375c..9be44f43 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/register.h b/src/gui/register.h index 9588e07e..922320db 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index eacc4714..4c225e81 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index 33ebc692..080b851c 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index e4be7921..fd271c63 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/sell.h b/src/gui/sell.h index c11a7b7c..3776477f 100644 --- a/src/gui/sell.h +++ b/src/gui/sell.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index e165ba57..2c187f94 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup.h b/src/gui/setup.h index e4eb0902..9f1bafc7 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index a4bc05ae..3c26f14b 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 9e951895..aad16617 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp index ee2d2f5e..03fdcfec 100644 --- a/src/gui/setup_colours.cpp +++ b/src/gui/setup_colours.cpp @@ -2,7 +2,7 @@ * Configurable text colors * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h index 57d9e304..ac06c178 100644 --- a/src/gui/setup_colours.h +++ b/src/gui/setup_colours.h @@ -2,7 +2,7 @@ * Configurable text colors * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index c0c04949..5bbaa368 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index eba8a2cc..ae888206 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 8638b277..1fb0b443 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h index 082fa84d..5fa961ae 100644 --- a/src/gui/setup_keyboard.h +++ b/src/gui/setup_keyboard.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index 8601d289..0ea6d167 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -1,8 +1,8 @@ /* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index 2edc6983..07f70b00 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -1,8 +1,8 @@ /* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 7c891f44..48bf63e7 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 13735e0f..9e4689bc 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h index 3e0c51e2..7e1bc36f 100644 --- a/src/gui/setuptab.h +++ b/src/gui/setuptab.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index a5f59bac..a56116d3 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/shop.h b/src/gui/shop.h index e0db4c59..166eb00b 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp index b5761535..9e53dff7 100644 --- a/src/gui/shoplistbox.cpp +++ b/src/gui/shoplistbox.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h index cde4786e..8542a7b8 100644 --- a/src/gui/shoplistbox.h +++ b/src/gui/shoplistbox.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp index 4472818e..cc559def 100644 --- a/src/gui/shortcutcontainer.cpp +++ b/src/gui/shortcutcontainer.cpp @@ -1,21 +1,22 @@ /* - * The Mana World + * Aethyra * Copyright 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h index f5f06163..3f2e1c60 100644 --- a/src/gui/shortcutcontainer.h +++ b/src/gui/shortcutcontainer.h @@ -1,21 +1,22 @@ /* - * The Mana World + * Aethyra * Copyright 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index 5d49a3c6..754b410a 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -1,8 +1,9 @@ /* - * The Mana World - * Copyright (C) 2007 The Mana World Development Team + * Aethyra + * Copyright 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index 64592328..42077d9c 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -1,8 +1,9 @@ /* - * The Mana World - * Copyright (C) 2007 The Mana World Development Team + * Aethyra + * Copyright 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp index 11db25ce..6c0414f3 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/skill.h b/src/gui/skill.h index 91c2b640..bcdd515c 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp index 9bfa840f..db34cc6a 100644 --- a/src/gui/slider.cpp +++ b/src/gui/slider.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/slider.h b/src/gui/slider.h index 56ea334a..35d875db 100644 --- a/src/gui/slider.h +++ b/src/gui/slider.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 7a191c37..c814253c 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -1,22 +1,22 @@ /* - * The Legend of Mazzeroth + * Aethyra * Copyright (C) 2008, The Legend of Mazzeroth Development Team * - * This file is part of The Legend of Mazzeroth based on original code - * from The Mana World. + * This file is part of Aethyra based on original code + * from The Legend of Mazzeroth. * - * The Legend of Mazzeroth is free software; you can redistribute it and/or modify + * This program 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 Legend of Mazzeroth is distributed in the hope that it will be useful, + * This program 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 Legend of Mazzeroth; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 6b71c09e..d30f5416 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -1,22 +1,22 @@ /* - * The Legend of Mazzeroth + * Aethyra * Copyright (C) 2008, The Legend of Mazzeroth Development Team * - * This file is part of The Legend of Mazzeroth based on original code - * from The Mana World. + * This file is part of Aethyra based on original code + * from The Legend of Mazzeroth. * - * The Legend of Mazzeroth is free software; you can redistribute it and/or modify + * This program 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 Legend of Mazzeroth is distributed in the hope that it will be useful, + * This program 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 Legend of Mazzeroth; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 271b6f1e..5547b996 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/status.h b/src/gui/status.h index 00a48f4e..5056f631 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/table.cpp b/src/gui/table.cpp index 674f3891..425c5b6f 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -1,8 +1,9 @@ /* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from Guichan. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/table.h b/src/gui/table.h index 912eb284..c84272a3 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -1,8 +1,9 @@ /* - * The Mana World - * Copyright (C) 2008 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra derived from original code + * from Guichan. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp index 19e780f3..8998961e 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/table_model.h b/src/gui/table_model.h index 1d966e8b..6edd7d65 100644 --- a/src/gui/table_model.h +++ b/src/gui/table_model.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp index 2a86d549..dc94ead2 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/textbox.h b/src/gui/textbox.h index 10a81fc0..33ea42f9 100644 --- a/src/gui/textbox.h +++ b/src/gui/textbox.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp index 99a95a2e..ed83622d 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/textfield.h b/src/gui/textfield.h index 73824615..b82912c0 100644 --- a/src/gui/textfield.h +++ b/src/gui/textfield.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index af30d1fe..c57cac59 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/trade.h b/src/gui/trade.h index df724038..f4a6b5cd 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index 2d32a213..a92e0dab 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index 017bc4fc..35e8270f 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 1f62bd2d..29e7e763 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h index 4ada3c3a..234a6f57 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 6b6c982a..79a37227 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 522ea734..a131d162 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 31d35cb0..a292edd5 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -1,21 +1,21 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index e5919dc7..ef53d930 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -1,21 +1,21 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Douglas Boffey * - * This file is part of The Mana World. + * This file is part of Aethyra. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index 4ffdda36..7fab91d7 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 20a4222d..04b75ca5 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp index 410de98a..ed002f99 100644 --- a/src/gui/widgets/layouthelper.cpp +++ b/src/gui/widgets/layouthelper.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2009 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index afa92a18..1125d209 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2009 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index fa264e37..f3cc4f83 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index 620c133f..7c96af45 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 22e952e7..1562e3f2 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index 3af4e2bf..4b331d66 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index c4e22bff..f0d719c6 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 01d70380..863ff79e 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 8000179d..516b4138 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/window.h b/src/gui/window.h index 25bf903a..0a0f4be9 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp index 2846b1c1..0aa61965 100644 --- a/src/gui/windowcontainer.cpp +++ b/src/gui/windowcontainer.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h index 62704d1b..09f34cf5 100644 --- a/src/gui/windowcontainer.h +++ b/src/gui/windowcontainer.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/guichanfwd.h b/src/guichanfwd.h index 4863421c..8859780f 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp index 557b3553..d2c955ee 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/imageparticle.h b/src/imageparticle.h index 317b17ea..3465b3e0 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/inventory.cpp b/src/inventory.cpp index 3ca26e1e..4053bc96 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/inventory.h b/src/inventory.h index 2c5d99e3..3b3ec507 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/item.cpp b/src/item.cpp index 9165c6c8..2125756a 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/item.h b/src/item.h index 3ea4a905..d67b5be4 100644 --- a/src/item.h +++ b/src/item.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 3404b0e3..fd32c4f5 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/itemshortcut.h b/src/itemshortcut.h index 95e17f44..4203f600 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/joystick.cpp b/src/joystick.cpp index 7e9a2285..18a09207 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/joystick.h b/src/joystick.h index 4c5390c2..67b5ab70 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 6c836a62..b75a3c1c 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index bfcde31c..484c0c63 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/localplayer.cpp b/src/localplayer.cpp index efcebf28..fb539a46 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/localplayer.h b/src/localplayer.h index a4625f73..0ba0dd90 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lockedarray.h b/src/lockedarray.h index 2b4b099d..3ef2bb99 100644 --- a/src/lockedarray.h +++ b/src/lockedarray.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/log.cpp b/src/log.cpp index b0024f80..29eeb010 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/log.h b/src/log.h index b06bdc89..a50eab9d 100644 --- a/src/log.h +++ b/src/log.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/logindata.h b/src/logindata.h index 410d2e73..3f686a22 100644 --- a/src/logindata.h +++ b/src/logindata.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main.cpp b/src/main.cpp index 35943abf..7f2012c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main.h b/src/main.h index 5a337d15..5f7ec54e 100644 --- a/src/main.h +++ b/src/main.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map.cpp b/src/map.cpp index 16882540..5e38aee2 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map.h b/src/map.h index 9703c5b3..eebdade1 100644 --- a/src/map.h +++ b/src/map.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/monster.cpp b/src/monster.cpp index 4cdcbb11..9f12ebf4 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/monster.h b/src/monster.h index 8d7f8ae7..776a215b 100644 --- a/src/monster.h +++ b/src/monster.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 2f5f0fee..15a659b3 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index 54b82075..5fbb57ce 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp index 67c79ec4..245b8a50 100644 --- a/src/net/buysellhandler.cpp +++ b/src/net/buysellhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index 0ede7b48..2b4aaf4f 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index 932cf705..5bf45bb4 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 37b378f2..2a5331b5 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp index 25877907..14566b39 100644 --- a/src/net/chathandler.cpp +++ b/src/net/chathandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/chathandler.h b/src/net/chathandler.h index ff649205..9a47c633 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp index 9a3c396a..fe158198 100644 --- a/src/net/equipmenthandler.cpp +++ b/src/net/equipmenthandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h index c66d7932..08de3b36 100644 --- a/src/net/equipmenthandler.h +++ b/src/net/equipmenthandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp index 46f03e28..ac5f94d3 100644 --- a/src/net/inventoryhandler.cpp +++ b/src/net/inventoryhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 336b2e98..f87e1214 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp index 8c4af4e4..e38be454 100644 --- a/src/net/itemhandler.cpp +++ b/src/net/itemhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h index 0cb3b42a..0f292d46 100644 --- a/src/net/itemhandler.h +++ b/src/net/itemhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp index 41314d16..34da5c6d 100644 --- a/src/net/loginhandler.cpp +++ b/src/net/loginhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index df86b634..6b938627 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp index b5192bd7..bcd3dd62 100644 --- a/src/net/maploginhandler.cpp +++ b/src/net/maploginhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h index c7fee70c..fb083b51 100644 --- a/src/net/maploginhandler.h +++ b/src/net/maploginhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp index f1561a31..f45000be 100644 --- a/src/net/messagehandler.cpp +++ b/src/net/messagehandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index 45cdf8cd..7ff5194b 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index a288d936..f1ff4013 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/messagein.h b/src/net/messagein.h index 0ff6e78a..94f2bee7 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index bf4957be..ab17f537 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/messageout.h b/src/net/messageout.h index b3a4ef68..93f1c2e8 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/network.cpp b/src/net/network.cpp index 059da779..02d8bf4f 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/network.h b/src/net/network.h index 02fe7538..e264f8a5 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index ea03537f..8425a215 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/npchandler.h b/src/net/npchandler.h index 7ac962eb..35db2956 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp index 03aca66d..3378a5d0 100644 --- a/src/net/partyhandler.cpp +++ b/src/net/partyhandler.cpp @@ -1,15 +1,15 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Lloyd Bryant * - * This file is part of The Mana World. + * This file is part of Aethyra. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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. diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index 048da9b1..158e89e6 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -1,15 +1,15 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * Aethyra + * Copyright (C) 2008 Lloyd Bryant * - * This file is part of The Mana World. + * This file is part of Aethyra. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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. diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index 46ded32e..21c37ea3 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 1a7c8da3..0500ae44 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp index 69d69901..563c1cc4 100644 --- a/src/net/protocol.cpp +++ b/src/net/protocol.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/protocol.h b/src/net/protocol.h index e9053451..081f8873 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp index e2185524..8ef37101 100644 --- a/src/net/skillhandler.cpp +++ b/src/net/skillhandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h index 2b55605d..689e42dc 100644 --- a/src/net/skillhandler.h +++ b/src/net/skillhandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index c5465835..98f26cbd 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index d479e43f..8f108248 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/npc.cpp b/src/npc.cpp index 7b7db125..c667e11e 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/npc.h b/src/npc.h index dd8d7f5d..f8aaad7f 100644 --- a/src/npc.h +++ b/src/npc.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index e7e7b204..71ab2fe3 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/openglgraphics.h b/src/openglgraphics.h index 566d6252..207d6725 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle.cpp b/src/particle.cpp index d89d0a3e..9510573f 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle.h b/src/particle.h index 881bbb74..9c01bcdf 100644 --- a/src/particle.h +++ b/src/particle.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index 1ed51053..0ebf4bc3 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particlecontainer.h b/src/particlecontainer.h index 4fb00027..1e2f8ff7 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index fa5dcde4..2c239fb9 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particleemitter.h b/src/particleemitter.h index 67b35ae2..835f39c5 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h index e68ac222..e3817763 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/party.cpp b/src/party.cpp index fe575a37..75569bc5 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -1,21 +1,21 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * Aethyra + * Copyright 2008 Lloyd Bryant * - * This file is part of The Mana World. + * This file is part of Aethyra. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/party.h b/src/party.h index 98252c37..0a19ae1d 100644 --- a/src/party.h +++ b/src/party.h @@ -1,21 +1,21 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * Aethyra + * Copyright 2008 Lloyd Bryant * - * This file is part of The Mana World. + * This file is part of Aethyra. * - * The Mana World is free software; you can redistribute it and/or modify + * This program 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, + * This program 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/player.cpp b/src/player.cpp index 610dfeb1..0eea8a6a 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/player.h b/src/player.h index f9911bb8..b815b829 100644 --- a/src/player.h +++ b/src/player.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/player_relations.cpp b/src/player_relations.cpp index aa83115c..d9ff4b8d 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/player_relations.h b/src/player_relations.h index 1eb4ede6..0440cace 100644 --- a/src/player_relations.h +++ b/src/player_relations.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/position.cpp b/src/position.cpp index 69d50476..f370f27b 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/position.h b/src/position.h index cbcf8c99..1c961c46 100644 --- a/src/position.h +++ b/src/position.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/properties.h b/src/properties.h index 4bad8e59..ad5af1d6 100644 --- a/src/properties.h +++ b/src/properties.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/action.cpp b/src/resources/action.cpp index e2cb11f2..67acf1b1 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/action.h b/src/resources/action.h index 649d3828..8dde068c 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp index 32ed47d1..9585f4f7 100644 --- a/src/resources/ambientoverlay.cpp +++ b/src/resources/ambientoverlay.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h index 65f9891d..bb61f826 100644 --- a/src/resources/ambientoverlay.h +++ b/src/resources/ambientoverlay.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 54c319de..901f4f25 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/animation.h b/src/resources/animation.h index 0c461ebe..bc8431c7 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp deleted file mode 100644 index 719ecab1..00000000 --- a/src/resources/buddylist.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include -#include -#include - -#include "buddylist.h" - -#include "../configuration.h" -#include "../main.h" - -BuddyList::BuddyList() -{ - // TODO: A buddy list would have to use the Configuration class to store - // the buddies. Also, there is now a player relationship manager - // which probably makes this buddy list kind of obsolete. - - // Find saved buddy list file - //mFilename = homeDir + "/buddy.txt"; - - // Load buddy from file - loadFile(); -} - -void BuddyList::loadFile() -{ - // Open file - std::ifstream inputStream(mFilename.c_str(), std::ios::in); - if (!inputStream) { - std::cerr << "Error opening input stream" << std::endl; - return; - } - - do { - char *buddy = new char[LEN_MAX_USERNAME]; - inputStream.getline(buddy, LEN_MAX_USERNAME); - // Ugly ? - if (strcmp(buddy, "")) mBuddylist.push_back(buddy); - delete [] buddy; - } while (!inputStream.eof()); - - // Read buddy and close file - inputStream.close(); -} - -void BuddyList::saveFile() -{ - std::string str; - - // Open file - std::ofstream outputStream(mFilename.c_str(), std::ios::trunc); - if (!outputStream) { - std::cerr << "Error opening output stream" << std::endl; - return; - } - - // Write buddy and close file - for (BuddyIterator i = mBuddylist.begin(); i != mBuddylist.end(); ++i) - { - outputStream << (const char*) i->c_str() << std::endl; - } - outputStream.close(); -} - -bool BuddyList::addBuddy(const std::string buddy) -{ - if (find(mBuddylist.begin(), mBuddylist.end(), buddy) != mBuddylist.end()) - { - return false; - } - - // Buddy doesnt exist, add it - mBuddylist.push_back(buddy); - - // Save file - saveFile(); - - return true; -} - -bool BuddyList::removeBuddy(const std::string buddy) -{ - BuddyIterator i = find(mBuddylist.begin(), mBuddylist.end(), buddy); - - if (i != mBuddylist.end()) { - mBuddylist.erase(i); - saveFile(); - return true; - } - - return false; -} - -int BuddyList::getNumberOfElements() -{ - return mBuddylist.size(); -} - -std::string BuddyList::getElementAt(int number) -{ - if (number >= (int) mBuddylist.size()) { - return ""; - } - - BuddyIterator i = mBuddylist.begin(); - std::advance(i, number); - return *i; -} diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h deleted file mode 100644 index f0758c25..00000000 --- a/src/resources/buddylist.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef BUDDYLIST_H -#define BUDDYLIST_H - -#include -#include - -#include - -class BuddyList : public gcn::ListModel -{ - public: - /** - * Constructor - */ - BuddyList(); - - /** - * Destructor - */ - virtual ~BuddyList() { } - - /** - * Adds buddy to the list - */ - bool addBuddy(const std::string buddy); - - /** - * Removes buddy from the list - */ - bool removeBuddy(const std::string buddy); - - /** - * Returns the number of buddy on the list - */ - int getNumberOfElements(); - - /** - * Returns the buddy of the number or null - */ - std::string getElementAt(int number); - - private: - /** - * Save buddy to file - */ - void saveFile(); - - /** - * Load buddy from file - */ - void loadFile(); - - typedef std::list Buddies; - typedef Buddies::iterator BuddyIterator; - Buddies mBuddylist; /**< Buddy list */ - std::string mFilename; /* File to work with */ -}; - -#endif /* BUDDYLIST_H */ diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 61ea4bc0..4ff8944c 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -1,21 +1,21 @@ /* - * Aethyra + * Color Database * Copyright 2008 Aethyra Development Team * * This file is part of Aethyra. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, + * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/colordb.h b/src/resources/colordb.h index 2166abcf..d4568d54 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -1,21 +1,21 @@ /* - * Aethyra + * Color Database * Copyright 2008 Aethyra Development Team * * This file is part of Aethyra. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, + * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 63d85501..a5998017 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/dye.h b/src/resources/dye.h index 1db16c6a..48254b6f 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index ac41b59c..5a014c95 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -1,21 +1,21 @@ /* - * Aethyra + * Emote database * Copyright 2009 Aethyra Development Team * * This file is part of Aethyra. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, + * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h index 2b9dbbc2..d0cd4d71 100644 --- a/src/resources/emotedb.h +++ b/src/resources/emotedb.h @@ -1,21 +1,21 @@ /* - * Aethyra + * Emote database * Copyright 2009 Aethyra Development Team * * This file is part of Aethyra. * - * Aethyra is free software; you can redistribute it and/or modify + * This program 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. * - * Aethyra is distributed in the hope that it will be useful, + * This program 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 Aethyra; if not, write to the Free Software Foundation, + * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 7a7e6ac8..7a15b762 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/image.h b/src/resources/image.h index fe3081ac..596917ce 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index c182b44c..fe420e89 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h index 0ac7c899..2695b99c 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp index 92bb3242..33be1573 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/imageset.h b/src/resources/imageset.h index f59c76bb..ad209aaf 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index c350ac07..5ddd24e3 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index 039d3afb..c69eb2d3 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 9976f0d4..5577b5e1 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 08a7acd0..1e55f146 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 2f118284..8dcb1c32 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index c03dec28..d3dd4908 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 2278dc67..840f0677 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 0ed553c3..2f64aa8c 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index c7824a5d..13f3a7ee 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index 0a218661..e49901d5 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 503990e7..5491a0bd 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index 359791fd..4a3208f4 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/music.cpp b/src/resources/music.cpp index ed78a541..72094025 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/music.h b/src/resources/music.h index 65f1ee88..36da6a61 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index 73c3939d..177d3116 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index af6764bf..394154fa 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index d1c3ada4..ca9a69c3 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/resource.h b/src/resources/resource.h index 7c5f989e..f8822d72 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index a5d927dd..fcd9495f 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 3a97c05f..10f6fffe 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index 3a285730..d1d24afb 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 116df930..e2181767 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index e8d064d4..989741dc 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 99d570f1..040d96e2 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/serverinfo.h b/src/serverinfo.h index c38d13c7..fc3ef032 100644 --- a/src/serverinfo.h +++ b/src/serverinfo.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/shopitem.cpp b/src/shopitem.cpp index 3b90dfdd..70a68719 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/shopitem.h b/src/shopitem.h index 3353ebe7..8b1ba4b2 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index 030619ce..09e8e0d3 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/simpleanimation.h b/src/simpleanimation.h index a639cf14..384823b7 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sound.cpp b/src/sound.cpp index 78538c09..083ffb6a 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sound.h b/src/sound.h index 05b2def3..53fde14e 100644 --- a/src/sound.h +++ b/src/sound.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sprite.h b/src/sprite.h index a6384e94..c2b0fc7c 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/textparticle.cpp b/src/textparticle.cpp index f38c32ce..3283f9fd 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/textparticle.h b/src/textparticle.h index cdf99d8f..d847eb00 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2006 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/tileset.h b/src/tileset.h index d4de7ba5..28f7d9d5 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 0b71fa50..96ce63d4 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/gettext.h b/src/utils/gettext.h index 5281d491..f7286187 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 5e5df8f8..569b6808 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2008 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp index 07fb3508..f90e6258 100644 --- a/src/utils/strprintf.cpp +++ b/src/utils/strprintf.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h index 78e7a04c..1d33c3f7 100644 --- a/src/utils/strprintf.h +++ b/src/utils/strprintf.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/tostring.h b/src/utils/tostring.h index 62eb44e4..131d559d 100644 --- a/src/utils/tostring.h +++ b/src/utils/tostring.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,8 +33,6 @@ std::string toString(const T &arg) return ss.str(); } -// TODO: Is there a good way to suppress warnings from classes which don't use -// this function? inline char *iptostring(int address) { static char asciiIP[16]; diff --git a/src/utils/trim.h b/src/utils/trim.h index b7474ac7..0602842f 100644 --- a/src/utils/trim.h +++ b/src/utils/trim.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 24058558..562f69e3 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils/xml.h b/src/utils/xml.h index 2e08dd50..b7d67924 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/vector.cpp b/src/vector.cpp index 9b573e88..bbfb1a70 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/vector.h b/src/vector.h index 6dd461ac..48933155 100644 --- a/src/vector.h +++ b/src/vector.h @@ -1,8 +1,9 @@ /* - * The Mana World + * Aethyra * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- cgit v1.2.3-70-g09d2 From 4a41ce55224ad7b54c6b5ea78126d8d314f5ef41 Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Tue, 10 Feb 2009 16:56:05 +0100 Subject: Changed spelling from colour to color. --- aethyra.cbp | 8 +- po/POTFILES.in | 4 +- src/CMakeLists.txt | 8 +- src/Makefile.am | 8 +- src/gui/browserbox.cpp | 8 +- src/gui/color.cpp | 146 +++++++++++++++++++++++++ src/gui/color.h | 136 +++++++++++++++++++++++ src/gui/colour.cpp | 146 ------------------------- src/gui/colour.h | 136 ----------------------- src/gui/gui.cpp | 2 +- src/gui/listbox.cpp | 8 +- src/gui/setup.cpp | 4 +- src/gui/setup_colors.cpp | 249 +++++++++++++++++++++++++++++++++++++++++++ src/gui/setup_colors.h | 75 +++++++++++++ src/gui/setup_colours.cpp | 249 ------------------------------------------- src/gui/setup_colours.h | 75 ------------- src/gui/shoplistbox.cpp | 8 +- src/gui/table.cpp | 14 +-- src/gui/widgets/dropdown.cpp | 4 +- src/main.cpp | 8 +- src/text.cpp | 10 +- src/text.h | 6 +- 22 files changed, 656 insertions(+), 656 deletions(-) create mode 100644 src/gui/color.cpp create mode 100644 src/gui/color.h delete mode 100644 src/gui/colour.cpp delete mode 100644 src/gui/colour.h create mode 100644 src/gui/setup_colors.cpp create mode 100644 src/gui/setup_colors.h delete mode 100644 src/gui/setup_colours.cpp delete mode 100644 src/gui/setup_colours.h (limited to 'src/gui/setup.cpp') diff --git a/aethyra.cbp b/aethyra.cbp index 795e179a..08ec74fd 100644 --- a/aethyra.cbp +++ b/aethyra.cbp @@ -132,8 +132,8 @@ - - + + @@ -215,8 +215,8 @@ - - + + diff --git a/po/POTFILES.in b/po/POTFILES.in index 295a6127..1b3dea84 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,7 +5,7 @@ src/gui/buysell.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp -src/gui/colour.cpp +src/gui/color.cpp src/gui/confirm_dialog.cpp src/gui/connection.cpp src/gui/emotecontainer.cpp @@ -31,7 +31,7 @@ src/gui/register.cpp src/gui/sell.cpp src/gui/setup_audio.cpp src/gui/setup.cpp -src/gui/setup_colours.cpp +src/gui/setup_colors.cpp src/gui/setup_joystick.cpp src/gui/setup_keyboard.cpp src/gui/setup_players.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5e26ff97..25bcbfb0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -81,8 +81,8 @@ SET(SRCS gui/chatinput.h gui/checkbox.cpp gui/checkbox.h - gui/colour.cpp - gui/colour.h + gui/color.cpp + gui/color.h gui/confirm_dialog.cpp gui/confirm_dialog.h gui/connection.cpp @@ -164,8 +164,8 @@ SET(SRCS gui/setup.h gui/setup_audio.cpp gui/setup_audio.h - gui/setup_colours.cpp - gui/setup_colours.h + gui/setup_colors.cpp + gui/setup_colors.h gui/setup_joystick.cpp gui/setup_joystick.h gui/setup_keyboard.cpp diff --git a/src/Makefile.am b/src/Makefile.am index b6b052f4..71862994 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,8 +31,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/chatinput.h \ gui/checkbox.cpp \ gui/checkbox.h \ - gui/colour.cpp \ - gui/colour.h \ + gui/color.cpp \ + gui/color.h \ gui/confirm_dialog.cpp \ gui/confirm_dialog.h \ gui/connection.cpp \ @@ -114,8 +114,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/setup.h \ gui/setup_audio.cpp \ gui/setup_audio.h \ - gui/setup_colours.cpp \ - gui/setup_colours.h \ + gui/setup_colors.cpp \ + gui/setup_colors.h \ gui/setup_joystick.cpp \ gui/setup_joystick.h \ gui/setup_keyboard.cpp \ diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 37480415..18fa2ad4 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -25,7 +25,7 @@ #include #include "browserbox.h" -#include "colour.h" +#include "color.h" #include "linkhandler.h" #include "truetypefont.h" @@ -255,7 +255,7 @@ void BrowserBox::draw(gcn::Graphics *graphics) bool valid; if ((mHighMode & BACKGROUND)) { - graphics->setColor(gcn::Color(textColour->getColour('H', valid))); + graphics->setColor(gcn::Color(textColor->getColor('H', valid))); graphics->fillRectangle(gcn::Rectangle( mLinks[mSelectedLink].x1, mLinks[mSelectedLink].y1, @@ -266,7 +266,7 @@ void BrowserBox::draw(gcn::Graphics *graphics) if ((mHighMode & UNDERLINE)) { - graphics->setColor(gcn::Color(textColour->getColour('<', valid))); + graphics->setColor(gcn::Color(textColor->getColor('<', valid))); graphics->drawLine( mLinks[mSelectedLink].x1, mLinks[mSelectedLink].y2, @@ -332,7 +332,7 @@ void BrowserBox::draw(gcn::Graphics *graphics) else { bool valid; - int rgb = textColour->getColour(c, valid); + int rgb = textColor->getColor(c, valid); if (c == '<') { const int size = mLinks[link].x2 - mLinks[link].x1; diff --git a/src/gui/color.cpp b/src/gui/color.cpp new file mode 100644 index 00000000..62537191 --- /dev/null +++ b/src/gui/color.cpp @@ -0,0 +1,146 @@ +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey + * + * This file is part of Aethyra. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "color.h" + +#include "../configuration.h" + +#include "../utils/gettext.h" +#include "../utils/tostring.h" + +Color::Color() +{ + addColor('C', 0x000000, _("Chat")); + addColor('G', 0xff0000, _("GM")); + addColor('H', 0xebc873, _("Highlight")); + addColor('Y', 0x1fa052, _("Player")); + addColor('W', 0x0000ff, _("Whisper")); + addColor('I', 0xf1dc27, _("Is")); + addColor('P', 0xff00d8, _("Party")); + addColor('S', 0x8415e2, _("Server")); + addColor('L', 0x919191, _("Logger")); + addColor('<', 0xe50d0d, _("Hyperlink")); + commit(); +} + +Color::~Color() +{ + for (ColVector::iterator col = mColVector.begin(), + colEnd = mColVector.end(); + col != colEnd; + ++col) + { + config.setValue("Color" + col->text, toString(col->rgb)); + } +} + +void Color::setColor(const char c, const int rgb) +{ + for (ColVector::iterator col = mColVector.begin(), + colEnd = mColVector.end(); + col != colEnd; + ++col) + { + if (col->ch == c) + { + col->rgb = rgb; + return; + } + } +} + +int Color::getColor(const char c, bool &valid) const +{ + for (ColVector::const_iterator col = mColVector.begin(), + colEnd = mColVector.end(); + col != colEnd; + ++col) + { + if (col->ch == c) + { + valid = true; + return col->rgb; + } + } + valid = false; + return 0x000000; +} + +std::string Color::getElementAt(int i) +{ + if (i < 0 || i >= getNumberOfElements()) + { + return ""; + } + return mColVector[i].text; +} + +char Color::getColorCharAt(int i) +{ + if (i < 0 || i >= getNumberOfElements()) + { + return 'C'; + } + return mColVector[i].ch; +} + +void Color::addColor(const char c, const int rgb, const std::string &text) +{ + int trueRgb = config.getValue("Color" + text, rgb); + mColVector.push_back(ColorElem(c, trueRgb, text)); +} + +int Color::getColorAt(int i) +{ + if (i < 0 || i >= getNumberOfElements()) + { + return 0; + } + return mColVector[i].rgb; +} + +void Color::setColorAt(int i, int rgb) +{ + if (i >= 0 && i < getNumberOfElements()) + { + mColVector[i].rgb = rgb; + } +} + +void Color::commit() +{ + for (ColVector::iterator i = mColVector.begin(), iEnd = mColVector.end(); + i != iEnd; + ++i) + { + i->committedRgb = i->rgb; + } +} + +void Color::rollback() +{ + for (ColVector::iterator i = mColVector.begin(), iEnd = mColVector.end(); + i != iEnd; + ++i) + { + i->rgb = i->committedRgb; + } +} diff --git a/src/gui/color.h b/src/gui/color.h new file mode 100644 index 00000000..aca3d045 --- /dev/null +++ b/src/gui/color.h @@ -0,0 +1,136 @@ +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey + * + * This file is part of Aethyra. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef COLOR_H +#define COLOR_H + +#include +#include + +#include + +class Color : public gcn::ListModel +{ + public: + /** + * Constructor + */ + Color(); + + /** + * Destructor + */ + ~Color(); + + /** + * Define the color replacement for a character + * + * @param c charater to be replaced + * @param rgb color to replace character + */ + void setColor(const char c, const int rgb); + + /** + * Define the color replacement for a character + * + * @param c character to be replaced + * @param r red component + * @param g green component + * @param b blue component + */ + void setColor(const char c, const int r, const int g, const int b) + { + setColor(c, (r << 16) | (g << 8) | b); + } + + /** + * Return the color associated with a character, if exists + * + * @param c character requested + * @param valid indicate whether character is known + */ + int getColor(const char c, bool &valid) const; + + /** + * Return the number of colors known + */ + int getNumberOfElements() {return mColVector.size(); } + + /** + * Return the name of the ith color + * + * @param i index of color interested in + */ + std::string getElementAt(int i); + + /** + * Get the color for the element at index i in the current color + * model + */ + int getColorAt(int i); + + /** + * Get the character used by the color for the element at index i in + * the current color model + */ + char getColorCharAt(int i); + + /** + * Set the color for the element at index i + */ + void setColorAt(int i, int rgb); + + /** + * Commit the colors + */ + void commit(); + + /** + * Rollback the colors + */ + void rollback(); + + private: + struct ColorElem + { + ColorElem(const char c, const int rgb, const std::string &text) : + ch(c), rgb(rgb), text(text) {} + char ch; + int rgb; + int committedRgb; + std::string text; + }; + typedef std::vector ColVector; + ColVector mColVector; + + /** + * Initialise color + * + * @param c character that needs initialising + * @param rgb default color if not found in config + * @param text identifier of color + */ + void addColor(const char c, const int rgb, const std::string &text); +}; + +extern Color *textColor; + +#endif diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp deleted file mode 100644 index 095662ef..00000000 --- a/src/gui/colour.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Configurable text colors - * Copyright (C) 2008 Douglas Boffey - * - * This file is part of Aethyra. - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "colour.h" - -#include "../configuration.h" - -#include "../utils/gettext.h" -#include "../utils/tostring.h" - -Colour::Colour() -{ - addColour('C', 0x000000, _("Chat")); - addColour('G', 0xff0000, _("GM")); - addColour('H', 0xebc873, _("Highlight")); - addColour('Y', 0x1fa052, _("Player")); - addColour('W', 0x0000ff, _("Whisper")); - addColour('I', 0xf1dc27, _("Is")); - addColour('P', 0xff00d8, _("Party")); - addColour('S', 0x8415e2, _("Server")); - addColour('L', 0x919191, _("Logger")); - addColour('<', 0xe50d0d, _("Hyperlink")); - commit(); -} - -Colour::~Colour() -{ - for (ColVector::iterator col = mColVector.begin(), - colEnd = mColVector.end(); - col != colEnd; - ++col) - { - config.setValue("Colour" + col->text, toString(col->rgb)); - } -} - -void Colour::setColour(const char c, const int rgb) -{ - for (ColVector::iterator col = mColVector.begin(), - colEnd = mColVector.end(); - col != colEnd; - ++col) - { - if (col->ch == c) - { - col->rgb = rgb; - return; - } - } -} - -int Colour::getColour(const char c, bool &valid) const -{ - for (ColVector::const_iterator col = mColVector.begin(), - colEnd = mColVector.end(); - col != colEnd; - ++col) - { - if (col->ch == c) - { - valid = true; - return col->rgb; - } - } - valid = false; - return 0x000000; -} - -std::string Colour::getElementAt(int i) -{ - if (i < 0 || i >= getNumberOfElements()) - { - return ""; - } - return mColVector[i].text; -} - -char Colour::getColourCharAt(int i) -{ - if (i < 0 || i >= getNumberOfElements()) - { - return 'C'; - } - return mColVector[i].ch; -} - -void Colour::addColour(const char c, const int rgb, const std::string &text) -{ - int trueRgb = config.getValue("Colour" + text, rgb); - mColVector.push_back(ColourElem(c, trueRgb, text)); -} - -int Colour::getColourAt(int i) -{ - if (i < 0 || i >= getNumberOfElements()) - { - return 0; - } - return mColVector[i].rgb; -} - -void Colour::setColourAt(int i, int rgb) -{ - if (i >= 0 && i < getNumberOfElements()) - { - mColVector[i].rgb = rgb; - } -} - -void Colour::commit() -{ - for (ColVector::iterator i = mColVector.begin(), iEnd = mColVector.end(); - i != iEnd; - ++i) - { - i->committedRgb = i->rgb; - } -} - -void Colour::rollback() -{ - for (ColVector::iterator i = mColVector.begin(), iEnd = mColVector.end(); - i != iEnd; - ++i) - { - i->rgb = i->committedRgb; - } -} diff --git a/src/gui/colour.h b/src/gui/colour.h deleted file mode 100644 index 820c319d..00000000 --- a/src/gui/colour.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Configurable text colors - * Copyright (C) 2008 Douglas Boffey - * - * This file is part of Aethyra. - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef COLOUR_H -#define COLOUR_H - -#include -#include - -#include - -class Colour : public gcn::ListModel -{ - public: - /** - * Constructor - */ - Colour(); - - /** - * Destructor - */ - ~Colour(); - - /** - * Define the colour replacement for a character - * - * @param c charater to be replaced - * @param rgb colour to replace character - */ - void setColour(const char c, const int rgb); - - /** - * Define the colour replacement for a character - * - * @param c character to be replaced - * @param r red component - * @param g green component - * @param b blue component - */ - void setColour(const char c, const int r, const int g, const int b) - { - setColour(c, (r << 16) | (g << 8) | b); - } - - /** - * Return the colour associated with a character, if exists - * - * @param c character requested - * @param valid indicate whether character is known - */ - int getColour(const char c, bool &valid) const; - - /** - * Return the number of colours known - */ - int getNumberOfElements() {return mColVector.size(); } - - /** - * Return the name of the ith colour - * - * @param i index of colour interested in - */ - std::string getElementAt(int i); - - /** - * Get the colour for the element at index i in the current colour - * model - */ - int getColourAt(int i); - - /** - * Get the character used by the colour for the element at index i in - * the current colour model - */ - char getColourCharAt(int i); - - /** - * Set the colour for the element at index i - */ - void setColourAt(int i, int rgb); - - /** - * Commit the colours - */ - void commit(); - - /** - * Rollback the colours - */ - void rollback(); - - private: - struct ColourElem - { - ColourElem(const char c, const int rgb, const std::string &text) : - ch(c), rgb(rgb), text(text) {} - char ch; - int rgb; - int committedRgb; - std::string text; - }; - typedef std::vector ColVector; - ColVector mColVector; - - /** - * Initialise colour - * - * @param c character that needs initialising - * @param rgb default colour if not found in config - * @param text identifier of colour - */ - void addColour(const char c, const int rgb, const std::string &text); -}; - -extern Colour *textColour; - -#endif diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index a8a2a72f..f8901119 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -135,7 +135,7 @@ Gui::Gui(Graphics *graphics): gcn::Widget::setGlobalFont(mGuiFont); - // Load hits' colourful fonts + // Load hits' colorful fonts try { hitRedFont = new gcn::ImageFont("graphics/gui/hits_red.png", diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index 97b3bbd0..12bb2c02 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -24,7 +24,7 @@ #include #include -#include "colour.h" +#include "color.h" #include "listbox.h" #include "../configuration.h" @@ -45,9 +45,9 @@ void ListBox::draw(gcn::Graphics *graphics) mAlpha = config.getValue("guialpha", 0.8); bool valid; - const int red = (textColour->getColour('H', valid) >> 16) & 0xFF; - const int green = (textColour->getColour('H', valid) >> 8) & 0xFF; - const int blue = textColour->getColour('H', valid) & 0xFF; + const int red = (textColor->getColor('H', valid) >> 16) & 0xFF; + const int green = (textColor->getColor('H', valid) >> 8) & 0xFF; + const int blue = textColor->getColor('H', valid) & 0xFF; const int alpha = mAlpha * 255; graphics->setColor(gcn::Color(red, green, blue, alpha)); diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 2c187f94..4798f598 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -23,7 +23,7 @@ #include "button.h" #include "setup.h" #include "setup_audio.h" -#include "setup_colours.h" +#include "setup_colors.h" #include "setup_joystick.h" #include "setup_keyboard.h" #include "setup_players.h" @@ -91,7 +91,7 @@ Setup::Setup(): panel->addTab(_("Keyboard"), tab); mTabs.push_back(tab); - tab = new Setup_Colours(); + tab = new Setup_Colors(); panel->addTab(_("Colors"), tab); mTabs.push_back(tab); diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp new file mode 100644 index 00000000..f3fa3c65 --- /dev/null +++ b/src/gui/setup_colors.cpp @@ -0,0 +1,249 @@ +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey + * + * This file is part of Aethyra. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include + +#include +#include +#include + +#include "browserbox.h" +#include "color.h" +#include "itemlinkhandler.h" +#include "listbox.h" +#include "scrollarea.h" +#include "setup_colors.h" +#include "slider.h" +#include "textfield.h" + +#include "widgets/layouthelper.h" + +#include "../configuration.h" + +#include "../utils/gettext.h" +#include "../utils/tostring.h" + +Setup_Colors::Setup_Colors() : + mSelected(-1) +{ + setOpaque(false); + + mColorBox = new ListBox(textColor); + mColorBox->setActionEventId("color_box"); + mColorBox->addActionListener(this); + + mScroll = new ScrollArea(mColorBox); + mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); + + mPreview = new BrowserBox(BrowserBox::AUTO_WRAP); + mPreview->setOpaque(false); + + // Replace this later with a more appropriate link handler. For now, this'll + // do, as it'll do nothing when clicked on. + mPreview->setLinkHandler(new ItemLinkHandler()); + + mPreviewBox = new ScrollArea(mPreview); + mPreviewBox->setHeight(20); + mPreviewBox->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER, + gcn::ScrollArea::SHOW_NEVER); + + mRedLabel = new gcn::Label(_("Red: ")); + + mRedText = new TextField(); + mRedText->setWidth(40); + mRedText->setRange(0, 255); + mRedText->setNumeric(true); + mRedText->addListener(this); + + mRedSlider = new Slider(0, 255); + mRedSlider->setWidth(160); + mRedSlider->setValue(mRedText->getValue()); + mRedSlider->setActionEventId("slider_red"); + mRedSlider->addActionListener(this); + + mGreenLabel = new gcn::Label(_("Green: ")); + + mGreenText = new TextField(); + mGreenText->setWidth(40); + mGreenText->setRange(0, 255); + mGreenText->setNumeric(true); + mGreenText->addListener(this); + + mGreenSlider = new Slider(0, 255); + mGreenSlider->setWidth(160); + mGreenSlider->setValue(mGreenText->getValue()); + mGreenSlider->setActionEventId("slider_green"); + mGreenSlider->addActionListener(this); + + mBlueLabel = new gcn::Label(_("Blue: ")); + + mBlueText = new TextField(); + mBlueText->setWidth(40); + mBlueText->setRange(0, 255); + mBlueText->setNumeric(true); + mBlueText->addListener(this); + + mBlueSlider = new Slider(0, 255); + mBlueSlider->setWidth(160); + mBlueSlider->setValue(mBlueText->getValue()); + mBlueSlider->setActionEventId("slider_blue"); + mBlueSlider->addActionListener(this); + + setOpaque(false); + + // Do the layout + LayoutHelper h(this); + ContainerPlacer place = h.getPlacer(0, 0); + + place(0, 0, mScroll, 4, 7).setPadding(2); + place(0, 7, mPreviewBox, 4).setPadding(2); + place(0, 8, mRedLabel, 2); + place(2, 8, mRedSlider); + place(3, 8, mRedText).setPadding(1); + place(0, 9, mGreenLabel, 2); + place(2, 9, mGreenSlider); + place(3, 9, mGreenText).setPadding(1); + place(0, 10, mBlueLabel, 2); + place(2, 10, mBlueSlider); + place(3, 10, mBlueText).setPadding(1); + + setDimension(gcn::Rectangle(0, 0, 325, 280)); +} + +Setup_Colors::~Setup_Colors() +{ + delete mRedLabel; + delete mRedSlider; + delete mRedText; + + delete mGreenLabel; + delete mGreenSlider; + delete mGreenText; + + delete mBlueLabel; + delete mBlueSlider; + delete mBlueText; + + delete mScroll; +} + +void Setup_Colors::action(const gcn::ActionEvent &event) +{ + if (event.getId() == "color_box") + { + mSelected = mColorBox->getSelected(); + int col = textColor->getColorAt(mSelected); + char ch = textColor->getColorCharAt(mSelected); + std::string msg; + + if (ch == '<') + msg = toString("@@|") + + _("This is what the color looks like") + "@@"; + else + msg = "##" + toString(ch) + + _("This is what the color looks like"); + + mPreview->clearRows(); + mPreview->addRow(msg); + setEntry(mRedSlider, mRedText, col >> 16); + setEntry(mGreenSlider, mGreenText, (col >> 8) & 0xff); + setEntry(mBlueSlider, mBlueText, col & 0xff); + return; + } + + if (event.getId() == "slider_red") + { + mRedText->setText(toString(std::floor(mRedSlider->getValue()))); + updateColor(); + return; + } + + if (event.getId() == "slider_green") + { + mGreenText->setText(toString(std::floor(mGreenSlider->getValue()))); + updateColor(); + return; + } + + if (event.getId() == "slider_blue") + { + mBlueText->setText(toString(std::floor(mBlueSlider->getValue()))); + updateColor(); + return; + } +} + +void Setup_Colors::setEntry(gcn::Slider *s, TextField *t, int value) +{ + s->setValue(value); + char buffer[100]; + sprintf(buffer, "%d", value); + t->setText(buffer); +} + +void Setup_Colors::apply() +{ + textColor->commit(); +} + +void Setup_Colors::cancel() +{ + textColor->rollback(); + int col = textColor->getColorAt(mSelected); + setEntry(mRedSlider, mRedText, col >> 16); + setEntry(mGreenSlider, mGreenText, (col >> 8) & 0xff); + setEntry(mBlueSlider, mBlueText, col & 0xff); +} + +void Setup_Colors::listen(const TextField *tf) +{ + if (tf == mRedText) + { + mRedSlider->setValue(tf->getValue()); + updateColor(); + return; + } + if (tf == mGreenText) + { + mGreenSlider->setValue(tf->getValue()); + updateColor(); + return; + } + if (tf == mBlueText) + { + mBlueSlider->setValue(tf->getValue()); + updateColor(); + return; + } +} + +void Setup_Colors::updateColor() +{ + if (mSelected == -1) + { + return; + } + int rgb = static_cast(mRedSlider->getValue()) << 16 | + static_cast(mGreenSlider->getValue()) << 8 | + static_cast(mBlueSlider->getValue()); + textColor->setColorAt(mSelected, rgb); +} diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h new file mode 100644 index 00000000..98a2d18b --- /dev/null +++ b/src/gui/setup_colors.h @@ -0,0 +1,75 @@ +/* + * Configurable text colors + * Copyright (C) 2008 Douglas Boffey + * + * This file is part of Aethyra. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef SETUP_COLORS_H +#define SETUP_COLORS_H + +#include + +#include + +#include +#include + +#include "setuptab.h" +#include "textfield.h" + +#include "../guichanfwd.h" + +class BrowserBox; + +class Setup_Colors : public SetupTab, public gcn::ActionListener, + public TextFieldListener +{ + public: + Setup_Colors(); + ~Setup_Colors(); + void apply(); + void cancel(); + void action(const gcn::ActionEvent &event); + + void listen(const TextField *tf); + private: + gcn::ListBox *mColorBox; + gcn::ScrollArea *mScroll; + BrowserBox *mPreview; + gcn::ScrollArea *mPreviewBox; + int mSelected; + + gcn::Label *mRedLabel; + gcn::Slider *mRedSlider; + TextField *mRedText; + int mRedValue; + + gcn::Label *mGreenLabel; + gcn::Slider *mGreenSlider; + TextField *mGreenText; + int mGreenValue; + + gcn::Label *mBlueLabel; + gcn::Slider *mBlueSlider; + TextField *mBlueText; + int mBlueValue; + + void setEntry(gcn::Slider *s, TextField *t, int value); + void updateColor(); +}; +#endif diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp deleted file mode 100644 index 03fdcfec..00000000 --- a/src/gui/setup_colours.cpp +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Configurable text colors - * Copyright (C) 2008 Douglas Boffey - * - * This file is part of Aethyra. - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include - -#include -#include -#include - -#include "browserbox.h" -#include "colour.h" -#include "itemlinkhandler.h" -#include "listbox.h" -#include "scrollarea.h" -#include "setup_colours.h" -#include "slider.h" -#include "textfield.h" - -#include "widgets/layouthelper.h" - -#include "../configuration.h" - -#include "../utils/gettext.h" -#include "../utils/tostring.h" - -Setup_Colours::Setup_Colours() : - mSelected(-1) -{ - setOpaque(false); - - mColourBox = new ListBox(textColour); - mColourBox->setActionEventId("colour_box"); - mColourBox->addActionListener(this); - - mScroll = new ScrollArea(mColourBox); - mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - - mPreview = new BrowserBox(BrowserBox::AUTO_WRAP); - mPreview->setOpaque(false); - - // Replace this later with a more appropriate link handler. For now, this'll - // do, as it'll do nothing when clicked on. - mPreview->setLinkHandler(new ItemLinkHandler()); - - mPreviewBox = new ScrollArea(mPreview); - mPreviewBox->setHeight(20); - mPreviewBox->setScrollPolicy(gcn::ScrollArea::SHOW_NEVER, - gcn::ScrollArea::SHOW_NEVER); - - mRedLabel = new gcn::Label(_("Red: ")); - - mRedText = new TextField(); - mRedText->setWidth(40); - mRedText->setRange(0, 255); - mRedText->setNumeric(true); - mRedText->addListener(this); - - mRedSlider = new Slider(0, 255); - mRedSlider->setWidth(160); - mRedSlider->setValue(mRedText->getValue()); - mRedSlider->setActionEventId("slider_red"); - mRedSlider->addActionListener(this); - - mGreenLabel = new gcn::Label(_("Green: ")); - - mGreenText = new TextField(); - mGreenText->setWidth(40); - mGreenText->setRange(0, 255); - mGreenText->setNumeric(true); - mGreenText->addListener(this); - - mGreenSlider = new Slider(0, 255); - mGreenSlider->setWidth(160); - mGreenSlider->setValue(mGreenText->getValue()); - mGreenSlider->setActionEventId("slider_green"); - mGreenSlider->addActionListener(this); - - mBlueLabel = new gcn::Label(_("Blue: ")); - - mBlueText = new TextField(); - mBlueText->setWidth(40); - mBlueText->setRange(0, 255); - mBlueText->setNumeric(true); - mBlueText->addListener(this); - - mBlueSlider = new Slider(0, 255); - mBlueSlider->setWidth(160); - mBlueSlider->setValue(mBlueText->getValue()); - mBlueSlider->setActionEventId("slider_blue"); - mBlueSlider->addActionListener(this); - - setOpaque(false); - - // Do the layout - LayoutHelper h(this); - ContainerPlacer place = h.getPlacer(0, 0); - - place(0, 0, mScroll, 4, 7).setPadding(2); - place(0, 7, mPreviewBox, 4).setPadding(2); - place(0, 8, mRedLabel, 2); - place(2, 8, mRedSlider); - place(3, 8, mRedText).setPadding(1); - place(0, 9, mGreenLabel, 2); - place(2, 9, mGreenSlider); - place(3, 9, mGreenText).setPadding(1); - place(0, 10, mBlueLabel, 2); - place(2, 10, mBlueSlider); - place(3, 10, mBlueText).setPadding(1); - - setDimension(gcn::Rectangle(0, 0, 325, 280)); -} - -Setup_Colours::~Setup_Colours() -{ - delete mRedLabel; - delete mRedSlider; - delete mRedText; - - delete mGreenLabel; - delete mGreenSlider; - delete mGreenText; - - delete mBlueLabel; - delete mBlueSlider; - delete mBlueText; - - delete mScroll; -} - -void Setup_Colours::action(const gcn::ActionEvent &event) -{ - if (event.getId() == "colour_box") - { - mSelected = mColourBox->getSelected(); - int col = textColour->getColourAt(mSelected); - char ch = textColour->getColourCharAt(mSelected); - std::string msg; - - if (ch == '<') - msg = toString("@@|") + - _("This is what the color looks like") + "@@"; - else - msg = "##" + toString(ch) + - _("This is what the color looks like"); - - mPreview->clearRows(); - mPreview->addRow(msg); - setEntry(mRedSlider, mRedText, col >> 16); - setEntry(mGreenSlider, mGreenText, (col >> 8) & 0xff); - setEntry(mBlueSlider, mBlueText, col & 0xff); - return; - } - - if (event.getId() == "slider_red") - { - mRedText->setText(toString(std::floor(mRedSlider->getValue()))); - updateColour(); - return; - } - - if (event.getId() == "slider_green") - { - mGreenText->setText(toString(std::floor(mGreenSlider->getValue()))); - updateColour(); - return; - } - - if (event.getId() == "slider_blue") - { - mBlueText->setText(toString(std::floor(mBlueSlider->getValue()))); - updateColour(); - return; - } -} - -void Setup_Colours::setEntry(gcn::Slider *s, TextField *t, int value) -{ - s->setValue(value); - char buffer[100]; - sprintf(buffer, "%d", value); - t->setText(buffer); -} - -void Setup_Colours::apply() -{ - textColour->commit(); -} - -void Setup_Colours::cancel() -{ - textColour->rollback(); - int col = textColour->getColourAt(mSelected); - setEntry(mRedSlider, mRedText, col >> 16); - setEntry(mGreenSlider, mGreenText, (col >> 8) & 0xff); - setEntry(mBlueSlider, mBlueText, col & 0xff); -} - -void Setup_Colours::listen(const TextField *tf) -{ - if (tf == mRedText) - { - mRedSlider->setValue(tf->getValue()); - updateColour(); - return; - } - if (tf == mGreenText) - { - mGreenSlider->setValue(tf->getValue()); - updateColour(); - return; - } - if (tf == mBlueText) - { - mBlueSlider->setValue(tf->getValue()); - updateColour(); - return; - } -} - -void Setup_Colours::updateColour() -{ - if (mSelected == -1) - { - return; - } - int rgb = static_cast(mRedSlider->getValue()) << 16 | - static_cast(mGreenSlider->getValue()) << 8 | - static_cast(mBlueSlider->getValue()); - textColour->setColourAt(mSelected, rgb); -} diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h deleted file mode 100644 index ac06c178..00000000 --- a/src/gui/setup_colours.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Configurable text colors - * Copyright (C) 2008 Douglas Boffey - * - * This file is part of Aethyra. - * - * This program 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. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef SETUP_COLOURS_H -#define SETUP_COLOURS_H - -#include - -#include - -#include -#include - -#include "setuptab.h" -#include "textfield.h" - -#include "../guichanfwd.h" - -class BrowserBox; - -class Setup_Colours : public SetupTab, public gcn::ActionListener, - public TextFieldListener -{ - public: - Setup_Colours(); - ~Setup_Colours(); - void apply(); - void cancel(); - void action(const gcn::ActionEvent &event); - - void listen(const TextField *tf); - private: - gcn::ListBox *mColourBox; - gcn::ScrollArea *mScroll; - BrowserBox *mPreview; - gcn::ScrollArea *mPreviewBox; - int mSelected; - - gcn::Label *mRedLabel; - gcn::Slider *mRedSlider; - TextField *mRedText; - int mRedValue; - - gcn::Label *mGreenLabel; - gcn::Slider *mGreenSlider; - TextField *mGreenText; - int mGreenValue; - - gcn::Label *mBlueLabel; - gcn::Slider *mBlueSlider; - TextField *mBlueText; - int mBlueValue; - - void setEntry(gcn::Slider *s, TextField *t, int value); - void updateColour(); -}; -#endif diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp index 9e53dff7..4f9f9024 100644 --- a/src/gui/shoplistbox.cpp +++ b/src/gui/shoplistbox.cpp @@ -23,7 +23,7 @@ #include #include -#include "colour.h" +#include "color.h" #include "shop.h" #include "shoplistbox.h" @@ -65,9 +65,9 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics) mAlpha = config.getValue("guialpha", 0.8); bool valid; - const int red = (textColour->getColour('H', valid) >> 16) & 0xFF; - const int green = (textColour->getColour('H', valid) >> 8) & 0xFF; - const int blue = textColour->getColour('H', valid) & 0xFF; + const int red = (textColor->getColor('H', valid) >> 16) & 0xFF; + const int green = (textColor->getColor('H', valid) >> 8) & 0xFF; + const int blue = textColor->getColor('H', valid) & 0xFF; const int alpha = mAlpha * 255; Graphics *graphics = static_cast(gcnGraphics); diff --git a/src/gui/table.cpp b/src/gui/table.cpp index b79d43cf..de7f11b2 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -24,7 +24,7 @@ #include #include -#include "colour.h" +#include "color.h" #include "table.h" #include "../configuration.h" @@ -326,10 +326,10 @@ void GuiTable::draw(gcn::Graphics* graphics) { bool valid; const int red = - (textColour->getColour('H', valid) >> 16) & 0xFF; + (textColor->getColor('H', valid) >> 16) & 0xFF; const int green = - (textColour->getColour('H', valid) >> 8) & 0xFF; - const int blue = textColour->getColour('H', valid) & 0xFF; + (textColor->getColor('H', valid) >> 8) & 0xFF; + const int blue = textColor->getColor('H', valid) & 0xFF; const int alpha = mAlpha * 127; graphics->setColor(gcn::Color(red, green, blue, alpha)); @@ -348,10 +348,10 @@ void GuiTable::draw(gcn::Graphics* graphics) { bool valid; const int red = - (textColour->getColour('H', valid) >> 16) & 0xFF; + (textColor->getColor('H', valid) >> 16) & 0xFF; const int green = - (textColour->getColour('H', valid) >> 8) & 0xFF; - const int blue = textColour->getColour('H', valid) & 0xFF; + (textColor->getColor('H', valid) >> 8) & 0xFF; + const int blue = textColor->getColor('H', valid) & 0xFF; const int alpha = mAlpha * 127; graphics->setColor(gcn::Color(red, green, blue, alpha)); diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index a292edd5..5d1b8d4f 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -23,7 +23,7 @@ #include "dropdown.h" -#include "../colour.h" +#include "../color.h" #include "../listbox.h" #include "../scrollarea.h" @@ -138,7 +138,7 @@ void DropDown::draw(gcn::Graphics* graphics) const int alpha = mAlpha * 255; gcn::Color faceColor = getBaseColor(); faceColor.a = alpha; - gcn::Color highlightColor = textColour->getColour('H', valid); + gcn::Color highlightColor = textColor->getColor('H', valid); highlightColor.a = alpha; gcn::Color shadowColor = faceColor - 0x303030; shadowColor.a = alpha; diff --git a/src/main.cpp b/src/main.cpp index c68c02d8..80cff8d1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,7 +56,7 @@ #include "gui/button.h" #include "gui/char_server.h" #include "gui/char_select.h" -#include "gui/colour.h" +#include "gui/color.h" #include "gui/gui.h" #include "gui/login.h" #include "gui/ok_dialog.h" @@ -136,7 +136,7 @@ CharServerHandler charServerHandler; LoginData loginData; LockedArray charInfo(MAX_SLOT + 1); -Colour *textColour; +Color *textColor; // This anonymous namespace hides whatever is inside from other modules. namespace { @@ -764,7 +764,7 @@ int main(int argc, char *argv[]) unsigned int oldstate = !state; // We start with a status change. // Needs to be created in main, as the updater uses it - textColour = new Colour(); + textColor = new Color(); Game *game = NULL; Window *currentDialog = NULL; @@ -1097,7 +1097,7 @@ int main(int argc, char *argv[]) usleep(50000); } - delete textColour; + delete textColor; #ifdef PACKAGE_VERSION delete versionLabel; #endif diff --git a/src/text.cpp b/src/text.cpp index 5a015139..e5e40235 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -30,8 +30,8 @@ int Text::mInstances = 0; Text::Text(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour) : - mText(text), mColour(colour) + gcn::Graphics::Alignment alignment, gcn::Color color) : + mText(text), mColor(color) { if (textManager == 0) { @@ -91,13 +91,13 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff) graphics->drawText(mText, mX - xOff, mY - yOff - 1, gcn::Graphics::LEFT); - graphics->setColor(mColour); + graphics->setColor(mColor); graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT); } FlashText::FlashText(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour) : - Text(text, x, y, alignment, colour), + gcn::Graphics::Alignment alignment, gcn::Color color) : + Text(text, x, y, alignment, color), mTime(0) { } diff --git a/src/text.h b/src/text.h index d62a125d..0b53dd48 100644 --- a/src/text.h +++ b/src/text.h @@ -39,7 +39,7 @@ class Text * Constructor creates a text object to display on the screen. */ Text(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour); + gcn::Graphics::Alignment alignment, gcn::Color color); /** * Destructor. The text is removed from the screen. @@ -64,14 +64,14 @@ class Text int mXOffset; /**< The offset of mX from the desired x. */ static int mInstances; /**< Instances of text. */ std::string mText; /**< The text to display. */ - gcn::Color mColour; /**< The colour of the text. */ + gcn::Color mColor; /**< The color of the text. */ }; class FlashText : public Text { public: FlashText(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Color colour); + gcn::Graphics::Alignment alignment, gcn::Color color); /** * Remove the text from the screen -- cgit v1.2.3-70-g09d2