From 159285c5aa24611ceee7e3847a87bf9ea5f7fb7a Mon Sep 17 00:00:00 2001 From: Lloyd Bryant Date: Fri, 18 Jul 2008 00:48:14 +0000 Subject: Import of client tree --- src/being.cpp | 55 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 20 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 625b0eef..14f7ce20 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id$ + * $Id: being.cpp 4301 2008-05-28 16:06:48Z peaveydk $ */ #include "being.h" @@ -32,6 +32,7 @@ #include "log.h" #include "map.h" #include "particle.h" +#include "text.h" #include "resources/resourcemanager.h" #include "resources/imageset.h" @@ -45,6 +46,9 @@ int Being::instances = 0; ImageSet *Being::emotionSet = NULL; +static const int X_SPEECH_OFFSET = 18; +static const int Y_SPEECH_OFFSET = 60; + Being::Being(int id, int job, Map *map): mJob(job), mX(0), mY(0), @@ -77,6 +81,7 @@ Being::Being(int id, int job, Map *map): } instances++; + mSpeech = 0; } Being::~Being() @@ -100,6 +105,10 @@ Being::~Being() emotionSet->decRef(); emotionSet = NULL; } + if (mSpeech) + { + delete mSpeech; + } } void @@ -147,7 +156,13 @@ Being::setSprite(int slot, int id, std::string color) void Being::setSpeech(const std::string &text, Uint32 time) { - mSpeech = text; + if (mSpeech) // don't introduce a memory leak + { + delete mSpeech; + } + mSpeech = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET, + gcn::Graphics::CENTER, speechFont, + gcn::Color(255, 255, 255)); mSpeechTime = 500; } @@ -355,13 +370,28 @@ void Being::logic() { // Reduce the time that speech is still displayed - if (mSpeechTime > 0) - mSpeechTime--; + if (mSpeechTime > 0 && mSpeech) + { + if (--mSpeechTime == 0) + { + delete mSpeech; + mSpeech = 0; + } + } + int oldPx = mPx; + int oldPy = mPy; // Update pixel coordinates mPx = mX * 32 + getXOffset(); mPy = mY * 32 + getYOffset(); - + if (mPx != oldPx || mPy != oldPy) + { + if (mSpeech) + { + mSpeech->adviseXY(mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET); + } + updateCoords(); + } if (mEmotion != 0) { mEmotionTime--; @@ -426,21 +456,6 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) graphics->drawImage(emotionSet->get(emotionIndex), px, py); } -void -Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) -{ - int px = mPx + offsetX; - int py = mPy + offsetY; - - // Draw speech above this being - if (mSpeechTime > 0) - { - graphics->setFont(speechFont); - graphics->setColor(gcn::Color(255, 255, 255)); - graphics->drawText(mSpeech, px + 18, py - 60, gcn::Graphics::CENTER); - } -} - Being::Type Being::getType() const { -- cgit v1.2.3-70-g09d2 From 94024e2b57b31ee92bb81fc48ce236283330b60c Mon Sep 17 00:00:00 2001 From: Lloyd Bryant Date: Wed, 13 Aug 2008 15:02:59 +0000 Subject: Added support for different colored fonts for different being types --- ChangeLog | 7 +++++ data/graphics/gui/Makefile.am | 3 ++ data/graphics/gui/rpgfont_wider-blue.png | Bin 0 -> 4475 bytes data/graphics/gui/rpgfont_wider-green.png | Bin 0 -> 4423 bytes data/graphics/gui/rpgfont_wider-orange.png | Bin 0 -> 4415 bytes src/being.cpp | 1 + src/being.h | 4 +++ src/gui/gui.cpp | 47 +++++++++++++++++++++++++++++ src/gui/gui.h | 8 +++++ src/monster.cpp | 2 +- src/net/beinghandler.cpp | 6 ++-- src/npc.cpp | 2 +- src/player.cpp | 13 ++++++-- 13 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 data/graphics/gui/rpgfont_wider-blue.png create mode 100644 data/graphics/gui/rpgfont_wider-green.png create mode 100644 data/graphics/gui/rpgfont_wider-orange.png (limited to 'src/being.cpp') diff --git a/ChangeLog b/ChangeLog index 2bb8660f..171295d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-13 Lloyd Bryant ("Sanga") + + * Added code to display NPC and monster names using an + alternate colored font. Added support for a server + provided "GM flag", which prepends "(GM)" to the player's + name and changes the font color. + 2008-08-08 Lloyd Bryant ("Sanga") * Made "--skipupdate" skip the update download process, but diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index cfa14192..ec99fdf6 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -32,6 +32,9 @@ gui_DATA = \ radioout.png \ resize.png \ rpgfont_wider.png \ + rpgfont_wider-blue.png \ + rpgfont_wider-green.png \ + rpgfont_wider-orange.png \ selection.png \ sansserif8.png \ slider.png \ diff --git a/data/graphics/gui/rpgfont_wider-blue.png b/data/graphics/gui/rpgfont_wider-blue.png new file mode 100644 index 00000000..4cd45c5c Binary files /dev/null and b/data/graphics/gui/rpgfont_wider-blue.png differ diff --git a/data/graphics/gui/rpgfont_wider-green.png b/data/graphics/gui/rpgfont_wider-green.png new file mode 100644 index 00000000..00098746 Binary files /dev/null and b/data/graphics/gui/rpgfont_wider-green.png differ diff --git a/data/graphics/gui/rpgfont_wider-orange.png b/data/graphics/gui/rpgfont_wider-orange.png new file mode 100644 index 00000000..18dd67e9 Binary files /dev/null and b/data/graphics/gui/rpgfont_wider-orange.png differ diff --git a/src/being.cpp b/src/being.cpp index 14f7ce20..822bc647 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -82,6 +82,7 @@ Being::Being(int id, int job, Map *map): instances++; mSpeech = 0; + mIsGM = false; } Being::~Being() diff --git a/src/being.h b/src/being.h index 90bab9ac..7f68c8c3 100644 --- a/src/being.h +++ b/src/being.h @@ -233,6 +233,9 @@ class Being : public Sprite virtual void nextStep(); + virtual void + setGM() { mIsGM = true; } + /** * Performs being logic. */ @@ -382,6 +385,7 @@ class Being : public Sprite Map *mMap; /**< Map on which this being resides */ std::string mName; /**< Name of character */ SpriteIterator mSpriteIterator; + bool mIsGM; /** Engine-related infos about weapon. */ const ItemInfo* mEquippedWeapon; diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index e56afc76..edc25152 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -56,6 +56,13 @@ gcn::Font *hitYellowFont; // Font used to display speech and player names gcn::Font *speechFont; +// Font for displaying NPC names +gcn::Font *npcNameFont; +// Font for displaying mob names +gcn::Font *mobNameFont; +// Font for displaying GM names +gcn::Font *gmNameFont; + class GuiConfigListener : public ConfigListener { public: @@ -128,6 +135,46 @@ Gui::Gui(Graphics *graphics): logger->error("Unable to load rpgfont_wider.png!"); } + // Set npc name font + try { + npcNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-blue.png", + " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\" + "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ" + ); + } + catch (gcn::Exception e) + { + logger->error("Unable to load rpgfont_wider-blue.png!"); + } + + // Set monster name font + try { + mobNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-orange.png", + " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\" + "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ" + ); + } + catch (gcn::Exception e) + { + logger->error("Unable to load rpgfont_wider-orange.png!"); + } + + // Set GM name font + try { + gmNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-green.png", + " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\" + "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ" + ); + } + catch (gcn::Exception e) + { + logger->error("Unable to load rpgfont_wider-green.png!"); + } + + gcn::Widget::setGlobalFont(mGuiFont); // Load hits' colourful fonts diff --git a/src/gui/gui.h b/src/gui/gui.h index d2a832c7..f250a8e3 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -119,4 +119,12 @@ extern gcn::Font *hitYellowFont; */ extern gcn::Font *speechFont; +/** + * being name fonts + */ +extern gcn::Font *npcNameFont; +extern gcn::Font *mobNameFont; +extern gcn::Font *gmNameFont; + + #endif diff --git a/src/monster.cpp b/src/monster.cpp index 1a7f6c4e..5d62a9cc 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -168,7 +168,7 @@ void Monster::showName(bool show) mText = new Text(getInfo().getName(), mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET - getHeight(), gcn::Graphics::CENTER, - speechFont, gcn::Color(255, 32, 32)); + mobNameFont, gcn::Color(255, 32, 32)); } else { diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index a8591fce..34c65d1c 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -71,6 +71,7 @@ void BeingHandler::handleMessage(MessageIn *msg) Uint16 headTop, headMid, headBottom; Uint16 shoes, gloves, cape, misc1, misc2; Uint16 weapon, shield; + Uint16 gmstatus; Sint16 param1; Sint8 type; Being *srcBeing, *dstBeing; @@ -443,8 +444,9 @@ void BeingHandler::handleMessage(MessageIn *msg) dstBeing->setDirection(dir); } - msg->readInt8(); // unknown - msg->readInt8(); // unknown + gmstatus = msg->readInt16(); + if (gmstatus & 0x01) + dstBeing->setGM(); if (msg->getId() == SMSG_PLAYER_UPDATE_1) { diff --git a/src/npc.cpp b/src/npc.cpp index ec7088ab..1615ecd6 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -84,7 +84,7 @@ void NPC::setName(const std::string &name) delete mName; } mName = new Text(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, - gcn::Graphics::CENTER, speechFont, + gcn::Graphics::CENTER, npcNameFont, gcn::Color(200, 200, 255)); } diff --git a/src/player.cpp b/src/player.cpp index 5db009ba..0740c7db 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -43,6 +43,7 @@ Player::Player(int id, int job, Map *map): Being(id, job, map) { mName = 0; + mIsGM = false; } Player::~Player() @@ -57,9 +58,15 @@ void Player::setName(const std::string &name) { if (mName == 0) { - mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, - gcn::Graphics::CENTER, - speechFont, gcn::Color(255, 255, 255)); + if (mIsGM) { + mName = new FlashText("(GM) " + name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, + gcn::Graphics::CENTER, + gmNameFont, gcn::Color(255, 255, 255)); + } else { + mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, + gcn::Graphics::CENTER, + speechFont, gcn::Color(255, 255, 255)); + } Being::setName(name); } } -- cgit v1.2.3-70-g09d2 From d5b86aa54dfa4ddf5b5f2361918c719ba8d0dd18 Mon Sep 17 00:00:00 2001 From: Lloyd Bryant Date: Sun, 17 Aug 2008 06:28:13 +0000 Subject: Fixed crash resulting from having a player targeted when hitting a warp point --- ChangeLog | 31 ++++++++++++++++++------------- src/being.cpp | 1 + src/monster.cpp | 10 ++++------ src/net/beinghandler.cpp | 5 ++--- src/net/playerhandler.cpp | 7 ++++++- 5 files changed, 31 insertions(+), 23 deletions(-) (limited to 'src/being.cpp') diff --git a/ChangeLog b/ChangeLog index 0204d81e..81fc32d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-16 Lloyd Bryant ("Sanga") + + * Fixed bug where client would crash if another player + was targeted when you hit a warp point. + 2008-08-14 Lloyd Bryant ("Sanga") * Uncommented line so that MP status bar correctly @@ -10,33 +15,33 @@ provided "GM flag", which prepends "(GM)" to the player's name and changes the font color. -2008-08-08 Lloyd Bryant ("Sanga") +2008-08-08 Lloyd Bryant ("Sanga") * Made "--skipupdate" skip the update download process, but still load whatever updates have been previously downloaded. -2008-07-25 Lloyd Bryant ("Sanga") +2008-07-25 Lloyd Bryant ("Sanga") * Added feature to remember window locations from one session to the next (patch from TMW by ElvenProgrammer) -2008-07-24 Lloyd Bryant ("Sanga") +2008-07-24 Lloyd Bryant ("Sanga") * Tweak in net/beinghandler.cpp to compensate for a visual bug when using the TMW server. -2008-07-23 Lloyd Bryant ("Sanga") +2008-07-23 Lloyd Bryant ("Sanga") * Added support for capes/misc1/misc2 into the character selection display -2008-07-23 Lloyd Bryant ("Sanga") +2008-07-23 Lloyd Bryant ("Sanga") * Added "chat" button to open/close chat window * Added support for viewable cape/misc1/misc2 (new eAthena version ONLY -2008-07-22 Lloyd Bryant ("Sanga") +2008-07-22 Lloyd Bryant ("Sanga") * Added handler for 0x0086 movement packet (new eAthena). * Changed startup sequence for game.cpp to send a ping packet @@ -44,11 +49,11 @@ This is required by the new eAthena version. * Added #deines for some "ping" packets. -2008-07-19 Lloyd Bryant ("Sanga") +2008-07-19 Lloyd Bryant ("Sanga") * Removed unnecessary check ("weight") from itemdb loader -2008-07-18 Lloyd Bryant ("Sanga") +2008-07-18 Lloyd Bryant ("Sanga") * Added code to provide viewable glove and shoe sprites @@ -56,18 +61,18 @@ * Added code to avoid collision between different displayed text. -2008-07-08 Lloyd Bryant ("Sanga") +2008-07-08 Lloyd Bryant ("Sanga") * Added handling for a "Stop Walking" packet. This will force the client back into sync during those "can't run away from a battle" sync error conditions. -2008-07-07 Lloyd Bryant ("Sanga") +2008-07-07 Lloyd Bryant ("Sanga") * Added support for update host provided by login server * Changed startup sequence to login first, then update -2008-07-05 Lloyd Bryant ("Sanga") +2008-07-05 Lloyd Bryant ("Sanga") * Applied patch from kraant to convert into a TME branded client * Removed redundant autoconf files @@ -153,12 +158,12 @@ now stored in an update host specific directory. Based on a patch by Sanga. -2008-06-04 Lloyd Bryant +2008-06-04 Lloyd Bryant * src/net/charserverhandler.cpp: Display shield sprite also in character select window. -2008-05-30 Lloyd Bryant +2008-05-30 Lloyd Bryant * src/net/equipmenthandler.cpp, src/net/beinghandler.cpp, src/net/protocol.h, src/being.h: Merged handling for eAthena packets diff --git a/src/being.cpp b/src/being.cpp index 822bc647..fd1b67fe 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -33,6 +33,7 @@ #include "map.h" #include "particle.h" #include "text.h" +#include "localplayer.h" #include "resources/resourcemanager.h" #include "resources/imageset.h" diff --git a/src/monster.cpp b/src/monster.cpp index 5d62a9cc..e5f9f4b2 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -28,7 +28,6 @@ #include "sound.h" #include "particle.h" #include "text.h" -#include "localplayer.h" #include "gui/gui.h" @@ -66,12 +65,11 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map): } } -Monster::~Monster() -{ +Monster::~Monster() { + if (mText) - { - player_node->setTarget(0); - } + delete mText; + } void diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index affdcd56..5b2ac5f4 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -201,10 +201,9 @@ void BeingHandler::handleMessage(MessageIn *msg) if (!dstBeing) break; - if (dstBeing == player_node->getTarget()) - { + // If this is player's current target, clear it. + if (player_node->getTarget() == dstBeing) player_node->stopAttack(); - } if (msg->readInt8() == 1) { diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index 7f9e455a..e871b670 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -129,6 +129,12 @@ void PlayerHandler::handleMessage(MessageIn *msg) logger->log("Warping to %s (%d, %d)", mapPath.c_str(), x, y); + /* + * We must clear the local player's target *before* the call + * to changeMap, as it deletes all beings. + */ + player_node->stopAttack(); + // Switch the actual map, deleting the previous one engine->changeMap(mapPath); @@ -138,7 +144,6 @@ void PlayerHandler::handleMessage(MessageIn *msg) float scrollOffsetY = (y - player_node->mY) * 32; player_node->setAction(Being::STAND); - player_node->stopAttack(); player_node->mFrame = 0; player_node->mX = x; player_node->mY = y; -- cgit v1.2.3-70-g09d2 From 489a429bea6739dfa25503b9329bd9e33bffb856 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Thu, 25 Sep 2008 00:15:44 +0000 Subject: Merged the Tametomo branch into trunk. --- data/graphics/gui/CMakeLists.txt | 4 + data/graphics/gui/Makefile.am | 4 + data/graphics/gui/buttonpress.png | Bin 434 -> 424 bytes data/graphics/gui/close_button.png | Bin 646 -> 637 bytes data/graphics/gui/hscroll_left_highlight.png | Bin 382 -> 381 bytes data/graphics/gui/hscroll_right_default.png | Bin 349 -> 346 bytes data/graphics/gui/mouse.png | Bin 4508 -> 4385 bytes src/CMakeLists.txt | 4 + src/Makefile.am | 2 + src/being.cpp | 265 +++++++---- src/being.h | 125 ++--- src/beingmanager.cpp | 17 +- src/beingmanager.h | 39 +- src/engine.cpp | 12 + src/engine.h | 7 +- src/equipment.cpp | 2 - src/equipment.h | 2 + src/flooritemmanager.cpp | 4 +- src/game.cpp | 678 +++++++++++++-------------- src/gui/setup.cpp | 2 +- src/gui/setup_video.cpp | 22 +- src/gui/shop.cpp | 4 +- src/gui/skill.cpp | 4 +- src/gui/textbox.cpp | 12 +- src/gui/textbox.h | 13 + src/gui/updatewindow.cpp | 2 +- src/gui/viewport.cpp | 143 +++--- src/gui/viewport.h | 25 +- src/gui/widgets/dropdown.cpp | 2 +- src/gui/window.cpp | 246 ++++++++-- src/gui/window.h | 14 +- src/gui/windowcontainer.cpp | 4 +- src/imageparticle.cpp | 2 +- src/keyboardconfig.cpp | 3 +- src/keyboardconfig.h | 3 +- src/localplayer.cpp | 22 +- src/localplayer.h | 2 +- src/map.cpp | 226 ++++----- src/map.h | 112 +++-- src/monster.cpp | 37 +- src/monster.h | 2 +- src/net/beinghandler.cpp | 11 +- src/net/equipmenthandler.cpp | 7 + src/net/loginhandler.cpp | 2 +- src/net/playerhandler.cpp | 60 ++- src/npc.cpp | 3 +- src/particle.cpp | 12 +- src/particle.h | 17 +- src/particleemitter.cpp | 29 +- src/particleemitter.h | 6 +- src/player.cpp | 12 + src/resources/action.cpp | 5 +- src/resources/imageset.cpp | 7 +- src/resources/imageset.h | 8 +- src/resources/itemdb.cpp | 6 +- src/resources/mapreader.cpp | 218 +++++---- src/resources/mapreader.h | 4 +- src/resources/monsterdb.cpp | 5 +- src/resources/monsterinfo.cpp | 5 +- src/resources/spritedef.cpp | 100 ++-- src/resources/spritedef.h | 8 +- src/sound.h | 2 +- src/textparticle.cpp | 2 +- src/tileset.h | 3 +- src/utils/dtor.h | 8 + 65 files changed, 1550 insertions(+), 1057 deletions(-) (limited to 'src/being.cpp') diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 5cb47b8c..0ad4bd13 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -8,7 +8,9 @@ SET (FILES checkbox.png close_button.png deepbox.png + default.png fixedfont.png + gui.xml hits_blue.png hits_red.png hits_yellow.png @@ -31,6 +33,8 @@ SET (FILES selection.png sansserif8.png slider.png + speech_bubble.png + speech_bubble.xml target-cursor-blue-l.png target-cursor-blue-m.png target-cursor-blue-s.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index ec99fdf6..f2abf035 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -11,8 +11,10 @@ gui_DATA = \ checkbox.png \ close_button.png \ deepbox.png \ + default.png \ emotions.png \ fixedfont.png \ + gui.xml \ hits_blue.png \ hits_red.png \ hits_yellow.png \ @@ -38,6 +40,8 @@ gui_DATA = \ selection.png \ sansserif8.png \ slider.png \ + speech_bubble.png \ + speechbubble.xml \ target-cursor-blue-l.png \ target-cursor-blue-m.png \ target-cursor-blue-s.png \ diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png index ed7e5054..4c45a45f 100644 Binary files a/data/graphics/gui/buttonpress.png and b/data/graphics/gui/buttonpress.png differ diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png index 8b4a451a..a0a6d144 100644 Binary files a/data/graphics/gui/close_button.png and b/data/graphics/gui/close_button.png differ diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png index e2686c13..1dd79658 100644 Binary files a/data/graphics/gui/hscroll_left_highlight.png and b/data/graphics/gui/hscroll_left_highlight.png differ diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png index 547a86dd..94c0efeb 100644 Binary files a/data/graphics/gui/hscroll_right_default.png and b/data/graphics/gui/hscroll_right_default.png differ diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png index 84dc2ad1..6c1b7e8e 100644 Binary files a/data/graphics/gui/mouse.png and b/data/graphics/gui/mouse.png differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6ee7405..e6b9d3b1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,6 +49,8 @@ MARK_AS_ADVANCED(SDL_INCLUDE_DIR) MARK_AS_ADVANCED(SDL_LIBRARY) SET(SRCS + gui/widgets/dropdown.cpp + gui/widgets/dropdown.h gui/widgets/resizegrip.cpp gui/widgets/resizegrip.h gui/box.cpp @@ -159,6 +161,8 @@ SET(SRCS gui/skill.h gui/slider.cpp gui/slider.h + gui/speechbubble.cpp + gui/speechbubble.h gui/status.cpp gui/status.h gui/tabbedcontainer.cpp diff --git a/src/Makefile.am b/src/Makefile.am index d2fd5efb..f6d06536 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -117,6 +117,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/skill.h \ gui/slider.cpp \ gui/slider.h \ + gui/speechbubble.cpp \ + gui/speechbubble.h \ gui/status.cpp \ gui/status.h \ gui/tabbedcontainer.cpp \ diff --git a/src/being.cpp b/src/being.cpp index fd1b67fe..1d7f5ee7 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -22,8 +22,8 @@ */ #include "being.h" -#include #include +#include #include "animatedsprite.h" #include "equipment.h" @@ -32,7 +32,7 @@ #include "log.h" #include "map.h" #include "particle.h" -#include "text.h" +#include "sound.h" #include "localplayer.h" #include "resources/resourcemanager.h" @@ -40,20 +40,22 @@ #include "resources/iteminfo.h" #include "gui/gui.h" +#include "gui/speechbubble.h" #include "utils/dtor.h" #include "utils/tostring.h" +#include "utils/xml.h" + +#define BEING_EFFECTS_FILE "effects.xml" + int Being::instances = 0; ImageSet *Being::emotionSet = NULL; -static const int X_SPEECH_OFFSET = 18; -static const int Y_SPEECH_OFFSET = 60; - Being::Being(int id, int job, Map *map): mJob(job), mX(0), mY(0), - mAction(0), + mAction(STAND), mWalkTime(0), mEmotion(0), mEmotionTime(0), mAttackSpeed(350), @@ -73,6 +75,8 @@ Being::Being(int id, int job, Map *map): { setMap(map); + mSpeechBubble = new SpeechBubble(); + if (instances == 0) { // Load the emotion set @@ -82,13 +86,13 @@ Being::Being(int id, int job, Map *map): } instances++; - mSpeech = 0; + mSpeech = ""; mIsGM = false; } Being::~Being() { - std::for_each(mSprites.begin(), mSprites.end(), make_dtor(mSprites)); + delete_all(mSprites); clearPath(); for ( std::list::iterator i = mChildParticleEffects.begin(); @@ -107,14 +111,11 @@ Being::~Being() emotionSet->decRef(); emotionSet = NULL; } - if (mSpeech) - { - delete mSpeech; - } + + delete mSpeechBubble; } -void -Being::setDestination(Uint16 destX, Uint16 destY) +void Being::setDestination(Uint16 destX, Uint16 destY) { if (mMap) { @@ -122,14 +123,12 @@ Being::setDestination(Uint16 destX, Uint16 destY) } } -void -Being::clearPath() +void Being::clearPath() { mPath.clear(); } -void -Being::setPath(const Path &path) +void Being::setPath(const Path &path) { mPath = path; @@ -140,36 +139,26 @@ Being::setPath(const Path &path) } } -void -Being::setHairStyle(int style, int color) +void Being::setHairStyle(int style, int color) { mHairStyle = style < 0 ? mHairStyle : style % NR_HAIR_STYLES; mHairColor = color < 0 ? mHairColor : color % NR_HAIR_COLORS; } -void -Being::setSprite(int slot, int id, std::string color) +void Being::setSprite(int slot, int id, std::string color) { assert(slot >= BASE_SPRITE && slot < VECTOREND_SPRITE); mSpriteIDs[slot] = id; mSpriteColors[slot] = color; } -void -Being::setSpeech(const std::string &text, Uint32 time) +void Being::setSpeech(const std::string &text, Uint32 time) { - if (mSpeech) // don't introduce a memory leak - { - delete mSpeech; - } - mSpeech = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET, - gcn::Graphics::CENTER, speechFont, - gcn::Color(255, 255, 255)); + mSpeech = text; mSpeechTime = 500; } -void -Being::takeDamage(int amount) +void Being::takeDamage(int amount) { gcn::Font *font; std::string damage = amount ? toString(amount) : "miss"; @@ -200,16 +189,14 @@ Being::takeDamage(int amount) mPx + 16, mPy + 16); } -void -Being::handleAttack(Being *victim, int damage) +void Being::handleAttack(Being *victim, int damage) { setAction(Being::ATTACK); mFrame = 0; mWalkTime = tick_time; } -void -Being::setMap(Map *map) +void Being::setMap(Map *map) { // Remove sprite from potential previous map if (mMap) @@ -229,8 +216,7 @@ Being::setMap(Map *map) mChildParticleEffects.clear(); } -void -Being::controlParticle(Particle *particle) +void Being::controlParticle(Particle *particle) { if (particle) { @@ -240,8 +226,7 @@ Being::controlParticle(Particle *particle) } } -void -Being::setAction(Uint8 action) +void Being::setAction(Action action) { SpriteAction currentAction = ACTION_INVALID; switch (action) @@ -294,10 +279,11 @@ Being::setAction(Uint8 action) } } - -void -Being::setDirection(Uint8 direction) +void Being::setDirection(Uint8 direction) { + if (mDirection == direction) + return; + mDirection = direction; SpriteDirection dir = getSpriteDirection(); @@ -308,8 +294,7 @@ Being::setDirection(Uint8 direction) } } -SpriteDirection -Being::getSpriteDirection() const +SpriteDirection Being::getSpriteDirection() const { SpriteDirection dir; @@ -325,15 +310,15 @@ Being::getSpriteDirection() const { dir = DIRECTION_RIGHT; } - else { - dir = DIRECTION_LEFT; + else + { + dir = DIRECTION_LEFT; } - + return dir; } -void -Being::nextStep() +void Being::nextStep() { if (mPath.empty()) { @@ -368,32 +353,23 @@ Being::nextStep() mWalkTime += mWalkSpeed / 10; } -void -Being::logic() +void Being::logic() { // Reduce the time that speech is still displayed - if (mSpeechTime > 0 && mSpeech) - { - if (--mSpeechTime == 0) - { - delete mSpeech; - mSpeech = 0; - } - } + if (mSpeechTime > 0) + mSpeechTime--; int oldPx = mPx; int oldPy = mPy; // Update pixel coordinates mPx = mX * 32 + getXOffset(); mPy = mY * 32 + getYOffset(); + if (mPx != oldPx || mPy != oldPy) { - if (mSpeech) - { - mSpeech->adviseXY(mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET); - } updateCoords(); } + if (mEmotion != 0) { mEmotionTime--; @@ -412,25 +388,23 @@ Being::logic() } //Update particle effects - for ( std::list::iterator i = mChildParticleEffects.begin(); - i != mChildParticleEffects.end(); - - ) + for (std::list::iterator i = mChildParticleEffects.begin(); + i != mChildParticleEffects.end();) { (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f); - if (!(*i)->isAlive()) + if ((*i)->isExtinct()) { (*i)->kill(); i = mChildParticleEffects.erase(i); } - else { + else + { i++; } } } -void -Being::draw(Graphics *graphics, int offsetX, int offsetY) const +void Being::draw(Graphics *graphics, int offsetX, int offsetY) const { int px = mPx + offsetX; int py = mPy + offsetY; @@ -444,8 +418,7 @@ Being::draw(Graphics *graphics, int offsetX, int offsetY) const } } -void -Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) +void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) { if (!mEmotion) return; @@ -458,17 +431,39 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) graphics->drawImage(emotionSet->get(emotionIndex), px, py); } -Being::Type -Being::getType() const +void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) +{ + int px = mPx + offsetX; + int py = mPy + offsetY; + + // Draw speech above this being + if (mSpeechTime > 0) + { + mSpeechBubble->setCaption(mName); + mSpeechBubble->setWindowName(mName); + // Not quite centered, but close enough. However, it's not too important to get + // it right right now, as it doesn't take bubble collision into account yet. + mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - + (mSpeechBubble->getNumRows()*14)); + mSpeechBubble->setText( mSpeech ); + mSpeechBubble->setVisible(true); + } + else if (mSpeechTime == 0) + { + mSpeechBubble->setVisible(false); + } +} + +Being::Type Being::getType() const { return UNKNOWN; } -int -Being::getOffset(char pos, char neg) const +int Being::getOffset(char pos, char neg) const { // Check whether we're walking in the requested direction - if (mAction != WALK || !(mDirection & (pos | neg))) { + if (mAction != WALK || !(mDirection & (pos | neg))) + { return 0; } @@ -476,40 +471,132 @@ Being::getOffset(char pos, char neg) const // We calculate the offset _from_ the _target_ location offset -= 32; - if (offset > 0) { + if (offset > 0) + { offset = 0; } // Going into negative direction? Invert the offset. - if (mDirection & pos) { + if (mDirection & pos) + { offset = -offset; } return offset; } - -int -Being::getWidth() const +int Being::getWidth() const { if (mSprites[BASE_SPRITE]) { return mSprites[BASE_SPRITE]->getWidth(); } - else { + else + { return 0; } } -int -Being::getHeight() const +int Being::getHeight() const { if (mSprites[BASE_SPRITE]) { return mSprites[BASE_SPRITE]->getHeight(); } - else { + else + { return 0; } } + +struct EffectDescription +{ + std::string mGFXEffect; + std::string mSFXEffect; +}; + +static EffectDescription *default_effect = NULL; +static std::map effects; +static bool effects_initialized = false; + +static EffectDescription *getEffectDescription(xmlNodePtr node, int *id) +{ + EffectDescription *ed = new EffectDescription; + + *id = atoi(XML::getProperty(node, "id", "-1").c_str()); + ed->mSFXEffect = XML::getProperty(node, "audio", ""); + ed->mGFXEffect = XML::getProperty(node, "particle", ""); + + return ed; +} + +static EffectDescription *getEffectDescription(int effectId) +{ + if (!effects_initialized) + { + XML::Document doc(BEING_EFFECTS_FILE); + xmlNodePtr root = doc.rootNode(); + + if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) + { + logger->log("Error loading being effects file: " + BEING_EFFECTS_FILE); + return NULL; + } + + for_each_xml_child_node(node, root) + { + int id; + + if (xmlStrEqual(node->name, BAD_CAST "effect")) + { + EffectDescription *EffectDescription = + getEffectDescription(node, &id); + effects[id] = EffectDescription; + } else if (xmlStrEqual(node->name, BAD_CAST "default")) + { + EffectDescription *EffectDescription = + getEffectDescription(node, &id); + + if (default_effect) + delete default_effect; + + default_effect = EffectDescription; + } + } + + effects_initialized = true; + } // done initializing + + EffectDescription *ed = effects[effectId]; + + if (!ed) + return default_effect; + else + return ed; +} + +void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx) +{ + logger->log("Special effect #%d on %s", effectId, + getId() == player_node->getId() ? "self" : "other"); + + EffectDescription *ed = getEffectDescription(effectId); + + if (!ed) { + logger->log("Unknown special effect and no default recorded"); + return; + } + + if (gfx && ed->mGFXEffect != "") { + Particle *selfFX; + + selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0); + controlParticle(selfFX); + } + + if (sfx && ed->mSFXEffect != "") { + sound.playSfx(ed->mSFXEffect); + } +} diff --git a/src/being.h b/src/being.h index f196f66c..b7f85c63 100644 --- a/src/being.h +++ b/src/being.h @@ -25,7 +25,6 @@ #define _TMW_BEING_H #include -#include #include #include #include @@ -34,6 +33,8 @@ #include "map.h" #include "animatedsprite.h" +#include "gui/speechbubble.h" + #define NR_HAIR_STYLES 10 #define NR_HAIR_COLORS 16 @@ -47,7 +48,7 @@ class Map; class Graphics; class ImageSet; class Particle; -class Text; +class SpeechBubble; /** * A position along a being's path. @@ -116,20 +117,17 @@ class Being : public Sprite /** * Directions, to be used as bitmask values */ - static const char DOWN = 1; - static const char LEFT = 2; - static const char UP = 4; - static const char RIGHT = 8; + enum { DOWN = 1, LEFT = 2, UP = 4, RIGHT = 8 }; Uint16 mJob; /**< Job (player job, npc, monster, ) */ Uint16 mX, mY; /**< Tile coordinates */ - Uint8 mAction; /**< Action the being is performing */ - Uint8 mFrame; + Action mAction; /**< Action the being is performing */ + Uint16 mFrame; Uint16 mWalkTime; Uint8 mEmotion; /**< Currently showing emotion */ Uint8 mEmotionTime; /**< Time until emotion disappears */ - Uint16 mAttackSpeed; /**< Attack speed */ + Uint16 mAttackSpeed; /**< Attack speed */ /** * Constructor. @@ -165,8 +163,7 @@ class Being : public Sprite * * @param amount The amount of damage. */ - virtual void - takeDamage(int amount); + virtual void takeDamage(int amount); /** * Handles an attack of another being by this being. @@ -174,22 +171,19 @@ class Being : public Sprite * @param victim The attacked being. * @param damage The amount of damage dealt (0 means miss). */ - virtual void - handleAttack(Being *victim, int damage); + virtual void handleAttack(Being *victim, int damage); /** * Returns the name of the being. */ - const std::string& - getName() const { return mName; } + const std::string& getName() const { return mName; } /** * Sets the name for the being. * * @param name The name that should appear. */ - virtual void - setName(const std::string &name) { mName = name; } + virtual void setName(const std::string &name) { mName = name; } /** * Gets the hair color for this being. @@ -206,47 +200,44 @@ class Being : public Sprite /** * Sets the hair style and color for this being. */ - virtual void - setHairStyle(int style, int color); + virtual void setHairStyle(int style, int color); /** * Sets visible equipments for this being. */ - virtual void - setSprite(int slot, int id, std::string color = ""); + virtual void setSprite(int slot, int id, std::string color = ""); /** * Sets the gender of this being. */ - virtual void - setGender(int gender) { mGender = gender; } + virtual void setGender(int gender) { mGender = gender; } /** * Gets the gender of this being. */ - int - getGender() const { return mGender; } + int getGender() const { return mGender; } /** * Makes this being take the next step of his path. */ - virtual void - nextStep(); + virtual void nextStep(); - virtual void - setGM() { mIsGM = true; } + virtual void setGM() { mIsGM = true; } /** * Performs being logic. */ - virtual void - logic(); + virtual void logic(); + + /** + * Draws the speech text above the being. + */ + void drawSpeech(Graphics *graphics, int offsetX, int offsetY); /** * Draws the emotion picture above the being. */ - void - drawEmotion(Graphics *graphics, int offsetX, int offsetY); + void drawEmotion(Graphics *graphics, int offsetX, int offsetY); /** * Returns the type of the being. @@ -256,26 +247,22 @@ class Being : public Sprite /** * Gets the walk speed. */ - Uint16 - getWalkSpeed() const { return mWalkSpeed; } + Uint16 getWalkSpeed() const { return mWalkSpeed; } /** * Sets the walk speed. */ - void - setWalkSpeed(Uint16 speed) { mWalkSpeed = speed; } + void setWalkSpeed(Uint16 speed) { mWalkSpeed = speed; } /** * Gets the sprite id. */ - Uint32 - getId() const { return mId; } + Uint32 getId() const { return mId; } /** * Sets the sprite id. */ - void - setId(Uint32 id) { mId = id; } + void setId(Uint32 id) { mId = id; } /** * Sets the map the being is on @@ -285,8 +272,7 @@ class Being : public Sprite /** * Sets the current action. */ - virtual void - setAction(Uint8 action); + virtual void setAction(Action action); /** * Returns the current direction. @@ -298,51 +284,54 @@ class Being : public Sprite */ void setDirection(Uint8 direction); + /** + * Gets the current action. + */ + int getWalkTime() { return mWalkTime; } + + /** + * Returns the direction the being is facing. + */ + SpriteDirection getSpriteDirection() const; + /** * Draws this being to the given graphics context. * * @see Sprite::draw(Graphics, int, int) */ - virtual void - draw(Graphics *graphics, int offsetX, int offsetY) const; + virtual void draw(Graphics *graphics, int offsetX, int offsetY) const; /** * Returns the pixel X coordinate. */ - int - getPixelX() const { return mPx; } + int getPixelX() const { return mPx; } /** * Returns the pixel Y coordinate. * * @see Sprite::getPixelY() */ - int - getPixelY() const { return mPy; } + int getPixelY() const { return mPy; } /** * Get the current X pixel offset. */ - int - getXOffset() const { return getOffset(LEFT, RIGHT); } + int getXOffset() const { return getOffset(LEFT, RIGHT); } /** * Get the current Y pixel offset. */ - int - getYOffset() const { return getOffset(UP, DOWN); } + int getYOffset() const { return getOffset(UP, DOWN); } /** * Returns the horizontal size of the current base sprite of the being */ - virtual int - getWidth() const; + virtual int getWidth() const; /** * Returns the vertical size of the current base sprite of the being */ - virtual int - getHeight() const; + virtual int getHeight() const; /** * Returns the required size of a target cursor for this being. @@ -361,6 +350,15 @@ class Being : public Sprite mEmotionTime = emote_time; } + /** + * Triggers a visual effect, such as `level up' + * + * Only draws the visual effect, does not play sound effects + * + * \param effectId ID of the effect to trigger + */ + virtual void triggerEffect(int effectId) { internalTriggerEffect(effectId, false, true); } + const std::auto_ptr mEquipment; protected: @@ -375,9 +373,13 @@ class Being : public Sprite virtual void updateCoords() {} /** - * Returns the sprite direction of this being. + * Trigger visual effect, with components + * + * \param effectId ID of the effect to trigger + * \param sfx Whether to trigger sound effects + * \param gfx Whether to trigger graphical effects */ - SpriteDirection getSpriteDirection() const; + void internalTriggerEffect(int effectId, bool sfx, bool gfx); Uint32 mId; /**< Unique sprite id */ Uint16 mWalkSpeed; /**< Walking speed */ @@ -391,7 +393,7 @@ class Being : public Sprite const ItemInfo* mEquippedWeapon; Path mPath; - Text *mSpeech; + std::string mSpeech; Uint16 mHairStyle, mHairColor; Uint8 mGender; Uint32 mSpeechTime; @@ -409,6 +411,9 @@ class Being : public Sprite */ int getOffset(char pos, char neg) const; + // Speech Bubble components + SpeechBubble *mSpeechBubble; + static int instances; /**< Number of Being instances */ static ImageSet *emotionSet; /**< Emoticons used by beings */ }; diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index 47729a92..f0ce9bd3 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -21,7 +21,7 @@ * $Id: beingmanager.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ -#include +#include #include "beingmanager.h" @@ -124,7 +124,7 @@ Being* BeingManager::findBeing(Uint16 x, Uint16 y, Being::Type type) return (i == mBeings.end()) ? NULL : *i; } -/*Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y) +Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y) { BeingIterator itr = mBeings.begin(); BeingIterator itr_end = mBeings.end(); @@ -144,7 +144,7 @@ Being* BeingManager::findBeing(Uint16 x, Uint16 y, Being::Type type) } return NULL; -}*/ +} Being* BeingManager::findBeingByName(std::string name, Being::Type type) { @@ -159,8 +159,6 @@ Being* BeingManager::findBeingByName(std::string name, Being::Type type) return NULL; } - - Beings& BeingManager::getAll() { return mBeings; @@ -193,7 +191,7 @@ void BeingManager::clear() mBeings.remove(player_node); } - for_each(mBeings.begin(), mBeings.end(), make_dtor(mBeings)); + delete_all(mBeings); mBeings.clear(); if (player_node) @@ -208,9 +206,12 @@ Being* BeingManager::findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist, Being *closestBeing = NULL; int dist = 0; - for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++) + BeingIterator itr = mBeings.begin(); + BeingIterator itr_end = mBeings.end(); + + for (; itr != itr_end; ++itr) { - Being *being = (*i); + Being *being = (*itr); int d = abs(being->mX - x) + abs(being->mY - y); if ((being->getType() == type || type == Being::UNKNOWN) diff --git a/src/beingmanager.h b/src/beingmanager.h index f8391855..6942ff54 100644 --- a/src/beingmanager.h +++ b/src/beingmanager.h @@ -51,7 +51,7 @@ class BeingManager /** * Create a being and add it to the list of beings. */ - Being* createBeing(Uint32 id, Uint16 job); + Being *createBeing(Uint32 id, Uint16 job); /** * Remove a Being. @@ -62,33 +62,36 @@ class BeingManager * Return a specific id Being. */ Being* findBeing(Uint32 id); + Being* findBeingByPixel(Uint16 x, Uint16 y); /** - * Return a being at specific coordinates. + * Returns a being at specific coordinates. */ Being* findBeing(Uint16 x, Uint16 y, Being::Type type = Being::UNKNOWN); - //Being* findBeingByPixel(Uint16 x, Uint16 y); - /** - * Return a being nearest to specific coordinates. - * - * \param maxdist maximal distance. If minimal distance is larger, - * no being is returned - */ + /** + * Returns a being nearest to specific coordinates. + * + * @param x X coordinate. + * @param y Y coordinate. + * @param maxdist Maximal distance. If minimal distance is larger, + * no being is returned. + * @param type The type of being to look for. + */ Being* findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist, Being::Type type = Being::UNKNOWN); - /** - * Finds a being by name and (optionally) by type. - */ + /** + * Finds a being by name and (optionally) by type. + */ Being* findBeingByName(std::string name, Being::Type type = Being::UNKNOWN); - /** - * Return a being nearest to another being. - * - * \param maxdist maximal distance. If minimal distance is larger, - * no being is returned - */ + /** + * Returns a being nearest to another being. + * + * \param maxdist maximal distance. If minimal distance is larger, + * no being is returned + */ Being* findNearestLivingBeing(Being *aroundBeing, int maxdist, Being::Type type = Being::UNKNOWN); diff --git a/src/engine.cpp b/src/engine.cpp index d1912b0d..42054ffb 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -96,6 +96,17 @@ void Engine::changeMap(const std::string &mapPath) if (newMap->hasProperty("minimap")) { mapImage = resman->getImage(newMap->getProperty("minimap")); + + // Set the title for the Minimap + if (newMap->hasProperty("mapname")) + { + minimap->setCaption(newMap->getProperty("mapname")); + } + else + { + minimap->setCaption("Unknown"); + logger->log("WARNING: Map file '%s' defines a minimap image but does not define a 'mapname' property", map_path.c_str()); + } } minimap->setMapImage(mapImage); beingManager->setMap(newMap); @@ -120,6 +131,7 @@ void Engine::changeMap(const std::string &mapPath) } mCurrentMap = newMap; + mMapName = mapPath; // Send "map loaded" MessageOut outMsg(mNetwork); diff --git a/src/engine.h b/src/engine.h index ed76a595..52f1e63a 100644 --- a/src/engine.h +++ b/src/engine.h @@ -18,13 +18,14 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: engine.h 4000 2008-03-23 11:47:52Z b_lindeijer $ + * $Id$ */ #ifndef _ENGINE_H #define _ENGINE_H #include +#include class Map; class Network; @@ -51,6 +52,9 @@ class Engine */ Map *getCurrentMap() { return mCurrentMap; } + const std::string &getCurrentMapName() { return mMapName; } + + /** * Sets the currently active map. */ @@ -64,6 +68,7 @@ class Engine private: Map *mCurrentMap; Network *mNetwork; + std::string mMapName; }; extern Engine *engine; diff --git a/src/equipment.cpp b/src/equipment.cpp index 08e6fad1..491aff0c 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -41,12 +41,10 @@ Equipment::removeEquipment(Item *item) if (i != mEquipment + EQUIPMENT_SIZE) { *i = 0; } - item->setEquipped(false); } void Equipment::removeEquipment(int index) { - mEquipment[index]->setEquipped(false); mEquipment[index] = 0; } diff --git a/src/equipment.h b/src/equipment.h index fd7a9c1e..e497a156 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -24,6 +24,8 @@ #ifndef _TMW_EQUIPMENT_H_ #define _TMW_EQUIPMENT_H_ +#include + class Item; #define EQUIPMENT_SIZE 10 diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp index f6ad3442..fe64779b 100644 --- a/src/flooritemmanager.cpp +++ b/src/flooritemmanager.cpp @@ -21,8 +21,6 @@ * $Id: flooritemmanager.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ -#include - #include "flooritemmanager.h" #include "floor_item.h" @@ -50,7 +48,7 @@ void FloorItemManager::destroy(FloorItem *item) void FloorItemManager::clear() { - for_each(mFloorItems.begin(), mFloorItems.end(), make_dtor(mFloorItems)); + delete_all(mFloorItems); mFloorItems.clear(); } diff --git a/src/game.cpp b/src/game.cpp index 0562b75e..5e7ee1e8 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -68,6 +68,7 @@ #include "gui/status.h" #include "gui/trade.h" #include "gui/viewport.h" + #include "net/protocol.h" #include "net/beinghandler.h" #include "net/buysellhandler.h" @@ -132,19 +133,19 @@ Particle* particleEngine = NULL; const int MAX_TIME = 10000; /** - * Listener used for exitting handling. + * Listener used for exiting handling. */ namespace { struct ExitListener : public gcn::ActionListener { - void action(const gcn::ActionEvent &event) - { - if (event.getId() == "yes" || event.getId() == "ok") { - done = true; + void action(const gcn::ActionEvent &event) + { + if (event.getId() == "yes" || event.getId() == "ok") { + done = true; + } + exitConfirm = NULL; + disconnectedDialog = NULL; } - exitConfirm = NULL; - disconnectedDialog = NULL; - } } exitListener; } @@ -171,11 +172,13 @@ Uint32 nextSecond(Uint32 interval, void *param) int get_elapsed_time(int start_time) { - if (start_time <= tick_time) { - return (tick_time - start_time) * 10; + if (start_time <= tick_time) + { + return (tick_time - start_time) * 10; } - else { - return (tick_time + (MAX_TIME - start_time)) * 10; + else + { + return (tick_time + (MAX_TIME - start_time)) * 10; } } @@ -218,8 +221,9 @@ void createGuiWindows(Network *network) chatWindow->setVisible((bool) config.getValue( chatWindow->getWindowName() + "Visible", true)); miniStatusWindow->setVisible((bool) config.getValue( - miniStatusWindow->getWindowName() + "Visible", - true)); + miniStatusWindow->getWindowName() + "Visible", true)); + buyDialog->setVisible(false); + sellDialog->setVisible(false); menuWindow->setVisible((bool) config.getValue( menuWindow->getWindowName() + "Visible", true)); itemShortcutWindow->setVisible((bool) config.getValue( @@ -227,7 +231,7 @@ void createGuiWindows(Network *network) if (config.getValue("logToChat", 0)) { - logger->setChatWindow(chatWindow); + logger->setChatWindow(chatWindow); } } @@ -369,15 +373,15 @@ bool saveScreenshot(SDL_Surface *screenshot) if (ImageWriter::writePNG(screenshot, filename.str())) { - std::stringstream chatlogentry; - chatlogentry << "Screenshot saved to " << filename.str().c_str(); - chatWindow->chatLog(chatlogentry.str(), BY_SERVER); - return true; + std::stringstream chatlogentry; + chatlogentry << "Screenshot saved to " << filename.str().c_str(); + chatWindow->chatLog(chatlogentry.str(), BY_SERVER); + return true; } else { - chatWindow->chatLog("Saving screenshot failed!", BY_SERVER); - return false; + chatWindow->chatLog("Saving screenshot failed!", BY_SERVER); + return false; } } @@ -420,18 +424,18 @@ void Game::logic() if (!mMinFrameTime || get_elapsed_time(mDrawTime / 10) > mMinFrameTime) { - frame++; - gui->draw(); - graphics->updateScreen(); - mDrawTime += mMinFrameTime; - - // Make sure to wrap mDrawTime, since tick_time will wrap. - if (mDrawTime > MAX_TIME * 10) - mDrawTime -= MAX_TIME * 10; + frame++; + gui->draw(); + graphics->updateScreen(); + mDrawTime += mMinFrameTime; + + // Make sure to wrap mDrawTime, since tick_time will wrap. + if (mDrawTime > MAX_TIME * 10) + mDrawTime -= MAX_TIME * 10; } else { - SDL_Delay(10); + SDL_Delay(10); } } else @@ -448,12 +452,11 @@ void Game::logic() { if (!disconnectedDialog) { - disconnectedDialog = new - OkDialog("Network Error", - "The connection to the server was lost, the " - "program will now quit"); - disconnectedDialog->addActionListener(&exitListener); - disconnectedDialog->requestMoveToTop(); + disconnectedDialog = new + OkDialog("Network Error", + "The connection to the server was lost, the program will now quit"); + disconnectedDialog->addActionListener(&exitListener); + disconnectedDialog->requestMoveToTop(); } } } @@ -463,273 +466,268 @@ void Game::handleInput() { if (joystick != NULL) { - joystick->update(); + joystick->update(); } // Events SDL_Event event; while (SDL_PollEvent(&event)) { - bool used = false; - - // Keyboard events (for discontinuous keys) - if (event.type == SDL_KEYDOWN) - { - gcn::Window *requestedWindow = NULL; + bool used = false; - if (setupWindow->isVisible() && - keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE) + // Keyboard events (for discontinuous keys) + if (event.type == SDL_KEYDOWN) { - keyboard.setNewKey((int) event.key.keysym.sym); - keyboard.callbackNewKey(); - keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE); - return; - } - // Keys pressed together with Alt/Meta - // Emotions and some internal gui windows - #ifndef __APPLE__ - if (event.key.keysym.mod & KMOD_ALT) - #else - if (event.key.keysym.mod & KMOD_LMETA) - #endif - { - switch (event.key.keysym.sym) - { - case SDLK_p: - // Screenshot (picture, hence the p) + gcn::Window *requestedWindow = NULL; + + if (setupWindow->isVisible() && + keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE) { - SDL_Surface *screenshot = - graphics->getScreenshot(); - if (!saveScreenshot(screenshot)) - { - logger-> - log("Error: could not save Screenshot."); - } - SDL_FreeSurface(screenshot); + keyboard.setNewKey((int) event.key.keysym.sym); + keyboard.callbackNewKey(); + keyboard.setNewKeyIndex(keyboard.KEY_NO_VALUE); + return; } - used = true; - break; - - default: - break; - - case SDLK_f: - // Find path to mouse (debug purpose) - viewport->toggleDebugPath(); - used = true; - break; - - case SDLK_t: - // Toggle accepting of incoming trade requests + // Keys pressed together with Alt/Meta + // Emotions and some internal gui windows + #ifndef __APPLE__ + if (event.key.keysym.mod & KMOD_ALT) + #else + if (event.key.keysym.mod & KMOD_LMETA) + #endif { - unsigned int deflt = player_relations.getDefault(); - if (deflt & PlayerRelation::TRADE) { - chatWindow-> - chatLog("Ignoring incoming trade requests", - BY_SERVER); - deflt &= ~PlayerRelation::TRADE; - } else { - chatWindow->chatLog("Accepting incoming trade " - "requests", BY_SERVER); - deflt |= PlayerRelation::TRADE; - } - - player_relations.setDefault(deflt); + switch (event.key.keysym.sym) + { + case SDLK_p: + // Screenshot (picture, hence the p) + { + SDL_Surface *screenshot = graphics->getScreenshot(); + if (!saveScreenshot(screenshot)) + { + logger->log("Error: could not save Screenshot."); + } + SDL_FreeSurface(screenshot); + } + used = true; + break; + + default: + break; + + case SDLK_f: + // Find path to mouse (debug purpose) + viewport->toggleDebugPath(); + used = true; + break; + + case SDLK_t: + // Toggle accepting of incoming trade requests + { + unsigned int deflt = player_relations.getDefault(); + if (deflt & PlayerRelation::TRADE) { + chatWindow->chatLog("Ignoring incoming trade requests", BY_SERVER); + deflt &= ~PlayerRelation::TRADE; + } else { + chatWindow->chatLog("Accepting incoming trade requests", BY_SERVER); + deflt |= PlayerRelation::TRADE; + } + + player_relations.setDefault(deflt); + } + used = true; + break; } - used = true; - break; - } - - // Emotions - Uint8 emotion; - switch (event.key.keysym.sym) - { - case SDLK_1: emotion = 1; break; - case SDLK_2: emotion = 2; break; - case SDLK_3: emotion = 3; break; - case SDLK_4: emotion = 4; break; - case SDLK_5: emotion = 5; break; - case SDLK_6: emotion = 6; break; - case SDLK_7: emotion = 7; break; - case SDLK_8: emotion = 8; break; - case SDLK_9: emotion = 9; break; - case SDLK_0: emotion = 10; break; - case SDLK_MINUS: emotion = 11; break; - case SDLK_EQUALS: emotion = 12; break; - default: emotion = 0; break; } - if (emotion) - { - player_node->emote(emotion); - used = true; - } - } - switch (event.key.keysym.sym) + // Smilie + if (keyboard.isKeyActive(keyboard.KEY_SMILIE)) { - case SDLK_PAGEUP: - if (chatWindow->isVisible()) + // Emotions + Uint8 emotion; + switch (event.key.keysym.sym) { - chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL); - used = true; + case SDLK_1: emotion = 1; break; + case SDLK_2: emotion = 2; break; + case SDLK_3: emotion = 3; break; + case SDLK_4: emotion = 4; break; + case SDLK_5: emotion = 5; break; + case SDLK_6: emotion = 6; break; + case SDLK_7: emotion = 7; break; + case SDLK_8: emotion = 8; break; + case SDLK_9: emotion = 9; break; + case SDLK_0: emotion = 10; break; + case SDLK_MINUS: emotion = 11; break; + case SDLK_EQUALS: emotion = 12; break; + default: emotion = 0; break; } - break; - case SDLK_PAGEDOWN: - if (chatWindow->isVisible()) + if (emotion) { - chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL); - used = true; + player_node->emote(emotion); + used = true; } - break; + } + switch (event.key.keysym.sym) + { + case SDLK_PAGEUP: + if (chatWindow->isVisible()) + { + chatWindow->scroll(-DEFAULT_CHAT_WINDOW_SCROLL); + used = true; + } + break; - case SDLK_F1: - // In-game Help - if (helpWindow->isVisible()) - { - helpWindow->setVisible(false); - } - else - { - helpWindow->loadHelp("index"); - helpWindow->requestMoveToTop(); - } - used = true; - break; + case SDLK_PAGEDOWN: + if (chatWindow->isVisible()) + { + chatWindow->scroll(DEFAULT_CHAT_WINDOW_SCROLL); + used = true; + } + break; - case SDLK_F2: requestedWindow = statusWindow; break; - case SDLK_F3: requestedWindow = inventoryWindow; break; - case SDLK_F4: requestedWindow = equipmentWindow; break; - case SDLK_F5: requestedWindow = skillDialog; break; - case SDLK_F6: requestedWindow = minimap; break; - case SDLK_F7: requestedWindow = chatWindow; break; - case SDLK_F8: requestedWindow = itemShortcutWindow; break; - case SDLK_F9: requestedWindow = setupWindow; break; - case SDLK_F10: requestedWindow = debugWindow; break; - //case SDLK_F11: requestedWindow = newSkillWindow; break; - - case SDLK_RETURN: - // Input chat window - if (chatWindow->isInputFocused() || - deathNotice != NULL || - weightNotice != NULL) - { - break; - } + case SDLK_F1: + // In-game Help + if (helpWindow->isVisible()) + { + helpWindow->setVisible(false); + } + else + { + helpWindow->loadHelp("index"); + helpWindow->requestMoveToTop(); + } + used = true; + break; + + case SDLK_F2: requestedWindow = statusWindow; break; + case SDLK_F3: requestedWindow = inventoryWindow; break; + case SDLK_F4: requestedWindow = equipmentWindow; break; + case SDLK_F5: requestedWindow = skillDialog; break; + case SDLK_F6: requestedWindow = minimap; break; + case SDLK_F7: requestedWindow = chatWindow; break; + case SDLK_F8: requestedWindow = itemShortcutWindow; break; + case SDLK_F9: requestedWindow = setupWindow; break; + case SDLK_F10: requestedWindow = debugWindow; break; + //case SDLK_F11: requestedWindow = newSkillWindow; break; + + case SDLK_RETURN: + // Input chat window + if (chatWindow->isInputFocused() || + deathNotice != NULL || + weightNotice != NULL) + { + break; + } - // Quit by pressing Enter if the exit confirm is there - if (exitConfirm) - { - done = true; - } - // Close the Browser if opened - else if (helpWindow->isVisible()) - { - helpWindow->setVisible(false); - } - // Close the config window, cancelling changes if opened - else if (setupWindow->isVisible()) - { - setupWindow->action(gcn::ActionEvent(NULL, "cancel")); - } - // Else, open the chat edit box - else - { - chatWindow->requestChatFocus(); - used = true; - } - break; - // Quitting confirmation dialog - case SDLK_ESCAPE: - if (!exitConfirm) { - exitConfirm = new ConfirmDialog( - "Quit", "Are you sure you want to quit?"); - exitConfirm->addActionListener(&exitListener); - exitConfirm->requestMoveToTop(); - } - else - { - exitConfirm->action(gcn::ActionEvent(NULL, "no")); - } - break; + // Quit by pressing Enter if the exit confirm is there + if (exitConfirm) + { + done = true; + } + // Close the Browser if opened + else if (helpWindow->isVisible()) + { + helpWindow->setVisible(false); + } + // Close the config window, cancelling changes if opened + else if (setupWindow->isVisible()) + { + setupWindow->action(gcn::ActionEvent(NULL, "cancel")); + } + // Else, open the chat edit box + else + { + chatWindow->requestChatFocus(); + used = true; + } + break; + // Quitting confirmation dialog + case SDLK_ESCAPE: + if (!exitConfirm) { + exitConfirm = new ConfirmDialog( + "Quit", "Are you sure you want to quit?"); + exitConfirm->addActionListener(&exitListener); + exitConfirm->requestMoveToTop(); + } + else + { + exitConfirm->action(gcn::ActionEvent(NULL, "no")); + } + break; - default: - break; + default: + break; } if (keyboard.isEnabled() && !chatWindow->isInputFocused()) { - const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); - // Checks if any item shortcut is pressed. - for (int i = KeyboardConfig::KEY_SHORTCUT_0; - i <= KeyboardConfig::KEY_SHORTCUT_9; - i++) - { - if (tKey == i && !used) { - itemShortcut->useItem( - i - KeyboardConfig::KEY_SHORTCUT_0); - break; + const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); + // Checks if any item shortcut is pressed. + for (int i = KeyboardConfig::KEY_SHORTCUT_0; + i <= KeyboardConfig::KEY_SHORTCUT_9; + i++) + { + if (tKey == i && !used) { + itemShortcut->useItem(i - KeyboardConfig::KEY_SHORTCUT_0); + break; } } switch (tKey) { case KeyboardConfig::KEY_PICKUP: { - FloorItem *item = - floorItemManager->findByCoordinates( - player_node->mX, player_node->mY); + FloorItem *item = floorItemManager->findByCoordinates( + player_node->mX, player_node->mY); // If none below the player, try the tile in front // of the player if (!item) { - Uint16 x = player_node->mX; - Uint16 y = player_node->mY; - if (player_node->getDirection() & Being::UP) - y--; - if (player_node->getDirection() & Being::DOWN) - y++; - if (player_node->getDirection() & Being::LEFT) - x--; - if (player_node->getDirection() & Being::RIGHT) - x++; - - item = floorItemManager-> - findByCoordinates(x, y); + Uint16 x = player_node->mX; + Uint16 y = player_node->mY; + switch (player_node->getSpriteDirection()) + { + case DIRECTION_UP : --y; break; + case DIRECTION_DOWN : ++y; break; + case DIRECTION_LEFT : --x; break; + case DIRECTION_RIGHT: ++x; break; + default: break; + } + item = floorItemManager->findByCoordinates(x, y); } if (item) - player_node->pickUp(item); + player_node->pickUp(item); used = true; } break; case KeyboardConfig::KEY_SIT: - // Player sit action - player_node->toggleSit(); - used = true; - break; + // Player sit action + player_node->toggleSit(); + used = true; + break; case KeyboardConfig::KEY_HIDE_WINDOWS: - // Hide certain windows - if (!chatWindow->isInputFocused()) - { - statusWindow->setVisible(false); - inventoryWindow->setVisible(false); - skillDialog->setVisible(false); - setupWindow->setVisible(false); - equipmentWindow->setVisible(false); - helpWindow->setVisible(false); - debugWindow->setVisible(false); + // Hide certain windows + if (!chatWindow->isInputFocused()) + { + statusWindow->setVisible(false); + inventoryWindow->setVisible(false); + skillDialog->setVisible(false); + setupWindow->setVisible(false); + equipmentWindow->setVisible(false); + helpWindow->setVisible(false); + debugWindow->setVisible(false); + } + break; } - break; - } } if (requestedWindow) { - requestedWindow->setVisible(!requestedWindow->isVisible()); - if (requestedWindow->isVisible()) - { - requestedWindow->requestMoveToTop(); - } - used = true; + requestedWindow->setVisible(!requestedWindow->isVisible()); + if (requestedWindow->isVisible()) + { + requestedWindow->requestMoveToTop(); + } + used = true; } } @@ -745,12 +743,12 @@ void Game::handleInput() { try { - guiInput->pushInput(event); + guiInput->pushInput(event); } catch (gcn::Exception e) { - const char* err = e.getMessage().c_str(); - logger->log("Warning: guichan input exception: %s", err); + const char* err = e.getMessage().c_str(); + logger->log("Warning: guichan input exception: %s", err); } } @@ -762,112 +760,106 @@ void Game::handleInput() } // Moving player around if (player_node->mAction != Being::DEAD && - current_npc == 0 && - !chatWindow->isInputFocused()) + current_npc == 0 && + !chatWindow->isInputFocused()) { - // Get the state of the keyboard keys - keyboard.refreshActiveKeys(); + // Get the state of the keyboard keys + keyboard.refreshActiveKeys(); - const Uint16 x = player_node->mX; - const Uint16 y = player_node->mY; - unsigned char direction = 0; + const Uint16 x = player_node->mX; + const Uint16 y = player_node->mY; + unsigned char direction = 0; - // Translate pressed keys to movement and direction - if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) || - (joystick && joystick->isUp())) - { - direction |= Being::UP; - } - else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) || - (joystick && joystick->isDown())) - { - direction |= Being::DOWN; - } + // Translate pressed keys to movement and direction + if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) || + (joystick && joystick->isUp())) + { + direction |= Being::UP; + } + else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) || + (joystick && joystick->isDown())) + { + direction |= Being::DOWN; + } - if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) || - (joystick && joystick->isLeft())) - { - direction |= Being::LEFT; - } - else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) || - (joystick && joystick->isRight())) - { - direction |= Being::RIGHT; - } + if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) || + (joystick && joystick->isLeft())) + { + direction |= Being::LEFT; + } + else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) || + (joystick && joystick->isRight())) + { + direction |= Being::RIGHT; + } - player_node->setWalkingDir(direction); + player_node->setWalkingDir(direction); - // Attacking monsters - if (keyboard.isKeyActive(keyboard.KEY_ATTACK) || - (joystick && joystick->buttonPressed(0))) - { - Being *target = NULL; - bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET); - // A set target has highest priority - if (newTarget || !player_node->getTarget()) + // Attacking monsters + if (keyboard.isKeyActive(keyboard.KEY_ATTACK) || + (joystick && joystick->buttonPressed(0))) { - Uint16 targetX = x, targetY = y; - - if (player_node->getDirection() & Being::UP) - targetY--; - if (player_node->getDirection() & Being::DOWN) - targetY++; - if (player_node->getDirection() & Being::LEFT) - targetX--; - if (player_node->getDirection() & Being::RIGHT) - targetX++; - - // Attack priorioty is: Monster, Player, auto target - target = beingManager->findBeing( - targetX, targetY, Being::MONSTER); - if (!target) - target = beingManager->findBeing( - targetX, targetY, Being::PLAYER); - } + Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER); - player_node->attack(target, newTarget); - } + bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET); + // A set target has highest priority + if (newTarget || !player_node->getTarget()) + { + Uint16 targetX = x, targetY = y; - // Target the nearest player if 'q' is pressed - if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) ) - //if (keys[SDLK_q]) - { - Being *target = - beingManager-> - findNearestLivingBeing(player_node, 20, Being::PLAYER); + switch (player_node->getSpriteDirection()) + { + case DIRECTION_UP : --targetY; break; + case DIRECTION_DOWN : ++targetY; break; + case DIRECTION_LEFT : --targetX; break; + case DIRECTION_RIGHT: ++targetX; break; + default: break; + } - if (target) - { - player_node->setTarget(target); - } - } + // Attack priorioty is: Monster, Player, auto target + target = beingManager->findBeing(targetX, targetY, Being::MONSTER); + if (!target) + target = beingManager->findBeing(targetX, targetY, Being::PLAYER); + } - // Target the nearest monster if 'a' pressed - if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) ) - //if (keys[SDLK_a]) - { - Being *target = - beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER); + player_node->attack(target, newTarget); + } - if (target) + // Target the nearest player if 'q' is pressed + if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) ) { - player_node->setTarget(target); + Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER); + + if (target) + { + player_node->setTarget(target); + } } - } - if (joystick) - { - if (joystick->buttonPressed(1)) + // Target the nearest monster if 'a' pressed + if ( keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) ) { - FloorItem *item = floorItemManager->findByCoordinates(x, y); + Being *target = beingManager->findNearestLivingBeing(x, y, 20, Being::MONSTER); - if (item) - player_node->pickUp(item); + if (target) + { + player_node->setTarget(target); + } } - else if (joystick->buttonPressed(2)) + + if (joystick) { - player_node->toggleSit(); + if (joystick->buttonPressed(1)) + { + FloorItem *item = floorItemManager->findByCoordinates(x, y); + + if (item) + player_node->pickUp(item); + } + else if (joystick->buttonPressed(2)) + { + player_node->toggleSit(); + } } } - } } diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 9c562b68..8ec3bfd8 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -102,7 +102,7 @@ Setup::Setup(): Setup::~Setup() { - for_each(mTabs.begin(), mTabs.end(), make_dtor(mTabs)); + delete_all(mTabs); } void Setup::action(const gcn::ActionEvent &event) diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 0e85138c..dd56ee2f 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -280,15 +280,17 @@ void Setup_Video::apply() bool fullscreen = mFsCheckBox->isSelected(); if (fullscreen != (config.getValue("screen", 0) == 1)) { + + /* Commented out the openGL test because + * the fullscreen mode change works fine, but + * will need to test it on windows so not + * deleting entirely until then --kraant*/ - /*Commented out the openGL test because - * the fullscreen mode change works fine, but - * will need to test it on windows so not - * deleting entirely until then --kraant*/ - +#ifdef WIN32 // checks for opengl usage - /*if (!(config.getValue("opengl", 0) == 1)) - {*/ + if (!(config.getValue("opengl", 0) == 1)) + { +#endif if (!graphics->setFullscreen(fullscreen)) { fullscreen = !fullscreen; @@ -302,10 +304,12 @@ void Setup_Video::apply() logger->error(error.str()); } } - /*} else { +#ifdef WIN32 + } else { new OkDialog("Switching to full screen", "Restart needed for changes to take effect."); - }*/ + } +#endif config.setValue("screen", fullscreen ? 1 : 0); } diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index 015e70d5..e7619547 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -25,8 +25,6 @@ #include "../utils/dtor.h" -#include - ShopItems::~ShopItems() { clear(); @@ -61,7 +59,7 @@ ShopItem* ShopItems::at(int i) const void ShopItems::clear() { - std::for_each(mShopItems.begin(), mShopItems.end(), make_dtor(mShopItems)); + delete_all(mShopItems); mShopItems.clear(); } diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp index e70fb3ef..8cf1e06d 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -21,8 +21,6 @@ * $Id: skill.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ -#include - #include #include "skill.h" @@ -186,6 +184,6 @@ void SkillDialog::setSkill(int id, int lvl, int mp) void SkillDialog::cleanList() { - for_each(mSkillList.begin(), mSkillList.end(), make_dtor(mSkillList)); + delete_all(mSkillList); mSkillList.clear(); } diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp index 743d88b6..4976549f 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -60,6 +60,8 @@ void TextBox::setTextWrapped(const std::string &text) text.substr(lastNewlinePos, newlinePos - lastNewlinePos); std::string::size_type spacePos, lastSpacePos = 0; int xpos = 0; + mMinWidth = getWidth(); + bool longWord = false; do { @@ -75,22 +77,28 @@ void TextBox::setTextWrapped(const std::string &text) int width = getFont()->getWidth(word); - if (xpos != 0 && xpos + width < getWidth()) + if (xpos != 0 && xpos + width + getFont()->getWidth(" ") < getWidth()) { xpos += width + getFont()->getWidth(" "); wrappedStream << " " << word; } else if (lastSpacePos == 0) { + if (xpos > mMinWidth) + { + longWord = true; + mMinWidth = xpos; + } xpos += width; wrappedStream << word; } else { + if ((xpos < mMinWidth) && !longWord && spacePos != line.size()) + mMinWidth = xpos; xpos = width; wrappedStream << "\n" << word; } - lastSpacePos = spacePos + 1; } while (spacePos != line.size()); diff --git a/src/gui/textbox.h b/src/gui/textbox.h index 7df30fd9..09819360 100644 --- a/src/gui/textbox.h +++ b/src/gui/textbox.h @@ -44,6 +44,19 @@ class TextBox : public gcn::TextBox { * Sets the text after wrapping it to the current width of the widget. */ void setTextWrapped(const std::string &text); + + /** + * Get the minimum text width for the text box. + */ + int getMinWidth() { return mMinWidth; } + + /** + * Set the minimum text width for the text box. + */ + void setMinWidth(int width) { mMinWidth = width; } + + private: + int mMinWidth; }; #endif diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 22e361c5..b052e4b6 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -115,7 +115,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost, mBrowserBox = new BrowserBox(); mScrollArea = new ScrollArea(mBrowserBox); mLabel = new gcn::Label("Connecting..."); - mProgressBar = new ProgressBar(0.0, w - 10, 20, 37, 70, 200); + mProgressBar = new ProgressBar(0.0, w - 10, 20, 168, 116, 31); mCancelButton = new Button("Cancel", "cancel", this); mPlayButton = new Button("Play", "play", this); diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 568c1ea3..95e0d2b6 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -33,6 +33,7 @@ #include "../configuration.h" #include "../flooritemmanager.h" #include "../graphics.h" +#include "../keyboardconfig.h" #include "../localplayer.h" #include "../map.h" #include "../monster.h" @@ -49,6 +50,8 @@ #include +extern volatile int tick_time; + Viewport::Viewport(): mMap(0), mPixelViewX(0.0f), @@ -112,7 +115,8 @@ Viewport::loadTargetCursor(std::string filename, int width, int height, mOutRangeImages[size] = currentImageSet; mTargetCursorOutRange[size] = currentCursor; } - else { + else + { mInRangeImages[size] = currentImageSet; mTargetCursorInRange[size] = currentCursor; } @@ -223,52 +227,46 @@ Viewport::draw(gcn::Graphics *gcnGraphics) // Draw tiles and sprites if (mMap) { - mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY, 0); - drawTargetCursor(graphics); - mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY, 1); - mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY, 2); - mMap->drawOverlay(graphics, mPixelViewX, mPixelViewY, - (int) config.getValue("OverlayDetail", 2)); - } + mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY); + drawTargetCursor(graphics); // TODO: Draw the cursor with the sprite - // Find a path from the player to the mouse, and draw it. This is for debug - // purposes. - if (mShowDebugPath && mMap) - { - // Get the current mouse position - int mouseX, mouseY; - SDL_GetMouseState(&mouseX, &mouseY); - int mouseTileX = mouseX / 32 + mTileViewX; - int mouseTileY = mouseY / 32 + mTileViewY; + // Find a path from the player to the mouse, and draw it. This is for debug + // purposes. + if (mShowDebugPath) + { + // Get the current mouse position + int mouseX, mouseY; + SDL_GetMouseState(&mouseX, &mouseY); - Path debugPath = mMap->findPath( - player_node->mX, player_node->mY, - mouseTileX, mouseTileY); + int mouseTileX = mouseX / 32 + mTileViewX; + int mouseTileY = mouseY / 32 + mTileViewY; - graphics->setColor(gcn::Color(255, 0, 0)); - for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++) - { - int squareX = i->x * 32 - (int) mPixelViewX + 12; - int squareY = i->y * 32 - (int) mPixelViewY + 12; + Path debugPath = mMap->findPath(player_node->mX, player_node->mY, mouseTileX, mouseTileY); - graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8)); - graphics->drawText( - toString(mMap->getMetaTile(i->x, i->y)->Gcost), - squareX + 4, squareY + 12, gcn::Graphics::CENTER); + graphics->setColor(gcn::Color(255, 0, 0)); + for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++) + { + int squareX = i->x * 32 - (int) mPixelViewX + 12; + int squareY = i->y * 32 - (int) mPixelViewY + 12; + + graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8)); + graphics->drawText(toString(mMap->getMetaTile(i->x, i->y)->Gcost), squareX + 4, squareY + 12, gcn::Graphics::CENTER); + } } } - // Draw text + // Draw names if (textManager) { textManager->draw(graphics, mPixelViewX, mPixelViewY); } - // Draw player nickname, speech, and emotion sprite as needed + // Draw player speech, and emotion sprite as needed Beings &beings = beingManager->getAll(); for (BeingIterator i = beings.begin(); i != beings.end(); i++) { + (*i)->drawSpeech(graphics, -(int) mPixelViewX, -(int) mPixelViewY); (*i)->drawEmotion(graphics, -(int) mPixelViewX, -(int) mPixelViewY); } @@ -276,8 +274,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics) WindowContainer::draw(gcnGraphics); } -void -Viewport::logic() +void Viewport::logic() { WindowContainer::logic(); @@ -295,15 +292,14 @@ Viewport::logic() mWalkTime = player_node->mWalkTime; } - for (int i = 0; i < 3; i++) + for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) { mTargetCursorInRange[i]->update(10); mTargetCursorOutRange[i]->update(10); } } -void -Viewport::drawTargetCursor(Graphics *graphics) +void Viewport::drawTargetCursor(Graphics *graphics) { // Draw target marker if needed Being *target = player_node->getTarget(); @@ -323,7 +319,8 @@ Viewport::drawTargetCursor(Graphics *graphics) { targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage(); } - else { + else + { targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage(); } @@ -332,11 +329,10 @@ Viewport::drawTargetCursor(Graphics *graphics) int posY = target->getPixelY() + 16 - targetCursor->getHeight() / 2 - (int) mPixelViewY; graphics->drawImage(targetCursor, posX, posY); - } + } } -void -Viewport::mousePressed(gcn::MouseEvent &event) +void Viewport::mousePressed(gcn::MouseEvent &event) { // Check if we are alive and kickin' if (!mMap || !player_node || player_node->mAction == Being::DEAD) @@ -348,8 +344,10 @@ Viewport::mousePressed(gcn::MouseEvent &event) mPlayerFollowMouse = false; - int tilex = event.getX() / 32 + mTileViewX; - int tiley = event.getY() / 32 + mTileViewY; + const int tilex = event.getX() / 32 + mTileViewX; + const int tiley = event.getY() / 32 + mTileViewY; + const int x = (int)((float) event.getX() + mPixelViewX); + const int y = (int)((float) event.getY() + mPixelViewY); // Right click might open a popup if (event.getButton() == gcn::MouseEvent::RIGHT) @@ -357,11 +355,11 @@ Viewport::mousePressed(gcn::MouseEvent &event) Being *being; FloorItem *floorItem; - if ((being = beingManager->findBeing(tilex, tiley)) && - being != player_node) + if ((being = beingManager->findBeingByPixel(x, y)) && + being != player_node) { - mPopupMenu->showPopup(event.getX(), event.getY(), being); - return; + mPopupMenu->showPopup(event.getX(), event.getY(), being); + return; } else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley))) { @@ -382,12 +380,10 @@ Viewport::mousePressed(gcn::MouseEvent &event) { Being *being; FloorItem *item; - + // Interact with some being -// int x = (int)((float) event.getX() + mPixelViewX); -// int y = (int)((float) event.getY() + mPixelViewY); -// if ((being = beingManager->findBeingByPixel(x, y))) - if ((being = beingManager->findBeing(tilex, tiley))) +// if ((being = beingManager->findBeing(tilex, tiley))) + if ((being = beingManager->findBeingByPixel(x, y))) { switch (being->getType()) { @@ -400,59 +396,49 @@ Viewport::mousePressed(gcn::MouseEvent &event) if (being->mAction == Being::DEAD) break; - if (player_node->withinAttackRange(being)) + if (keyboard.isKeyActive(keyboard.KEY_TARGET) || player_node->withinAttackRange(being)) { + player_node->stopAttack(); + player_node->setGotoTarget(being); player_node->attack(being, true); } else { - Uint8 *keys = SDL_GetKeyState(NULL); - if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT])) - { - player_node->stopAttack(); - player_node->setGotoTarget(being); - } + player_node->setDestination(tilex, tiley); + player_node->stopAttack(); } break; default: break; - } + } } // Pick up some item else if ((item = floorItemManager->findByCoordinates(tilex, tiley))) { - player_node->pickUp(item); + player_node->pickUp(item); } // Just walk around else { - // XXX XXX XXX REALLY UGLY! - Uint8 *keys = SDL_GetKeyState(NULL); - if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT])) - { - player_node->setDestination(tilex, tiley); - player_node->stopAttack(); - } + player_node->stopAttack(); + player_node->setDestination(tilex, tiley); mPlayerFollowMouse = true; } } else if (event.getButton() == gcn::MouseEvent::MIDDLE) { // Find the being nearest to the clicked position - Being *target = beingManager->findNearestLivingBeing( - tilex, tiley, - 20, Being::MONSTER); - + Being *target = beingManager->findBeingByPixel(x, y); + if (target) { - player_node->setTarget(target); + player_node->setTarget(target); } } } -void -Viewport::mouseDragged(gcn::MouseEvent &event) +void Viewport::mouseDragged(gcn::MouseEvent &event) { if (!mMap || !player_node) return; @@ -465,20 +451,17 @@ Viewport::mouseDragged(gcn::MouseEvent &event) } } -void -Viewport::mouseReleased(gcn::MouseEvent &event) +void Viewport::mouseReleased(gcn::MouseEvent &event) { mPlayerFollowMouse = false; } -void -Viewport::showPopup(int x, int y, Item *item) +void Viewport::showPopup(int x, int y, Item *item) { mPopupMenu->showPopup(x, y, item); } -void -Viewport::optionChanged(const std::string &name) +void Viewport::optionChanged(const std::string &name) { mScrollLaziness = (int) config.getValue("ScrollLaziness", 32); mScrollRadius = (int) config.getValue("ScrollRadius", 32); diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 44a877a6..325a7221 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: viewport.h 4247 2008-05-19 10:48:18Z b_lindeijer $ + * $Id$ */ #ifndef _TMW_VIEWPORT_H_ @@ -117,16 +117,16 @@ class Viewport : public WindowContainer, public gcn::MouseListener, optionChanged(const std::string &name); /** - * Returns camera x offset in tiles. + * Returns camera x offset in pixels. */ int - getCameraX() { return mTileViewX; } + getCameraX() const { return (int) mPixelViewX; } /** - * Returns camera y offset in tiles. + * Returns camera y offset in pixels. */ int - getCameraY() { return mTileViewY; } + getCameraY() const { return (int) mPixelViewY; } /** * Changes viewpoint by relative pixel coordinates. @@ -138,22 +138,13 @@ class Viewport : public WindowContainer, public gcn::MouseListener, /** * Helper function for loading target cursors */ - void - loadTargetCursor(std::string filename, int width, int height, - bool outRange, Being::TargetCursorSize size); + void loadTargetCursor(std::string filename, int width, int height, + bool outRange, Being::TargetCursorSize size); /** * Draws range based target cursor */ - void - drawTargetCursor(Graphics *graphics); - - /** - * Draws target name - */ - void - drawTargetName(Graphics *graphics); - + void drawTargetCursor(Graphics *graphics); Map *mMap; /**< The current map. */ diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index b33a55cf..9bf7452d 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -165,5 +165,5 @@ void DropDown::drawButton(gcn::Graphics *graphics) int height = mDroppedDown ? mFoldedUpHeight : getHeight(); static_cast(graphics)-> - drawImage(buttons[mDroppedDown][mPushed], getWidth() - height, 1); + drawImage(buttons[mDroppedDown][mPushed], getWidth() - height + 2, 1); } diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 55dac5e0..1a6f1ac6 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -18,11 +18,12 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: window.cpp 4207 2008-04-29 09:10:43Z b_lindeijer $ + * $Id$ */ #include #include +#include #include #include @@ -43,24 +44,28 @@ #include "../resources/image.h" #include "../resources/resourcemanager.h" +#include "../utils/xml.h" + ConfigListener *Window::windowConfigListener = 0; WindowContainer *Window::windowContainer = 0; int Window::instances = 0; int Window::mouseResize = 0; ImageRect Window::border; Image *Window::closeImage = NULL; +bool Window::mAlphaChanged = false; class WindowConfigListener : public ConfigListener { void optionChanged(const std::string &) { + Window::mAlphaChanged = true; for_each(Window::border.grid, Window::border.grid + 9, std::bind2nd(std::mem_fun(&Image::setAlpha), config.getValue("guialpha", 0.8))); } }; -Window::Window(const std::string& caption, bool modal, Window *parent): +Window::Window(const std::string& caption, bool modal, Window *parent, const std::string& skin): gcn::Window(caption), mGrip(0), mParent(parent), @@ -72,7 +77,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent): mMinWinWidth(100), mMinWinHeight(40), mMaxWinWidth(INT_MAX), - mMaxWinHeight(INT_MAX) + mMaxWinHeight(INT_MAX), + mSkin(skin) { logger->log("Window::Window(\"%s\")", caption.c_str()); @@ -80,23 +86,13 @@ Window::Window(const std::string& caption, bool modal, Window *parent): throw GCN_EXCEPTION("Window::Window. no windowContainer set"); } + // Loads the skin + loadSkin(mSkin); + + setGuiAlpha(); + if (instances == 0) { - // Load static resources - ResourceManager *resman = ResourceManager::getInstance(); - Image *dBorders = resman->getImage("graphics/gui/vscroll_grey.png"); - border.grid[0] = dBorders->getSubImage(0, 0, 4, 4); - border.grid[1] = dBorders->getSubImage(4, 0, 3, 4); - border.grid[2] = dBorders->getSubImage(7, 0, 4, 4); - border.grid[3] = dBorders->getSubImage(0, 4, 4, 10); - border.grid[4] = resman->getImage("graphics/gui/bg_quad_dis.png"); - border.grid[5] = dBorders->getSubImage(7, 4, 4, 10); - border.grid[6] = dBorders->getSubImage(0, 15, 4, 4); - border.grid[7] = dBorders->getSubImage(4, 15, 3, 4); - border.grid[8] = dBorders->getSubImage(7, 15, 4, 4); - dBorders->decRef(); - closeImage = resman->getImage("graphics/gui/close_button.png"); - windowConfigListener = new WindowConfigListener(); // Send GUI alpha changed for initialization windowConfigListener->optionChanged("guialpha"); @@ -135,14 +131,15 @@ Window::~Window() const std::string &name = mWindowName; // Saving X, Y and Width and Height for resizables in the config - config.setValue(name + "WinX", getX()); - config.setValue(name + "WinY", getY()); - config.setValue(name + "Visible", isVisible()); - - if (mGrip) - { - config.setValue(name + "WinWidth", getWidth()); - config.setValue(name + "WinHeight", getHeight()); + if (!name.empty()) { + config.setValue(name + "WinX", getX()); + config.setValue(name + "WinY", getY()); + config.setValue(name + "Visible", isVisible()); + + if (mGrip) { + config.setValue(name + "WinWidth", getWidth()); + config.setValue(name + "WinHeight", getHeight()); + } } instances--; @@ -154,15 +151,11 @@ Window::~Window() windowConfigListener = NULL; // Clean up static resources - delete border.grid[0]; - delete border.grid[1]; - delete border.grid[2]; - delete border.grid[3]; - border.grid[4]->decRef(); - delete border.grid[5]; - delete border.grid[6]; - delete border.grid[7]; - delete border.grid[8]; + for( int i = 0; i < 9; i++ ) + { + delete border.grid[i]; + border.grid[i] = NULL; + } closeImage->decRef(); } @@ -474,6 +467,7 @@ void Window::loadWindowState() { const std::string &name = mWindowName; + assert(!name.empty()); setPosition((int) config.getValue(name + "WinX", mDefaultX), (int) config.getValue(name + "WinY", mDefaultY)); @@ -536,3 +530,185 @@ int Window::getResizeHandles(gcn::MouseEvent &event) return resizeHandles; } + +void Window::setGuiAlpha() +{ + //logger->log("Window::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8)); + for(int i = 0; i < 9; i++) + { + //logger->log("Window::setGuiAlpha: Border Image (%i)", i); + border.grid[i]->setAlpha(config.getValue("guialpha", 0.8)); + } + + mAlphaChanged = false; +} + +void Window::loadSkin(const std::string filename) +{ + const std::string windowId = Window::getId(); + + ResourceManager *resman = ResourceManager::getInstance(); + + logger->log("Loading Window Skin '%s'.", filename.c_str()); + logger->log("Loading Window ID '%s'.", windowId.c_str()); + + + if(filename == "") + logger->error("Window::loadSkin(): Invalid File Name."); + + // TODO: + // If there is an error loading the specified file, we should try to revert + // to a 'default' skin file. Only if the 'default' skin file can't be loaded + // should we have a terminating error. + XML::Document doc(filename); + xmlNodePtr rootNode = doc.rootNode(); + + if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset")) + { + logger->error("Widget Skinning error"); + } + + std::string skinSetImage; + skinSetImage = XML::getProperty(rootNode, "image", ""); + Image *dBorders = NULL; + if(skinSetImage != "") + { + logger->log("Window::loadSkin(): defines '%s' as a skin image.", skinSetImage.c_str()); + dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png"); + } + else + { + logger->error("Window::loadSkin(): Skinset does not define an image!"); + } + + //iterate 's + for_each_xml_child_node(widgetNode, rootNode) + { + if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget")) + continue; + + std::string widgetType; + widgetType = XML::getProperty(widgetNode, "type", "unknown"); + if (widgetType == "Window") + { + // Iterate through 's + // LEEOR / TODO: + // We need to make provisions to load in a CloseButton image. For now it + // can just be hard-coded. + for_each_xml_child_node(partNode, widgetNode) + { + if (!xmlStrEqual(partNode->name, BAD_CAST "part")) + { + continue; + } + + std::string partType; + partType = XML::getProperty(partNode, "type", "unknown"); + // TOP ROW + if(partType == "top-left-corner") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height); + } + else if(partType == "top-edge") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height); + } + else if(partType == "top-right-corner") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[2] = dBorders->getSubImage(xPos, yPos, width, height); + } + + // MIDDLE ROW + else if(partType == "left-edge") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height); + } + else if(partType == "bg-quad") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height); + } + else if(partType == "right-edge") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[5] = dBorders->getSubImage(xPos, yPos, width, height); + } + + // BOTTOM ROW + else if(partType == "bottom-left-corner") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height); + } + else if(partType == "bottom-edge") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height); + } + else if(partType == "bottom-right-corner") + { + const int xPos = XML::getProperty(partNode, "xpos", 0); + const int yPos = XML::getProperty(partNode, "ypos", 0); + const int width = XML::getProperty(partNode, "width", 1); + const int height = XML::getProperty(partNode, "height", 1); + + border.grid[8] = dBorders->getSubImage(xPos, yPos, width, height); + } + + // Part is of an uknown type. + else + { + logger->log("Window::loadSkin(): Unknown Part Type '%s'", partType.c_str()); + } + } + } + // Widget is of an uknown type. + else + { + logger->log("Window::loadSkin(): Unknown Widget Type '%s'", widgetType.c_str()); + } + } + dBorders->decRef(); + + logger->log("Finished loading Window Skin."); + + // Hard-coded for now until we update the above code to look for window buttons. + closeImage = resman->getImage("graphics/gui/close_button.png"); +} + diff --git a/src/gui/window.h b/src/gui/window.h index 8f288991..228cc37b 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: window.h 4207 2008-04-29 09:10:43Z b_lindeijer $ + * $Id$ */ #ifndef _TMW_WINDOW_H__ @@ -56,9 +56,10 @@ class Window : public gcn::Window, gcn::WidgetListener * @param parent The parent window. This is the window standing above * this one in the window hiearchy. When reordering, * a window will never go below its parent window. + * @param skin The location where the window's skin XML can be found. */ Window(const std::string &caption = "Window", bool modal = false, - Window *parent = NULL); + Window *parent = NULL, const std::string &skin = "graphics/gui/gui.xml"); /** * Destructor. @@ -237,6 +238,11 @@ class Window : public gcn::Window, gcn::WidgetListener */ virtual void resetToDefaultSize(); + /** + * Loads a window skin + */ + void loadSkin(const std::string filename); + enum ResizeHandles { TOP = 0x01, @@ -255,6 +261,8 @@ class Window : public gcn::Window, gcn::WidgetListener */ int getResizeHandles(gcn::MouseEvent &event); + void setGuiAlpha(); + GCContainer *mChrome; /**< Contained container */ ResizeGrip *mGrip; /**< Resize grip */ Window *mParent; /**< The parent window */ @@ -263,6 +271,7 @@ class Window : public gcn::Window, gcn::WidgetListener bool mModal; /**< Window is modal */ bool mCloseButton; /**< Window has a close button */ bool mSticky; /**< Window resists minimization */ + static bool mAlphaChanged; /**< Whether the alpha percent was changed */ int mMinWinWidth; /**< Minimum window width */ int mMinWinHeight; /**< Minimum window height */ int mMaxWinWidth; /**< Maximum window width */ @@ -271,6 +280,7 @@ class Window : public gcn::Window, gcn::WidgetListener int mDefaultY; /**< Default window Y position */ int mDefaultWidth; /**< Default window width */ int mDefaultHeight; /**< Default window height */ + std::string mSkin; /**< Name of the skin to use */ /** The window container windows add themselves to. */ static WindowContainer *windowContainer; diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp index 0a0a0a55..05c2b5e9 100644 --- a/src/gui/windowcontainer.cpp +++ b/src/gui/windowcontainer.cpp @@ -21,15 +21,13 @@ * $Id: windowcontainer.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ -#include - #include "windowcontainer.h" #include "../utils/dtor.h" void WindowContainer::logic() { - for_each(mDeathList.begin(), mDeathList.end(), make_dtor(mDeathList)); + delete_all(mDeathList); mDeathList.clear(); gcn::Container::logic(); diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp index d4ff8f02..965434b0 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: imageparticle.cpp 4360 2008-06-23 14:44:20Z crush_tmw $ + * $Id$ */ #include "imageparticle.h" diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 5534b96e..9f558883 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: keyboardconfig.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ + * $Id$ */ #include "keyboardconfig.h" @@ -43,6 +43,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = { {"keyMoveLeft", SDLK_LEFT, "Move Left"}, {"keyMoveRight", SDLK_RIGHT, "Move Right"}, {"keyAttack", SDLK_LCTRL, "Attack"}, + {"keySmilie", SDLK_LALT, "Smilie"}, {"keyTarget", SDLK_LSHIFT, "Target"}, {"keyTargetClosest", SDLK_a, "Target Closest"}, {"keyTargetPlayer", SDLK_q, "Target Player"}, diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index b98fcb7a..b57136dc 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: keyboardconfig.h 4255 2008-05-21 21:44:27Z crush_tmw $ + * $Id$ */ #ifndef _TMW_KEYBOARDCONFIG_H @@ -151,6 +151,7 @@ class KeyboardConfig KEY_MOVE_LEFT, KEY_MOVE_RIGHT, KEY_ATTACK, + KEY_SMILIE, KEY_TARGET, KEY_TARGET_CLOSEST, KEY_TARGET_PLAYER, diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 554c52a6..66d37ddf 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: localplayer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ + * $Id$ */ #include "localplayer.h" @@ -48,8 +48,8 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): mAttackRange(0), mXp(0), mNetwork(0), mTarget(NULL), mPickUpTarget(NULL), - mTrading(false), mInStorage(false), - mGoingToTarget(false), mLastAction(-1), + mTrading(false), mGoingToTarget(false), + mLastAction(-1), mWalkingDir(0), mDestX(0), mDestY(0), mInventory(new Inventory(INVENTORY_SIZE)), mStorage(new Inventory(STORAGE_SIZE)) @@ -65,6 +65,18 @@ LocalPlayer::~LocalPlayer() void LocalPlayer::logic() { switch (mAction) { + case STAND: + break; + + case SIT: + break; + + case DEAD: + break; + + case HURT: + break; + case WALK: mFrame = (get_elapsed_time(mWalkTime) * 6) / mWalkSpeed; if (mFrame >= 6) { @@ -144,6 +156,9 @@ void LocalPlayer::unequipItem(Item *item) MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_PLAYER_UNEQUIP); outMsg.writeInt16(item->getInvIndex()); + + // Tidy equipment directly to avoid weapon still shown bug, for instance + mEquipment->removeEquipment(item); } void LocalPlayer::useItem(Item *item) @@ -183,7 +198,6 @@ void LocalPlayer::pickUp(FloorItem *item) void LocalPlayer::walk(unsigned char dir) { - if (!mMap || !dir) return; diff --git a/src/localplayer.h b/src/localplayer.h index 1d865824..757c70eb 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: localplayer.h 4347 2008-06-12 09:06:01Z b_lindeijer $ + * $Id$ */ #ifndef _TMW_LOCALPLAYER_H diff --git a/src/map.cpp b/src/map.cpp index d9d3a319..ef622ad0 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -23,10 +23,11 @@ #include "map.h" -#include #include +#include #include "beingmanager.h" +#include "configuration.h" #include "game.h" #include "graphics.h" #include "particle.h" @@ -40,6 +41,8 @@ #include "utils/dtor.h" #include "utils/tostring.h" +extern volatile int tick_time; + /** * A location on a tile map. Used for pathfinding, open list. */ @@ -62,6 +65,80 @@ struct Location MetaTile *tile; }; +MapLayer::MapLayer(int x, int y, int width, int height, bool isFringeLayer): + mX(x), mY(y), + mWidth(width), mHeight(height), + mIsFringeLayer(isFringeLayer) +{ + const int size = mWidth * mHeight; + mTiles = new Image*[size]; + std::fill_n(mTiles, size, (Image*) 0); +} + +MapLayer::~MapLayer() +{ + delete[] mTiles; +} + +void MapLayer::setTile(int x, int y, Image *img) +{ + mTiles[x + y * mWidth] = img; +} + +Image* MapLayer::getTile(int x, int y) const +{ + return mTiles[x + y * mWidth]; +} + +void MapLayer::draw(Graphics *graphics, + int startX, int startY, + int endX, int endY, + int scrollX, int scrollY, + const Sprites &sprites) const +{ + startX -= mX; + startY -= mY; + endX -= mX; + endY -= mY; + + if (startX < 0) startX = 0; + if (startY < 0) startY = 0; + if (endX > mWidth) endX = mWidth; + if (endY > mHeight) endY = mHeight; + + Sprites::const_iterator si = sprites.begin(); + + for (int y = startY; y < endY; y++) + { + // If drawing the fringe layer, make sure all sprites above this row of + // tiles have been drawn + if (mIsFringeLayer) { + while (si != sprites.end() && (*si)->getPixelY() <= y * 32 - 32) { + (*si)->draw(graphics, -scrollX, -scrollY); + si++; + } + } + + for (int x = startX; x < endX; x++) + { + Image *img = getTile(x, y); + if (img) { + const int px = (x + mX) * 32 - scrollX; + const int py = (y + mY) * 32 - scrollY + 32 - img->getHeight(); + graphics->drawImage(img, px, py); + } + } + } + + // Draw any remaining sprites + if (mIsFringeLayer) { + while (si != sprites.end()) { + (*si)->draw(graphics, -scrollX, -scrollY); + si++; + } + } +} + Map::Map(int width, int height, int tileWidth, int tileHeight): mWidth(width), mHeight(height), mTileWidth(tileWidth), mTileHeight(tileHeight), @@ -69,23 +146,18 @@ Map::Map(int width, int height, int tileWidth, int tileHeight): mOnClosedList(1), mOnOpenList(2), mLastScrollX(0.0f), mLastScrollY(0.0f) { - int size = mWidth * mHeight; + const int size = mWidth * mHeight; mMetaTiles = new MetaTile[size]; - mTiles = new Image*[size * 3]; - std::fill_n(mTiles, size * 3, (Image*)0); } Map::~Map() { - // clean up map data + // delete metadata, layers, tilesets and overlays delete[] mMetaTiles; - delete[] mTiles; - // clean up tilesets - for_each(mTilesets.begin(), mTilesets.end(), make_dtor(mTilesets)); - mTilesets.clear(); - // clean up overlays - for_each(mOverlays.begin(), mOverlays.end(), make_dtor(mOverlays)); + delete_all(mLayers); + delete_all(mTilesets); + delete_all(mOverlays); } void Map::initializeOverlays() @@ -99,9 +171,9 @@ void Map::initializeOverlays() const std::string name = "overlay" + toString(i); Image *img = resman->getImage(getProperty(name + "image")); - float speedX = getFloatProperty(name + "scrollX"); - float speedY = getFloatProperty(name + "scrollY"); - float parallax = getFloatProperty(name + "parallax"); + const float speedX = getFloatProperty(name + "scrollX"); + const float speedY = getFloatProperty(name + "scrollY"); + const float parallax = getFloatProperty(name + "parallax"); if (img) { @@ -114,6 +186,11 @@ void Map::initializeOverlays() } } +void Map::addLayer(MapLayer *layer) +{ + mLayers.push_back(layer); +} + void Map::addTileset(Tileset *tileset) { mTilesets.push_back(tileset); @@ -127,63 +204,32 @@ bool spriteCompare(const Sprite *a, const Sprite *b) return a->getPixelY() < b->getPixelY(); } -void Map::draw(Graphics *graphics, int scrollX, int scrollY, int layer) +void Map::draw(Graphics *graphics, int scrollX, int scrollY) { int endPixelY = graphics->getHeight() + scrollY + mTileHeight - 1; - // If drawing the fringe layer, make sure sprites are sorted - SpriteIterator si; - if (layer == 1) - { - mSprites.sort(spriteCompare); - si = mSprites.begin(); - endPixelY += mMaxTileHeight - mTileHeight; - } + // TODO: Do this per-layer + endPixelY += mMaxTileHeight - mTileHeight; int startX = scrollX / mTileWidth; int startY = scrollY / mTileHeight; int endX = (graphics->getWidth() + scrollX + mTileWidth - 1) / mTileWidth; int endY = endPixelY / mTileHeight; - if (startX < 0) startX = 0; - if (startY < 0) startY = 0; - if (endX > mWidth) endX = mWidth; - if (endY > mHeight) endY = mHeight; + // Make sure sprites are sorted + mSprites.sort(spriteCompare); - for (int y = startY; y < endY; y++) + Layers::const_iterator layeri = mLayers.begin(); + for (; layeri != mLayers.end(); ++layeri) { - // If drawing the fringe layer, make sure all sprites above this row of - // tiles have been drawn - if (layer == 1) - { - while (si != mSprites.end() && (*si)->getPixelY() <= y * 32 - 32) - { - (*si)->draw(graphics, -scrollX, -scrollY); - si++; - } - } - - for (int x = startX; x < endX; x++) - { - Image *img = getTile(x, y, layer); - if (img) { - graphics->drawImage(img, - x * mTileWidth - scrollX, - y * mTileHeight - scrollY + - mTileHeight - img->getHeight()); - } - } + (*layeri)->draw(graphics, + startX, startY, endX, endY, + scrollX, scrollY, + mSprites); } - // Draw any remaining sprites - if (layer == 1) - { - while (si != mSprites.end()) - { - (*si)->draw(graphics, -scrollX, -scrollY); - si++; - } - } + drawOverlay(graphics, scrollX, scrollY, + (int) config.getValue("OverlayDetail", 2)); } void Map::drawOverlay(Graphics *graphics, @@ -226,23 +272,10 @@ void Map::drawOverlay(Graphics *graphics, }; } -void Map::setTileWithGid(int x, int y, int layer, int gid) -{ - if (layer == 3) - { - Tileset *set = getTilesetWithGid(gid); - setWalk(x, y, (!set || (gid - set->getFirstGid() == 0))); - } - else if (layer < 3) - { - setTile(x, y, layer, getTileWithGid(gid)); - } -} - class ContainsGidFunctor { public: - bool operator() (Tileset* set) + bool operator() (Tileset* set) const { return (set->getFirstGid() <= gid && gid - set->getFirstGid() < (int)set->size()); @@ -255,27 +288,16 @@ Tileset* Map::getTilesetWithGid(int gid) const containsGid.gid = gid; Tilesets::const_iterator i = find_if(mTilesets.begin(), mTilesets.end(), - containsGid); + containsGid); return (i == mTilesets.end()) ? NULL : *i; } -Image* Map::getTileWithGid(int gid) const -{ - Tileset *set = getTilesetWithGid(gid); - - if (set) { - return set->get(gid - set->getFirstGid()); - } - - return NULL; -} - void Map::setWalk(int x, int y, bool walkable) { mMetaTiles[x + y * mWidth].walkable = walkable; } - + bool Map::occupied(int x, int y) const { Beings &beings = beingManager->getAll(); @@ -293,7 +315,7 @@ bool Map::occupied(int x, int y) const bool Map::tileCollides(int x, int y) const { - return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable); + return !(contains(x, y) && mMetaTiles[x + y * mWidth].walkable); } bool Map::contains(int x, int y) const @@ -301,16 +323,6 @@ bool Map::contains(int x, int y) const return x >= 0 && y >= 0 && x < mWidth && y < mHeight; } -void Map::setTile(int x, int y, int layer, Image *img) -{ - mTiles[x + y * mWidth + layer * (mWidth * mHeight)] = img; -} - -Image* Map::getTile(int x, int y, int layer) -{ - return mTiles[x + y * mWidth + layer * (mWidth * mHeight)]; -} - MetaTile* Map::getMetaTile(int x, int y) { return &mMetaTiles[x + y * mWidth]; @@ -327,6 +339,8 @@ void Map::removeSprite(SpriteIterator iterator) mSprites.erase(iterator); } +static int const basicCost = 100; + Path Map::findPath(int startX, int startY, int destX, int destY) { // Path to be built up (empty by default) @@ -367,8 +381,8 @@ Path Map::findPath(int startX, int startY, int destX, int destY) for (int dx = -1; dx <= 1; dx++) { // Calculate location of tile to check - int x = curr.x + dx; - int y = curr.y + dy; + const int x = curr.x + dx; + const int y = curr.y + dy; // Skip if if we're checking the same tile we're leaving from, // or if the new location falls outside of the map boundaries @@ -379,7 +393,8 @@ Path Map::findPath(int startX, int startY, int destX, int destY) MetaTile *newTile = getMetaTile(x, y); - // Skip if the tile is on the closed list or collides unless its the destination tile + // Skip if the tile is on the closed list or collides unless + // its the destination tile if (newTile->whichList == mOnClosedList || (tileCollides(x, y) && !(x == destX && y == destY))) { @@ -404,13 +419,6 @@ Path Map::findPath(int startX, int startY, int destX, int destY) // 14 for moving diagonal (sqrt(200) = 14.1421...) int Gcost = curr.tile->Gcost + ((dx == 0 || dy == 0) ? 10 : 14); - // It costs extra to walk through a being (needs to be enough - // to make it more attractive to walk around). - if (occupied(x, y)) - { - Gcost += 30; - } - // Skip if Gcost becomes too much // Warning: probably not entirely accurate if (Gcost > 200) @@ -430,7 +438,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY) // Update Gcost and Fcost of new tile newTile->Gcost = Gcost; - newTile->Fcost = newTile->Gcost + newTile->Hcost; + newTile->Fcost = Gcost + newTile->Hcost; if (x != destX || y != destY) { // Add this tile to the open list @@ -447,7 +455,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY) // Found a shorter route. // Update Gcost and Fcost of the new tile newTile->Gcost = Gcost; - newTile->Fcost = newTile->Gcost + newTile->Hcost; + newTile->Fcost = Gcost + newTile->Hcost; // Set the current tile as the parent of the new tile newTile->parentX = curr.x; @@ -488,7 +496,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY) return path; } -void Map::addParticleEffect (std::string effectFile, int x, int y) +void Map::addParticleEffect(const std::string &effectFile, int x, int y) { ParticleEffectData newEffect; newEffect.file = effectFile; diff --git a/src/map.h b/src/map.h index 7695ba31..95532eb3 100644 --- a/src/map.h +++ b/src/map.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: map.h 3887 2008-02-12 19:49:37Z umperio $ + * $Id$ */ #ifndef _TMW_MAP_H_ @@ -32,6 +32,7 @@ class AmbientOverlay; class Graphics; class Image; +class MapLayer; class Particle; class Sprite; class Tileset; @@ -41,8 +42,7 @@ struct PATH_NODE; typedef std::vector Tilesets; typedef std::list Sprites; typedef Sprites::iterator SpriteIterator; - -extern volatile int tick_time; +typedef std::vector Layers; /** * A meta tile stores additional information about a location on a tile map. @@ -66,6 +66,56 @@ struct MetaTile bool walkable; /**< Can beings walk on this tile */ }; +/** + * A map layer. Stores a grid of tiles and their offset, and implements layer + * rendering. + */ +class MapLayer +{ + public: + /** + * Constructor, taking layer origin, size and whether this layer is the + * fringe layer. The fringe layer is the layer that draws the sprites. + * There can be only one fringe layer per map. + */ + MapLayer(int x, int y, int width, int height, bool isFringeLayer); + + /** + * Destructor. + */ + ~MapLayer(); + + /** + * Set tile image, with x and y in layer coordinates. + */ + void setTile(int x, int y, Image *img); + + /** + * Get tile image, with x and y in layer coordinates. + */ + Image *getTile(int x, int y) const; + + /** + * Draws this layer to the given graphics context. The coordinates are + * expected to be in map range and will be translated to local layer + * coordinates and clipped to the layer's dimensions. + * + * The given sprites are only drawn when this layer is the fringe + * layer. + */ + void draw(Graphics *graphics, + int startX, int startY, + int endX, int endY, + int scrollX, int scrollY, + const Sprites &sprites) const; + + private: + int mX, mY; + int mWidth, mHeight; + bool mIsFringeLayer; /**< Whether the sprites are drawn. */ + Image **mTiles; +}; + /** * A tile map. */ @@ -89,39 +139,30 @@ class Map : public Properties void initializeOverlays(); /** - * Draws a map layer to the given graphics output. - */ - void draw(Graphics *graphics, int scrollX, int scrollY, int layer); - - /** - * Draws the overlay graphic to the given graphics output. - */ - void - drawOverlay(Graphics *graphics, float scrollX, float scrollY, - int detail); - - /** - * Adds a tileset to this map. + * Draws the map to the given graphics output. This method draws all + * layers, sprites and overlay effects. + * + * TODO: For efficiency reasons, this method could take into account + * the clipping rectangle set on the Graphics object. However, + * currently the map is always drawn full-screen. */ - void - addTileset(Tileset *tileset); + void draw(Graphics *graphics, int scrollX, int scrollY); /** - * Sets a tile using a global tile id. Used by the layer loading - * routine. + * Adds a layer to this map. The map takes ownership of the layer. */ - void - setTileWithGid(int x, int y, int layer, int gid); + void addLayer(MapLayer *layer); /** - * Set tile ID. + * Adds a tileset to this map. The map takes ownership of the tileset. */ - void setTile(int x, int y, int layer, Image *img); + void addTileset(Tileset *tileset); /** - * Get tile ID. + * Finds the tile set that a tile with the given global id is part of. */ - Image *getTile(int x, int y, int layer); + Tileset* + getTilesetWithGid(int gid) const; /** * Get tile reference. @@ -183,7 +224,7 @@ class Map : public Properties /** * Adds a particle effect */ - void addParticleEffect (std::string effectFile, int x, int y); + void addParticleEffect(const std::string &effectFile, int x, int y); /** * Initializes all added particle effects @@ -193,15 +234,11 @@ class Map : public Properties private: /** - * Converts a global tile id to the Image* pointing to the associated - * tile image. - */ - Image* getTileWithGid(int gid) const; - - /** - * Finds the tile set that a tile with the given global id is part of. + * Draws the overlay graphic to the given graphics output. */ - Tileset* getTilesetWithGid(int gid) const; + void + drawOverlay(Graphics *graphics, float scrollX, float scrollY, + int detail); /** * Tells whether a tile is occupied by a being. @@ -217,15 +254,14 @@ class Map : public Properties int mTileWidth, mTileHeight; int mMaxTileHeight; MetaTile *mMetaTiles; - Image **mTiles; - + Layers mLayers; Tilesets mTilesets; Sprites mSprites; // Pathfinding members int mOnClosedList, mOnOpenList; - // Overlay Data + // Overlay data std::list mOverlays; float mLastScrollX; float mLastScrollY; diff --git a/src/monster.cpp b/src/monster.cpp index d3e52520..2b6fadce 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -74,15 +74,13 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map): } } -Monster::~Monster() { - +Monster::~Monster() +{ if (mText) delete mText; - } -void -Monster::logic() +void Monster::logic() { if (mAction != STAND) { @@ -97,14 +95,12 @@ Monster::logic() Being::logic(); } -Being::Type -Monster::getType() const +Being::Type Monster::getType() const { return MONSTER; } -void -Monster::setAction(Uint8 action) +void Monster::setAction(Action action) { SpriteAction currentAction = ACTION_INVALID; @@ -122,11 +118,14 @@ Monster::setAction(Uint8 action) mSprites[BASE_SPRITE]->reset(); break; case STAND: - currentAction = ACTION_STAND; - break; + currentAction = ACTION_STAND; + break; case HURT: - // Not implemented yet - break; + // Not implemented yet + break; + case SIT: + // Also not implemented yet + break; } if (currentAction != ACTION_INVALID) @@ -142,8 +141,7 @@ Monster::setAction(Uint8 action) } } -void -Monster::handleAttack(Being *victim, int damage) +void Monster::handleAttack(Being *victim, int damage) { Being::handleAttack(victim, damage); @@ -151,21 +149,18 @@ Monster::handleAttack(Being *victim, int damage) sound.playSfx(mi.getSound((damage > 0) ? MONSTER_EVENT_HIT : MONSTER_EVENT_MISS)); } -void -Monster::takeDamage(int amount) +void Monster::takeDamage(int amount) { if (amount > 0) sound.playSfx(getInfo().getSound(MONSTER_EVENT_HURT)); Being::takeDamage(amount); } -Being::TargetCursorSize -Monster::getTargetCursorSize() const +Being::TargetCursorSize Monster::getTargetCursorSize() const { return getInfo().getTargetCursorSize(); } -const MonsterInfo& -Monster::getInfo() const +const MonsterInfo& Monster::getInfo() const { return MonsterDB::get(mJob - 1002); } diff --git a/src/monster.h b/src/monster.h index b613e96d..4839966a 100644 --- a/src/monster.h +++ b/src/monster.h @@ -38,7 +38,7 @@ class Monster : public Being virtual void logic(); - virtual void setAction(Uint8 action); + virtual void setAction(Action action); virtual Type getType() const; diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index fbef02bd..7c9b8afd 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -23,6 +23,7 @@ #include "beinghandler.h" +#include #include #include "messagein.h" @@ -37,6 +38,7 @@ #include "../particle.h" #include "../sound.h" #include "../player_relations.h" +#include "../npc.h" const int EMOTION_TIME = 150; /**< Duration of emotion icon */ @@ -203,8 +205,13 @@ void BeingHandler::handleMessage(MessageIn *msg) break; // If this is player's current target, clear it. - if (player_node->getTarget() == dstBeing) + if (dstBeing == player_node->getTarget()) + { player_node->stopAttack(); + } + + if (dstBeing == current_npc) + current_npc = NULL; if (msg->readInt8() == 1) { @@ -464,7 +471,7 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt8(); // unknown dstBeing->mWalkTime = tick_time; - dstBeing->mFrame = 0; + //dstBeing->mFrame = 0; break; case SMSG_PLAYER_STOP: diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp index cc5d016c..0fc98175 100644 --- a/src/net/equipmenthandler.cpp +++ b/src/net/equipmenthandler.cpp @@ -156,6 +156,12 @@ void EquipmentHandler::handleMessage(MessageIn *msg) mask <<= 1; position++; } + + item = inventory->getItem(index); + if (!item) + break; + + item->setEquipped(false); player_node->mEquipment->removeEquipment(position); } logger->log("Unequipping: %i %i(%i) %i", @@ -174,6 +180,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg) item = inventory->getItem(index); if (item) { + item->setEquipped(true); player_node->mEquipment->setArrows(item); logger->log("Arrows equipped: %i", index); } diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp index 6505e39f..737d1762 100644 --- a/src/net/loginhandler.cpp +++ b/src/net/loginhandler.cpp @@ -113,7 +113,7 @@ void LoginHandler::handleMessage(MessageIn *msg) errorMessage = "You have been blocked by the GM Team"; break; case 6: - errorMessage = "You have been banned for 5 minutes"; + errorMessage = "You have been temporarily banned from the game. Please contact the GM team"; break; case 9: errorMessage = "This user name is already taken"; diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index e871b670..61e68295 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -52,6 +52,9 @@ extern BuyDialog *buyDialog; extern SellDialog *sellDialog; extern Window *buySellDialog; +static const int MAP_TELEPORT_SCROLL_DISTANCE = 8; /* Max. distance we are willing to scroll after a teleport; + * everything beyond will reset the port hard. */ + /** * Listener used for handling the overweigth message. */ @@ -113,17 +116,13 @@ void PlayerHandler::handleMessage(MessageIn *msg) * This client assumes that all walk messages succeed, * and that the server will send a correction notice * otherwise. - * - * Note that this packet is also used by eAthena to notify - * the client of a server-generated auto-move. A patch has - * been submitted to Mantis to eliminate these auto moves, - * since they're inconsistent with the client design. */ break; case SMSG_PLAYER_WARP: { std::string mapPath = msg->readString(16); + bool nearby; Uint16 x = msg->readInt16(); Uint16 y = msg->readInt16(); @@ -135,13 +134,23 @@ void PlayerHandler::handleMessage(MessageIn *msg) */ player_node->stopAttack(); + nearby = (engine->getCurrentMapName() == mapPath); // Switch the actual map, deleting the previous one engine->changeMap(mapPath); current_npc = 0; - float scrollOffsetX = (x - player_node->mX) * 32; - float scrollOffsetY = (y - player_node->mY) * 32; + float scrollOffsetX = 0.0f; + float scrollOffsetY = 0.0f; + + /* Scroll if neccessary */ + if (!nearby + || (abs(x - player_node->mX) > MAP_TELEPORT_SCROLL_DISTANCE) + || (abs(y - player_node->mY) > MAP_TELEPORT_SCROLL_DISTANCE)) + { + scrollOffsetX = (x - player_node->mX) * 32; + scrollOffsetY = (y - player_node->mY) * 32; + } player_node->setAction(Being::STAND); player_node->mFrame = 0; @@ -204,8 +213,39 @@ void PlayerHandler::handleMessage(MessageIn *msg) if (player_node->mHp == 0 && deathNotice == NULL) { - deathNotice = new OkDialog("Message", - "You're now dead, press ok to restart"); + static char const *const deadMsg[] = + { + "You are dead.", + "We regret to inform you that your character was killed in battle.", + "You are not that alive anymore.", + "The cold hands of the grim reaper are grabbing for your soul.", + "Game Over!", + "Insert coin to continue", + "No, kids. Your character did not really die. It... err... went to a better place.", + "Your plan of breaking your enemies weapon by bashing it with your throat failed.", + "I guess this did not run too well.", + "Do you want your possessions identified?", // Nethack reference + "Sadly, no trace of you was ever found...", // Secret of Mana reference + "Annihilated.", // Final Fantasy VI reference + "Looks like you got your head handed to you.", //Earthbound reference + "You screwed up again, dump your body down the tubes and get you another one.", // Leisure Suit Larry 1 Reference + "You're not dead yet. You're just resting.", // Monty Python reference from a couple of skits + "You are no more.", // Monty Python reference from the dead parrot sketch starting now + "You have ceased to be.", + "You've expired and gone to meet your maker.", + "You're a stiff.", + "Bereft of life, you rest in peace.", + "If you weren't so animated, you'd be pushing up the daisies.", + "Your metabolic processes are now history.", + "You're off the twig.", + "You've kicked the bucket.", + "You've shuffled off your mortal coil, run down the curtain and joined the bleedin' choir invisibile.", + "You are an ex-player.", + "You're pining for the fjords." // Monty Python reference from the dead parrot sketch + }; + std::string message(deadMsg[rand()%27]); + + deathNotice = new OkDialog("Message", message); deathNotice->addActionListener(&deathListener); player_node->setAction(Being::DEAD); } @@ -288,7 +328,7 @@ void PlayerHandler::handleMessage(MessageIn *msg) } break; - // Updates stats and status points + // Updates stats and status points case SMSG_PLAYER_STAT_UPDATE_5: player_node->mStatsPointsToAttribute = msg->readInt16(); player_node->mAttr[LocalPlayer::STR] = msg->readInt8(); diff --git a/src/npc.cpp b/src/npc.cpp index 1615ecd6..fe0b4598 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -86,7 +86,8 @@ void NPC::setName(const std::string &name) mName = new Text(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, gcn::Graphics::CENTER, npcNameFont, gcn::Color(200, 200, 255)); - } + Being::setName(name + " (NPC)"); +} Being::Type NPC::getType() const diff --git a/src/particle.cpp b/src/particle.cpp index 651fae41..8591838f 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: particle.cpp 4362 2008-06-24 12:29:33Z crush_tmw $ + * $Id$ */ #include @@ -61,7 +61,7 @@ Particle::Particle(Map *map): mAutoDelete(true), mMap(map), mGravity(0.0f), - mRandomnes(0), + mRandomness(0), mBounce(0.0f), mFollow(false), mTarget(NULL), @@ -139,11 +139,11 @@ Particle::update() } } - if (mRandomnes > 0) + if (mRandomness > 0) { - mVelocity.x += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f; - mVelocity.y += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f; - mVelocity.z += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f; + mVelocity.x += (rand()%mRandomness - rand()%mRandomness) / 1000.0f; + mVelocity.y += (rand()%mRandomness - rand()%mRandomness) / 1000.0f; + mVelocity.z += (rand()%mRandomness - rand()%mRandomness) / 1000.0f; } mVelocity.z -= mGravity; diff --git a/src/particle.h b/src/particle.h index d4a671c7..f281864d 100644 --- a/src/particle.h +++ b/src/particle.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: particle.h 4362 2008-06-24 12:29:33Z crush_tmw $ + * $Id$ */ #ifndef _PARTICLE_H @@ -160,6 +160,9 @@ class Particle : public Sprite moveBy(float x, float y, float z) { mPos.x += x; mPos.y += y; mPos.z += z; } + void + moveChildren(Vector change); + void moveBy (Vector change) { mPos += change; } @@ -227,8 +230,8 @@ class Particle : public Sprite * Sets the ammount of random vector changes */ void - setRandomnes(int r) - { mRandomnes = r; } + setRandomness(int r) + { mRandomness = r; } /** * Sets the ammount of velocity particles retain after @@ -270,6 +273,12 @@ class Particle : public Sprite bool isAlive() { return mAlive; } + /** + * Determines whether the particle and its children are all dead + */ + bool isExtinct() + { return !isAlive() && mChildParticles.empty(); } + /** * Manually marks the particle for deletion. */ @@ -303,7 +312,7 @@ class Particle : public Sprite // dynamic particle Vector mVelocity; /**< Speed in pixels per game-tick. */ float mGravity; /**< Downward acceleration in pixels per game-tick. */ - int mRandomnes; /**< Ammount of random vector change */ + int mRandomness; /**< Ammount of random vector change */ float mBounce; /**< How much the particle bounces off when hitting the ground */ bool mFollow; /**< is this particle moved when its parent particle moves? */ diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 996e3396..3e0a3d75 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: particleemitter.cpp 4362 2008-06-24 12:29:33Z crush_tmw $ + * $Id$ */ #include "particleemitter.h" @@ -39,6 +39,7 @@ #define DEG_RAD_FACTOR 0.017453293f ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map): + mOutputPauseLeft(0), mParticleImage(0) { mMap = map; @@ -52,7 +53,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * mParticleAngleVertical.set(0.0f); mParticlePower.set(0.0f); mParticleGravity.set(0.0f); - mParticleRandomnes.set(0); + mParticleRandomness.set(0); mParticleBounce.set(0.0f); mParticleFollow = false; mParticleAcceleration.set(0.0f); @@ -62,6 +63,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * mParticleFadeOut.set(0); mParticleFadeIn.set(0); mOutput.set(1); + mOutputPause.set(0); mParticleAlpha.set(1.0f); for_each_xml_child_node(propertyNode, emitterNode) @@ -117,9 +119,9 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * { mParticleGravity = readMinMax(propertyNode, 0.0f); } - else if (name == "randomnes") + else if (name == "randomnes" || name == "randomness") // legacy bug { - mParticleRandomnes = readMinMax(propertyNode, 0); + mParticleRandomness = readMinMax(propertyNode, 0); } else if (name == "bounce") { @@ -135,6 +137,11 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * mOutput = readMinMax(propertyNode, 0); mOutput.maxVal +=1; } + else if (name == "output-pause") + { + mOutputPause = readMinMax(propertyNode, 0); + mOutputPauseLeft = mOutputPause.value(); + } else if (name == "acceleration") { mParticleAcceleration = readMinMax(propertyNode, 0.0f); @@ -261,7 +268,7 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o) mParticleAngleVertical = o.mParticleAngleVertical; mParticlePower = o.mParticlePower; mParticleGravity = o.mParticleGravity; - mParticleRandomnes = o.mParticleRandomnes; + mParticleRandomness = o.mParticleRandomness; mParticleBounce = o.mParticleBounce; mParticleFollow = o.mParticleFollow; mParticleTarget = o.mParticleTarget; @@ -274,10 +281,13 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o) mParticleAlpha = o.mParticleAlpha; mMap = o.mMap; mOutput = o.mOutput; + mOutputPause = o.mOutputPause; mParticleImage = o.mParticleImage; mParticleAnimation = o.mParticleAnimation; mParticleChildEmitters = o.mParticleChildEmitters; + mOutputPauseLeft = 0; + if (mParticleImage) mParticleImage->incRef(); return *this; @@ -308,6 +318,13 @@ ParticleEmitter::createParticles() { std::list newParticles; + if (mOutputPauseLeft > 0) + { + mOutputPauseLeft--; + return newParticles; + } + mOutputPauseLeft = mOutputPause.value(); + for (int i = mOutput.value(); i > 0; i--) { // Limit maximum particles @@ -342,7 +359,7 @@ ParticleEmitter::createParticles() sin(angleH) * cos(angleV) * power, sin(angleV) * power); - newParticle->setRandomnes(mParticleRandomnes.value()); + newParticle->setRandomness(mParticleRandomness.value()); newParticle->setGravity(mParticleGravity.value()); newParticle->setBounce(mParticleBounce.value()); newParticle->setFollow(mParticleFollow); diff --git a/src/particleemitter.h b/src/particleemitter.h index 481d4b44..5cf3fd46 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: particleemitter.h 4362 2008-06-24 12:29:33Z crush_tmw $ + * $Id$ */ #ifndef _PARTICLEEMITTER_H @@ -97,7 +97,7 @@ class ParticleEmitter * Vector changing of particles: */ MinMax mParticleGravity; - MinMax mParticleRandomnes; + MinMax mParticleRandomness; MinMax mParticleBounce; bool mParticleFollow; @@ -119,6 +119,8 @@ class ParticleEmitter Map *mMap; /**< Map the particles are spawned on */ MinMax mOutput; /**< Number of particles spawned per update */ + MinMax mOutputPause; /**< Pause in frames between two spawns */ + int mOutputPauseLeft; /* * Graphical representation of the particle diff --git a/src/player.cpp b/src/player.cpp index 125407de..8380fdfe 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -75,6 +75,18 @@ void Player::logic() { switch (mAction) { + case STAND: + break; + + case SIT: + break; + + case DEAD: + break; + + case HURT: + break; + case WALK: mFrame = (get_elapsed_time(mWalkTime) * 6) / mWalkSpeed; if (mFrame >= 6) { diff --git a/src/resources/action.cpp b/src/resources/action.cpp index facd23fb..8ed099ea 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -23,8 +23,6 @@ #include "action.h" -#include - #include "animation.h" #include "../utils/dtor.h" @@ -36,8 +34,7 @@ Action::Action() Action::~Action() { - std::for_each(mAnimations.begin(), mAnimations.end(), - make_dtor(mAnimations)); + delete_all(mAnimations); } Animation* diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp index 6228f4e4..b7263ec3 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -21,8 +21,6 @@ * $Id: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $ */ -#include - #include "imageset.h" #include "../log.h" @@ -46,11 +44,10 @@ ImageSet::ImageSet(Image *img, int width, int height) ImageSet::~ImageSet() { - for_each(mImages.begin(), mImages.end(), make_dtor(mImages)); + delete_all(mImages); } -Image* -ImageSet::get(size_type i) +Image* ImageSet::get(size_type i) const { if (i >= mImages.size()) { diff --git a/src/resources/imageset.h b/src/resources/imageset.h index 719e9769..e276dd06 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -47,12 +47,18 @@ class ImageSet : public Resource */ ~ImageSet(); + /** + * Returns the width of the images in the image set. + */ int getWidth() { return mWidth; }; + /** + * Returns the height of the images in the image set. + */ int getHeight() { return mHeight; }; typedef std::vector::size_type size_type; - Image* get(size_type i); + Image* get(size_type i) const; size_type size() { return mImages.size(); } diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 6ae7b499..8999f651 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -21,7 +21,6 @@ * $Id: itemdb.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include #include #include @@ -146,7 +145,7 @@ void ItemDB::unload() delete mUnknown; mUnknown = NULL; - for_each(mItemInfos.begin(), mItemInfos.end(), make_dtor(mItemInfos)); + delete_all(mItemInfos); mItemInfos.clear(); mLoaded = false; } @@ -177,8 +176,7 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node) { itemInfo->setSprite(filename, 0); } - - if (gender == "female" || gender == "unisex") + else { itemInfo->setSprite(filename, 1); } diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index e2b47e66..ab3b0cae 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -145,8 +145,7 @@ inflateMemory(unsigned char *in, unsigned int inLength, return outLength; } -Map* -MapReader::readMap(const std::string &filename) +Map* MapReader::readMap(const std::string &filename) { // Load the file through resource manager ResourceManager *resman = ResourceManager::getInstance(); @@ -206,19 +205,13 @@ MapReader::readMap(const std::string &filename) Map* MapReader::readMap(xmlNodePtr node, const std::string &path) { - xmlChar *prop; - // Take the filename off the path - std::string pathDir = path.substr(0, path.rfind("/") + 1); - - prop = xmlGetProp(node, BAD_CAST "version"); - xmlFree(prop); + const std::string pathDir = path.substr(0, path.rfind("/") + 1); - int w = XML::getProperty(node, "width", 0); - int h = XML::getProperty(node, "height", 0); - int tilew = XML::getProperty(node, "tilewidth", DEFAULT_TILE_WIDTH); - int tileh = XML::getProperty(node, "tileheight", DEFAULT_TILE_HEIGHT); - int layerNr = 0; + const int w = XML::getProperty(node, "width", 0); + const int h = XML::getProperty(node, "height", 0); + const int tilew = XML::getProperty(node, "tilewidth", DEFAULT_TILE_WIDTH); + const int tileh = XML::getProperty(node, "tileheight", DEFAULT_TILE_HEIGHT); Map *map = new Map(w, h, tilew, tileh); for_each_xml_child_node(childNode, node) @@ -232,9 +225,7 @@ MapReader::readMap(xmlNodePtr node, const std::string &path) } else if (xmlStrEqual(childNode->name, BAD_CAST "layer")) { - logger->log("- Loading layer %d", layerNr); - readLayer(childNode, map, layerNr); - layerNr++; + readLayer(childNode, map); } else if (xmlStrEqual(childNode->name, BAD_CAST "properties")) { @@ -246,15 +237,29 @@ MapReader::readMap(xmlNodePtr node, const std::string &path) { if (xmlStrEqual(objectNode->name, BAD_CAST "object")) { - std::string objName = XML::getProperty(objectNode, "name", ""); - std::string objType = XML::getProperty(objectNode, "type", ""); - int objX = XML::getProperty(objectNode, "x", 0); - int objY = XML::getProperty(objectNode, "y", 0); + const std::string objType = XML::getProperty(objectNode, "type", ""); + + if (objType == "WARP" || objType == "NPC" || + objType == "SCRIPT" || objType == "SPAWN") + { + // Silently skip server-side objects. + continue; + } + + const std::string objName = XML::getProperty(objectNode, "name", ""); + const int objX = XML::getProperty(objectNode, "x", 0); + const int objY = XML::getProperty(objectNode, "y", 0); logger->log("- Loading object name: %s type: %s at %d:%d", objName.c_str(), objType.c_str(), objX, objY); + if (objType == "PARTICLE_EFFECT") { + if (objName.empty()) { + logger->log(" Warning: No particle file given"); + continue; + } + map->addParticleEffect(objName, objX, objY); } else @@ -271,8 +276,7 @@ MapReader::readMap(xmlNodePtr node, const std::string &path) return map; } -void -MapReader::readProperties(xmlNodePtr node, Properties* props) +void MapReader::readProperties(xmlNodePtr node, Properties* props) { for_each_xml_child_node(childNode, node) { @@ -280,43 +284,65 @@ MapReader::readProperties(xmlNodePtr node, Properties* props) continue; // Example: - xmlChar *name = xmlGetProp(childNode, BAD_CAST "name"); - xmlChar *value = xmlGetProp(childNode, BAD_CAST "value"); + const std::string name = XML::getProperty(childNode, "name", ""); + const std::string value = XML::getProperty(childNode, "value", ""); - if (name && value) { - props->setProperty((const char*)name, (const char*)value); - } - - if (name) xmlFree(name); - if (value) xmlFree(value); + if (!name.empty() && !value.empty()) + props->setProperty(name, value); } } -void -MapReader::readLayer(xmlNodePtr node, Map *map, int layer) +static void setTile(Map *map, MapLayer *layer, int x, int y, int gid) +{ + const Tileset * const set = map->getTilesetWithGid(gid); + if (layer) { + // Set regular tile on a layer + Image * const img = set ? set->get(gid - set->getFirstGid()) : 0; + layer->setTile(x, y, img); + } else { + // Set collision tile + map->setWalk(x, y, (!set || (gid - set->getFirstGid() == 0))); + } +} + +void MapReader::readLayer(xmlNodePtr node, Map *map) { - int h = map->getHeight(); - int w = map->getWidth(); + // Layers are not necessarily the same size as the map + const int w = XML::getProperty(node, "width", map->getWidth()); + const int h = XML::getProperty(node, "height", map->getHeight()); + const int offsetX = XML::getProperty(node, "xoffset", 0); + const int offsetY = XML::getProperty(node, "yoffset", 0); + const std::string name = XML::getProperty(node, "name", ""); + + const bool isFringeLayer = (name.substr(0,6) == "Fringe"); + const bool isCollisionLayer = (name.substr(0,9) == "Collision"); + + MapLayer *layer = 0; + + if (!isCollisionLayer) { + layer = new MapLayer(offsetX, offsetY, w, h, isFringeLayer); + map->addLayer(layer); + } + + logger->log("- Loading layer \"%s\"", name.c_str()); int x = 0; int y = 0; - - // Load the tile data. Layers are assumed to be map size, with (0,0) as - // origin. + + // Load the tile data for_each_xml_child_node(childNode, node) { if (!xmlStrEqual(childNode->name, BAD_CAST "data")) - continue; - - xmlChar *encoding = xmlGetProp(childNode, BAD_CAST "encoding"); - xmlChar *compression = xmlGetProp(childNode, BAD_CAST "compression"); - - if (encoding && xmlStrEqual(encoding, BAD_CAST "base64")) + continue; + + const std::string encoding = + XML::getProperty(childNode, "encoding", ""); + const std::string compression = + XML::getProperty(childNode, "compression", ""); + + if (encoding == "base64") { - xmlFree(encoding); - - if (compression && !xmlStrEqual(compression, BAD_CAST "gzip")) { + if (!compression.empty() && compression != "gzip") { logger->log("Warning: only gzip layer compression supported!"); - xmlFree(compression); return; } @@ -324,15 +350,15 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer) xmlNodePtr dataChild = childNode->xmlChildrenNode; if (!dataChild) continue; - + int len = strlen((const char*)dataChild->content) + 1; unsigned char *charData = new unsigned char[len + 1]; const char *charStart = (const char*)dataChild->content; unsigned char *charIndex = charData; - + while (*charStart) { if (*charStart != ' ' && *charStart != '\t' && - *charStart != '\n') + *charStart != '\n') { *charIndex = *charStart; charIndex++; @@ -348,40 +374,34 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer) delete[] charData; if (binData) { - if (compression) { - if (xmlStrEqual(compression, BAD_CAST "gzip")) { - // Inflate the gzipped layer data - unsigned char *inflated; - unsigned int inflatedSize = - inflateMemory(binData, binLen, inflated); - - free(binData); - binData = inflated; - binLen = inflatedSize; - - if (inflated == NULL) - { - logger->log("Error: Could not decompress layer!"); - xmlFree(compression); - return; - } + if (compression == "gzip") { + // Inflate the gzipped layer data + unsigned char *inflated; + unsigned int inflatedSize = + inflateMemory(binData, binLen, inflated); + + free(binData); + binData = inflated; + binLen = inflatedSize; + + if (!inflated) { + logger->log("Error: Could not decompress layer!"); + return; } - xmlFree(compression); } for (int i = 0; i < binLen - 3; i += 4) { - int gid = binData[i] | + const int gid = binData[i] | binData[i + 1] << 8 | binData[i + 2] << 16 | binData[i + 3] << 24; - map->setTileWithGid(x, y, layer, gid); - + setTile(map, layer, x, y, gid); + x++; - if (x == w) { + if (x == w) + { x = 0; y++; - - // When we're done, don't crash on too much data if (y == h) break; } @@ -390,29 +410,29 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer) } } else { - // Read plain XML map file - for_each_xml_child_node(childNode2, childNode) - { - if (!xmlStrEqual(childNode2->name, BAD_CAST "tile")) + // Read plain XML map file + for_each_xml_child_node(childNode2, childNode) + { + if (!xmlStrEqual(childNode2->name, BAD_CAST "tile")) continue; - - int gid = XML::getProperty(childNode2, "gid", -1); - map->setTileWithGid(x, y, layer, gid); - - x++; - if (x == w) { - x = 0; y++; - if (y >= h) - break; - } - } + + const int gid = XML::getProperty(childNode2, "gid", -1); + setTile(map, layer, x, y, gid); + + x++; + if (x == w) { + x = 0; y++; + if (y >= h) + break; + } + } } - + if (y < h) std::cerr << "TOO SMALL!\n"; if (x) std::cerr << "TOO SMALL!\n"; - + // There can be only one data element break; } @@ -429,20 +449,20 @@ MapReader::readTileset(xmlNodePtr node, return NULL; } - int firstGid = XML::getProperty(node, "firstgid", 0); - int tw = XML::getProperty(node, "tilewidth", map->getTileWidth()); - int th = XML::getProperty(node, "tileheight", map->getTileHeight()); + const int firstGid = XML::getProperty(node, "firstgid", 0); + const int tw = XML::getProperty(node, "tilewidth", map->getTileWidth()); + const int th = XML::getProperty(node, "tileheight", map->getTileHeight()); for_each_xml_child_node(childNode, node) { if (!xmlStrEqual(childNode->name, BAD_CAST "image")) continue; - xmlChar* source = xmlGetProp(childNode, BAD_CAST "source"); + const std::string source = XML::getProperty(childNode, "source", ""); - if (source) + if (!source.empty()) { - std::string sourceStr = std::string((const char*)source); + std::string sourceStr = source; sourceStr.erase(0, 3); // Remove "../" ResourceManager *resman = ResourceManager::getInstance(); @@ -452,14 +472,14 @@ MapReader::readTileset(xmlNodePtr node, { Tileset *set = new Tileset(tilebmp, tw, th, firstGid); tilebmp->decRef(); - xmlFree(source); return set; } else { - logger->log("Warning: Failed to load tileset (%s)", source); + logger->log("Warning: Failed to load tileset (%s)", source.c_str()); } } + // Only one image element expected break; } diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 0d59fc9f..eb0d4873 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -63,10 +63,10 @@ class MapReader readProperties(xmlNodePtr node, Properties* props); /** - * Reads a map layer. + * Reads a map layer and adds it to the given map. */ static void - readLayer(xmlNodePtr node, Map *map, int layer); + readLayer(xmlNodePtr node, Map *map); /** * Reads a tile set. diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 847b99fe..73e9d666 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -21,8 +21,6 @@ * $Id: monsterdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ -#include - #include "monsterdb.h" #include "resourcemanager.h" @@ -143,8 +141,7 @@ MonsterDB::load() void MonsterDB::unload() { - for_each(mMonsterInfos.begin(), mMonsterInfos.end(), - make_dtor(mMonsterInfos)); + delete_all(mMonsterInfos); mMonsterInfos.clear(); mLoaded = false; diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index e492ccd3..19f2990b 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -21,8 +21,6 @@ * $Id: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $ */ -#include - #include "monsterinfo.h" #include "../utils/dtor.h" @@ -35,8 +33,7 @@ MonsterInfo::MonsterInfo() MonsterInfo::~MonsterInfo() { // kill vectors in mSoundEffects - for_each (mSounds.begin(), mSounds.end(), - make_dtor(mSounds)); + delete_all(mSounds); mSounds.clear(); } diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 550b2d1c..ebc60240 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: spritedef.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $ + * $Id$ */ #include @@ -70,33 +70,8 @@ SpriteDef *SpriteDef::load(std::string const &animationFile, int variant) } } - // Get the variant - int variant_num = XML::getProperty(rootNode, "variants", 0); - int variant_offset = 0; - - if (variant_num > 0 && variant < variant_num) - { - variant_offset = variant * XML::getProperty(rootNode, "variant_offset", 0); - } - SpriteDef *def = new SpriteDef; - - for_each_xml_child_node(node, rootNode) - { - if (xmlStrEqual(node->name, BAD_CAST "imageset")) - { - def->loadImageSet(node, palettes); - } - else if (xmlStrEqual(node->name, BAD_CAST "action")) - { - def->loadAction(node, variant_offset); - } - else if (xmlStrEqual(node->name, BAD_CAST "include")) - { - def->includeSprite(node); - } - } - + def->loadSprite(rootNode, variant, palettes); def->substituteActions(); return def; } @@ -119,11 +94,47 @@ void SpriteDef::substituteActions() substituteAction(ACTION_DEAD, ACTION_HURT); } +void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant, + const std::string &palettes) +{ + // Get the variant + const int variantCount = XML::getProperty(spriteNode, "variants", 0); + int variant_offset = 0; + + if (variantCount > 0 && variant < variantCount) + { + variant_offset = + variant * XML::getProperty(spriteNode, "variant_offset", 0); + } + + for_each_xml_child_node(node, spriteNode) + { + if (xmlStrEqual(node->name, BAD_CAST "imageset")) + { + loadImageSet(node, palettes); + } + else if (xmlStrEqual(node->name, BAD_CAST "action")) + { + loadAction(node, variant_offset); + } + else if (xmlStrEqual(node->name, BAD_CAST "include")) + { + includeSprite(node); + } + } +} + void SpriteDef::loadImageSet(xmlNodePtr node, std::string const &palettes) { - int width = XML::getProperty(node, "width", 0); - int height = XML::getProperty(node, "height", 0); - std::string name = XML::getProperty(node, "name", ""); + const std::string name = XML::getProperty(node, "name", ""); + + // We don't allow redefining image sets. This way, an included sprite + // definition will use the already loaded image set with the same name. + if (mImageSets.find(name) != mImageSets.end()) + return; + + const int width = XML::getProperty(node, "width", 0); + const int height = XML::getProperty(node, "height", 0); std::string imageSrc = XML::getProperty(node, "src", ""); Dye::instantiate(imageSrc, palettes); @@ -184,9 +195,9 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, Action *action, ImageSet *imageSet, int variant_offset) { - std::string directionName = + const std::string directionName = XML::getProperty(animationNode, "direction", ""); - SpriteDirection directionType = makeSpriteDirection(directionName); + const SpriteDirection directionType = makeSpriteDirection(directionName); if (directionType == DIRECTION_INVALID) { @@ -201,7 +212,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, // Get animation frames for_each_xml_child_node(frameNode, animationNode) { - int delay = XML::getProperty(frameNode, "delay", 0); + const int delay = XML::getProperty(frameNode, "delay", 0); int offsetX = XML::getProperty(frameNode, "offsetX", 0); int offsetY = XML::getProperty(frameNode, "offsetY", 0); offsetY -= imageSet->getHeight() - 32; @@ -209,7 +220,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) { - int index = XML::getProperty(frameNode, "index", -1); + const int index = XML::getProperty(frameNode, "index", -1); if (index < 0) { @@ -230,7 +241,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) { int start = XML::getProperty(frameNode, "start", -1); - int end = XML::getProperty(frameNode, "end", -1); + const int end = XML::getProperty(frameNode, "end", -1); if (start < 0 || end < 0) { @@ -263,12 +274,23 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, void SpriteDef::includeSprite(xmlNodePtr includeNode) { + // TODO: Perform circular dependency check, since it's easy to crash the + // client this way. const std::string filename = XML::getProperty(includeNode, "file", ""); - ResourceManager *resman = ResourceManager::getInstance(); - SpriteDef *sprite = resman->getSprite("graphics/sprites/" + filename); - // TODO: Somehow implement actually including it - sprite->decRef(); + if (filename.empty()) + return; + + XML::Document doc("graphics/sprites/" + filename); + xmlNodePtr rootNode = doc.rootNode(); + + if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) + { + logger->log("Error, no sprite root node in %s", filename.c_str()); + return; + } + + loadSprite(rootNode, 0); } void diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 2872af06..72c2566f 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: spritedef.h 4255 2008-05-21 21:44:27Z crush_tmw $ + * $Id$ */ #ifndef _TMW_SPRITEDEF_H @@ -91,6 +91,12 @@ class SpriteDef : public Resource */ ~SpriteDef(); + /** + * Loads a sprite element. + */ + void loadSprite(xmlNodePtr spriteNode, int variant, + const std::string &palettes = ""); + /** * Loads an imageset element. */ diff --git a/src/sound.h b/src/sound.h index 038f299e..ebcd6442 100644 --- a/src/sound.h +++ b/src/sound.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: sound.h 3606 2007-09-27 14:54:09Z b_lindeijer $ + * $Id$ */ #ifndef _TMW_SOUND_H diff --git a/src/textparticle.cpp b/src/textparticle.cpp index c4b432f3..89466006 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: textparticle.cpp 4360 2008-06-23 14:44:20Z crush_tmw $ + * $Id$ */ #include "textparticle.h" diff --git a/src/tileset.h b/src/tileset.h index 6272d64a..fb5593ef 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -44,8 +44,7 @@ class Tileset : public ImageSet /** * Returns the first gid. */ - int - getFirstGid() + int getFirstGid() const { return mFirstGid; } diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 3b8aeb0e..29cde178 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -24,6 +24,7 @@ #ifndef _TMW_UTILS_DTOR_H #define _TMW_UTILS_DTOR_H +#include #include #include @@ -46,4 +47,11 @@ inline dtor make_dtor(Cont const&) return dtor(); } +template +inline void delete_all(Container &c) +{ + std::for_each(c.begin(), c.end(), make_dtor(c)); +} + + #endif -- cgit v1.2.3-70-g09d2 From 7729faaadff2e6f92d24f43e52d085f4b11be315 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 10 Oct 2008 17:48:27 +0000 Subject: Did a little bit of code cleanup (mostly from TMW changes) as well as properly implemented line wrapping. Now, there are no more visual artifacts for speech boxes, and it always chooses the most optimal box size (which required that npc_text use it also. Do any other gui classes use the textbox class?). --- src/animatedsprite.cpp | 16 ++-------------- src/being.cpp | 2 +- src/gui/npc_text.cpp | 2 ++ src/gui/speechbubble.cpp | 8 +++----- src/gui/textbox.cpp | 22 +++++++++++----------- src/gui/updatewindow.cpp | 4 ++-- src/particleemitter.cpp | 5 ++--- src/resources/spritedef.cpp | 5 ++--- src/simpleanimation.cpp | 5 ++--- 9 files changed, 27 insertions(+), 42 deletions(-) (limited to 'src/being.cpp') diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index dd43e0f1..34ea60f4 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -195,23 +195,11 @@ AnimatedSprite::setDirection(SpriteDirection direction) int AnimatedSprite::getWidth() const { - if (mFrame) - { - return mFrame->image->getWidth(); - } - else { - return 0; - } + return mframe ? mFrame->image->getWidth() : 0; } int AnimatedSprite::getHeight() const { - if (mFrame) - { - return mFrame->image->getHeight(); - } - else { - return 0; - } + return mFrame ? mFrame->image->getHeight() : 0; } diff --git a/src/being.cpp b/src/being.cpp index 1d7f5ee7..a30bf465 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -443,9 +443,9 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) mSpeechBubble->setWindowName(mName); // Not quite centered, but close enough. However, it's not too important to get // it right right now, as it doesn't take bubble collision into account yet. + mSpeechBubble->setText( mSpeech ); mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - (mSpeechBubble->getNumRows()*14)); - mSpeechBubble->setText( mSpeech ); mSpeechBubble->setVisible(true); } else if (mSpeechTime == 0) diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp index 52f35a88..d51698fb 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npc_text.cpp @@ -57,12 +57,14 @@ NpcTextDialog::NpcTextDialog(): void NpcTextDialog::setText(const std::string &text) { + mTextBox->setMinWidth(230); mTextBox->setTextWrapped(text); } void NpcTextDialog::addText(const std::string &text) { + mTextBox->setMinWidth(230); mTextBox->setTextWrapped(mTextBox->getText() + text + "\n"); } diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index d71ceedf..c5c653e7 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -61,8 +61,8 @@ SpeechBubble::SpeechBubble()//: void SpeechBubble::setText(const std::string mText) { - mSpeechBox->setTextWrapped( mText ); mSpeechBox->setMinWidth(140); + mSpeechBox->setTextWrapped( mText ); int numRows = mSpeechBox->getNumberOfRows(); @@ -76,10 +76,8 @@ void SpeechBubble::setText(const std::string mText) } else { - int width; - if (this->getCaption().length() > mText.length()) - width = getFont()->getWidth(this->getCaption()); - else + int width = getFont()->getWidth(this->getCaption()); + if (width < getFont()->getWidth(mText)) width = getFont()->getWidth(mText); setContentSize(width + 15, 30); mSpeechArea->setDimension(gcn::Rectangle(4, 15, width + 5, 17)); diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp index 4976549f..e779a9bb 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -45,6 +45,7 @@ void TextBox::setTextWrapped(const std::string &text) std::stringstream wrappedStream; std::string::size_type newlinePos, lastNewlinePos = 0; + int minWidth = 0; do { @@ -60,8 +61,6 @@ void TextBox::setTextWrapped(const std::string &text) text.substr(lastNewlinePos, newlinePos - lastNewlinePos); std::string::size_type spacePos, lastSpacePos = 0; int xpos = 0; - mMinWidth = getWidth(); - bool longWord = false; do { @@ -77,25 +76,26 @@ void TextBox::setTextWrapped(const std::string &text) int width = getFont()->getWidth(word); - if (xpos != 0 && xpos + width + getFont()->getWidth(" ") < getWidth()) + if (xpos != 0 && xpos + width + getFont()->getWidth(" ") <= mMinWidth) { xpos += width + getFont()->getWidth(" "); wrappedStream << " " << word; } else if (lastSpacePos == 0) { - if (xpos > mMinWidth) - { - longWord = true; - mMinWidth = xpos; - } xpos += width; wrappedStream << word; } else { - if ((xpos < mMinWidth) && !longWord && spacePos != line.size()) - mMinWidth = xpos; + if (xpos > minWidth) + { + minWidth = xpos; + if (minWidth > mMinWidth) + { + mMinWidth = minWidth; + } + } xpos = width; wrappedStream << "\n" << word; } @@ -107,10 +107,10 @@ void TextBox::setTextWrapped(const std::string &text) { wrappedStream << "\n"; } - lastNewlinePos = newlinePos + 1; } while (newlinePos != text.size()); + mMinWidth = minWidth; gcn::TextBox::setText(wrappedStream.str()); } diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index b052e4b6..5e9baa32 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -58,9 +58,9 @@ unsigned long fadler32(FILE *file) // Calculate Adler-32 checksum char *buffer = (char*) malloc(fileSize); - fread(buffer, 1, fileSize, file); + const size_t read = fread(buffer, 1, fileSize, file); unsigned long adler = adler32(0L, Z_NULL, 0); - adler = adler32(adler, (Bytef*) buffer, fileSize); + adler = adler32(adler, (Bytef*) buffer, read); free(buffer); return adler; diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 3e0a3d75..816a5d28 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -213,7 +213,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * if (!img) { - logger->log("No image at index " + (index)); + logger->log("No image at index %d", index); continue; } @@ -236,8 +236,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * if (!img) { - logger->log("No image at index " + - (start)); + logger->log("No image at index %d", start); continue; } diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index ebc60240..a6d8891e 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -232,7 +232,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, if (!img) { - logger->log("No image at index " + (index + variant_offset)); + logger->log("No image at index %d", index + variant_offset); continue; } @@ -255,8 +255,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, if (!img) { - logger->log("No image at index " + - (start + variant_offset)); + logger->log("No image at index %d", start + variant_offset); continue; } diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index db1c0c91..a75a3392 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -68,7 +68,7 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode): if (!img) { - logger->log("No image at index " + (index)); + logger->log("No image at index %d", index); continue; } @@ -91,8 +91,7 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode): if (!img) { - logger->log("No image at index " + - (start)); + logger->log("No image at index %d", start); continue; } -- cgit v1.2.3-70-g09d2 From dc3c5d595e60a8498e44affb8ec05b91709d34fc Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 14 Oct 2008 21:04:46 +0000 Subject: Early addition of a particle effect disabling option. Would like to change this in the future to update instantaneously. --- src/being.cpp | 31 ++++++++++++++++++------------- src/being.h | 3 +++ src/gui/setup_video.cpp | 15 +++++++++++++++ src/gui/setup_video.h | 2 ++ src/map.cpp | 13 ++++++++----- src/monster.cpp | 16 +++++++++------- src/npc.cpp | 15 +++++++++------ 7 files changed, 64 insertions(+), 31 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index a30bf465..c4723f79 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -34,6 +34,7 @@ #include "particle.h" #include "sound.h" #include "localplayer.h" +#include "configuration.h" #include "resources/resourcemanager.h" #include "resources/imageset.h" @@ -71,7 +72,8 @@ Being::Being(int id, int job, Map *map): mPx(0), mPy(0), mSprites(VECTOREND_SPRITE, NULL), mSpriteIDs(VECTOREND_SPRITE, 0), - mSpriteColors(VECTOREND_SPRITE, "") + mSpriteColors(VECTOREND_SPRITE, ""), + mParticleEffects(config.getValue("particleeffects", 1)) { setMap(map); @@ -387,19 +389,22 @@ void Being::logic() } } - //Update particle effects - for (std::list::iterator i = mChildParticleEffects.begin(); - i != mChildParticleEffects.end();) + if (mParticleEffects) { - (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f); - if ((*i)->isExtinct()) + //Update particle effects + for (std::list::iterator i = mChildParticleEffects.begin(); + i != mChildParticleEffects.end();) { - (*i)->kill(); - i = mChildParticleEffects.erase(i); - } - else - { - i++; + (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f); + if ((*i)->isExtinct()) + { + (*i)->kill(); + i = mChildParticleEffects.erase(i); + } + else + { + i++; + } } } } @@ -589,7 +594,7 @@ void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx) return; } - if (gfx && ed->mGFXEffect != "") { + if (gfx && ed->mGFXEffect != "" && mParticleEffects) { Particle *selfFX; selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0); diff --git a/src/being.h b/src/being.h index cc6ba427..05a49d9a 100644 --- a/src/being.h +++ b/src/being.h @@ -405,6 +405,9 @@ class Being : public Sprite std::vector mSpriteColors; std::list mChildParticleEffects; + protected: + bool mParticleEffects; /**< Whether to display particles or not */ + private: /** * Calculates the offset in the given directions. diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index dd56ee2f..e065edae 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -106,6 +106,7 @@ Setup_Video::Setup_Video(): mFullScreenEnabled(config.getValue("screen", 0)), mOpenGLEnabled(config.getValue("opengl", 0)), mCustomCursorEnabled(config.getValue("customcursor", 1)), + mParticleEffectsEnabled(config.getValue("particleeffects", 1)), mOpacity(config.getValue("guialpha", 0.8)), mFps((int)config.getValue("fpslimit", 60)), mModeListModel(new ModeListModel()), @@ -113,6 +114,7 @@ Setup_Video::Setup_Video(): mFsCheckBox(new CheckBox("Full screen", mFullScreenEnabled)), mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)), mCustomCursorCheckBox(new CheckBox("Custom cursor", mCustomCursorEnabled)), + mParticleEffectsCheckBox(new CheckBox("Particle effects", mParticleEffectsEnabled)), mAlphaSlider(new Slider(0.2, 1.0)), mFpsCheckBox(new CheckBox("FPS Limit: ")), mFpsSlider(new Slider(10, 200)), @@ -144,6 +146,7 @@ Setup_Video::Setup_Video(): scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 50)); mFsCheckBox->setPosition(110, 10); mOpenGLCheckBox->setPosition(110, 30); + mParticleEffectsCheckBox->setPosition(175, 30); mCustomCursorCheckBox->setPosition(110, 50); mAlphaSlider->setDimension(gcn::Rectangle(10, 80, 100, 10)); alphaLabel->setPosition(20 + mAlphaSlider->getWidth(), @@ -163,6 +166,7 @@ Setup_Video::Setup_Video(): mFpsCheckBox->setSelected(mFps > 0); mCustomCursorCheckBox->setActionEventId("customcursor"); + mParticleEffectsCheckBox->setActionEventId("particleeffects"); mAlphaSlider->setActionEventId("guialpha"); mFpsCheckBox->setActionEventId("fpslimitcheckbox"); mFpsSlider->setActionEventId("fpslimitslider"); @@ -176,6 +180,7 @@ Setup_Video::Setup_Video(): mParticleDetailField->setActionEventId("particledetailfield"); mCustomCursorCheckBox->addActionListener(this); + mParticleEffectsCheckBox->addActionListener(this); mAlphaSlider->addActionListener(this); mFpsCheckBox->addActionListener(this); mFpsSlider->addActionListener(this); @@ -250,6 +255,7 @@ Setup_Video::Setup_Video(): add(mFsCheckBox); add(mOpenGLCheckBox); add(mCustomCursorCheckBox); + add(mParticleEffectsCheckBox); add(mAlphaSlider); add(alphaLabel); add(mFpsCheckBox); @@ -371,6 +377,8 @@ void Setup_Video::cancel() config.setValue("screen", mFullScreenEnabled ? 1 : 0); config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0); + config.setValue("particleeffects", mParticleEffectsEnabled ? 1 : 0); + config.setValue("screen", mParticleEffectsEnabled ? 1 : 0); config.setValue("guialpha", mOpacity); config.setValue("opengl", mOpenGLEnabled ? 1 : 0); } @@ -386,6 +394,13 @@ void Setup_Video::action(const gcn::ActionEvent &event) config.setValue("customcursor", mCustomCursorCheckBox->isSelected() ? 1 : 0); } + else if (event.getId() == "particleeffects") + { + config.setValue("particleeffects", + mParticleEffectsCheckBox->isSelected() ? 1 : 0); + new OkDialog("Particle effect settings changed", + "Restart your client or change maps for the change to take effect."); + } else if (event.getId() == "fpslimitslider") { mFps = (int) mFpsSlider->getValue(); diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 0d7ea700..7eb872d4 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -51,6 +51,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, bool mFullScreenEnabled; bool mOpenGLEnabled; bool mCustomCursorEnabled; + bool mParticleEffectsEnabled; double mOpacity; int mFps; @@ -60,6 +61,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, gcn::CheckBox *mFsCheckBox; gcn::CheckBox *mOpenGLCheckBox; gcn::CheckBox *mCustomCursorCheckBox; + gcn::CheckBox *mParticleEffectsCheckBox; gcn::Slider *mAlphaSlider; gcn::CheckBox *mFpsCheckBox; diff --git a/src/map.cpp b/src/map.cpp index 3adc3498..f9454187 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -504,11 +504,14 @@ void Map::addParticleEffect(const std::string &effectFile, int x, int y) void Map::initializeParticleEffects(Particle* particleEngine) { - for (std::list::iterator i = particleEffects.begin(); - i != particleEffects.end(); - i++ - ) + if (config.getValue("particleeffects", 1)) { - particleEngine->addEffect(i->file, i->x, i->y); + for (std::list::iterator i = particleEffects.begin(); + i != particleEffects.end(); + i++ + ) + { + particleEngine->addEffect(i->file, i->x, i->y); + } } } diff --git a/src/monster.cpp b/src/monster.cpp index 61f1f5c3..be22bed3 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -65,13 +65,15 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map): mSprites[c] = AnimatedSprite::load("graphics/sprites/error.xml"); } - const std::list &particleEffects = info.getParticleEffects(); - for ( std::list::const_iterator i = particleEffects.begin(); - i != particleEffects.end(); - i++ - ) + if (mParticleEffects) { - controlParticle(particleEngine->addEffect((*i), 0, 0)); + const std::list &particleEffects = info.getParticleEffects(); + for ( std::list::const_iterator i = particleEffects.begin(); + i != particleEffects.end(); i++ + ) + { + controlParticle(particleEngine->addEffect((*i), 0, 0)); + } } } @@ -122,7 +124,7 @@ void Monster::setAction(Action action) //attack particle effect particleEffect = getInfo().getAttackParticleEffect(); - if (particleEffect != "") + if (particleEffect != "" && mParticleEffects) { switch (mDirection) { diff --git a/src/npc.cpp b/src/npc.cpp index fe0b4598..3f9a1601 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -58,13 +58,16 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network): c++; } - //setup particle effects - for (std::list::const_iterator i = info.particles.begin(); - i != info.particles.end(); - i++) + if (mParticleEffects) { - Particle *p = particleEngine->addEffect(*i, 0, 0); - this->controlParticle(p); + //setup particle effects + for (std::list::const_iterator i = info.particles.begin(); + i != info.particles.end(); + i++) + { + Particle *p = particleEngine->addEffect(*i, 0, 0); + this->controlParticle(p); + } } mName = 0; } -- cgit v1.2.3-70-g09d2 From d3f84af9d22814db0ec67e87805b3d1054afd606 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Wed, 15 Oct 2008 15:23:21 +0000 Subject: De-hardcoded colors in trunk. Now, all colors are loaded from colors.xml. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/being.cpp | 2 +- src/being.h | 8 ++-- src/gui/char_select.cpp | 8 +++- src/localplayer.cpp | 1 + src/player.cpp | 23 +-------- src/resources/colordb.cpp | 119 ++++++++++++++++++++++++++++++++++++++++++++++ src/resources/colordb.h | 52 ++++++++++++++++++++ 9 files changed, 188 insertions(+), 29 deletions(-) create mode 100644 src/resources/colordb.cpp create mode 100644 src/resources/colordb.h (limited to 'src/being.cpp') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6b9d3b1..d7ff67a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -227,6 +227,8 @@ SET(SRCS resources/animation.h resources/buddylist.cpp resources/buddylist.h + resources/colordb.cpp + resources/colordb.h resources/dye.cpp resources/dye.h resources/image.cpp diff --git a/src/Makefile.am b/src/Makefile.am index f6d06536..0f12579f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -189,6 +189,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ resources/animation.h \ resources/buddylist.cpp \ resources/buddylist.h \ + resources/colordb.cpp \ + resources/colordb.h \ resources/dye.cpp \ resources/dye.h \ resources/image.cpp \ diff --git a/src/being.cpp b/src/being.cpp index c4723f79..97ccd42e 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -144,7 +144,7 @@ void Being::setPath(const Path &path) void Being::setHairStyle(int style, int color) { mHairStyle = style < 0 ? mHairStyle : style % NR_HAIR_STYLES; - mHairColor = color < 0 ? mHairColor : color % NR_HAIR_COLORS; + mHairColor = color; } void Being::setSprite(int slot, int id, std::string color) diff --git a/src/being.h b/src/being.h index 05a49d9a..f5f1a1a7 100644 --- a/src/being.h +++ b/src/being.h @@ -36,8 +36,9 @@ #include "gui/speechbubble.h" +#include "resources/colordb.h" + #define NR_HAIR_STYLES 10 -#define NR_HAIR_COLORS 16 #define FIRST_IGNORE_EMOTE 14 @@ -362,6 +363,7 @@ class Being : public Sprite const std::auto_ptr mEquipment; + protected: /** * Sets the new path for this being. @@ -389,6 +391,7 @@ class Being : public Sprite std::string mName; /**< Name of character */ SpriteIterator mSpriteIterator; bool mIsGM; + bool mParticleEffects; /**< Whether to display particles or not */ /** Engine-related infos about weapon. */ const ItemInfo* mEquippedWeapon; @@ -405,9 +408,6 @@ class Being : public Sprite std::vector mSpriteColors; std::list mChildParticleEffects; - protected: - bool mParticleEffects; /**< Whether to display particles or not */ - private: /** * Calculates the offset in the given directions. diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index c4b1d89e..65d0159f 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -256,7 +256,10 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network, { mPlayer = new Player(0, 0, NULL); mPlayer->setGender(gender); - mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % NR_HAIR_COLORS); + + int numberOfHairColors = ColorDB::size(); + + mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % numberOfHairColors); mNameField = new TextField(""); mNameLabel = new gcn::Label("Name:"); @@ -322,6 +325,7 @@ CharCreateDialog::~CharCreateDialog() void CharCreateDialog::action(const gcn::ActionEvent &event) { + int numberOfColors = ColorDB::size(); if (event.getId() == "create") { if (getName().length() >= 4) { // Attempt to create the character @@ -340,7 +344,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event) mPlayer->setHairStyle(-1, mPlayer->getHairColor() + 1); } else if (event.getId() == "prevcolor") { - mPlayer->setHairStyle(-1, mPlayer->getHairColor() + NR_HAIR_COLORS - 1); + mPlayer->setHairStyle(-1, mPlayer->getHairColor() + numberOfColors - 1); } else if (event.getId() == "nextstyle") { mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, -1); diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 66d37ddf..d83bd254 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -54,6 +54,7 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): mInventory(new Inventory(INVENTORY_SIZE)), mStorage(new Inventory(STORAGE_SIZE)) { + ColorDB::load(); } LocalPlayer::~LocalPlayer() diff --git a/src/player.cpp b/src/player.cpp index 8380fdfe..37badcdc 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -160,32 +160,11 @@ void Player::setGender(int gender) void Player::setHairStyle(int style, int color) { style = style < 0 ? mHairStyle : style % NR_HAIR_STYLES; - color = color < 0 ? mHairColor : color % NR_HAIR_COLORS; if (style == mHairStyle && color == mHairColor) return; Being::setHairStyle(style, color); - static char const *const colors[NR_HAIR_COLORS] = - { - "#8c4b41,da9041,ffffff", // light brown - "#06372b,489e25,fdedcc", // green - "#5f0b33,91191c,f9ad81", // dark red - "#602486,934cc3,fdc689", // purple - "#805e74,c6b09b,ffffff", // white - "#8c6625,dab425,ffffff", // yellow - "#1d2d6d,1594a3,fdedcc", // blue - "#831f2d,be4f2d,f8cc8b", // brown - "#432482,584bbc,dae8e5", // light blue - "#460850,611967,e7b4ae", // dark purple - "#8f3e21,bc522b,ff946c", // orange - "#9c6b84,d272a3,ffcae5", // pink - "#1d1d1d,414141,6f6f6f", // charcoal - "#525252,99999b,cacaca", // silver - "#841413,aa2829,ffaeb1", // light red - "#a82513,ffa525,ffffff", // strawberry blond - }; - - setSprite(HAIR_SPRITE, style * -1, colors[color]); + setSprite(HAIR_SPRITE, style * -1, ColorDB::get(color)); setAction(mAction); } diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp new file mode 100644 index 00000000..837561ed --- /dev/null +++ b/src/resources/colordb.cpp @@ -0,0 +1,119 @@ +/* + * Aethyra + * Copyright 2008 Aethyra Development Team + * + * This file is part of Aethyra. + * + * Aethyra 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, + * 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, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include + +#include "colordb.h" + +#include "../log.h" + +#include "../utils/dtor.h" +#include "../utils/xml.h" + +#define HAIR_COLOR_FILE "colors.xml" + +namespace +{ + ColorDB::Colors mColors; + bool mLoaded = false; + std::string mFail = ""; +} + +void ColorDB::load() +{ + if (mLoaded) + { + return; + } + + XML::Document doc(HAIR_COLOR_FILE); + xmlNodePtr root = doc.rootNode(); + + if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + { + logger->log("Error loading colors file: " + HAIR_COLOR_FILE); + + // Provide "legacy" support for the TMW server that + // doesn't seperate out hair colors from the actual + // code. Seriously, this is freaking annoying. + mColors[0] = "#8c4b41,da9041,ffffff"; // light brown + mColors[1] = "#06372b,489e25,fdedcc"; // green + mColors[2] = "#5f0b33,91191c,f9ad81"; // dark red + mColors[3] = "#602486,934cc3,fdc689"; // purple + mColors[4] = "#805e74,c6b09b,ffffff"; // white + mColors[5] = "#8c6625,dab425,ffffff"; // yellow + mColors[6] = "#1d2d6d,1594a3,fdedcc"; // blue + mColors[7] = "#831f2d,be4f2d,f8cc8b"; // brown + mColors[8] = "#432482,584bbc,dae8e5"; // light blue + mColors[9] = "#460850,611967,e7b4ae"; // dark purple + } + else + { + for_each_xml_child_node(node, root) + { + if (xmlStrEqual(node->name, BAD_CAST "color")) + { + int id = XML::getProperty(node, "id", 0); + + if (mColors.find(id) != mColors.end()) + { + logger->log("ColorDB: Redefinition of dye ID %d", id); + } + + mColors[id] = XML::getProperty(node, "dye", ""); + } + } + } + + mLoaded = true; +} + +void ColorDB::unload() +{ + logger->log("Unloading color database..."); + + mColors.clear(); + mLoaded = false; +} + +std::string& ColorDB::get(int id) +{ + assert(mLoaded); + + ColorIterator i = mColors.find(id); + + if (i == mColors.end()) + { + logger->log("ColorDB: Error, unknown dye ID# %d", id); + return mFail; + } + else + { + return i->second; + } +} + +const int& ColorDB::size() +{ + return mColors.size(); +} diff --git a/src/resources/colordb.h b/src/resources/colordb.h new file mode 100644 index 00000000..43398af4 --- /dev/null +++ b/src/resources/colordb.h @@ -0,0 +1,52 @@ +/* + * Aethyra + * Copyright 2008 Aethyra Development Team + * + * This file is part of Aethyra. + * + * Aethyra 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, + * 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, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _AETHYRA_COLOR_MANAGER_H +#define _AETHYRA_COLOR_MANAGER_H + +#include +#include + +/** + * The class that holds the color information. + */ +namespace ColorDB +{ + /** + * Loads the color data from colors.xml. + */ + void load(); + + /** + * Clear the color data + */ + void unload(); + + std::string& get(int id); + + const int& size(); + + // Color DB + typedef std::map Colors; + typedef Colors::iterator ColorIterator; +}; + +#endif -- cgit v1.2.3-70-g09d2 From f07fdcc9668cc446d31ce2539e3934c40d103ae3 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Wed, 15 Oct 2008 17:57:54 +0000 Subject: Added patch so that players can turn on or off speech bubbles. --- src/being.cpp | 26 ++++++++++++++++++++++++- src/being.h | 2 ++ src/gui/setup.cpp | 2 +- src/gui/setup_players.cpp | 2 +- src/gui/setup_video.cpp | 48 ++++++++++++++++++++++++++++++----------------- src/gui/setup_video.h | 2 ++ 6 files changed, 62 insertions(+), 20 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 97ccd42e..4958700f 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -35,6 +35,7 @@ #include "sound.h" #include "localplayer.h" #include "configuration.h" +#include "text.h" #include "resources/resourcemanager.h" #include "resources/imageset.h" @@ -53,6 +54,9 @@ int Being::instances = 0; ImageSet *Being::emotionSet = NULL; +static const int X_SPEECH_OFFSET = 18; +static const int Y_SPEECH_OFFSET = 60; + Being::Being(int id, int job, Map *map): mJob(job), mX(0), mY(0), @@ -90,6 +94,7 @@ Being::Being(int id, int job, Map *map): instances++; mSpeech = ""; mIsGM = false; + mText = 0; } Being::~Being() @@ -115,6 +120,7 @@ Being::~Being() } delete mSpeechBubble; + delete mText; } void Being::setDestination(Uint16 destX, Uint16 destY) @@ -157,6 +163,17 @@ void Being::setSprite(int slot, int id, std::string color) void Being::setSpeech(const std::string &text, Uint32 time) { mSpeech = text; + + if (!config.getValue("speechbubble", 1)) + { + // don't introduce a memory leak + delete mText; + + mText = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET, + gcn::Graphics::CENTER, speechFont, + gcn::Color(255, 255, 255)); + } + mSpeechTime = 500; } @@ -361,6 +378,13 @@ void Being::logic() if (mSpeechTime > 0) mSpeechTime--; + // Remove text if speech boxes aren't being used + if (mSpeechTime == 0 && mText) + { + delete mText; + mText = 0; + } + int oldPx = mPx; int oldPy = mPy; // Update pixel coordinates @@ -442,7 +466,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) int py = mPy + offsetY; // Draw speech above this being - if (mSpeechTime > 0) + if (mSpeechTime > 0 && config.getValue("speechbubble", 1)) { mSpeechBubble->setCaption(mName); mSpeechBubble->setWindowName(mName); diff --git a/src/being.h b/src/being.h index f5f1a1a7..cceebc3c 100644 --- a/src/being.h +++ b/src/being.h @@ -51,6 +51,7 @@ class Graphics; class ImageSet; class Particle; class SpeechBubble; +class Text; /** * A position along a being's path. @@ -398,6 +399,7 @@ class Being : public Sprite Path mPath; std::string mSpeech; + Text *mText; Uint16 mHairStyle, mHairColor; Uint8 mGender; Uint32 mSpeechTime; diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 8ec3bfd8..4faa8a86 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -50,7 +50,7 @@ Setup::Setup(): { setCloseButton(true); int width = 310; - int height = 290; + int height = 310; setContentSize(width, height); const char *buttonNames[] = { diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index 809364ea..ed1facc7 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -48,7 +48,7 @@ #define WIDGET_AT(row, column) (((row) * COLUMNS_NR) + column) -static std::string table_titles[COLUMNS_NR] = {"name", "relation"}; +static std::string table_titles[COLUMNS_NR] = {" name", "relation "}; static const std::string RELATION_NAMES[PlayerRelation::RELATIONS_NR] = { "neutral", "friend", "disregarded", "ignored" diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 612de09f..6a246501 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -107,6 +107,7 @@ Setup_Video::Setup_Video(): mOpenGLEnabled(config.getValue("opengl", 0)), mCustomCursorEnabled(config.getValue("customcursor", 1)), mParticleEffectsEnabled(config.getValue("particleeffects", 1)), + mSpeechBubbleEnabled(config.getValue("speechbubble", 1)), mOpacity(config.getValue("guialpha", 0.8)), mFps((int)config.getValue("fpslimit", 60)), mModeListModel(new ModeListModel()), @@ -115,6 +116,7 @@ Setup_Video::Setup_Video(): mOpenGLCheckBox(new CheckBox("OpenGL", mOpenGLEnabled)), mCustomCursorCheckBox(new CheckBox("Custom cursor", mCustomCursorEnabled)), mParticleEffectsCheckBox(new CheckBox("Particle effects", mParticleEffectsEnabled)), + mSpeechBubbleCheckBox(new CheckBox("Speech bubbles", mSpeechBubbleEnabled)), mAlphaSlider(new Slider(0.2, 1.0)), mFpsCheckBox(new CheckBox("FPS Limit: ")), mFpsSlider(new Slider(10, 200)), @@ -142,17 +144,18 @@ Setup_Video::Setup_Video(): mOpenGLCheckBox->setEnabled(false); #endif - mModeList->setDimension(gcn::Rectangle(0, 0, 60, 50)); - scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 50)); + mModeList->setDimension(gcn::Rectangle(0, 0, 60, 70)); + scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 70)); mFsCheckBox->setPosition(110, 10); mOpenGLCheckBox->setPosition(110, 30); mParticleEffectsCheckBox->setPosition(175, 30); mCustomCursorCheckBox->setPosition(110, 50); - mAlphaSlider->setDimension(gcn::Rectangle(10, 80, 100, 10)); + mSpeechBubbleCheckBox->setPosition(110, 70); + mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 100, 10)); alphaLabel->setPosition(20 + mAlphaSlider->getWidth(), mAlphaSlider->getY()); - mFpsCheckBox->setPosition(90, 100); - mFpsSlider->setDimension(gcn::Rectangle(10, 100, 75, 10)); + mFpsCheckBox->setPosition(90, 120); + mFpsSlider->setDimension(gcn::Rectangle(10, 120, 75, 10)); mFpsField->setPosition(100 + mFpsCheckBox->getWidth(), 100); mFpsField->setWidth(30); @@ -167,6 +170,7 @@ Setup_Video::Setup_Video(): mCustomCursorCheckBox->setActionEventId("customcursor"); mParticleEffectsCheckBox->setActionEventId("particleeffects"); + mSpeechBubbleCheckBox->setActionEventId("speechbubble"); mAlphaSlider->setActionEventId("guialpha"); mFpsCheckBox->setActionEventId("fpslimitcheckbox"); mFpsSlider->setActionEventId("fpslimitslider"); @@ -181,6 +185,7 @@ Setup_Video::Setup_Video(): mCustomCursorCheckBox->addActionListener(this); mParticleEffectsCheckBox->addActionListener(this); + mSpeechBubbleCheckBox->addActionListener(this); mAlphaSlider->addActionListener(this); mFpsCheckBox->addActionListener(this); mFpsSlider->addActionListener(this); @@ -194,26 +199,26 @@ Setup_Video::Setup_Video(): mParticleDetailSlider->addActionListener(this); mParticleDetailField->addKeyListener(this); - mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10)); + mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 140, 75, 10)); gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius"); - scrollRadiusLabel->setPosition(90, 120); - mScrollRadiusField->setPosition(mFpsField->getX(), 120); + scrollRadiusLabel->setPosition(90, 140); + mScrollRadiusField->setPosition(mFpsField->getX(), 140); mScrollRadiusField->setWidth(30); mScrollRadiusField->setText(toString(mOriginalScrollRadius)); mScrollRadiusSlider->setValue(mOriginalScrollRadius); - mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 140, 75, 10)); + mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 160, 75, 10)); gcn::Label *scrollLazinessLabel = new gcn::Label("Scroll laziness"); - scrollLazinessLabel->setPosition(90, 140); - mScrollLazinessField->setPosition(mFpsField->getX(), 140); + scrollLazinessLabel->setPosition(90, 160); + mScrollLazinessField->setPosition(mFpsField->getX(), 160); mScrollLazinessField->setWidth(30); mScrollLazinessField->setText(toString(mOriginalScrollLaziness)); mScrollLazinessSlider->setValue(mOriginalScrollLaziness); - mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 160, 75, 10)); + mOverlayDetailSlider->setDimension(gcn::Rectangle(10, 180, 75, 10)); gcn::Label *overlayDetailLabel = new gcn::Label("Ambient FX"); - overlayDetailLabel->setPosition(90, 160); - mOverlayDetailField->setPosition(180, 160); + overlayDetailLabel->setPosition(90, 180); + mOverlayDetailField->setPosition(180, 180); mOverlayDetailField->setWidth(30); switch (mOverlayDetail) { @@ -229,10 +234,10 @@ Setup_Video::Setup_Video(): } mOverlayDetailSlider->setValue(mOverlayDetail); - mParticleDetailSlider->setDimension(gcn::Rectangle(10, 180, 75, 10)); + mParticleDetailSlider->setDimension(gcn::Rectangle(10, 200, 75, 10)); gcn::Label *particleDetailLabel = new gcn::Label("Particle Detail"); - particleDetailLabel->setPosition(90, 180); - mParticleDetailField->setPosition(180, 180); + particleDetailLabel->setPosition(90, 200); + mParticleDetailField->setPosition(180, 200); mParticleDetailField->setWidth(60); switch (mParticleDetail) { @@ -256,6 +261,7 @@ Setup_Video::Setup_Video(): add(mOpenGLCheckBox); add(mCustomCursorCheckBox); add(mParticleEffectsCheckBox); + add(mSpeechBubbleCheckBox); add(mAlphaSlider); add(alphaLabel); add(mFpsCheckBox); @@ -335,6 +341,8 @@ void Setup_Video::apply() // We sync old and new values at apply time mFullScreenEnabled = config.getValue("screen", 0); mCustomCursorEnabled = config.getValue("customcursor", 1); + mParticleEffectsEnabled = config.getValue("particleeffects", 1); + mSpeechBubbleEnabled = config.getValue("speechbubble", 1); mOpacity = config.getValue("guialpha", 0.8); mOverlayDetail = (int)config.getValue("OverlayDetail", 2); mOpenGLEnabled = config.getValue("opengl", 0); @@ -378,6 +386,7 @@ void Setup_Video::cancel() config.setValue("screen", mFullScreenEnabled ? 1 : 0); config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0); config.setValue("particleeffects", mParticleEffectsEnabled ? 1 : 0); + config.setValue("speechbubble", mSpeechBubbleEnabled ? 1 : 0); config.setValue("guialpha", mOpacity); config.setValue("opengl", mOpenGLEnabled ? 1 : 0); } @@ -400,6 +409,11 @@ void Setup_Video::action(const gcn::ActionEvent &event) new OkDialog("Particle effect settings changed", "Restart your client or change maps for the change to take effect."); } + else if (event.getId() == "speechbubble") + { + config.setValue("speechbubble", + mSpeechBubbleCheckBox->isSelected() ? 1 : 0); + } else if (event.getId() == "fpslimitslider") { mFps = (int) mFpsSlider->getValue(); diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 7eb872d4..d0a19cb6 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -52,6 +52,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, bool mOpenGLEnabled; bool mCustomCursorEnabled; bool mParticleEffectsEnabled; + bool mSpeechBubbleEnabled; double mOpacity; int mFps; @@ -62,6 +63,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, gcn::CheckBox *mOpenGLCheckBox; gcn::CheckBox *mCustomCursorCheckBox; gcn::CheckBox *mParticleEffectsCheckBox; + gcn::CheckBox *mSpeechBubbleCheckBox; gcn::Slider *mAlphaSlider; gcn::CheckBox *mFpsCheckBox; -- cgit v1.2.3-70-g09d2 From be1af40e371845bcad1337cc59e5f5ac0f991f02 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Thu, 16 Oct 2008 01:20:24 +0000 Subject: Fixed a width that I accidently messed up earlier, as well as made text and speech bubble transitions smoother. --- src/being.cpp | 30 ++++++++++++++++++++---------- src/gui/setup_video.cpp | 2 +- 2 files changed, 21 insertions(+), 11 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 4958700f..f05652f3 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -164,16 +164,6 @@ void Being::setSpeech(const std::string &text, Uint32 time) { mSpeech = text; - if (!config.getValue("speechbubble", 1)) - { - // don't introduce a memory leak - delete mText; - - mText = new Text(text, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET, - gcn::Graphics::CENTER, speechFont, - gcn::Color(255, 255, 255)); - } - mSpeechTime = 500; } @@ -468,6 +458,12 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) // Draw speech above this being if (mSpeechTime > 0 && config.getValue("speechbubble", 1)) { + if (mText) + { + delete mText; + mText = 0; + } + mSpeechBubble->setCaption(mName); mSpeechBubble->setWindowName(mName); // Not quite centered, but close enough. However, it's not too important to get @@ -477,6 +473,20 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) (mSpeechBubble->getNumRows()*14)); mSpeechBubble->setVisible(true); } + else if (!config.getValue("speechbubble", 1)) + { + mSpeechBubble->setVisible(false); + // don't introduce a memory leak + if (mText) + { + delete mText; + mText = 0; + } + + mText = new Text(mSpeech, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET, + gcn::Graphics::CENTER, speechFont, + gcn::Color(255, 255, 255)); + } else if (mSpeechTime == 0) { mSpeechBubble->setVisible(false); diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 6a246501..879a3066 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -151,7 +151,7 @@ Setup_Video::Setup_Video(): mParticleEffectsCheckBox->setPosition(175, 30); mCustomCursorCheckBox->setPosition(110, 50); mSpeechBubbleCheckBox->setPosition(110, 70); - mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 100, 10)); + mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 75, 10)); alphaLabel->setPosition(20 + mAlphaSlider->getWidth(), mAlphaSlider->getY()); mFpsCheckBox->setPosition(90, 120); -- cgit v1.2.3-70-g09d2 From e57f4ec64f53091dd254c2ee2db9592d30a5af0b Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 19 Oct 2008 23:07:35 +0000 Subject: Fixed a small error that I didn't notice before with de-hardcoding the colors. Thanks goes to paks for noticing this. --- src/being.cpp | 3 --- src/gui/char_select.cpp | 3 +++ src/player.cpp | 1 + src/resources/colordb.cpp | 2 +- src/resources/colordb.h | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index f05652f3..07c0716d 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -478,10 +478,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) mSpeechBubble->setVisible(false); // don't introduce a memory leak if (mText) - { delete mText; - mText = 0; - } mText = new Text(mSpeech, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET, gcn::Graphics::CENTER, speechFont, diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 65d0159f..628ab35f 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -257,8 +257,11 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network, mPlayer = new Player(0, 0, NULL); mPlayer->setGender(gender); + ColorDB::load(); int numberOfHairColors = ColorDB::size(); + printf("%d\n", numberOfHairColors); + mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % numberOfHairColors); mNameField = new TextField(""); diff --git a/src/player.cpp b/src/player.cpp index 37badcdc..4025f8f4 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -44,6 +44,7 @@ Player::Player(int id, int job, Map *map): { mName = 0; mIsGM = false; + ColorDB::load(); } Player::~Player() diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 837561ed..f738b471 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -113,7 +113,7 @@ std::string& ColorDB::get(int id) } } -const int& ColorDB::size() +int ColorDB::size() { return mColors.size(); } diff --git a/src/resources/colordb.h b/src/resources/colordb.h index 43398af4..1f8b191c 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -42,7 +42,7 @@ namespace ColorDB std::string& get(int id); - const int& size(); + int size(); // Color DB typedef std::map Colors; -- cgit v1.2.3-70-g09d2 From 5b70e7729229317acfd1b8f79e8eb1b90870827b Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Thu, 23 Oct 2008 12:08:44 +0000 Subject: Removed a few compiler warnings. --- src/being.cpp | 6 +++--- src/text.cpp | 11 +++++++++++ src/text.h | 7 ++++++- 3 files changed, 20 insertions(+), 4 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 07c0716d..519be4cc 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -69,6 +69,8 @@ Being::Being(int id, int job, Map *map): mWalkSpeed(150), mDirection(DOWN), mMap(NULL), + mIsGM(false), + mParticleEffects(config.getValue("particleeffects", 1)), mEquippedWeapon(NULL), mHairStyle(1), mHairColor(0), mGender(2), @@ -76,8 +78,7 @@ Being::Being(int id, int job, Map *map): mPx(0), mPy(0), mSprites(VECTOREND_SPRITE, NULL), mSpriteIDs(VECTOREND_SPRITE, 0), - mSpriteColors(VECTOREND_SPRITE, ""), - mParticleEffects(config.getValue("particleeffects", 1)) + mSpriteColors(VECTOREND_SPRITE, "") { setMap(map); @@ -93,7 +94,6 @@ Being::Being(int id, int job, Map *map): instances++; mSpeech = ""; - mIsGM = false; mText = 0; } diff --git a/src/text.cpp b/src/text.cpp index 545c1c0e..7967b56f 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -100,3 +100,14 @@ void FlashText::draw(Graphics *graphics, int xOff, int yOff) } Text::draw(graphics, xOff, yOff); } + +FlashText::~FlashText() +{ + mTime = 0; + textManager->removeText(this); + if (--mInstances == 0) + { + delete textManager; + textManager = 0; + } +} diff --git a/src/text.h b/src/text.h index 67454e30..0de495e0 100644 --- a/src/text.h +++ b/src/text.h @@ -57,7 +57,7 @@ class Text virtual void draw(Graphics *graphics, int xOff, int yOff); - private: + protected: int mX; /**< Actual x-value of left of text written */ int mY; /**< Actual y-value of top of text written */ @@ -77,6 +77,11 @@ class FlashText : public Text gcn::Graphics::Alignment alignment, gcn::Font *font, gcn::Color colour); + /** + * Remove the text from the screen + */ + ~FlashText(); + /** * Flash the text for so many refreshes */ -- cgit v1.2.3-70-g09d2 From 8119f4ec53b64adc427f683077f65ce8aec85582 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 27 Oct 2008 01:32:22 +0000 Subject: Merged the Tametomo branch back into trunk. Targeting has been removed from the viewport, and is now located on the beings themselves. Eventually, this will be changed further so that the targets draw below the being, instead of maintaining the same logic, but baby steps first. --- src/being.cpp | 4 +-- src/being.h | 10 +++--- src/gui/viewport.cpp | 95 +------------------------------------------------ src/gui/viewport.h | 24 ------------- src/localplayer.cpp | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/localplayer.h | 25 +++++++++++++ 6 files changed, 133 insertions(+), 124 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 519be4cc..c4569d4e 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -26,15 +26,15 @@ #include #include "animatedsprite.h" +#include "configuration.h" #include "equipment.h" #include "game.h" #include "graphics.h" +#include "localplayer.h" #include "log.h" #include "map.h" #include "particle.h" #include "sound.h" -#include "localplayer.h" -#include "configuration.h" #include "text.h" #include "resources/resourcemanager.h" diff --git a/src/being.h b/src/being.h index cceebc3c..1eeeb9db 100644 --- a/src/being.h +++ b/src/being.h @@ -30,9 +30,9 @@ #include #include -#include "sprite.h" -#include "map.h" #include "animatedsprite.h" +#include "map.h" +#include "sprite.h" #include "gui/speechbubble.h" @@ -48,7 +48,6 @@ class ItemInfo; class Item; class Map; class Graphics; -class ImageSet; class Particle; class SpeechBubble; class Text; @@ -362,8 +361,10 @@ class Being : public Sprite */ virtual void triggerEffect(int effectId) { internalTriggerEffect(effectId, false, true); } - const std::auto_ptr mEquipment; + // Target cursor being used by the being + Image *mTargetCursor; + const std::auto_ptr mEquipment; protected: /** @@ -392,6 +393,7 @@ class Being : public Sprite std::string mName; /**< Name of character */ SpriteIterator mSpriteIterator; bool mIsGM; + bool mTargeted; bool mParticleEffects; /**< Whether to display particles or not */ /** Engine-related infos about weapon. */ diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index f6361ef7..7f420e0a 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -74,65 +74,11 @@ Viewport::Viewport(): config.addListener("ScrollRadius", this); mPopupMenu = new PopupMenu(); - - // Load target cursors - loadTargetCursor("graphics/gui/target-cursor-blue-s.png", 44, 35, - false, Being::TC_SMALL); - loadTargetCursor("graphics/gui/target-cursor-red-s.png", 44, 35, - true, Being::TC_SMALL); - loadTargetCursor("graphics/gui/target-cursor-blue-m.png", 62, 44, - false, Being::TC_MEDIUM); - loadTargetCursor("graphics/gui/target-cursor-red-m.png", 62, 44, - true, Being::TC_MEDIUM); - loadTargetCursor("graphics/gui/target-cursor-blue-l.png", 82, 60, - false, Being::TC_LARGE); - loadTargetCursor("graphics/gui/target-cursor-red-l.png", 82, 60, - true, Being::TC_LARGE); -} - -void -Viewport::loadTargetCursor(std::string filename, int width, int height, - bool outRange, Being::TargetCursorSize size) -{ - assert(size > -1); - assert(size < 3); - - ImageSet* currentImageSet; - SimpleAnimation* currentCursor; - - ResourceManager *resman = ResourceManager::getInstance(); - - currentImageSet = resman->getImageSet(filename, width, height); - Animation *anim = new Animation(); - for (unsigned int i = 0; i < currentImageSet->size(); ++i) - { - anim->addFrame(currentImageSet->get(i), 75, 0, 0); - } - currentCursor = new SimpleAnimation(anim); - - if (outRange) - { - mOutRangeImages[size] = currentImageSet; - mTargetCursorOutRange[size] = currentCursor; - } - else - { - mInRangeImages[size] = currentImageSet; - mTargetCursorInRange[size] = currentCursor; - } } Viewport::~Viewport() { delete mPopupMenu; - - for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) - { - delete mTargetCursorInRange[i]; - delete mTargetCursorOutRange[i]; - mInRangeImages[i]->decRef(); - mOutRangeImages[i]->decRef(); - } } void @@ -228,7 +174,7 @@ Viewport::draw(gcn::Graphics *gcnGraphics) if (mMap) { mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY); - drawTargetCursor(graphics); // TODO: Draw the cursor with the sprite + player_node->drawTargetCursor(graphics, (int) mPixelViewX, (int) mPixelViewY); // Find a path from the player to the mouse, and draw it. This is for debug @@ -291,45 +237,6 @@ void Viewport::logic() mouseY / 32 + mTileViewY); mWalkTime = player_node->mWalkTime; } - - for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) - { - mTargetCursorInRange[i]->update(10); - mTargetCursorOutRange[i]->update(10); - } -} - -void Viewport::drawTargetCursor(Graphics *graphics) -{ - // Draw target marker if needed - Being *target = player_node->getTarget(); - if (target) - { - // Calculate target circle position - - // Find whether target is in range - int rangeX = abs(target->mX - player_node->mX); - int rangeY = abs(target->mY - player_node->mY); - int attackRange = player_node->getAttackRange(); - - // Get the correct target cursors graphic - Being::TargetCursorSize cursorSize = target->getTargetCursorSize(); - Image* targetCursor; - if (rangeX > attackRange || rangeY > attackRange) - { - targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage(); - } - else - { - targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage(); - } - - // Draw the target cursor at the correct position - int posX = target->getPixelX() + 16 - targetCursor->getWidth() / 2 - (int) mPixelViewX; - int posY = target->getPixelY() + 16 - targetCursor->getHeight() / 2 - (int) mPixelViewY; - - graphics->drawImage(targetCursor, posX, posY); - } } void Viewport::mousePressed(gcn::MouseEvent &event) diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 70ac1bea..c7b3c0e7 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -38,7 +38,6 @@ class ImageSet; class Item; class PopupMenu; class Graphics; -class SimpleAnimation; /** * The viewport on the map. Displays the current map and handles mouse input @@ -136,17 +135,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener, scrollBy(float x, float y) { mPixelViewX += x; mPixelViewY += y; } private: - /** - * Helper function for loading target cursors - */ - void loadTargetCursor(std::string filename, int width, int height, - bool outRange, Being::TargetCursorSize size); - - /** - * Draws range based target cursor - */ - void drawTargetCursor(Graphics *graphics); - Map *mMap; /**< The current map. */ int mScrollRadius; @@ -159,18 +147,6 @@ class Viewport : public WindowContainer, public gcn::MouseListener, int mTileViewY; /**< Current viewpoint in tiles. */ bool mShowDebugPath; /**< Show a path from player to pointer. */ - /** Images of in range target cursor. */ - ImageSet *mInRangeImages[Being::NUM_TC]; - - /** Images of out of range target cursor. */ - ImageSet *mOutRangeImages[Being::NUM_TC]; - - /** Animated in range target cursor. */ - SimpleAnimation *mTargetCursorInRange[Being::NUM_TC]; - - /** Animated out of range target cursor. */ - SimpleAnimation *mTargetCursorOutRange[Being::NUM_TC]; - bool mPlayerFollowMouse; int mWalkTime; diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 66d37ddf..4cdaf03c 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -20,6 +20,7 @@ * * $Id$ */ +#include #include "localplayer.h" @@ -38,6 +39,9 @@ #include "net/messageout.h" #include "net/protocol.h" +#include "resources/resourcemanager.h" +#include "resources/imageset.h" + #include "utils/tostring.h" LocalPlayer *player_node = NULL; @@ -54,12 +58,21 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): mInventory(new Inventory(INVENTORY_SIZE)), mStorage(new Inventory(STORAGE_SIZE)) { + initTargetCursor(); } LocalPlayer::~LocalPlayer() { delete mInventory; delete mStorage; + + for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) + { + delete mTargetCursorInRange[i]; + delete mTargetCursorOutRange[i]; + mInRangeImages[i]->decRef(); + mOutRangeImages[i]->decRef(); + } } void LocalPlayer::logic() @@ -104,6 +117,12 @@ void LocalPlayer::logic() mLastAction = -1; } + for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) + { + player_node->mTargetCursorInRange[i]->update(10); + player_node->mTargetCursorOutRange[i]->update(10); + } + Being::logic(); } @@ -494,3 +513,83 @@ void LocalPlayer::setGotoTarget(Being *target) mGoingToTarget = true; setDestination(target->mX, target->mY); } + +void LocalPlayer::initTargetCursor() +{ + // Load target cursors + loadTargetCursor("graphics/gui/target-cursor-blue-s.png", 44, 35, + false, TC_SMALL); + loadTargetCursor("graphics/gui/target-cursor-red-s.png", 44, 35, + true, TC_SMALL); + loadTargetCursor("graphics/gui/target-cursor-blue-m.png", 62, 44, + false, TC_MEDIUM); + loadTargetCursor("graphics/gui/target-cursor-red-m.png", 62, 44, + true, TC_MEDIUM); + loadTargetCursor("graphics/gui/target-cursor-blue-l.png", 82, 60, + false, TC_LARGE); + loadTargetCursor("graphics/gui/target-cursor-red-l.png", 82, 60, + true, TC_LARGE); +} + +void LocalPlayer::loadTargetCursor(std::string filename, int width, int height, + bool outRange, TargetCursorSize size) +{ + assert(size > -1); + assert(size < 3); + + ImageSet* currentImageSet; + SimpleAnimation* currentCursor; + + ResourceManager *resman = ResourceManager::getInstance(); + + currentImageSet = resman->getImageSet(filename, width, height); + Animation *anim = new Animation(); + for (unsigned int i = 0; i < currentImageSet->size(); ++i) + { + anim->addFrame(currentImageSet->get(i), 75, 0, 0); + } + currentCursor = new SimpleAnimation(anim); + + if (outRange) + { + mOutRangeImages[size] = currentImageSet; + mTargetCursorOutRange[size] = currentCursor; + } + else + { + mInRangeImages[size] = currentImageSet; + mTargetCursorInRange[size] = currentCursor; + } +} + +void LocalPlayer::drawTargetCursor(Graphics *graphics, int offsetX, int offsetY) +{ + // Draw target marker if needed + if (mTarget) + { + // Calculate target circle position + + // Find whether target is in range + int rangeX = abs(mTarget->mX - mX); + int rangeY = abs(mTarget->mY - mY); + int attackRange = getAttackRange(); + + // Get the correct target cursors graphic + TargetCursorSize cursorSize = mTarget->getTargetCursorSize(); + + if (rangeX > attackRange || rangeY > attackRange) + { + mTarget->mTargetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage(); + } + else + { + mTarget->mTargetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage(); + } + + // Draw the target cursor at the correct position + int posX = mTarget->getPixelX() + 16 - mTarget->mTargetCursor->getWidth() / 2 - offsetX; + int posY = mTarget->getPixelY() + 16 - mTarget->mTargetCursor->getHeight() / 2 - offsetY; + + graphics->drawImage(mTarget->mTargetCursor, posX, posY); + } +} diff --git a/src/localplayer.h b/src/localplayer.h index 757c70eb..c0627378 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -25,6 +25,7 @@ #define _TMW_LOCALPLAYER_H #include "player.h" +#include "simpleanimation.h" // TODO move into some sane place... #define MAX_SLOT 2 @@ -33,6 +34,7 @@ #define STORAGE_SIZE 301 class FloorItem; +class ImageSet; class Inventory; class Item; class Network; @@ -214,6 +216,14 @@ class LocalPlayer : public Player float mLastAttackTime; /**< Used to synchronize the charge dialog */ + void drawTargetCursor(Graphics *graphics, int offsetX, int offsetY); + + /** Animated in range target cursor. */ + SimpleAnimation *mTargetCursorInRange[NUM_TC]; + + /** Animated out of range target cursor. */ + SimpleAnimation *mTargetCursorOutRange[NUM_TC]; + protected: void walk(unsigned char dir); @@ -233,6 +243,21 @@ class LocalPlayer : public Player Inventory *mInventory; Inventory *mStorage; + + /** + * Helper function for loading target cursors + */ + void loadTargetCursor(std::string filename, int width, int height, + bool outRange, Being::TargetCursorSize size); + + /** Images of in range target cursor. */ + ImageSet *mInRangeImages[NUM_TC]; + + /** Images of out of range target cursor. */ + ImageSet *mOutRangeImages[NUM_TC]; + + // Load the target cursors into memory + void initTargetCursor(); }; extern LocalPlayer *player_node; -- cgit v1.2.3-70-g09d2 From f3beda85b284e57caf6e5c685174bcb2e608d9ce Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 27 Oct 2008 07:19:11 +0000 Subject: Revised code so that dead sprites are de-targeted. --- src/being.cpp | 1 + src/gui/viewport.cpp | 2 +- src/localplayer.cpp | 21 ++++++++++++++------- 3 files changed, 16 insertions(+), 8 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index c4569d4e..db8b18e6 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -238,6 +238,7 @@ void Being::controlParticle(Particle *particle) void Being::setAction(Action action) { SpriteAction currentAction = ACTION_INVALID; + switch (action) { case WALK: diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index ad0c35e5..ef3f0dff 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -303,7 +303,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) if (player_node->withinAttackRange(being) || keyboard.isKeyActive(keyboard.KEY_ATTACK)) { player_node->setGotoTarget(being); - player_node->attack(being, keyboard.isKeyActive(keyboard.KEY_TARGET)); + player_node->attack(being, true); } else { diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 34a99bc9..85030eb7 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -112,8 +112,8 @@ void LocalPlayer::logic() break; } - // Actions are allowed once per second - if (get_elapsed_time(mLastAction) >= 1000) { + // Actions are allowed twice per second + if (get_elapsed_time(mLastAction) >= 500) { mLastAction = -1; } @@ -125,6 +125,15 @@ void LocalPlayer::logic() mLastAction = -1; } + if (mTarget) + { + if (mTarget->mAction == DEAD) + { + setTarget(mTarget); + mLastAction = -1; + } + } + for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) { player_node->mTargetCursorInRange[i]->update(10); @@ -439,14 +448,11 @@ void LocalPlayer::attack(Being *target, bool keep) if (mAction != STAND) return; - if (keep && target) + if (keep && (mTarget != target)) { + mLastAction = -1; setTarget(target); } - else if (mTarget) - { - target = mTarget; - } if (!target) return; @@ -535,6 +541,7 @@ bool LocalPlayer::withinAttackRange(Being *target) void LocalPlayer::setGotoTarget(Being *target) { + mLastAction = -1; setTarget(target); mGoingToTarget = true; setDestination(target->mX, target->mY); -- cgit v1.2.3-70-g09d2 From 0007b8e9497eacb506c8bfad34aad5adff10ba5a Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 27 Oct 2008 17:05:14 +0000 Subject: De-hardcoded the number of hair styles. --- src/being.cpp | 15 ++++++++++++++- src/being.h | 9 +++++++-- src/gui/char_select.cpp | 4 ++-- src/player.cpp | 2 +- src/resources/colordb.cpp | 2 +- 5 files changed, 25 insertions(+), 7 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index db8b18e6..7c884218 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -38,6 +38,7 @@ #include "text.h" #include "resources/resourcemanager.h" +#include "resources/itemdb.h" #include "resources/imageset.h" #include "resources/iteminfo.h" @@ -52,6 +53,7 @@ #define BEING_EFFECTS_FILE "effects.xml" int Being::instances = 0; +int Being::mNumberOfHairstyles = 1; ImageSet *Being::emotionSet = NULL; static const int X_SPEECH_OFFSET = 18; @@ -90,6 +92,17 @@ Being::Being(int id, int job, Map *map): ResourceManager *rm = ResourceManager::getInstance(); emotionSet = rm->getImageSet("graphics/gui/emotions.png", 30, 32); if (!emotionSet) logger->error("Unable to load emotions!"); + + // Hairstyles are encoded as negative numbers. Count how far negative we can go. + int hairstyles = 1; + while (ItemDB::get(-hairstyles).getSprite(0) != "error.xml") + { + hairstyles++; + } + mNumberOfHairstyles = hairstyles; + if (mNumberOfHairstyles == 0) + mNumberOfHairstyles = 1; // No hair style -> no hair + } instances++; @@ -149,7 +162,7 @@ void Being::setPath(const Path &path) void Being::setHairStyle(int style, int color) { - mHairStyle = style < 0 ? mHairStyle : style % NR_HAIR_STYLES; + mHairStyle = style < 0 ? mHairStyle : style % mNumberOfHairstyles; mHairColor = color; } diff --git a/src/being.h b/src/being.h index a2d5e5a7..b0c5b49e 100644 --- a/src/being.h +++ b/src/being.h @@ -38,8 +38,6 @@ #include "resources/colordb.h" -#define NR_HAIR_STYLES 10 - #define FIRST_IGNORE_EMOTE 14 class AnimatedSprite; @@ -199,6 +197,11 @@ class Being : public Sprite int getHairStyle() const { return mHairStyle; } + /** + * Get the number of hairstyles implemented + */ + static int getNumOfHairstyles() { return mNumberOfHairstyles; } + /** * Sets the hair style and color for this being. */ @@ -398,6 +401,8 @@ class Being : public Sprite /** Engine-related infos about weapon. */ const ItemInfo* mEquippedWeapon; + static int mNumberOfHairstyles; /** Number of hair styles in use */ + Path mPath; std::string mSpeech; Text *mText; diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index b83f98de..ca4d8608 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -261,7 +261,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network, printf("%d\n", numberOfHairColors); - mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % numberOfHairColors); + mPlayer->setHairStyle(rand() % mPlayer->getNumOfHairstyles(), rand() % numberOfHairColors); mNameField = new TextField(""); mNameLabel = new gcn::Label("Name:"); @@ -352,7 +352,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event) mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, mPlayer->getHairColor()); } else if (event.getId() == "prevstyle") { - mPlayer->setHairStyle(mPlayer->getHairStyle() + NR_HAIR_STYLES - 1, mPlayer->getHairColor()); + mPlayer->setHairStyle(mPlayer->getHairStyle() + mPlayer->getNumOfHairstyles() - 1, mPlayer->getHairColor()); } } diff --git a/src/player.cpp b/src/player.cpp index 37badcdc..c9d1e683 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -159,7 +159,7 @@ void Player::setGender(int gender) void Player::setHairStyle(int style, int color) { - style = style < 0 ? mHairStyle : style % NR_HAIR_STYLES; + style = style < 0 ? mHairStyle : style % mNumberOfHairstyles; if (style == mHairStyle && color == mHairColor) return; Being::setHairStyle(style, color); diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index caa1fbda..26ba298d 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -35,7 +35,7 @@ namespace { ColorDB::Colors mColors; bool mLoaded = false; - std::string mFail = ""; + std::string mFail = "#ffffff"; } void ColorDB::load() -- cgit v1.2.3-70-g09d2 From 9cd73fb8c9d4890336d0d0ccf290d45084155c2d Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 27 Oct 2008 17:09:55 +0000 Subject: Removed an unnecessary check. --- src/being.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 7c884218..19c2224d 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -100,9 +100,6 @@ Being::Being(int id, int job, Map *map): hairstyles++; } mNumberOfHairstyles = hairstyles; - if (mNumberOfHairstyles == 0) - mNumberOfHairstyles = 1; // No hair style -> no hair - } instances++; -- cgit v1.2.3-70-g09d2 From c22fc71adacaf6222f7e6fb70f83758298f25904 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 31 Oct 2008 04:05:51 +0000 Subject: Added critical notifications to the client. While I had originally planned to do this (I still did it my way), TMW beat me to implementing, so I'll credit them with their commit reminding me to do it. This is not done the exact same way, as I prefer to see an actual "crit!" show above the being, instead of an ambiguous particle. --- data/graphics/gui/hits_blue.png | Bin 589 -> 884 bytes data/graphics/gui/hits_red.png | Bin 561 -> 813 bytes data/graphics/gui/hits_yellow.png | Bin 894 -> 907 bytes src/being.cpp | 24 ++++++++++++++++++++---- src/being.h | 5 +++++ src/gui/gui.cpp | 4 ++-- src/net/beinghandler.cpp | 5 ++++- 7 files changed, 31 insertions(+), 7 deletions(-) (limited to 'src/being.cpp') diff --git a/data/graphics/gui/hits_blue.png b/data/graphics/gui/hits_blue.png index 59458485..cfb04ab8 100644 Binary files a/data/graphics/gui/hits_blue.png and b/data/graphics/gui/hits_blue.png differ diff --git a/data/graphics/gui/hits_red.png b/data/graphics/gui/hits_red.png index da765dc4..150f1c1e 100644 Binary files a/data/graphics/gui/hits_red.png and b/data/graphics/gui/hits_red.png differ diff --git a/data/graphics/gui/hits_yellow.png b/data/graphics/gui/hits_yellow.png index d77b7c05..6975dfd5 100644 Binary files a/data/graphics/gui/hits_yellow.png and b/data/graphics/gui/hits_yellow.png differ diff --git a/src/being.cpp b/src/being.cpp index 19c2224d..3214b491 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -189,10 +189,6 @@ void Being::takeDamage(int amount) } else { - // Hit particle effect - controlParticle(particleEngine->addEffect( - "graphics/particles/hit.particle.xml", 0, 0)); - if (getType() == MONSTER) { font = hitBlueFont; @@ -208,6 +204,26 @@ void Being::takeDamage(int amount) mPx + 16, mPy + 16); } +void Being::showCrit() +{ + gcn::Font *font; + std::string text = "crit!"; + + // Selecting the right color + if (getType() == MONSTER) + { + font = hitBlueFont; + } + else + { + font = hitRedFont; + } + + // Show crit notice + particleEngine->addTextRiseFadeOutEffect(text, font, + mPx + 16, mPy - 16); +} + void Being::handleAttack(Being *victim, int damage) { setAction(Being::ATTACK); diff --git a/src/being.h b/src/being.h index b0c5b49e..62a1c937 100644 --- a/src/being.h +++ b/src/being.h @@ -165,6 +165,11 @@ class Being : public Sprite */ virtual void takeDamage(int amount); + /** + * Puts a crit notification bubble above this being. + */ + virtual void showCrit(); + /** * Handles an attack of another being by this being. * diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index edc25152..6d70d532 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -180,9 +180,9 @@ Gui::Gui(Graphics *graphics): // Load hits' colourful fonts try { hitRedFont = new gcn::ImageFont("graphics/gui/hits_red.png", - "0123456789"); + "0123456789crit! "); hitBlueFont = new gcn::ImageFont("graphics/gui/hits_blue.png", - "0123456789"); + "0123456789crit! "); hitYellowFont = new gcn::ImageFont("graphics/gui/hits_yellow.png", "0123456789misxp "); } diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index baca0cfc..85e18e5a 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -237,8 +237,11 @@ void BeingHandler::handleMessage(MessageIn *msg) switch (type) { - case 0x00: // Damage case 0x0a: // Critical Damage + if (dstBeing) { + dstBeing->showCrit(); + } + case 0x00: // Damage if (dstBeing) { dstBeing->takeDamage(param1); } -- cgit v1.2.3-70-g09d2 From b28c963a566f685f71c3c404099fe7c65bfa0a70 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 31 Oct 2008 21:12:38 +0000 Subject: Added a text patch done on TMW to increase the number of characters supported (done by vargavind), as well as changing the effect used for critical updates (change of opinion on what looks better). --- src/being.cpp | 4 ++-- src/gui/gui.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 3214b491..245e023e 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -220,8 +220,8 @@ void Being::showCrit() } // Show crit notice - particleEngine->addTextRiseFadeOutEffect(text, font, - mPx + 16, mPy - 16); + particleEngine->addTextSplashEffect(text, 255, 255, 255, font, + mPx + 16, mPy + 16); } void Being::handleAttack(Being *victim, int damage) diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 6d70d532..e386a85c 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -114,7 +114,7 @@ Gui::Gui(Graphics *graphics): try { mGuiFont = new gcn::ImageFont("graphics/gui/sansserif8.png", " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[" - "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~|" + "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~|áÁéÉßøèÈ" ); } catch (gcn::Exception e) -- cgit v1.2.3-70-g09d2 From 842336f6d028dd8995b777439c9d1bf41f152d0f Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 2 Nov 2008 02:07:04 +0000 Subject: Fixed weapon attacks, which apparently has been broken since the mapping code was imported, due to me changing the actions to enumerations. --- src/being.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 245e023e..b4e7847d 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -276,9 +276,6 @@ void Being::setAction(Action action) case ATTACK: if (mEquippedWeapon) { - currentAction = mEquippedWeapon->getAttackType(); - } - else { currentAction = ACTION_ATTACK; } for (int i = 0; i < VECTOREND_SPRITE; i++) -- cgit v1.2.3-70-g09d2 From 168eba19e2b4712c8410bd940e3bd1fbba746d1f Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 2 Nov 2008 02:41:08 +0000 Subject: Fixed a hair color problem that Soft reported that I apparently broke when I de-hardcoded the hair colors. --- src/being.cpp | 2 +- src/player.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index b4e7847d..5c09218c 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -160,7 +160,7 @@ void Being::setPath(const Path &path) void Being::setHairStyle(int style, int color) { mHairStyle = style < 0 ? mHairStyle : style % mNumberOfHairstyles; - mHairColor = color; + mHairColor = color < 0 ? mHairColor : color % ColorDB::size(); } void Being::setSprite(int slot, int id, std::string color) diff --git a/src/player.cpp b/src/player.cpp index c9d1e683..5fb5ffe9 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -160,6 +160,7 @@ void Player::setGender(int gender) void Player::setHairStyle(int style, int color) { style = style < 0 ? mHairStyle : style % mNumberOfHairstyles; + color = color < 0 ? mHairColor : color % ColorDB::size(); if (style == mHairStyle && color == mHairColor) return; Being::setHairStyle(style, color); -- cgit v1.2.3-70-g09d2 From da8d03a095ff2ef34f688db8c602c974be956223 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 2 Nov 2008 03:06:25 +0000 Subject: This correctly fixes the attack problem. Apparently, I didn't realize a bit ago that the item type was being used to determine which attack animation to use, since a comment lied about it not being used. --- src/being.cpp | 4 ++++ src/resources/itemdb.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 5c09218c..7ad83e5e 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -275,6 +275,10 @@ void Being::setAction(Action action) break; case ATTACK: if (mEquippedWeapon) + { + currentAction = mEquippedWeapon->getAttackType(); + } + else { currentAction = ACTION_ATTACK; } diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index ad9eda01..8b73f646 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -91,7 +91,7 @@ void ItemDB::load() std::string image = XML::getProperty(node, "image", ""); std::string description = XML::getProperty(node, "description", ""); std::string effect = XML::getProperty(node, "effect", ""); - //int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra + int weaponType = XML::getProperty(node, "weapon_type", 0);// Not used by Aethyra if (id) { @@ -103,7 +103,7 @@ void ItemDB::load() itemInfo->setType(type); itemInfo->setView(view); //itemInfo->setWeight(weight); - //itemInfo->setWeaponType(weaponType); + itemInfo->setWeaponType(weaponType); for_each_xml_child_node(itemChild, node) { -- cgit v1.2.3-70-g09d2 From 2f01bff208bec2c2d5ffdb98b35b9398b88092a3 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 11 Nov 2008 20:14:19 +0000 Subject: Fixed a text glitch reported by Jarvellis. --- src/being.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 7ad83e5e..7fb63a7c 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -501,7 +501,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) (mSpeechBubble->getNumRows()*14)); mSpeechBubble->setVisible(true); } - else if (!config.getValue("speechbubble", 1)) + else if (mSpeechTime > 0 && !config.getValue("speechbubble", 1)) { mSpeechBubble->setVisible(false); // don't introduce a memory leak -- cgit v1.2.3-70-g09d2 From 40f2ec0582932bb21952cb58c5e51ca508206cae Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 18 Nov 2008 06:45:46 +0000 Subject: Pedantic fixes to the client, where I alphabetized all of the include statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this. --- AethyraLin2WinXcompile.cbp | 2 - debian/control | 2 +- debian/watch | 2 - src/CMakeLists.txt | 3 +- src/Makefile.am | 3 +- src/animatedsprite.cpp | 3 - src/animatedsprite.h | 2 - src/animationparticle.cpp | 2 - src/animationparticle.h | 1 - src/being.cpp | 9 +- src/being.h | 4 +- src/beingmanager.cpp | 3 - src/beingmanager.h | 2 - src/configlistener.h | 3 - src/configuration.cpp | 6 +- src/configuration.h | 8 +- src/engine.cpp | 6 +- src/engine.h | 2 - src/equipment.cpp | 2 - src/floor_item.cpp | 3 - src/flooritemmanager.cpp | 5 +- src/flooritemmanager.h | 2 - src/game.cpp | 12 +-- src/game.h | 2 - src/graphics.cpp | 2 - src/graphics.h | 2 - src/gui/box.cpp | 2 - src/gui/box.h | 2 - src/gui/browserbox.cpp | 4 +- src/gui/browserbox.h | 4 +- src/gui/button.cpp | 2 - src/gui/button.h | 2 - src/gui/buttonbox.cpp | 5 +- src/gui/buttonbox.h | 6 +- src/gui/buy.cpp | 5 +- src/gui/buy.h | 2 - src/gui/buysell.cpp | 5 +- src/gui/buysell.h | 6 +- src/gui/char_select.cpp | 5 +- src/gui/char_select.h | 8 +- src/gui/char_server.cpp | 5 +- src/gui/char_server.h | 2 - src/gui/chargedialog.cpp | 2 - src/gui/chargedialog.h | 1 - src/gui/chat.cpp | 12 +-- src/gui/chat.h | 6 +- src/gui/chatinput.cpp | 2 - src/gui/chatinput.h | 6 +- src/gui/checkbox.cpp | 2 - src/gui/checkbox.h | 2 - src/gui/colour.cpp | 4 +- src/gui/colour.h | 3 +- src/gui/confirm_dialog.cpp | 6 +- src/gui/confirm_dialog.h | 2 - src/gui/connection.cpp | 5 +- src/gui/connection.h | 2 - src/gui/debugwindow.cpp | 7 +- src/gui/debugwindow.h | 2 - src/gui/equipmentwindow.cpp | 2 - src/gui/equipmentwindow.h | 2 - src/gui/focushandler.cpp | 3 - src/gui/focushandler.h | 2 - src/gui/gccontainer.cpp | 2 - src/gui/gccontainer.h | 2 - src/gui/gui.cpp | 7 +- src/gui/gui.h | 4 +- src/gui/hbox.cpp | 2 - src/gui/hbox.h | 2 - src/gui/help.cpp | 5 +- src/gui/help.h | 4 +- src/gui/inttextbox.cpp | 6 +- src/gui/inttextbox.h | 2 - src/gui/inventorywindow.cpp | 5 +- src/gui/inventorywindow.h | 2 - src/gui/item_amount.cpp | 5 +- src/gui/item_amount.h | 2 - src/gui/itemcontainer.cpp | 4 +- src/gui/itemcontainer.h | 6 +- src/gui/itempopup.cpp | 10 +- src/gui/itempopup.h | 4 +- src/gui/itemshortcutcontainer.cpp | 4 +- src/gui/itemshortcutcontainer.h | 2 - src/gui/itemshortcutwindow.cpp | 5 +- src/gui/itemshortcutwindow.h | 2 - src/gui/linkhandler.h | 2 - src/gui/listbox.cpp | 6 +- src/gui/listbox.h | 2 - src/gui/login.cpp | 14 ++- src/gui/login.h | 10 +- src/gui/menuwindow.cpp | 13 +-- src/gui/menuwindow.h | 2 - src/gui/minimap.cpp | 2 - src/gui/minimap.h | 2 - src/gui/ministatus.cpp | 7 +- src/gui/ministatus.h | 2 - src/gui/newskill.cpp | 195 -------------------------------------- src/gui/newskill.h | 71 -------------- src/gui/npc_text.cpp | 5 +- src/gui/npc_text.h | 5 +- src/gui/npclistdialog.cpp | 5 +- src/gui/npclistdialog.h | 2 - src/gui/ok_dialog.cpp | 2 - src/gui/ok_dialog.h | 2 - src/gui/passwordfield.cpp | 2 - src/gui/passwordfield.h | 2 - src/gui/playerbox.cpp | 4 +- src/gui/playerbox.h | 2 - src/gui/popupmenu.cpp | 7 +- src/gui/popupmenu.h | 5 +- src/gui/progressbar.cpp | 2 - src/gui/progressbar.h | 3 - src/gui/radiobutton.cpp | 2 - src/gui/radiobutton.h | 2 - src/gui/register.cpp | 7 +- src/gui/register.h | 4 +- src/gui/scrollarea.cpp | 2 - src/gui/scrollarea.h | 2 - src/gui/sell.cpp | 9 +- src/gui/sell.h | 2 - src/gui/setup.cpp | 17 ++-- src/gui/setup.h | 2 - src/gui/setup_audio.cpp | 5 +- src/gui/setup_audio.h | 6 +- src/gui/setup_colours.cpp | 3 +- src/gui/setup_colours.h | 6 +- src/gui/setup_joystick.cpp | 6 +- src/gui/setup_joystick.h | 6 +- src/gui/setup_keyboard.cpp | 7 +- src/gui/setup_keyboard.h | 10 +- src/gui/setup_players.cpp | 8 +- src/gui/setup_players.h | 7 +- src/gui/setup_video.cpp | 7 +- src/gui/setup_video.h | 6 +- src/gui/setuptab.h | 2 - src/gui/shop.cpp | 2 - src/gui/shop.h | 8 +- src/gui/shoplistbox.cpp | 10 +- src/gui/shoplistbox.h | 2 - src/gui/skill.cpp | 7 +- src/gui/skill.h | 2 - src/gui/slider.cpp | 2 - src/gui/slider.h | 3 - src/gui/speechbubble.cpp | 2 - src/gui/speechbubble.h | 4 +- src/gui/status.cpp | 5 +- src/gui/status.h | 2 - src/gui/tabbedcontainer.cpp | 7 +- src/gui/tabbedcontainer.h | 4 +- src/gui/table.cpp | 6 +- src/gui/table.h | 1 + src/gui/table_model.cpp | 4 +- src/gui/table_model.h | 4 +- src/gui/textbox.cpp | 6 +- src/gui/textbox.h | 2 - src/gui/textfield.cpp | 3 +- src/gui/textfield.h | 2 - src/gui/trade.cpp | 5 +- src/gui/trade.h | 2 - src/gui/updatewindow.cpp | 9 +- src/gui/updatewindow.h | 3 +- src/gui/vbox.cpp | 2 - src/gui/vbox.h | 2 - src/gui/viewport.cpp | 11 +-- src/gui/viewport.h | 4 +- src/gui/widgets/dropdown.cpp | 2 - src/gui/widgets/dropdown.h | 6 +- src/gui/widgets/resizegrip.cpp | 6 +- src/gui/widgets/resizegrip.h | 2 - src/gui/window.cpp | 8 +- src/gui/window.h | 7 +- src/gui/windowcontainer.cpp | 2 - src/gui/windowcontainer.h | 2 - src/guichanfwd.h | 2 - src/imageparticle.cpp | 5 +- src/imageparticle.h | 2 - src/inventory.cpp | 5 +- src/inventory.h | 2 - src/item.cpp | 2 - src/item.h | 2 - src/itemshortcut.cpp | 5 +- src/itemshortcut.h | 2 - src/joystick.cpp | 5 +- src/joystick.h | 2 - src/keyboardconfig.cpp | 8 +- src/keyboardconfig.h | 6 +- src/localplayer.cpp | 7 +- src/localplayer.h | 2 - src/lockedarray.h | 2 - src/main.cpp | 33 +++---- src/main.h | 2 - src/map.cpp | 7 +- src/map.h | 2 - src/monster.cpp | 7 +- src/monster.h | 2 - src/net/beinghandler.cpp | 9 +- src/net/beinghandler.h | 2 - src/net/buysellhandler.cpp | 7 +- src/net/buysellhandler.h | 2 - src/net/charserverhandler.cpp | 7 +- src/net/charserverhandler.h | 2 - src/net/chathandler.cpp | 5 +- src/net/chathandler.h | 2 - src/net/equipmenthandler.cpp | 3 - src/net/equipmenthandler.h | 2 - src/net/inventoryhandler.cpp | 10 +- src/net/inventoryhandler.h | 2 - src/net/itemhandler.cpp | 3 - src/net/itemhandler.h | 2 - src/net/loginhandler.cpp | 3 - src/net/loginhandler.h | 5 +- src/net/maploginhandler.cpp | 3 - src/net/maploginhandler.h | 2 - src/net/messagehandler.cpp | 5 +- src/net/messagehandler.h | 2 - src/net/messagein.cpp | 7 +- src/net/messagein.h | 4 +- src/net/messageout.cpp | 7 +- src/net/messageout.h | 2 - src/net/network.cpp | 7 +- src/net/network.h | 2 - src/net/npchandler.cpp | 7 +- src/net/npchandler.h | 2 - src/net/partyhandler.cpp | 9 +- src/net/partyhandler.h | 2 - src/net/playerhandler.cpp | 8 +- src/net/playerhandler.h | 2 - src/net/protocol.cpp | 2 - src/net/protocol.h | 2 - src/net/skillhandler.cpp | 5 +- src/net/skillhandler.h | 2 - src/net/tradehandler.cpp | 5 +- src/net/tradehandler.h | 2 - src/npc.cpp | 6 +- src/npc.h | 2 - src/openglgraphics.cpp | 7 +- src/openglgraphics.h | 2 - src/particle.cpp | 5 +- src/particle.h | 2 - src/particleemitter.cpp | 7 +- src/particleemitter.h | 2 - src/particleemitterprop.h | 4 +- src/party.cpp | 7 +- src/party.h | 2 - src/player.cpp | 10 +- src/player.h | 2 - src/player_relations.cpp | 7 +- src/player_relations.h | 11 ++- src/properties.h | 4 +- src/recorder.cpp | 4 +- src/recorder.h | 4 +- src/resources/action.cpp | 4 - src/resources/action.h | 2 - src/resources/ambientoverlay.cpp | 3 - src/resources/ambientoverlay.h | 2 - src/resources/animation.cpp | 6 +- src/resources/animation.h | 2 - src/resources/buddylist.cpp | 6 +- src/resources/buddylist.h | 2 - src/resources/colordb.h | 2 +- src/resources/dye.cpp | 2 - src/resources/dye.h | 7 +- src/resources/image.cpp | 5 +- src/resources/image.h | 5 +- src/resources/imageloader.cpp | 6 +- src/resources/imageloader.h | 2 - src/resources/imageset.cpp | 5 +- src/resources/imageset.h | 3 - src/resources/imagewriter.cpp | 8 +- src/resources/imagewriter.h | 2 - src/resources/itemdb.cpp | 4 +- src/resources/itemdb.h | 6 +- src/resources/iteminfo.cpp | 5 +- src/resources/iteminfo.h | 2 - src/resources/mapreader.cpp | 7 +- src/resources/mapreader.h | 4 +- src/resources/monsterdb.cpp | 3 - src/resources/monsterdb.h | 2 - src/resources/monsterinfo.cpp | 2 - src/resources/monsterinfo.h | 5 +- src/resources/music.cpp | 2 - src/resources/music.h | 2 - src/resources/npcdb.cpp | 3 - src/resources/npcdb.h | 4 +- src/resources/resource.cpp | 3 - src/resources/resource.h | 2 - src/resources/resourcemanager.cpp | 12 +-- src/resources/resourcemanager.h | 6 +- src/resources/soundeffect.cpp | 2 - src/resources/soundeffect.h | 2 - src/resources/spritedef.cpp | 5 +- src/resources/spritedef.h | 6 +- src/serverinfo.h | 2 - src/shopitem.cpp | 2 - src/shopitem.h | 2 - src/simpleanimation.cpp | 8 +- src/simpleanimation.h | 2 - src/sound.cpp | 6 +- src/sound.h | 3 - src/sprite.h | 2 - src/text.cpp | 3 +- src/textmanager.cpp | 3 +- src/textparticle.cpp | 5 +- src/textparticle.h | 5 +- src/utils/base64.cpp | 3 +- src/utils/base64.h | 1 - src/utils/dtor.h | 2 - src/utils/fastsqrt.h | 2 - src/utils/strprintf.cpp | 2 - src/utils/strprintf.h | 2 - src/utils/tostring.h | 2 - src/utils/trim.h | 2 - src/utils/xml.cpp | 4 +- src/utils/xml.h | 6 +- src/vector.h | 2 - 314 files changed, 320 insertions(+), 1252 deletions(-) delete mode 100644 debian/watch delete mode 100644 src/gui/newskill.cpp delete mode 100644 src/gui/newskill.h (limited to 'src/being.cpp') diff --git a/AethyraLin2WinXcompile.cbp b/AethyraLin2WinXcompile.cbp index 50881830..ec4940ac 100644 --- a/AethyraLin2WinXcompile.cbp +++ b/AethyraLin2WinXcompile.cbp @@ -168,8 +168,6 @@ - - diff --git a/debian/control b/debian/control index b845ba94..0d94b4fd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Homepage: http://www.aethyra.org/ Maintainer: Aethyra Project -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan-dev (>= 0.8.1-3), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev Standards-Version: 3.7.3 Package: aethyra diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 01aa13f7..00000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/themanaworld/tmw-(.*)\.tar\.gz diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d5021823..e4803230 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,8 +118,6 @@ SET(SRCS gui/minimap.h gui/ministatus.cpp gui/ministatus.h - gui/newskill.cpp - gui/newskill.h gui/npclistdialog.cpp gui/npclistdialog.h gui/npc_text.cpp @@ -286,6 +284,7 @@ SET(SRCS engine.h equipment.cpp equipment.h + extensions.h floor_item.cpp floor_item.h flooritemmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 17445ddf..5c759135 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -70,8 +70,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/minimap.h \ gui/ministatus.cpp \ gui/ministatus.h \ - gui/newskill.cpp \ - gui/newskill.h \ gui/npclistdialog.cpp \ gui/npclistdialog.h \ gui/npc_text.cpp \ @@ -248,6 +246,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ engine.h \ equipment.cpp \ equipment.h \ + extensions.h \ floor_item.cpp \ floor_item.h \ flooritemmanager.cpp \ diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 92c4e3f3..c86c5392 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animatedsprite.cpp 3752 2007-11-20 10:50:00Z b_lindeijer $ */ #include "animatedsprite.h" - #include "graphics.h" #include "log.h" diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 1fac5220..405bf42e 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animatedsprite.h 3752 2007-11-20 10:50:00Z b_lindeijer $ */ #ifndef _TMW_ANIMATEDSPRITE_H diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp index c79a5bc4..59eacb05 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -17,11 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #include "animationparticle.h" - #include "graphics.h" #include "simpleanimation.h" diff --git a/src/animationparticle.h b/src/animationparticle.h index 054b1b73..eabc2742 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #ifndef _ANIMATION_PARTICLE diff --git a/src/being.cpp b/src/being.cpp index 7fb63a7c..27bd0c57 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: being.cpp 4301 2008-05-28 16:06:48Z peaveydk $ */ -#include "being.h" #include #include #include "animatedsprite.h" +#include "being.h" #include "configuration.h" #include "equipment.h" #include "game.h" @@ -37,17 +35,16 @@ #include "sound.h" #include "text.h" -#include "resources/resourcemanager.h" -#include "resources/itemdb.h" #include "resources/imageset.h" +#include "resources/itemdb.h" #include "resources/iteminfo.h" +#include "resources/resourcemanager.h" #include "gui/gui.h" #include "gui/speechbubble.h" #include "utils/dtor.h" #include "utils/tostring.h" - #include "utils/xml.h" #define BEING_EFFECTS_FILE "effects.xml" diff --git a/src/being.h b/src/being.h index 62a1c937..325ec51a 100644 --- a/src/being.h +++ b/src/being.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: being.h 4321 2008-06-02 11:42:26Z b_lindeijer $ */ #ifndef _TMW_BEING_H @@ -26,8 +24,8 @@ #include #include -#include #include +#include #include #include "animatedsprite.h" diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index f0ce9bd3..ada1ddfa 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beingmanager.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #include #include "beingmanager.h" - #include "localplayer.h" #include "monster.h" #include "npc.h" diff --git a/src/beingmanager.h b/src/beingmanager.h index 6942ff54..0179bed8 100644 --- a/src/beingmanager.h +++ b/src/beingmanager.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beingmanager.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_BEINGMANAGER_H diff --git a/src/configlistener.h b/src/configlistener.h index bf00f3ef..9fbc4544 100644 --- a/src/configlistener.h +++ b/src/configlistener.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configlistener.h 1673 2005-08-29 22:00:35Z der_doener $ */ #ifndef _TMW_CONFIGLISTENER_H @@ -26,7 +24,6 @@ #include - /** * The listener interface for receiving notifications about changes to * configuration options. diff --git a/src/configuration.cpp b/src/configuration.cpp index e9c8db7a..8e80de18 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -17,16 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configuration.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ - -#include "configuration.h" - #include #include "configlistener.h" +#include "configuration.h" #include "log.h" #include "utils/tostring.h" diff --git a/src/configuration.h b/src/configuration.h index 7dadb083..197e1a41 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: configuration.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_CONFIGURATION_H #define _TMW_CONFIGURATION_H -#include -#include -#include #include #include +#include +#include +#include class ConfigListener; class ConfigurationObject; diff --git a/src/engine.cpp b/src/engine.cpp index c8fee995..b51f4852 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -17,21 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: engine.cpp 4000 2008-03-23 11:47:52Z b_lindeijer $ */ -#include "engine.h" - #include #include "being.h" #include "beingmanager.h" #include "configuration.h" +#include "engine.h" #include "flooritemmanager.h" #include "game.h" #include "graphics.h" -#include "main.h" #include "localplayer.h" #include "log.h" #include "main.h" diff --git a/src/engine.h b/src/engine.h index 52f1e63a..8d387f80 100644 --- a/src/engine.h +++ b/src/engine.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _ENGINE_H diff --git a/src/equipment.cpp b/src/equipment.cpp index 984df74d..f1d1d4f2 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipment.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include diff --git a/src/floor_item.cpp b/src/floor_item.cpp index 399a4149..0b114e14 100644 --- a/src/floor_item.cpp +++ b/src/floor_item.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: floor_item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "floor_item.h" - #include "map.h" FloorItem::FloorItem(unsigned int id, diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp index fe64779b..7445b1e9 100644 --- a/src/flooritemmanager.cpp +++ b/src/flooritemmanager.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: flooritemmanager.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ -#include "flooritemmanager.h" - #include "floor_item.h" +#include "flooritemmanager.h" #include "utils/dtor.h" diff --git a/src/flooritemmanager.h b/src/flooritemmanager.h index a6bfbdc3..3dbaf988 100644 --- a/src/flooritemmanager.h +++ b/src/flooritemmanager.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: flooritemmanager.h 2150 2006-02-06 02:56:48Z der_doener $ */ #ifndef _TMW_FLOORITEMMANAGER_H diff --git a/src/game.cpp b/src/game.cpp index eb200f4a..34fb4622 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: game.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #include "game.h" @@ -28,8 +26,8 @@ #include #include -#include #include +#include #include "beingmanager.h" #include "configuration.h" @@ -69,19 +67,19 @@ #include "gui/trade.h" #include "gui/viewport.h" -#include "net/protocol.h" #include "net/beinghandler.h" #include "net/buysellhandler.h" #include "net/chathandler.h" #include "net/equipmenthandler.h" #include "net/inventoryhandler.h" #include "net/itemhandler.h" +#include "net/messageout.h" #include "net/network.h" #include "net/npchandler.h" #include "net/playerhandler.h" +#include "net/protocol.h" #include "net/skillhandler.h" #include "net/tradehandler.h" -#include "net/messageout.h" #include "resources/imagewriter.h" @@ -115,7 +113,6 @@ InventoryWindow *inventoryWindow; NpcListDialog *npcListDialog; NpcTextDialog *npcTextDialog; SkillDialog *skillDialog; -//NewSkillDialog *newSkillWindow; Setup* setupWindow; Minimap *minimap; EquipmentWindow *equipmentWindow; @@ -199,7 +196,6 @@ void createGuiWindows(Network *network) npcTextDialog = new NpcTextDialog(); npcListDialog = new NpcListDialog(); skillDialog = new SkillDialog(); - //newSkillWindow = new NewSkillDialog(); setupWindow = new Setup(); minimap = new Minimap(); equipmentWindow = new EquipmentWindow(player_node->mEquipment.get()); @@ -256,7 +252,6 @@ void destroyGuiWindows() delete minimap; delete equipmentWindow; //delete chargeDialog; - //delete newSkillWindow; delete tradeWindow; //delete buddyWindow; delete helpWindow; @@ -609,7 +604,6 @@ void Game::handleInput() case SDLK_F8: requestedWindow = itemShortcutWindow; break; case SDLK_F9: requestedWindow = setupWindow; break; case SDLK_F10: requestedWindow = debugWindow; break; - //case SDLK_F11: requestedWindow = newSkillWindow; break; case SDLK_RETURN: // Input chat window diff --git a/src/game.h b/src/game.h index 583aea70..1cc18cae 100644 --- a/src/game.h +++ b/src/game.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: game.h 3859 2008-01-26 19:38:43Z b_lindeijer $ */ #ifndef _TMW_GAME_ diff --git a/src/graphics.cpp b/src/graphics.cpp index 0433678f..6920bcb0 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: graphics.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #include diff --git a/src/graphics.h b/src/graphics.h index 0cf58141..efdd1ac1 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: graphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _GRAPHICS_H diff --git a/src/gui/box.cpp b/src/gui/box.cpp index f53bc18e..59d8c135 100644 --- a/src/gui/box.cpp +++ b/src/gui/box.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $ */ #include "box.h" diff --git a/src/gui/box.h b/src/gui/box.h index 280fd3e2..46654b48 100644 --- a/src/gui/box.h +++ b/src/gui/box.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: box.h 2529 2006-08-13 10:20:19Z b_lindeijer $ */ diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index b7d08cab..430a2aa2 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: browserbox.cpp 4348 2008-06-14 12:42:49Z the_enemy $ */ #include @@ -28,8 +26,8 @@ #include #include "browserbox.h" -#include "linkhandler.h" #include "colour.h" +#include "linkhandler.h" #ifdef USE_OPENGL #include "../configuration.h" diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h index c671d835..267e0fea 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: browserbox.h 3687 2007-10-26 00:22:12Z crush_tmw $ */ #ifndef __TMW_BROWSERBOX_H__ @@ -27,8 +25,8 @@ #include #include -#include #include +#include #include "../guichanfwd.h" #include "../main.h" diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 1243d798..40ecd1b7 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: button.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include diff --git a/src/gui/button.h b/src/gui/button.h index bbd26010..eecd0dc0 100644 --- a/src/gui/button.h +++ b/src/gui/button.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: button.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_BUTTON_H diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp index 592cb92a..903d971d 100644 --- a/src/gui/buttonbox.cpp +++ b/src/gui/buttonbox.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buttonbox.cpp */ -#include "buttonbox.h" - #include "button.h" +#include "buttonbox.h" ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt, ButtonBoxListener *listener) : diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h index 5fc9f88d..edde4aa4 100644 --- a/src/gui/buttonbox.h +++ b/src/gui/buttonbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buttonbox.h */ #ifndef _TMW_BUTTONBOX_H @@ -28,10 +26,10 @@ #include -#include "../guichanfwd.h" - #include "window.h" +#include "../guichanfwd.h" + class ButtonBoxListener { public: diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp index 8e2a7a7a..a4574eb7 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buy.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buy.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "buy.h" - #include #include "button.h" +#include "buy.h" #include "scrollarea.h" #include "shop.h" #include "shoplistbox.h" diff --git a/src/gui/buy.h b/src/gui/buy.h index 6f75cab5..0915385a 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buy.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef _TMW_BUY_H diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp index 9cc3b297..57c95841 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buysell.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysell.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "buysell.h" - #include "button.h" +#include "buysell.h" #include "../npc.h" diff --git a/src/gui/buysell.h b/src/gui/buysell.h index 0966ec03..d73205b6 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysell.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_BUYSELL_H @@ -26,10 +24,10 @@ #include -#include "../guichanfwd.h" - #include "window.h" +#include "../guichanfwd.h" + /** * A dialog to choose between buying or selling at a shop. * diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index ca4d8608..93783ded 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -17,17 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_select.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $ */ -#include "char_select.h" - #include #include #include "button.h" +#include "char_select.h" #include "confirm_dialog.h" #include "ok_dialog.h" #include "playerbox.h" diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 182600d1..63630736 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -17,23 +17,21 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_select.h 3752 2007-11-20 10:50:00Z b_lindeijer $ */ #ifndef _CHAR_SELECT_H #define _CHAR_SELECT_H +#include + #include "window.h" #include "../guichanfwd.h" #include "../lockedarray.h" -#include - -class Player; class LocalPlayer; class Network; +class Player; class PlayerBox; /** diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index 3465fb69..8f68e6e1 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_server.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "char_server.h" - #include "button.h" +#include "char_server.h" #include "listbox.h" #include "scrollarea.h" diff --git a/src/gui/char_server.h b/src/gui/char_server.h index 32a0645f..bb81d3a5 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: char_server.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _CHAR_SEL_SERVER_H diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp index 862378ae..1733c7eb 100644 --- a/src/gui/chargedialog.cpp +++ b/src/gui/chargedialog.cpp @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ /* The window supported by this class shows player stats and keeps a charging @@ -25,7 +24,6 @@ */ #include "chargedialog.h" - #include "progressbar.h" #include "../localplayer.h" diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h index 222fb3b5..53998ab8 100644 --- a/src/gui/chargedialog.h +++ b/src/gui/chargedialog.h @@ -17,7 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #ifndef _TMW_CHARGE_H diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 6a74d19e..dd11cebb 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -17,29 +17,27 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chat.cpp 4227 2008-05-08 00:39:29Z peaveydk $ */ #include #include + #include #include -#include "chat.h" - #include "browserbox.h" +#include "chat.h" #include "chatinput.h" #include "scrollarea.h" #include "windowcontainer.h" +#include "../beingmanager.h" #include "../configuration.h" +#include "../extensions.h" #include "../game.h" #include "../localplayer.h" -#include "../beingmanager.h" -#include "../recorder.h" #include "../party.h" -#include "../extensions.h" +#include "../recorder.h" #include "../net/messageout.h" #include "../net/protocol.h" diff --git a/src/gui/chat.h b/src/gui/chat.h index 5e5ca110..437dc115 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chat.h 4227 2008-05-08 00:39:29Z peaveydk $ */ #ifndef _TMW_CHAT_H #define _TMW_CHAT_H +#include #include #include -#include #include #include @@ -37,9 +35,9 @@ class BrowserBox; class Network; -class ScrollArea; class Recorder; class Party; +class ScrollArea; #define BY_GM 0 // those should be self-explanatory =) #define BY_PLAYER 1 diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp index b403a03e..afe7f037 100644 --- a/src/gui/chatinput.cpp +++ b/src/gui/chatinput.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chatinput.cpp 3361 2007-07-07 20:12:58Z b_lindeijer $ */ #include "chatinput.h" diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h index 043244b9..44e22956 100644 --- a/src/gui/chatinput.h +++ b/src/gui/chatinput.h @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chatinput.h 3361 2007-07-07 20:12:58Z b_lindeijer $ */ #ifndef _TMW_CHATINPUT_H #define _TMW_CHATINPUT_H +#include + #include "textfield.h" #include "../guichanfwd.h" -#include - /** * The chat input hides when it loses focus. It is also invisible by default. */ diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp index b530bbea..20e24dee 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: checkbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include "checkbox.h" diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h index 160a2bf4..f6d8f2e5 100644 --- a/src/gui/checkbox.h +++ b/src/gui/checkbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: checkbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef _TMW_CHECKBOX_H diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp index d1782e1c..4c3782a4 100644 --- a/src/gui/colour.cpp +++ b/src/gui/colour.cpp @@ -19,10 +19,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "colour.h" - #include +#include "colour.h" + #include "../configuration.h" Colour::Colour() diff --git a/src/gui/colour.h b/src/gui/colour.h index ac75f08b..1e8ba3db 100644 --- a/src/gui/colour.h +++ b/src/gui/colour.h @@ -21,9 +21,10 @@ #ifndef _COLOUR_H #define _COLOUR_H + #include -#include #include +#include #include diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp index 848c4767..732f5769 100644 --- a/src/gui/confirm_dialog.cpp +++ b/src/gui/confirm_dialog.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: confirm_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "confirm_dialog.h" - #include +#include "confirm_dialog.h" + ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg, Window *parent): Window(title, true, parent) diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h index 65f33cac..109dcea0 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: confirm_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_OPTION_DIALOG_H diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp index 0b62ca3c..1204b203 100644 --- a/src/gui/connection.cpp +++ b/src/gui/connection.cpp @@ -17,17 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: connection.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "connection.h" - #include #include #include "button.h" +#include "connection.h" #include "progressbar.h" #include "../main.h" diff --git a/src/gui/connection.h b/src/gui/connection.h index 86b688a3..c3a6208f 100644 --- a/src/gui/connection.h +++ b/src/gui/connection.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: connection.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_CONNECTION_H diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 1e7d5b35..7fc63096 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -17,22 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: debugwindow.cpp 3509 2007-08-23 13:43:17Z b_lindeijer $ */ -#include "debugwindow.h" - #include #include #include "button.h" +#include "debugwindow.h" #include "gui.h" #include "viewport.h" -#include "../game.h" #include "../engine.h" +#include "../game.h" #include "../particle.h" #include "../map.h" diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index 59ae765c..ae1d8b14 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: debugwindow.h 3509 2007-08-23 13:43:17Z b_lindeijer $ */ #ifndef _TMW_DEBUGWINDOW_H diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 727ac732..bf85f033 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmentwindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "equipmentwindow.h" diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 6a7a4944..7aacfc1e 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmentwindow.h 2545 2006-08-17 19:11:28Z crush_tmw $ */ #ifndef _TMW_EQUIPMENT_H diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp index 966d2013..f9ea8b7d 100644 --- a/src/gui/focushandler.cpp +++ b/src/gui/focushandler.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: focushandler.cpp 2239 2006-03-09 05:16:27Z der_doener $ */ #include "focushandler.h" - void FocusHandler::requestModalFocus(gcn::Widget *widget) { /* If there is another widget with modal focus, remove its modal focus diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 5fde09f1..a5218485 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: focushandler.h 2239 2006-03-09 05:16:27Z der_doener $ */ #ifndef _TMW_FOCUSHANDLER_H diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp index 8095be61..ec3c8a5c 100644 --- a/src/gui/gccontainer.cpp +++ b/src/gui/gccontainer.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gccontainer.cpp 4208 2008-04-29 11:25:26Z b_lindeijer $ */ #include "gccontainer.h" diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h index 660111fc..2af7f6ad 100644 --- a/src/gui/gccontainer.h +++ b/src/gui/gccontainer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gccontainer.h 4208 2008-04-29 11:25:26Z b_lindeijer $ */ #ifndef _TMW_GUI_GCCONTAINER_H diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index f72f544c..fcc7ed77 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gui.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $ */ -#include "gui.h" - #include #include #include @@ -31,6 +27,7 @@ #include #include "focushandler.h" +#include "gui.h" #include "viewport.h" #include "window.h" #include "windowcontainer.h" @@ -41,8 +38,8 @@ #include "../log.h" #include "../resources/imageset.h" -#include "../resources/resourcemanager.h" #include "../resources/imageloader.h" +#include "../resources/resourcemanager.h" // Guichan stuff Gui *gui; diff --git a/src/gui/gui.h b/src/gui/gui.h index f250a8e3..8cf91915 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: gui.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _TMW_GUI @@ -28,8 +26,8 @@ #include "../guichanfwd.h" -class GuiConfigListener; class Graphics; +class GuiConfigListener; class ImageSet; class Viewport; diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp index dc909195..020e85c6 100644 --- a/src/gui/hbox.cpp +++ b/src/gui/hbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: hbox.cpp 1881 2005-10-18 21:40:25Z der_doener $ */ #include "hbox.h" diff --git a/src/gui/hbox.h b/src/gui/hbox.h index 93ac270d..da70a53c 100644 --- a/src/gui/hbox.h +++ b/src/gui/hbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: hbox.h 1881 2005-10-18 21:40:25Z der_doener $ */ #ifndef HBOX_H diff --git a/src/gui/help.cpp b/src/gui/help.cpp index 56a5e70e..19413a08 100644 --- a/src/gui/help.cpp +++ b/src/gui/help.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: help.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "help.h" - #include "button.h" #include "browserbox.h" +#include "help.h" #include "scrollarea.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/help.h b/src/gui/help.h index 3b45283c..bd200ccf 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: help.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_HELP_H @@ -26,8 +24,8 @@ #include -#include "window.h" #include "linkhandler.h" +#include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp index 7a39c2df..858a3fcb 100644 --- a/src/gui/inttextbox.cpp +++ b/src/gui/inttextbox.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inttextbox.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "inttextbox.h" - #include +#include "inttextbox.h" + #include "../utils/tostring.h" IntTextBox::IntTextBox(int i): diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h index 6ade7e71..922ef4c5 100644 --- a/src/gui/inttextbox.h +++ b/src/gui/inttextbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inttextbox.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef INTTEXTBOX_H diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 1b2e5c63..cbce0ee3 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventorywindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "inventorywindow.h" - #include #include #include "button.h" #include "gui.h" +#include "inventorywindow.h" #include "item_amount.h" #include "itemcontainer.h" #include "scrollarea.h" diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 055bfad9..2e589471 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventorywindow.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_INVENTORYWINDOW_H diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp index 40e2e121..4ce8ac6c 100644 --- a/src/gui/item_amount.cpp +++ b/src/gui/item_amount.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item_amount.cpp 3718 2007-11-11 14:46:33Z b_lindeijer $ */ -#include "item_amount.h" - #include "button.h" #include "inttextbox.h" +#include "item_amount.h" #include "slider.h" #include "trade.h" diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h index 668dfe3b..2005094d 100644 --- a/src/gui/item_amount.h +++ b/src/gui/item_amount.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item_amount.h 3718 2007-11-11 14:46:33Z b_lindeijer $ */ #ifndef _TMW_ITEM_AMOUNT_WINDOW_H diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 186a2da6..30cb1d6d 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "itemcontainer.h" @@ -30,8 +28,8 @@ #include "../inventory.h" #include "../item.h" #include "../itemshortcut.h" -#include "../log.h" #include "../localplayer.h" +#include "../log.h" #include "../resources/image.h" #include "../resources/iteminfo.h" diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h index 5562023f..54e0c1ca 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemcontainer.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_ITEMCONTAINER_H__ #define _TMW_ITEMCONTAINER_H__ +#include + #include #include #include -#include - #include "../guichanfwd.h" class Image; diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index aab9fd9d..055cbe44 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -18,23 +18,21 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "itempopup.h" #include -#include "widgets/layout.h" #include "gui.h" +#include "itempopup.h" + +#include "widgets/layout.h" #include "../resources/image.h" -#include "../resources/resourcemanager.h" #include "../resources/iteminfo.h" +#include "../resources/resourcemanager.h" #include "../utils/gettext.h" #include "../utils/strprintf.h" - ItemPopup::ItemPopup() { diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 499b2e0a..0082ec2c 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -19,15 +19,13 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _LOM_ITEMPOPUP_H__ #define _LOM_ITEMPOPUP_H__ -#include "textbox.h" #include "scrollarea.h" +#include "textbox.h" #include "window.h" #include "../item.h" diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp index 5899abd1..86a53aca 100644 --- a/src/gui/itemshortcutcontainer.cpp +++ b/src/gui/itemshortcutcontainer.cpp @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "itemshortcutcontainer.h" -#include "../localplayer.h" #include "../graphics.h" #include "../inventory.h" #include "../item.h" #include "../itemshortcut.h" #include "../keyboardconfig.h" +#include "../localplayer.h" #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index cc4e830a..a8daca0b 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutcontainer.h 4076 2008-04-12 18:36:15Z b_lindeijer $ */ #ifndef _TMW_ITEMSHORTCUTCONTAINER_H__ diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp index 394fcbb7..5a4dfacd 100644 --- a/src/gui/itemshortcutwindow.cpp +++ b/src/gui/itemshortcutwindow.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutwindow.cpp 4076 2008-04-12 18:36:15Z b_lindeijer $ */ -#include "itemshortcutwindow.h" - #include "itemshortcutcontainer.h" +#include "itemshortcutwindow.h" #include "scrollarea.h" static const int SCROLL_PADDING = 0; diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h index 112c39d9..587f15c8 100644 --- a/src/gui/itemshortcutwindow.h +++ b/src/gui/itemshortcutwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcutwindow.h 4076 2008-04-12 18:36:15Z b_lindeijer $ */ #ifndef _TMW_ITEMSHORTCUTWINDOW_H diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h index 93a8c000..44f906db 100644 --- a/src/gui/linkhandler.h +++ b/src/gui/linkhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: linkhandler.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_LINK_HANDLER_H_ diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index cf941be1..4dca66a0 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "listbox.h" - #include #include #include #include +#include "listbox.h" + ListBox::ListBox(gcn::ListModel *listModel): gcn::ListBox(listModel) { diff --git a/src/gui/listbox.h b/src/gui/listbox.h index 2f501a6c..30eb4c79 100644 --- a/src/gui/listbox.h +++ b/src/gui/listbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef _TMW_LISTBOX_H diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 0cdb4656..fa47af32 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -17,26 +17,24 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: login.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "login.h" - #include #include #include -#include "../main.h" -#include "../logindata.h" -#include "../configuration.h" - #include "button.h" #include "checkbox.h" +#include "login.h" #include "ok_dialog.h" #include "passwordfield.h" #include "textfield.h" + +#include "../main.h" +#include "../logindata.h" +#include "../configuration.h" + #include "../utils/tostring.h" static const int MAX_SERVER_LIST_SIZE = 5; diff --git a/src/gui/login.h b/src/gui/login.h index 3550d82b..3b911424 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -17,24 +17,24 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: login.h 3234 2007-03-24 13:05:27Z b_lindeijer $ */ #ifndef _TMW_LOGIN_H #define _TMW_LOGIN_H #include -#include #include +#include #include #include +#include "scrollarea.h" #include "window.h" -#include "../guichanfwd.h" + #include "widgets/dropdown.h" -#include "scrollarea.h" + +#include "../guichanfwd.h" class LoginData; diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp index 2d07e632..79281631 100644 --- a/src/gui/menuwindow.cpp +++ b/src/gui/menuwindow.cpp @@ -17,26 +17,23 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: menuwindow.cpp 4060 2008-04-09 14:49:07Z b_lindeijer $ */ -#include "menuwindow.h" - #include #include #include "button.h" +#include "menuwindow.h" #include "windowcontainer.h" -extern Window *setupWindow; -extern Window *inventoryWindow; +extern Window *chatWindow; extern Window *equipmentWindow; +extern Window *inventoryWindow; +extern Window *itemShortcutWindow; +extern Window *setupWindow; extern Window *skillDialog; extern Window *statusWindow; -extern Window *itemShortcutWindow; -extern Window *chatWindow; namespace { struct MenuWindowListener : public gcn::ActionListener diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h index add04095..03ec3380 100644 --- a/src/gui/menuwindow.h +++ b/src/gui/menuwindow.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: menuwindow.h 2417 2006-07-19 15:12:06Z umperio $ */ #ifndef _TMW_MENU_H diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 8404e52a..728f61e4 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: minimap.cpp 4116 2008-04-17 12:48:43Z peaveydk $ */ #include "minimap.h" diff --git a/src/gui/minimap.h b/src/gui/minimap.h index a3b14729..7897ebdb 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: minimap.h 2417 2006-07-19 15:12:06Z umperio $ */ #ifndef _TMW_MINIMAP_H diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 1bdabbfe..59dca0e1 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ministatus.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $ */ -#include "ministatus.h" - #include #include "gui.h" +#include "ministatus.h" #include "progressbar.h" -#include "../localplayer.h" #include "../configuration.h" #include "../graphics.h" +#include "../localplayer.h" #include "../utils/tostring.h" diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h index d4002d93..d7f6f68c 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatus.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ministatus.h 2581 2006-08-25 22:04:17Z b_lindeijer $ */ #ifndef _TMW_MINISTATUS_H diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp deleted file mode 100644 index c2088e75..00000000 --- a/src/gui/newskill.cpp +++ /dev/null @@ -1,195 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: newskill.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ - */ - - /* This file implements the new skill dialog for use under the latest - * version of the skill system as of 2005/02/20 - */ - -#include "newskill.h" - -#include - -#include "button.h" -#include "progressbar.h" - -#include "../graphics.h" - -const char *skill_name[] = { - // 0-99 - // weapon skills 0-9 - "Short Blades", "Long Blades", "Hammers", "Archery", "Whip", - "Staves", "Throwing", "Piercing", "Hand to Hand", NULL, - // magic skills 10-19 - "Epyri (Fire)", "Merene (Water)", "Geon (Earth)", "Izurial (Air)", - "Lumine (Light)", "Tenebrae (Dark)", "Chronos (Time)", "Teless (Space)", - "Gen (Mana)", NULL, - // craft skills 20-29 - "Metalworking", "Woodworking", "Jeweler", "Cook", "Tailor", - "Alchemist", "Artisan", "Synthesis", NULL, NULL, - // general skills 30-39 - "Running", "Searching", "Sneak", "Trading", "Intimidate", - "Athletics", NULL, NULL, NULL,NULL, - // combat skills 40-49 - "Dodge", "Accuracy", "Critical", "Block", "Parry", "Diehard", "Magic Aura", - "Counter", NULL, NULL, - // resistance skills 50-59 - "Poison", "Silence", "Petrify", "Paralyze", "Blind", "Slow", "Zombie", - "Critical", NULL, NULL, - // element reistance 60-69 - "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)", - "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", NULL, - NULL, - // hunting skills 70-79 - "Insects", "Birds", "Lizards", "Amorphs", "Undead", "Machines", "Arcana", - "Humanoids", "Plantoids", NULL, - // stats 80-89 - "Strength", "Fortitude", "Vitality", "Menality", "Awareness", "Mana", - "Dexterity", NULL, NULL, NULL, - // unused (reserved) 90-99 - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL -}; - - -NewSkillDialog::NewSkillDialog(): - Window("Skills") -{ - startPoint = 0; - for (int i = 0; i < N_SKILL_CAT_SIZE; i++) - { - mSkillLabel[i] = new gcn::Label("Empty "); - mSkillLevel[i] = new gcn::Label("00000"); - mSkillbar[i] = new ProgressBar(0.0f,100,15,0,0,255); - mSkillLevel[i]->setAlignment(Graphics::RIGHT); - add(mSkillLabel[i],40,5+i*25); - add(mSkillLevel[i],150,5+i*25); - add(mSkillbar[i],180,5+i*25); - } - // initialize the skills - for (int i = 0; i < N_SKILL; i++) - { - mPlayerSkill[i].level = 0; - mPlayerSkill[i].exp = 0; - } - resetNSD(); - - // create controls - Button *catButton[N_SKILL_CAT]; - catButton[0] = new Button("Weapons", "g1", this); - catButton[1] = new Button("Magic", "g2", this); - catButton[2] = new Button("Craft", "g3", this); - catButton[3] = new Button("General", "g4", this); - catButton[4] = new Button("Combat", "g5", this); - catButton[5] = new Button("E. Resist", "g6", this); - catButton[6] = new Button("S. Resist", "g7", this); - catButton[7] = new Button("Hunting", "g8", this); - catButton[8] = new Button("Stat", "g9", this); - - setContentSize(350, 250); - - for (int i = 0; i < 9; ++i) { - catButton[i]->setDimension(gcn::Rectangle(0, 0, 60, 20)); - catButton[i]->setPosition(290, 20 * i); - add(catButton[i]); - } - - Button *closeButton = new Button("Close", "close", this); - closeButton->setDimension(gcn::Rectangle(0,0,60,20)); - closeButton->setPosition(290, 230); - add(closeButton); - - // finsihing touches - setLocationRelativeTo(getParent()); -} - -void NewSkillDialog::action(const gcn::ActionEvent &event) -{ - int osp = startPoint; - if (event.getId() == "close") - { - setVisible(false); - } - else if (event.getId() == "g1") // weapons group 0-9 - { - startPoint =0; - } - else if (event.getId() == "g2") // magic group 10-19 - { - startPoint =10; - } - else if (event.getId() == "g3") // craft group 20-29 - { - startPoint =20; - } - else if (event.getId() == "g4") // general group 30-39 - { - startPoint =30; - } - else if (event.getId() == "g5") // combat group 40-49 - { - startPoint =40; - } - else if (event.getId() == "g6") // e. resist group 50-59 - { - startPoint =50; - } - else if (event.getId() == "g7") // s resist group 60-69 - { - startPoint =60; - } - else if (event.getId() == "g8") // hunting group 70-79 - { - startPoint =70; - } - else if (event.getId() == "g9") // stats group 80-89 - { - startPoint =80; - } - if (osp != startPoint) - { - resetNSD(); - } -} - -void NewSkillDialog::resetNSD() -{ - for (int a = 0; a < N_SKILL_CAT_SIZE; a++) - { - if (skill_name[a + startPoint]) - { - mSkillLabel[a]->setCaption(skill_name[a + startPoint]); - mSkillLabel[a]->setVisible(true); - char tmp[5]; - sprintf(tmp, "%d", mPlayerSkill[a+startPoint].level); - mSkillLevel[a]->setCaption(tmp); - mSkillLevel[a]->setVisible(true); - mSkillbar[a]->setProgress(0.0f); - mSkillbar[a]->setVisible(true); - } - else - { - mSkillLevel[a]->setVisible(false); - mSkillLabel[a]->setVisible(false); - mSkillbar[a]->setVisible(false); - } - } -} diff --git a/src/gui/newskill.h b/src/gui/newskill.h deleted file mode 100644 index c553ab1d..00000000 --- a/src/gui/newskill.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The Mana World - * Copyright 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * The Mana World is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Mana World is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Mana World; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: newskill.h 3035 2007-01-14 14:54:39Z b_lindeijer $ - */ - -#ifndef _TMW_NSKILL_H -#define _TMW_NSKILL_H - -#include - -#include "window.h" - -#include "../guichanfwd.h" - -class ProgressBar; - -#define N_SKILL 100 // skill count constant -#define N_SKILL_CAT 9 // skill category count -#define N_SKILL_CAT_SIZE 10 // skill category maximum size - -struct nSkill { - short level; - short exp; -}; - -/** - * Dialog showing the skills in the planned skill model. - * - * \ingroup Interface - */ -class NewSkillDialog : public Window, public gcn::ActionListener -{ - public: - /** - * Constructor. - */ - NewSkillDialog(); - - // action listener - void action(const gcn::ActionEvent &event); - - private: - void resetNSD(); // updates the values in the dialog box - - // members - int startPoint; // starting point of skill listing - ProgressBar *mSkillbar[N_SKILL_CAT_SIZE]; - gcn::Label *mSkillLabel[N_SKILL_CAT_SIZE]; - gcn::Label *mSkillLevel[N_SKILL_CAT_SIZE]; - nSkill mPlayerSkill[N_SKILL]; // pointer to an array of skill values -}; - -#endif diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp index d74b3ddd..052b5f33 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npc_text.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc_text.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $ */ -#include "npc_text.h" - #include +#include "npc_text.h" #include "textbox.h" #include "../npc.h" diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index 3773950a..e26dd870 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -17,18 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc_text.h 4096 2008-04-16 08:39:59Z b_lindeijer $ */ #ifndef _TMW_NPC_TEXT_H #define _TMW_NPC_TEXT_H #include + #include -#include "scrollarea.h" #include "button.h" +#include "scrollarea.h" #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp index 3203ba84..ba9e3d58 100644 --- a/src/gui/npclistdialog.cpp +++ b/src/gui/npclistdialog.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npclistdialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ -#include "npclistdialog.h" - #include #include "listbox.h" +#include "npclistdialog.h" #include "../npc.h" diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h index 4e9d4b3b..77f0c177 100644 --- a/src/gui/npclistdialog.h +++ b/src/gui/npclistdialog.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npclistdialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_GUI_NPCLISTDIALOG_H diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp index b8d3c7ba..421c873e 100644 --- a/src/gui/ok_dialog.cpp +++ b/src/gui/ok_dialog.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ok_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #include "ok_dialog.h" diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h index 426da538..a06ddd7c 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/ok_dialog.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ok_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _OK_DIALOG_H diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp index 710eb767..01c7e15d 100644 --- a/src/gui/passwordfield.cpp +++ b/src/gui/passwordfield.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: passwordfield.cpp 2132 2006-02-01 14:53:10Z der_doener $ */ #include "passwordfield.h" diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index 8228bfe2..9aa6ab49 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: passwordfield.h 2895 2006-12-09 01:44:18Z b_lindeijer $ */ #ifndef _TMW_PASSWORDFIELD_H_ diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index 6d39ce05..79c5676f 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include #include "playerbox.h" -#include "../player.h" #include "../graphics.h" +#include "../player.h" #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h index 86cdf064..7aec87bf 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef __TMW_PLAYERBOX_H__ diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 7e40abed..c0feb68d 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: popupmenu.cpp 4243 2008-05-16 15:48:52Z the_enemy $ */ -#include "popupmenu.h" - #include #include @@ -31,6 +27,7 @@ #include "browserbox.h" #include "inventorywindow.h" #include "item_amount.h" +#include "popupmenu.h" #include "windowcontainer.h" #include "../being.h" @@ -43,8 +40,8 @@ #include "../net/messageout.h" #include "../net/protocol.h" -#include "../resources/iteminfo.h" #include "../resources/itemdb.h" +#include "../resources/iteminfo.h" extern std::string tradePartnerName; diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 601fa2ae..3cf949b3 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -17,22 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: popupmenu.h 2239 2006-03-09 05:16:27Z der_doener $ */ #ifndef _TMW_POPUP_MENU_H #define _TMW_POPUP_MENU_H -#include "window.h" #include "linkhandler.h" +#include "window.h" class Being; class BrowserBox; class FloorItem; class Item; - /** * Window showing popup menu. */ diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 6dbc3b85..708a2991 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: progressbar.cpp 4008 2008-03-27 14:51:10Z b_lindeijer $ */ #include "progressbar.h" diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h index df825a5d..a20c901f 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: progressbar.h 2240 2006-03-09 12:24:36Z der_doener $ */ #ifndef _TMW_PROGRESSBAR_H @@ -32,7 +30,6 @@ class ImageRect; - /** * A progress bar. * diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp index cbab4d2d..5f929e62 100644 --- a/src/gui/radiobutton.cpp +++ b/src/gui/radiobutton.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: radiobutton.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include "radiobutton.h" diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h index ef87dccd..8fb6d832 100644 --- a/src/gui/radiobutton.h +++ b/src/gui/radiobutton.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: radiobutton.h 1584 2005-08-13 12:49:52Z der_doener $ */ #ifndef _TMW_RADIOBUTTON_H diff --git a/src/gui/register.cpp b/src/gui/register.cpp index e0b663b8..ec6a9756 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: register.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "register.h" - #include #include @@ -36,10 +32,11 @@ #include "button.h" #include "checkbox.h" #include "login.h" +#include "ok_dialog.h" #include "passwordfield.h" #include "radiobutton.h" +#include "register.h" #include "textfield.h" -#include "ok_dialog.h" #include "../utils/tostring.h" diff --git a/src/gui/register.h b/src/gui/register.h index 6f997b75..87a11bb9 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -17,18 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: register.h 3234 2007-03-24 13:05:27Z b_lindeijer $ */ #ifndef _TMW_REGISTER_H #define _TMW_REGISTER_H #include + #include #include #include "window.h" + #include "../guichanfwd.h" class LoginData; diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index a3aef702..032e3f78 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: scrollarea.cpp 4204 2008-04-28 18:29:04Z b_lindeijer $ */ #include diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index 32a192fc..ebe2c77b 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: scrollarea.h 4204 2008-04-28 18:29:04Z b_lindeijer $ */ #ifndef __TMW_SCROLLAREA_H__ diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index 9fed52f3..63af1aaa 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sell.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "sell.h" - #include #include @@ -30,17 +26,18 @@ #include "button.h" #include "shoplistbox.h" #include "scrollarea.h" +#include "sell.h" #include "shop.h" #include "slider.h" #include "../item.h" #include "../npc.h" -#include "../resources/iteminfo.h" - #include "../net/messageout.h" #include "../net/protocol.h" +#include "../resources/iteminfo.h" + #include "../utils/tostring.h" SellDialog::SellDialog(Network *network): diff --git a/src/gui/sell.h b/src/gui/sell.h index 11528f89..48961efc 100644 --- a/src/gui/sell.h +++ b/src/gui/sell.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sell.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_SELL_H diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 4faa8a86..b8fdb7de 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -17,33 +17,30 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup.cpp 4306 2008-05-28 20:22:37Z crush_tmw $ */ #include - -#include "setup.h" +#include #include "button.h" +#include "setup.h" #include "setup_audio.h" +#include "setup_colours.h" #include "setup_joystick.h" -#include "setup_video.h" #include "setup_keyboard.h" #include "setup_players.h" -#include "setup_colours.h" +#include "setup_video.h" #include "tabbedcontainer.h" #include "../utils/dtor.h" -#include -extern Window *statusWindow; -extern Window *minimap; extern Window *chatWindow; -extern Window *inventoryWindow; extern Window *equipmentWindow; extern Window *helpWindow; +extern Window *inventoryWindow; +extern Window *minimap; extern Window *skillDialog; +extern Window *statusWindow; Setup::Setup(): Window("Setup") diff --git a/src/gui/setup.h b/src/gui/setup.h index c24b8cb9..fd200f4c 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_SETUP_H diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index 09357cce..70b34a31 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_audio.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "setup_audio.h" - #include #include "checkbox.h" #include "ok_dialog.h" +#include "setup_audio.h" #include "slider.h" #include "../configuration.h" diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 76420101..9835a8fb 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_audio.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_GUI_SETUP_AUDIO_H #define _TMW_GUI_SETUP_AUDIO_H -#include "setuptab.h" - #include +#include "setuptab.h" + #include "../guichanfwd.h" class Setup_Audio : public SetupTab, public gcn::ActionListener diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp index 2c6d7aa9..0becd48f 100644 --- a/src/gui/setup_colours.cpp +++ b/src/gui/setup_colours.cpp @@ -19,8 +19,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "setup_colours.h" - #include #include @@ -29,6 +27,7 @@ #include "colour.h" #include "scrollarea.h" +#include "setup_colours.h" #include "slider.h" #include "../configuration.h" diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h index 566bed37..3bd87848 100644 --- a/src/gui/setup_colours.h +++ b/src/gui/setup_colours.h @@ -22,17 +22,17 @@ #ifndef _SETUP_COLOURS_H #define _SETUP_COLOURS_H -#include #include +#include #include -#include #include +#include +#include "scrollarea.h" #include "setuptab.h" #include "slider.h" #include "textfield.h" -#include "scrollarea.h" #include "../guichanfwd.h" diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 41e91595..723d0597 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_joystick.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ -#include "setup_joystick.h" - #include #include "button.h" #include "checkbox.h" +#include "setup_joystick.h" + #include "../configuration.h" #include "../joystick.h" diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index 399156d8..d2973a89 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_joystick.h 3035 2007-01-14 14:54:39Z b_lindeijer $ */ #ifndef _TMW_GUI_SETUP_JOYSTICK_H #define _TMW_GUI_SETUP_JOYSTICK_H -#include "setuptab.h" - #include +#include "setuptab.h" + #include "../guichanfwd.h" class Setup_Joystick : public SetupTab, public gcn::ActionListener diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 704fc691..007fcb52 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -17,11 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_keyboard.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ -#include "setup_keyboard.h" +#include #include #include @@ -30,14 +28,13 @@ #include "listbox.h" #include "ok_dialog.h" #include "scrollarea.h" +#include "setup_keyboard.h" #include "../configuration.h" #include "../keyboardconfig.h" #include "../utils/tostring.h" -#include - /** * The list model for key function list. * diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h index 7f945181..937790af 100644 --- a/src/gui/setup_keyboard.h +++ b/src/gui/setup_keyboard.h @@ -17,21 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_keyboard.h 4255 2008-05-21 21:44:27Z crush_tmw $ */ #ifndef _TMW_GUI_SETUP_KEYBOARD_H #define _TMW_GUI_SETUP_KEYBOARD_H -#include "setuptab.h" -#include "button.h" -#include "../guichanfwd.h" +#include #include +#include "button.h" +#include "setuptab.h" -#include +#include "../guichanfwd.h" class Setup_Keyboard : public SetupTab, public gcn::ActionListener { diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index ed1facc7..d07a9685 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -17,23 +17,21 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_players.cpp 4353 2008-06-16 07:04:46Z b_lindeijer $ */ -#include "setup_players.h" - #include + #include #include #include "button.h" #include "checkbox.h" #include "ok_dialog.h" +#include "setup_players.h" -#include "../player_relations.h" #include "../configuration.h" #include "../log.h" +#include "../player_relations.h" #include "../sound.h" #define COLUMNS_NR 2 // name plus listbox diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index b04023ab..b693a952 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -22,15 +22,14 @@ #ifndef _TMW_GUI_SETUP_PLAYERS_H #define _TMW_GUI_SETUP_PLAYERS_H -#include "setuptab.h" +#include -#include "scrollarea.h" #include "button.h" +#include "scrollarea.h" +#include "setuptab.h" #include "table.h" -#include #include "../guichanfwd.h" - #include "../player_relations.h" class PlayerTableModel; diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 879a3066..ec5b1d0a 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -17,15 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_video.cpp 4338 2008-06-05 18:41:39Z crush_tmw $ */ -#include "setup_video.h" - +#include #include #include -#include #include #include @@ -36,6 +32,7 @@ #include "listbox.h" #include "ok_dialog.h" #include "scrollarea.h" +#include "setup_video.h" #include "slider.h" #include "textfield.h" diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index d0a19cb6..4103c5ef 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setup_video.h 4306 2008-05-28 20:22:37Z crush_tmw $ */ #ifndef _TMW_GUI_SETUP_VIDEO_H #define _TMW_GUI_SETUP_VIDEO_H -#include "setuptab.h" - #include #include +#include "setuptab.h" + #include "../guichanfwd.h" class Setup_Video : public SetupTab, public gcn::ActionListener, diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h index bbfe4fac..6c276c35 100644 --- a/src/gui/setuptab.h +++ b/src/gui/setuptab.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: setuptab.h 2273 2006-03-19 00:48:10Z der_doener $ */ #ifndef _TMW_GUI_SETUPTAB_H diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index e7619547..a4478a62 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shop.cpp 4348 2008-06-14 12:42:49Z the_enemy $ */ #include "shop.h" diff --git a/src/gui/shop.h b/src/gui/shop.h index 8dfda67e..97b8d173 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shop.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _SHOP_H @@ -29,10 +27,10 @@ #include -#include "../resources/image.h" - -#include "../shopitem.h" #include "../guichanfwd.h" +#include "../shopitem.h" + +#include "../resources/image.h" class ShopItems : public gcn::ListModel { diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp index 7a8b52ed..e31eee58 100644 --- a/src/gui/shoplistbox.cpp +++ b/src/gui/shoplistbox.cpp @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.cpp 2655 2006-09-03 21:25:02Z b_lindeijer $ */ -#include "shoplistbox.h" - +#include #include #include +#include #include #include -#include -#include + +#include "shoplistbox.h" #include "../graphics.h" diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h index 5840e47f..e856c076 100644 --- a/src/gui/shoplistbox.h +++ b/src/gui/shoplistbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: listbox.h 2655 2006-09-03 21:25:02Z b_lindeijer $ */ #ifndef _TMW_SHOPLISTBOX_H diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp index 5a23e2a8..36c3a305 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -17,25 +17,22 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include #include -#include "skill.h" - #include "button.h" #include "listbox.h" +#include "skill.h" #include "windowcontainer.h" #include "../localplayer.h" +#include "../log.h" #include "../utils/dtor.h" #include "../utils/xml.h" -#include "../log.h" #define SKILLS_FILE "skills.xml" diff --git a/src/gui/skill.h b/src/gui/skill.h index 92badc8a..ee579dd5 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_SKILL_H diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp index a1ae6acc..afeecf17 100644 --- a/src/gui/slider.cpp +++ b/src/gui/slider.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: slider.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include "slider.h" diff --git a/src/gui/slider.h b/src/gui/slider.h index 5700d64d..36bfe698 100644 --- a/src/gui/slider.h +++ b/src/gui/slider.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: slider.h 1584 2005-08-13 12:49:52Z der_doener $ */ #ifndef _TMW_SLIDER_H @@ -30,7 +28,6 @@ class Image; - /** * Slider widget. Same as the Guichan slider but with custom look. * diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 0ccbebc0..2ab80bd9 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -18,8 +18,6 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 7a2a73b8..9b8eab70 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -18,15 +18,13 @@ * You should have received a copy of the GNU General Public License * along with The Legend of Mazzeroth; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _LOM_SPEECHBUBBLE_H__ #define _LOM_SPEECHBUBBLE_H__ -#include "textbox.h" #include "scrollarea.h" +#include "textbox.h" #include "window.h" class SpeechBubble : public Window diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 79b3aec7..9d6760d0 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: status.cpp 3510 2007-08-23 14:14:51Z b_lindeijer $ */ -#include "status.h" - #include #include "button.h" #include "progressbar.h" +#include "status.h" #include "windowcontainer.h" #include "../localplayer.h" diff --git a/src/gui/status.h b/src/gui/status.h index 4d082148..55ed393e 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: status.h 3538 2007-08-28 00:01:38Z b_lindeijer $ */ #ifndef _TMW_STATUS_H diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp index fc3efbd5..8e95aa7c 100644 --- a/src/gui/tabbedcontainer.cpp +++ b/src/gui/tabbedcontainer.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tabbedcontainer.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include -#include "tabbedcontainer.h" - #include "button.h" +#include "tabbedcontainer.h" -#include "../utils/tostring.h" #include "../utils/dtor.h" +#include "../utils/tostring.h" TabbedContainer::TabbedContainer(int width, int padX, int buttonHeight, int height, int padY, int buttonsPerRow): diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h index b004edc2..2fc41247 100644 --- a/src/gui/tabbedcontainer.h +++ b/src/gui/tabbedcontainer.h @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tabbedcontainer.h 3152 2007-02-27 16:31:34Z crush_tmw $ */ #ifndef _TMW_TABPANE_H #define _TMW_TABPANE_H #include -#include #include +#include #include diff --git a/src/gui/table.cpp b/src/gui/table.cpp index 8d2ab86a..e4d7812e 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -19,12 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include "table.h" #include +#include +#include +#include "table.h" class GuiTableActionListener : public gcn::ActionListener { diff --git a/src/gui/table.h b/src/gui/table.h index cef82d5d..b4c607ae 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -31,6 +31,7 @@ #include #include "table_model.h" + #include "../guichanfwd.h" class GuiTableActionListener; diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp index 57da29d9..e1afef96 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -19,8 +19,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include + +#include + #include "table_model.h" void diff --git a/src/gui/table_model.h b/src/gui/table_model.h index 69e41cd3..4022e369 100644 --- a/src/gui/table_model.h +++ b/src/gui/table_model.h @@ -22,9 +22,11 @@ #ifndef TMW_TABLE_MODEL_H_ #define TMW_TABLE_MODEL_H_ -#include #include #include + +#include + #include "../guichanfwd.h" class TableModelListener diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp index 2a496a1f..d7b589fa 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textbox.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $ */ -#include "textbox.h" - #include #include #include +#include "textbox.h" + TextBox::TextBox(): gcn::TextBox() { diff --git a/src/gui/textbox.h b/src/gui/textbox.h index 6f4db7dd..a0f0f947 100644 --- a/src/gui/textbox.h +++ b/src/gui/textbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textbox.h 4096 2008-04-16 08:39:59Z b_lindeijer $ */ #ifndef __TMW_TEXTBOX_H__ diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp index b128701b..bd016a8d 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -17,13 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textfield.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #include #include + #include #include "textfield.h" diff --git a/src/gui/textfield.h b/src/gui/textfield.h index 60766676..6def784d 100644 --- a/src/gui/textfield.h +++ b/src/gui/textfield.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textfield.h 4045 2008-04-07 15:23:07Z b_lindeijer $ */ #ifndef __TMW_TEXTFIELD_H__ diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index 2831fc46..8c02ab01 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id $ */ -#include "trade.h" - #include #include @@ -34,6 +30,7 @@ #include "itemcontainer.h" #include "scrollarea.h" #include "textfield.h" +#include "trade.h" #include "../inventory.h" #include "../item.h" diff --git a/src/gui/trade.h b/src/gui/trade.h index 7adf9575..5d587991 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id $ */ #ifndef _TMW_TRADE_H diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 5e9baa32..64f02f54 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: updatewindow.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $ */ -#include "updatewindow.h" - #include #include #include @@ -34,6 +30,7 @@ #include "button.h" #include "progressbar.h" #include "scrollarea.h" +#include "updatewindow.h" // Curl should be included after Guichan to avoid Windows redefinitions #include @@ -42,10 +39,10 @@ #include "../log.h" #include "../main.h" -#include "../utils/tostring.h" - #include "../resources/resourcemanager.h" +#include "../utils/tostring.h" + /** * Calculates the Alder-32 checksum for the given file. */ diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h index b669f829..4c302e85 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -17,14 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: updatewindow.h 4332 2008-06-05 07:33:12Z b_lindeijer $ */ #ifndef _UPDATERWINDOW_H #define _UPDATERWINDOW_H #include + #include #include diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp index 6f36dc9c..2ec1112d 100644 --- a/src/gui/vbox.cpp +++ b/src/gui/vbox.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: vbox.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #include "vbox.h" diff --git a/src/gui/vbox.h b/src/gui/vbox.h index fd029143..4538338f 100644 --- a/src/gui/vbox.h +++ b/src/gui/vbox.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: vbox.h 1881 2005-10-18 21:40:25Z der_doener $ */ #ifndef VBOX_H diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 6f89f639..3f0f546e 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -17,16 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: viewport.cpp 4098 2008-04-16 11:36:41Z b_lindeijer $ */ -#include "viewport.h" +#include #include #include "gui.h" #include "popupmenu.h" +#include "viewport.h" #include "../beingmanager.h" #include "../configuration.h" @@ -40,15 +39,13 @@ #include "../textmanager.h" #include "../resources/animation.h" -#include "../resources/monsterinfo.h" -#include "../resources/resourcemanager.h" #include "../resources/image.h" #include "../resources/imageset.h" +#include "../resources/monsterinfo.h" +#include "../resources/resourcemanager.h" #include "../utils/tostring.h" -#include - extern volatile int tick_time; Viewport::Viewport(): diff --git a/src/gui/viewport.h b/src/gui/viewport.h index c7b3c0e7..3120de91 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_VIEWPORT_H_ @@ -28,8 +26,8 @@ #include "windowcontainer.h" -#include "../configlistener.h" #include "../being.h" +#include "../configlistener.h" #include "../guichanfwd.h" class Map; diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 9bf7452d..88a12d68 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 9f6491b7..25ae05f8 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef DROPDOWN_H @@ -27,8 +25,10 @@ #include #include -#include "../scrollarea.h" + #include "../listbox.h" +#include "../scrollarea.h" + #include "../../guichanfwd.h" class Image; diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index e13493bb..e8b50dc9 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resizegrip.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ */ -#include "resizegrip.h" - #include +#include "resizegrip.h" + #include "../../graphics.h" #include "../../resources/image.h" diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index 03a9228f..5f3a09a4 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resizegrip.h 3270 2007-04-15 01:22:17Z b_lindeijer $ */ #ifndef _TMW_RESIZEGRIP_H diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 1a6f1ac6..4ace032b 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -17,21 +17,19 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include -#include #include +#include #include -#include -#include "window.h" +#include #include "gui.h" #include "gccontainer.h" +#include "window.h" #include "windowcontainer.h" #include "widgets/resizegrip.h" diff --git a/src/gui/window.h b/src/gui/window.h index 228cc37b..3bb41a95 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -17,24 +17,23 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_WINDOW_H__ #define _TMW_WINDOW_H__ -#include #include +#include + #include "../guichanfwd.h" class ConfigListener; class GCContainer; +class Image; class ImageRect; class ResizeGrip; class WindowContainer; -class Image; /** * A window. This window can be dragged around and has a title bar. Windows are diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp index 05c2b5e9..d8535f73 100644 --- a/src/gui/windowcontainer.cpp +++ b/src/gui/windowcontainer.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: windowcontainer.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ #include "windowcontainer.h" diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h index c9728230..d783fefd 100644 --- a/src/gui/windowcontainer.h +++ b/src/gui/windowcontainer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: windowcontainer.h 2884 2006-12-04 11:20:54Z b_lindeijer $ */ #ifndef _TMW_WINDOWCONTAINER_H_ diff --git a/src/guichanfwd.h b/src/guichanfwd.h index 0a2560bf..4fb7ea3e 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: guichanfwd.h 2907 2006-12-12 15:33:46Z b_lindeijer $ */ #ifndef _TMW_GUICHANFWD_H diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp index 965434b0..6d74801e 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "imageparticle.h" - #include "graphics.h" +#include "imageparticle.h" #include "resources/image.h" diff --git a/src/imageparticle.h b/src/imageparticle.h index ef663473..91c5426c 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageparticle.h 3567 2007-09-07 09:13:17Z b_lindeijer $ */ #ifndef _IMAGEPARTICLE_H diff --git a/src/inventory.cpp b/src/inventory.cpp index 0b1b9613..764d7fee 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventory.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "inventory.h" - #include #include +#include "inventory.h" #include "item.h" #include "log.h" diff --git a/src/inventory.h b/src/inventory.h index 42b0d86a..87d09567 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventory.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _INVENTORY_H diff --git a/src/item.cpp b/src/item.cpp index 2e33a9de..bc6b7cc7 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "item.h" diff --git a/src/item.h b/src/item.h index 449b388c..eb6fed77 100644 --- a/src/item.h +++ b/src/item.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: item.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _ITEM_H_ diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 5379f0eb..a3812042 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcut.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "itemshortcut.h" - #include "configuration.h" #include "inventory.h" #include "item.h" +#include "itemshortcut.h" #include "localplayer.h" #include "utils/tostring.h" diff --git a/src/itemshortcut.h b/src/itemshortcut.h index bbf21332..a0c52468 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemshortcut.h 4180 2008-04-24 20:49:30Z peaveydk $ */ #ifndef _TMW_ITEMSHORTCUT_H__ diff --git a/src/joystick.cpp b/src/joystick.cpp index ebae5c3a..f009ebc4 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: joystick.cpp 2595 2006-08-26 20:19:39Z b_lindeijer $ */ -#include "joystick.h" - #include "configuration.h" +#include "joystick.h" #include "log.h" int Joystick::joystickCount = 0; diff --git a/src/joystick.h b/src/joystick.h index 5c6f7c86..4cc1babd 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: joystick.h 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #ifndef _TMW_JOYSTICK_H diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 46fea458..f67c9534 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "keyboardconfig.h" +#include + #include "configuration.h" +#include "keyboardconfig.h" #include "log.h" -#include - #include "gui/setup_keyboard.h" struct KeyData diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h index a4329b09..158252d4 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_KEYBOARDCONFIG_H @@ -26,10 +24,10 @@ #include -#include "gui/setup_keyboard.h" - #include +#include "gui/setup_keyboard.h" + /** * Each key represents a key function. Such as 'Move up', 'Attack' etc. */ diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 9475fcbb..68999787 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include -#include "localplayer.h" - #include "equipment.h" #include "floor_item.h" #include "game.h" #include "inventory.h" #include "item.h" +#include "localplayer.h" #include "main.h" #include "monster.h" #include "particle.h" @@ -39,8 +36,8 @@ #include "net/messageout.h" #include "net/protocol.h" -#include "resources/resourcemanager.h" #include "resources/imageset.h" +#include "resources/resourcemanager.h" #include "utils/tostring.h" diff --git a/src/localplayer.h b/src/localplayer.h index 1eebabb6..ad59d138 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_LOCALPLAYER_H diff --git a/src/lockedarray.h b/src/lockedarray.h index bbb72520..a3e5dc0a 100644 --- a/src/lockedarray.h +++ b/src/lockedarray.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: lockedarray.h 2277 2006-03-19 21:40:21Z der_doener $ */ #ifndef _TMW_LOCKEDARRAY_H diff --git a/src/main.cpp b/src/main.cpp index db7b16d4..42a504fe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,50 +17,51 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: main.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $ */ -#include "main.h" - #include #include #include +#include #include #include -#include #include + #include + #include #include -#ifndef WIN32 -#include -#include +#ifdef __APPLE__ +#include #endif #ifdef __MINGW32__ #include #define usleep(usec) (Sleep ((usec) / 1000), 0) #endif -#if defined __APPLE__ -#include +#ifdef WIN32 +#include +#else +#include +#include #endif #include "configuration.h" -#include "keyboardconfig.h" -#include "player_relations.h" #include "game.h" #include "graphics.h" #include "itemshortcut.h" -#include "lockedarray.h" +#include "keyboardconfig.h" #include "localplayer.h" +#include "lockedarray.h" #include "log.h" #include "logindata.h" +#include "main.h" #ifdef USE_OPENGL #include "openglgraphics.h" #endif +#include "player_relations.h" #include "serverinfo.h" #include "sound.h" @@ -72,8 +73,8 @@ #include "gui/ok_dialog.h" #include "gui/progressbar.h" #include "gui/register.h" -#include "gui/updatewindow.h" #include "gui/textfield.h" +#include "gui/updatewindow.h" #include "net/charserverhandler.h" #include "net/loginhandler.h" @@ -91,10 +92,6 @@ #include "utils/dtor.h" #include "utils/tostring.h" -#ifdef WIN32 -#include -#endif - // Account infos char n_server, n_character; diff --git a/src/main.h b/src/main.h index 8dfc51cf..a0fe65cb 100644 --- a/src/main.h +++ b/src/main.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: main.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _TMW_MAIN_H diff --git a/src/map.cpp b/src/map.cpp index 15d5e5f3..612d9020 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: map.cpp 4171 2008-04-22 18:42:21Z b_lindeijer $ */ -#include "map.h" - #include #include "beingmanager.h" @@ -30,13 +26,14 @@ #include "game.h" #include "graphics.h" #include "localplayer.h" +#include "map.h" #include "particle.h" #include "sprite.h" #include "tileset.h" -#include "resources/resourcemanager.h" #include "resources/ambientoverlay.h" #include "resources/image.h" +#include "resources/resourcemanager.h" #include "utils/dtor.h" #include "utils/tostring.h" diff --git a/src/map.h b/src/map.h index 95532eb3..6eaf9e43 100644 --- a/src/map.h +++ b/src/map.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_MAP_H_ diff --git a/src/monster.cpp b/src/monster.cpp index be22bed3..62be513d 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monster.cpp 3823 2007-12-28 18:36:58Z crush_tmw $ */ -#include "monster.h" - #include "animatedsprite.h" #include "game.h" -#include "sound.h" +#include "monster.h" #include "particle.h" +#include "sound.h" #include "text.h" #include "gui/gui.h" diff --git a/src/monster.h b/src/monster.h index 4839966a..0906dff3 100644 --- a/src/monster.h +++ b/src/monster.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monster.h 3690 2007-10-26 12:50:49Z crush_tmw $ */ #ifndef _TMW_MONSTER_H diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index b9686e39..8a7e61a1 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beinghandler.cpp 4321 2008-06-02 11:42:26Z b_lindeijer $ */ -#include "beinghandler.h" - #include #include +#include "beinghandler.h" #include "messagein.h" #include "protocol.h" @@ -35,10 +32,10 @@ #include "../localplayer.h" #include "../log.h" #include "../main.h" +#include "../npc.h" #include "../particle.h" -#include "../sound.h" #include "../player_relations.h" -#include "../npc.h" +#include "../sound.h" const int EMOTION_TIME = 150; /**< Duration of emotion icon */ diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h index 8f58a397..9e736751 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: beinghandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_BEINGHANDLER_H diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp index b4e2cf30..b464e69f 100644 --- a/src/net/buysellhandler.cpp +++ b/src/net/buysellhandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysellhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "buysellhandler.h" - #include +#include "buysellhandler.h" #include "messagein.h" #include "protocol.h" @@ -39,8 +36,8 @@ #include "../gui/sell.h" extern BuyDialog *buyDialog; -extern SellDialog *sellDialog; extern Window *buySellDialog; +extern SellDialog *sellDialog; BuySellHandler::BuySellHandler() { diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index 4da52c95..49984840 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buysellhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_BUYSELLHANDLER_H diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index 2af3fe07..833732db 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -17,25 +17,22 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: charserverhandler.cpp 4330 2008-06-04 08:53:01Z b_lindeijer $ */ #include "charserverhandler.h" - #include "messagein.h" #include "network.h" #include "protocol.h" +#include "../extensions.h" #include "../game.h" #include "../localplayer.h" #include "../log.h" #include "../logindata.h" #include "../main.h" -#include "../extensions.h" -#include "../gui/ok_dialog.h" #include "../gui/char_select.h" +#include "../gui/ok_dialog.h" /* * Yeah, this is a global. Get over it. diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 663de94d..05f547d0 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: charserverhandler.h 3228 2007-03-22 23:53:13Z b_lindeijer $ */ #ifndef _TMW_NET_CHARSERVERHANDLER_H diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp index bee19112..b73b86b4 100644 --- a/src/net/chathandler.cpp +++ b/src/net/chathandler.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chathandler.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ -#include "chathandler.h" - #include #include +#include "chathandler.h" #include "messagein.h" #include "protocol.h" diff --git a/src/net/chathandler.h b/src/net/chathandler.h index 08a560f3..53ea61d8 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: chathandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_CHATHANDLER_H diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp index 5464fa55..4775371a 100644 --- a/src/net/equipmenthandler.cpp +++ b/src/net/equipmenthandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmenthandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "equipmenthandler.h" - #include "messagein.h" #include "protocol.h" diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h index 0121e6ad..31a747c3 100644 --- a/src/net/equipmenthandler.h +++ b/src/net/equipmenthandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: equipmenthandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_EQUIPMENTHANDLER_H diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp index 44a3256e..12b7d5ef 100644 --- a/src/net/inventoryhandler.cpp +++ b/src/net/inventoryhandler.cpp @@ -17,26 +17,24 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventoryhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "inventoryhandler.h" - #include +#include "inventoryhandler.h" #include "messagein.h" #include "protocol.h" -#include "../resources/iteminfo.h" +#include "../inventory.h" #include "../item.h" #include "../itemshortcut.h" #include "../localplayer.h" #include "../log.h" -#include "../inventory.h" #include "../gui/chat.h" +#include "../resources/iteminfo.h" + #include "../utils/tostring.h" InventoryHandler::InventoryHandler() diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 64ef8464..002fa938 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: inventoryhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_INVENTORYHANDLER_H diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp index 9af2be10..9cf85ce7 100644 --- a/src/net/itemhandler.cpp +++ b/src/net/itemhandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemhandler.cpp 2150 2006-02-06 02:56:48Z der_doener $ */ #include "itemhandler.h" - #include "messagein.h" #include "protocol.h" diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h index 702e193a..99fc6b62 100644 --- a/src/net/itemhandler.h +++ b/src/net/itemhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_ITEMHANDLER_H diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp index 946f4a21..9a7aaabd 100644 --- a/src/net/loginhandler.cpp +++ b/src/net/loginhandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: loginhandler.cpp 3233 2007-03-24 01:57:39Z b_lindeijer $ */ #include "loginhandler.h" - #include "messagein.h" #include "network.h" #include "protocol.h" diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 797655c3..1e087619 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -17,16 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: loginhandler.h 2137 2006-02-04 16:54:35Z der_doener $ */ #ifndef _TMW_NET_LOGINHANDLER_H #define _TMW_NET_LOGINHANDLER_H -#include "messagehandler.h" #include +#include "messagehandler.h" + struct LoginData; class LoginHandler : public MessageHandler diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp index 15f70baf..bc08d5d6 100644 --- a/src/net/maploginhandler.cpp +++ b/src/net/maploginhandler.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: maploginhandler.cpp 2239 2006-03-09 05:16:27Z der_doener $ */ #include "maploginhandler.h" - #include "messagein.h" #include "protocol.h" diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h index 6ff6bc00..4d9fa75b 100644 --- a/src/net/maploginhandler.h +++ b/src/net/maploginhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: maploginhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_MAPLOGINHANDLER_H diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp index 370a01ab..7a41e1ad 100644 --- a/src/net/messagehandler.cpp +++ b/src/net/messagehandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagehandler.cpp 2112 2006-01-22 13:31:13Z der_doener $ */ -#include "messagehandler.h" - #include +#include "messagehandler.h" #include "network.h" MessageHandler::MessageHandler(): diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index 90ffa489..952e76a9 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagehandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_MESSAGEHANDLER_H diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index bec47a5a..345e02fc 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -17,21 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagein.cpp 2369 2006-06-26 21:32:52Z b_lindeijer $ */ -#include "messagein.h" - #include #include #include +#include "messagein.h" + #define MAKEWORD(low,high) \ ((unsigned short)(((unsigned char)(low)) | \ ((unsigned short)((unsigned char)(high))) << 8)) - MessageIn::MessageIn(const char *data, unsigned int length): mData(data), mLength(length), diff --git a/src/net/messagein.h b/src/net/messagein.h index 0a6b8b8b..81db6cdc 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messagein.h 1879 2005-10-16 21:18:11Z der_doener $ */ #ifndef _TMW_MESSAGEIN_ #define _TMW_MESSAGEIN_ -#include #include +#include /** * Used for parsing an incoming message. diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index f5f3dad9..6aa25411 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messageout.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $ */ #include -#include #include #include - -#include "network.h" +#include #include "messageout.h" +#include "network.h" MessageOut::MessageOut(Network *network): mNetwork(network), diff --git a/src/net/messageout.h b/src/net/messageout.h index 33deb1bb..3c4cc241 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: messageout.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_MESSAGEOUT_ diff --git a/src/net/network.cpp b/src/net/network.cpp index efb11708..c9f8d1bd 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -17,19 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: network.cpp 3550 2007-08-30 16:46:21Z b_lindeijer $ */ -#include "network.h" +#include #include "messagehandler.h" #include "messagein.h" +#include "network.h" #include "../log.h" -#include - /** Warning: buffers and other variables are shared, so there can be only one connection active at a time */ diff --git a/src/net/network.h b/src/net/network.h index 826e6776..856808a2 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: network.h 3234 2007-03-24 13:05:27Z b_lindeijer $ */ #ifndef _TMW_NETWORK_ diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index 70f04271..65259959 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npchandler.cpp 2883 2006-12-03 17:00:07Z b_lindeijer $ */ -#include "npchandler.h" - #include "messagein.h" +#include "npchandler.h" #include "protocol.h" #include "../beingmanager.h" #include "../npc.h" -#include "../gui/npclistdialog.h" #include "../gui/npc_text.h" +#include "../gui/npclistdialog.h" extern NpcListDialog *npcListDialog; extern NpcTextDialog *npcTextDialog; diff --git a/src/net/npchandler.h b/src/net/npchandler.h index 7abd7495..abb16b7a 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npchandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_NPCHANDLER_H diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp index c1f2ba2e..9b5f3080 100644 --- a/src/net/partyhandler.cpp +++ b/src/net/partyhandler.cpp @@ -17,23 +17,20 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: partyhandler.cpp */ -#include "partyhandler.h" +#include +#include "partyhandler.h" #include "protocol.h" #include "messagein.h" #include "../gui/chat.h" #include "../gui/confirm_dialog.h" +#include "../beingmanager.h" #include "../game.h" #include "../party.h" -#include "../beingmanager.h" - -#include PartyHandler::PartyHandler(Party *party) : mParty(party) { diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index de97d084..daabc52f 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: partyhandler.h */ #ifndef _TMW_NET_PARTYHANDLER_H diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index ea561a81..c8442a89 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -17,20 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerhandler.cpp 4190 2008-04-26 17:37:03Z peaveydk $ */ -#include "playerhandler.h" - #include "messagein.h" +#include "playerhandler.h" #include "protocol.h" #include "../engine.h" #include "../localplayer.h" #include "../log.h" #include "../npc.h" -#include "../utils/tostring.h" #include "../gui/buy.h" #include "../gui/chat.h" @@ -42,6 +38,8 @@ #include "../gui/skill.h" #include "../gui/viewport.h" +#include "../utils/tostring.h" + // TODO Move somewhere else OkDialog *weightNotice = NULL; OkDialog *deathNotice = NULL; diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index f7c0672d..ec22e704 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: playerhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_PLAYERHANDLER_H diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp index 791b7fe5..a0e21d2e 100644 --- a/src/net/protocol.cpp +++ b/src/net/protocol.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: protocol.cpp 2158 2006-02-07 10:37:54Z der_doener $ */ #include "protocol.h" diff --git a/src/net/protocol.h b/src/net/protocol.h index 5e1d3c62..fabe6911 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: protocol.h 4321 2008-06-02 11:42:26Z b_lindeijer $ */ #ifndef _TMW_PROTOCOL_ diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp index 3685d04b..b9a232fb 100644 --- a/src/net/skillhandler.cpp +++ b/src/net/skillhandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: skillhandler.cpp 2832 2006-11-05 20:57:59Z b_lindeijer $ */ -#include "skillhandler.h" - #include "messagein.h" #include "protocol.h" +#include "skillhandler.h" #include "../log.h" diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h index 734772b4..80095bd3 100644 --- a/src/net/skillhandler.h +++ b/src/net/skillhandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: skillhandler.h 2112 2006-01-22 13:31:13Z der_doener $ */ #ifndef _TMW_NET_SKILLHANDLER_H diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 9174d846..11fe2c19 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tradehandler.cpp 4354 2008-06-17 16:52:44Z the_enemy $ */ -#include "tradehandler.h" - #include "messagein.h" #include "protocol.h" +#include "tradehandler.h" #include "../inventory.h" #include "../item.h" diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index 22e01f48..37ec5024 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tradehandler.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_NET_TRADEHANDLER_H diff --git a/src/npc.cpp b/src/npc.cpp index 82b68af4..78670581 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ -#include "npc.h" - #include "animatedsprite.h" #include "graphics.h" +#include "npc.h" #include "particle.h" #include "text.h" #include "net/messageout.h" #include "net/protocol.h" + #include "resources/npcdb.h" #include "gui/gui.h" diff --git a/src/npc.h b/src/npc.h index fa39e6c2..a37e8c66 100644 --- a/src/npc.h +++ b/src/npc.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npc.h 2883 2006-12-03 17:00:07Z b_lindeijer $ */ #ifndef _TMW_NPC_H diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 6ffc5668..8f47bc1f 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -17,12 +17,8 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: openglgraphics.cpp 4130 2008-04-18 20:39:29Z the_enemy $ */ -#include "main.h" - #ifdef USE_OPENGL #ifndef GL_TEXTURE_RECTANGLE_ARB @@ -30,8 +26,6 @@ #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 #endif -#include "openglgraphics.h" - #include #include @@ -43,6 +37,7 @@ #include #include "log.h" +#include "openglgraphics.h" #include "resources/image.h" diff --git a/src/openglgraphics.h b/src/openglgraphics.h index c3dc794c..7d39e306 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: openglgraphics.h 3628 2007-10-18 18:39:48Z b_lindeijer $ */ #ifndef _TMW_OPENGLGRAPHICS_H diff --git a/src/particle.cpp b/src/particle.cpp index af54a4b5..f1896ae2 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include #include -#include "particle.h" - #include "animationparticle.h" #include "configuration.h" #include "imageparticle.h" #include "log.h" #include "map.h" +#include "particle.h" #include "particleemitter.h" #include "textparticle.h" diff --git a/src/particle.h b/src/particle.h index a21fe88b..0a53f5af 100644 --- a/src/particle.h +++ b/src/particle.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _PARTICLE_H diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index edd7bf4f..03fe4672 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -17,21 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "particleemitter.h" - #include "animationparticle.h" #include "imageparticle.h" #include "log.h" #include "particle.h" +#include "particleemitter.h" #include "resources/animation.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/imageset.h" +#include "resources/resourcemanager.h" #include diff --git a/src/particleemitter.h b/src/particleemitter.h index 31346401..809a6ded 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _PARTICLEEMITTER_H diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h index e645c169..f9c329a9 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -17,12 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include #include +#include /** * Returns a random numeric value that is larger than or equal min and smaller diff --git a/src/party.cpp b/src/party.cpp index 39c39352..3df2eedc 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: party.cpp */ -#include "party.h" - #include "beingmanager.h" -#include "localplayer.h" #include "game.h" +#include "localplayer.h" +#include "party.h" #include "gui/chat.h" #include "gui/confirm_dialog.h" diff --git a/src/party.h b/src/party.h index d4f51b5a..0e1afc3c 100644 --- a/src/party.h +++ b/src/party.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: party.h */ #ifndef _TMW_PARTY_H diff --git a/src/player.cpp b/src/player.cpp index 5fb5ffe9..1a7480db 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -17,25 +17,23 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: player.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $ */ -#include "player.h" +#include #include "animatedsprite.h" #include "game.h" #include "graphics.h" #include "log.h" +#include "player.h" + +#include "gui/gui.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" #include "utils/strprintf.h" -#include "gui/gui.h" -#include - static const int NAME_X_OFFSET = 15; static const int NAME_Y_OFFSET = 30; diff --git a/src/player.h b/src/player.h index 6def34a5..8b1c8dcb 100644 --- a/src/player.h +++ b/src/player.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: player.h 4237 2008-05-14 18:57:32Z b_lindeijer $ */ #ifndef _TMW_PLAYER_H diff --git a/src/player_relations.cpp b/src/player_relations.cpp index 8abc9848..157cc09b 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -19,12 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include + #include "beingmanager.h" -#include "player_relations.h" #include "graphics.h" -#include "gui/gui.h" +#include "player_relations.h" -#include +#include "gui/gui.h" #define PLAYER_IGNORE_STRATEGY_NOP "nop" #define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0" diff --git a/src/player_relations.h b/src/player_relations.h index ec93b4dc..56f3d5a4 100644 --- a/src/player_relations.h +++ b/src/player_relations.h @@ -22,13 +22,14 @@ #ifndef TMW_PLAYER_RELATIONS_H_ #define TMW_PLAYER_RELATIONS_H_ -#include "being.h" -#include "player.h" -#include "configuration.h" -#include +#include #include +#include #include -#include + +#include "being.h" +#include "configuration.h" +#include "player.h" struct PlayerRelation { diff --git a/src/properties.h b/src/properties.h index 9ebead66..86fffea3 100644 --- a/src/properties.h +++ b/src/properties.h @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: properties.h 3754 2007-11-20 15:19:50Z b_lindeijer $ */ #ifndef _TMW_PROPERTIES_H_ #define _TMW_PROPERTIES_H_ #include -#include #include +#include /** * A class holding a set of properties. diff --git a/src/recorder.cpp b/src/recorder.cpp index 48ecb837..7bf618c5 100644 --- a/src/recorder.cpp +++ b/src/recorder.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: record.cpp */ #include "recorder.h" -#include "gui/chat.h" #include "gui/buttonbox.h" +#include "gui/chat.h" #include "utils/trim.h" diff --git a/src/recorder.h b/src/recorder.h index 75d86f88..9f30184f 100644 --- a/src/recorder.h +++ b/src/recorder.h @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: record.h */ #ifndef _TMW_RECORD_H #define _TMW_RECORD_H -#include #include +#include #include "gui/buttonbox.h" diff --git a/src/resources/action.cpp b/src/resources/action.cpp index 8ed099ea..f40d3109 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -17,17 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: action.cpp 3676 2007-10-23 08:02:22Z b_lindeijer $ */ #include "action.h" - #include "animation.h" #include "../utils/dtor.h" - Action::Action() { } diff --git a/src/resources/action.h b/src/resources/action.h index 61307652..09eb066e 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: action.h 2905 2006-12-12 15:06:06Z b_lindeijer $ */ #ifndef _TMW_ACTION_H diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp index 654cbb32..38d8fc46 100644 --- a/src/resources/ambientoverlay.cpp +++ b/src/resources/ambientoverlay.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ambientoverlay.cpp 2727 2006-10-07 20:01:34Z b_lindeijer $ */ #include "ambientoverlay.h" - #include "image.h" #include "../graphics.h" diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h index c0b18600..56c70066 100644 --- a/src/resources/ambientoverlay.h +++ b/src/resources/ambientoverlay.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: ambientoverlay.h 2727 2006-10-07 20:01:34Z b_lindeijer $ */ #ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_ diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index b740b9b5..596c5fac 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -17,14 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animation.cpp 2905 2006-12-12 15:06:06Z b_lindeijer $ */ -#include "animation.h" - #include +#include "animation.h" + #include "../utils/dtor.h" Animation::Animation(): diff --git a/src/resources/animation.h b/src/resources/animation.h index 53420ecd..8dfe8614 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: animation.h 3301 2007-05-23 21:35:01Z b_lindeijer $ */ #ifndef _TMW_ANIMATION_H diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index c917a45e..1bd98680 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -17,19 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buddylist.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $ */ #include #include -#include #include +#include #include "buddylist.h" -#include "../main.h" #include "../configuration.h" +#include "../main.h" BuddyList::BuddyList() { diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h index 5a8f2324..6a3de8c4 100644 --- a/src/resources/buddylist.h +++ b/src/resources/buddylist.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: buddylist.h 2239 2006-03-09 05:16:27Z der_doener $ */ #ifndef _TMW_BUDDYLIST_H diff --git a/src/resources/colordb.h b/src/resources/colordb.h index 1f8b191c..2b750fa3 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -22,8 +22,8 @@ #ifndef _AETHYRA_COLOR_MANAGER_H #define _AETHYRA_COLOR_MANAGER_H -#include #include +#include /** * The class that holds the color information. diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 195d5dd1..3be105d8 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: dye.cpp 3708 2007-11-04 11:52:44Z gmelquio $ */ #include diff --git a/src/resources/dye.h b/src/resources/dye.h index fe8669bb..4fb8fd40 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -17,13 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: dye.h 3706 2007-11-03 21:04:51Z gmelquio $ */ #ifndef _TMW_DYE_H #define _TMW_DYE_H +#include #include /** @@ -38,7 +37,7 @@ class Palette * The string is either a file name or a sequence of hexadecimal RGB * values separated by ',' and starting with '#'. */ - Palette(std::string const &); + Palette(std::string const &pallete); /** * Gets a pixel color depending on its intensity. @@ -65,7 +64,7 @@ class Dye * The parts of string are separated by semi-colons. Each part starts * by an uppercase letter, followed by a colon and then a palette name. */ - Dye(std::string const &); + Dye(std::string const &dye); /** * Destroys the associated palettes. diff --git a/src/resources/image.cpp b/src/resources/image.cpp index dc22a69b..35b9c254 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: image.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $ */ #include -#include "image.h" - #include "dye.h" +#include "image.h" #include "../log.h" diff --git a/src/resources/image.h b/src/resources/image.h index 6f10f858..6eb33ed9 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -17,16 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: image.h 3760 2007-11-21 19:43:11Z b_lindeijer $ */ #ifndef _TMW_IMAGE_H #define _TMW_IMAGE_H +#include + #include "../main.h" -#include #ifdef USE_OPENGL /* The definition of OpenGL extensions by SDL is giving problems with recent diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index d6539b05..a7e813d7 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -17,18 +17,16 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageloader.cpp 3515 2007-08-25 16:56:52Z gmelquio $ */ #include #include + #include #include -#include "imageloader.h" - #include "image.h" +#include "imageloader.h" #include "resourcemanager.h" ProxyImage::ProxyImage(SDL_Surface *s): diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h index 89f38eda..7979fd2f 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageloader.h 3515 2007-08-25 16:56:52Z gmelquio $ */ #ifndef _TMW_IMAGELOADER_H diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp index b7263ec3..b321439a 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -17,16 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $ */ +#include "image.h" #include "imageset.h" #include "../log.h" -#include "image.h" - #include "../utils/dtor.h" ImageSet::ImageSet(Image *img, int width, int height) diff --git a/src/resources/imageset.h b/src/resources/imageset.h index e276dd06..c7915212 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imageset.h 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #ifndef _TMW_IMAGESET_H @@ -30,7 +28,6 @@ class Image; - /** * Stores a set of subimages originating from a single image. */ diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index f11cad24..36805646 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imagewriter.cpp 2417 2006-07-19 15:12:06Z umperio $ */ -#include "imagewriter.h" - #include -#include #include +#include + +#include "imagewriter.h" #include "../log.h" diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index c7968d30..632e2ae4 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: imagewriter.h 1766 2005-09-18 01:31:33Z bertram25 $ */ #include diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 8b73f646..3f8dadce 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemdb.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include + #include #include "itemdb.h" - #include "iteminfo.h" #include "resourcemanager.h" diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 1ee1b5f0..9b661a60 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: itemdb.h 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #ifndef _TMW_ITEM_MANAGER_H #define _TMW_ITEM_MANAGER_H -#include "iteminfo.h" - #include +#include "iteminfo.h" + /** * The namespace that holds the item information. */ diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 64f5c37e..5daeafe6 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: iteminfo.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ -#include "iteminfo.h" - #include "itemdb.h" +#include "iteminfo.h" const std::string& ItemInfo::getSprite(int gender) const diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 85f79263..4678bc08 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: iteminfo.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _TMW_ITEMINFO_H_ diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index f3d78ae9..d6154ee0 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: mapreader.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ -#include "mapreader.h" - #include #include #include -#include "resourcemanager.h" #include "image.h" +#include "mapreader.h" +#include "resourcemanager.h" #include "../log.h" #include "../map.h" diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index eb0d4873..ef52564e 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: mapreader.h 3587 2007-09-20 13:24:20Z b_lindeijer $ */ #ifndef _TMW_MAPREADER_H_ @@ -28,8 +26,8 @@ #include -class Properties; class Map; +class Properties; class Tileset; /** diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 8d8dd133..4d52b8ad 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ #include "monsterdb.h" - #include "resourcemanager.h" #include "../log.h" diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index 43865bb3..f1d69e72 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterdb.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_MONSTER_DB_H diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 19f2990b..4a71a122 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $ */ #include "monsterinfo.h" diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index c5345bd8..05a78c5a 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -17,21 +17,18 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $ */ #ifndef _TMW_MONSTERINFO_H_ #define _TMW_MONSTERINFO_H_ +#include #include #include #include -#include #include "../being.h" - enum MonsterSoundEvent { MONSTER_EVENT_HIT, diff --git a/src/resources/music.cpp b/src/resources/music.cpp index 0e327218..2386aa43 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: music.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #include "music.h" diff --git a/src/resources/music.h b/src/resources/music.h index a15d22c1..d50150b8 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: music.h 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #ifndef _TMW_MUSIC_H diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index c310d6e3..3ae58067 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -17,12 +17,9 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npcdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ #include "npcdb.h" - #include "resourcemanager.h" #include "../log.h" diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index e1240c5e..b4539866 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: npcdb.h 4255 2008-05-21 21:44:27Z crush_tmw $ */ #ifndef _TMW_NPC_DB_H #define _TMW_NPC_DB_H -#include #include +#include #include struct NPCsprite diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index 2bb60e56..e9310905 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -17,14 +17,11 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resource.cpp 3808 2007-12-22 21:33:47Z b_lindeijer $ */ #include #include "resource.h" - #include "resourcemanager.h" Resource::~Resource() diff --git a/src/resources/resource.h b/src/resources/resource.h index 9c70f6c0..e85e3147 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resource.h 3808 2007-12-22 21:33:47Z b_lindeijer $ */ #ifndef _TMW_RESOURCE_H diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 16a2c470..310982af 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -17,29 +17,25 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resourcemanager.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include -#include -#include - #include #include +#include -#include "resourcemanager.h" +#include #include "dye.h" #include "image.h" +#include "imageset.h" #include "music.h" +#include "resourcemanager.h" #include "soundeffect.h" -#include "imageset.h" #include "spritedef.h" #include "../log.h" - ResourceManager *ResourceManager::instance = NULL; ResourceManager::ResourceManager() diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 3f0f1704..c814d752 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: resourcemanager.h 3839 2008-01-13 16:28:50Z the_enemy $ */ #ifndef _TMW_RESOURCE_MANAGER_H @@ -29,11 +27,11 @@ #include #include -class Resource; class Image; +class ImageSet; class Music; +class Resource; class SoundEffect; -class ImageSet; class SpriteDef; struct SDL_Surface; diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index 03fa337e..e21fd2b0 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: soundeffect.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #include "soundeffect.h" diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index 0a574e7d..c3ff6668 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: soundeffect.h 3753 2007-11-20 12:27:56Z b_lindeijer $ */ #ifndef _TMW_SOUND_EFFECT_H diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index a6d8891e..b4193fd3 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -17,20 +17,17 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include -#include "spritedef.h" - #include "action.h" #include "animation.h" #include "dye.h" #include "image.h" #include "imageset.h" #include "resourcemanager.h" +#include "spritedef.h" #include "../log.h" #include "../utils/xml.h" diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 72c2566f..4b712340 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_SPRITEDEF_H @@ -27,10 +25,10 @@ #include #include -#include "resource.h" - #include +#include "resource.h" + class Action; class ImageSet; diff --git a/src/serverinfo.h b/src/serverinfo.h index 9a9eef1d..4d2bb525 100644 --- a/src/serverinfo.h +++ b/src/serverinfo.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: serverinfo.h 1735 2005-09-13 22:56:29Z der_doener $ */ #ifndef _TMW_SERVERINFO_ diff --git a/src/shopitem.cpp b/src/shopitem.cpp index 8bd79cc1..9888f829 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shopitem.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #include "shopitem.h" diff --git a/src/shopitem.h b/src/shopitem.h index 4e6fd3a3..f0c00ef0 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: shopitem.h 4347 2008-06-12 09:06:01Z b_lindeijer $ */ #ifndef _SHOPITEM_H_ diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index a75a3392..544d02b5 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -17,19 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: simpleanimation.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $ */ -#include "simpleanimation.h" - #include "graphics.h" #include "log.h" +#include "simpleanimation.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/imageset.h" - +#include "resources/resourcemanager.h" SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode): mAnimationTime(0), diff --git a/src/simpleanimation.h b/src/simpleanimation.h index dfca33e2..577268a8 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: simpleanimation.h 3301 2007-05-23 21:35:01Z b_lindeijer $ */ #ifndef _TMW_SIMPLEANIMAION_H diff --git a/src/sound.cpp b/src/sound.cpp index f0101442..6d440134 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -17,15 +17,13 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sound.cpp 3892 2008-02-18 10:00:45Z umperio $ */ -#include "sound.h" - #include #include "log.h" +#include "sound.h" + #include "resources/resourcemanager.h" #include "resources/soundeffect.h" diff --git a/src/sound.h b/src/sound.h index ebcd6442..72180607 100644 --- a/src/sound.h +++ b/src/sound.h @@ -17,15 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_SOUND_H #define _TMW_SOUND_H #include - #include /** Sound engine diff --git a/src/sprite.h b/src/sprite.h index cbe32186..0e0a95db 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: sprite.h 3292 2007-05-07 16:22:54Z crush_tmw $ */ #ifndef _TMW_SPRITE_H_ diff --git a/src/text.cpp b/src/text.cpp index 545c1c0e..4d36b8fc 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -19,12 +19,11 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "text.h" - #include #include +#include "text.h" #include "textmanager.h" int Text::mInstances = 0; diff --git a/src/textmanager.cpp b/src/textmanager.cpp index 54d44c2a..cb5d0bf2 100644 --- a/src/textmanager.cpp +++ b/src/textmanager.cpp @@ -19,11 +19,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "textmanager.h" - #include #include "text.h" +#include "textmanager.h" TextManager *textManager = 0; diff --git a/src/textparticle.cpp b/src/textparticle.cpp index 89466006..ed9d5717 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -17,13 +17,10 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "textparticle.h" - #include "graphics.h" +#include "textparticle.h" TextParticle::TextParticle(Map *map, const std::string &text, int colorR, int colorG, int colorB, diff --git a/src/textparticle.h b/src/textparticle.h index 5f81abff..f662621f 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -17,18 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: textparticle.h 3539 2007-08-28 16:42:47Z b_lindeijer $ */ #ifndef _TEXTPARTICLE_H #define _TEXTPARTICLE_H -#include "particle.h" - #include #include "guichanfwd.h" +#include "particle.h" class TextParticle : public Particle { diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index e98216d4..9d8ba836 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -26,10 +26,9 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.cpp 2906 2006-12-12 15:18:30Z b_lindeijer $ */ -#include #include +#include #include "base64.h" diff --git a/src/utils/base64.h b/src/utils/base64.h index 3356debf..c802207b 100644 --- a/src/utils/base64.h +++ b/src/utils/base64.h @@ -26,7 +26,6 @@ | Author: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: base64.h 2906 2006-12-12 15:18:30Z b_lindeijer $ */ #ifndef _TMW_BASE64_H #define _TMW_BASE64_H diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 29cde178..514ea9e7 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: dtor.h 2271 2006-03-18 15:15:33Z der_doener $ */ #ifndef _TMW_UTILS_DTOR_H diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h index 4513a79d..8da1d354 100644 --- a/src/utils/fastsqrt.h +++ b/src/utils/fastsqrt.h @@ -5,8 +5,6 @@ * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf * * Unfortunately the original creator of this function seems to be unknown. - * - * $Id: fastsqrt.h 3508 2007-08-22 16:32:52Z b_lindeijer $ */ float fastInvSqrt(float x) diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp index 48fc3814..c532dd0d 100644 --- a/src/utils/strprintf.cpp +++ b/src/utils/strprintf.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: strprintf.cpp 3416 2007-08-06 06:20:14Z gmelquio $ */ #include diff --git a/src/utils/strprintf.h b/src/utils/strprintf.h index 66d753fa..382ab6e0 100644 --- a/src/utils/strprintf.h +++ b/src/utils/strprintf.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: strprintf.h 3417 2007-08-06 11:14:45Z gmelquio $ */ #ifndef _TMW_UTILS_STRPRINTF_H diff --git a/src/utils/tostring.h b/src/utils/tostring.h index 3cbeef27..d2dd941a 100644 --- a/src/utils/tostring.h +++ b/src/utils/tostring.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: tostring.h 3500 2007-08-21 15:11:19Z joshlangley $ */ #ifndef _TMW_UTILS_TOSTRING_H diff --git a/src/utils/trim.h b/src/utils/trim.h index 7b236730..a7c40ca2 100644 --- a/src/utils/trim.h +++ b/src/utils/trim.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: trim.h 3606 2007-09-27 14:54:09Z b_lindeijer $ */ #ifndef _TMW_UTILS_TRIM_H_ diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index c0b921b8..e511ced3 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -17,12 +17,12 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: xml.cpp 4255 2008-05-21 21:44:27Z crush_tmw $ */ #include "xml.h" + #include "../log.h" + #include "../resources/resourcemanager.h" namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index c64c1204..9e691963 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -17,17 +17,15 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: xml.h 4255 2008-05-21 21:44:27Z crush_tmw $ */ #ifndef _TMW_XML_H #define _TMW_XML_H -#include - #include +#include + /** * XML helper functions. */ diff --git a/src/vector.h b/src/vector.h index 379c50e1..b19f6c64 100644 --- a/src/vector.h +++ b/src/vector.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id: vector.h 3541 2007-08-29 00:31:59Z b_lindeijer $ */ #ifndef _TMW_VECTOR_H_ -- cgit v1.2.3-70-g09d2 From 68926c15e6d31c4af90bce9ec57aa39f839d7d6b Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Wed, 3 Dec 2008 12:30:11 -0700 Subject: Add an effects manager (patch by Kage Jittai) NOTE: This patch demonstrates the need to fix pixel coordinates in the eAthena client. Bjorn did the movement patch in the TMWClient, however, I still haven't got that fully working with the merges. It's likely that a clone will be developed to tackle this problem. Signed-off-by: Ira Rice --- src/CMakeLists.txt | 2 ++ src/Makefile.am | 3 ++ src/being.cpp | 90 ------------------------------------------------ src/being.h | 10 +----- src/game.cpp | 4 +++ src/net/beinghandler.cpp | 5 ++- src/player.h | 8 ----- src/vector.cpp | 28 +++++++++++++++ src/vector.h | 68 +++++++++++++++++++++++++++++++++--- 9 files changed, 105 insertions(+), 113 deletions(-) create mode 100644 src/vector.cpp (limited to 'src/being.cpp') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e4803230..4e8654e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -342,6 +342,8 @@ SET(SRCS textparticle.h tileset.h vector.h + effectmanager.cpp + effectmanager.h ) ADD_EXECUTABLE(aethyra ${SRCS}) diff --git a/src/Makefile.am b/src/Makefile.am index 5c759135..76773d49 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -242,6 +242,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ configlistener.h \ configuration.cpp \ configuration.h \ + effectmanager.cpp \ + effectmanager.h \ engine.cpp \ engine.h \ equipment.cpp \ @@ -313,6 +315,7 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ textparticle.cpp \ textparticle.h \ tileset.h \ + vector.cpp \ vector.h # set the include path found by configure diff --git a/src/being.cpp b/src/being.cpp index 27bd0c57..ded3abd8 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -571,93 +571,3 @@ int Being::getHeight() const } } -struct EffectDescription -{ - std::string mGFXEffect; - std::string mSFXEffect; -}; - -static EffectDescription *default_effect = NULL; -static std::map effects; -static bool effects_initialized = false; - -static EffectDescription *getEffectDescription(xmlNodePtr node, int *id) -{ - EffectDescription *ed = new EffectDescription; - - *id = atoi(XML::getProperty(node, "id", "-1").c_str()); - ed->mSFXEffect = XML::getProperty(node, "audio", ""); - ed->mGFXEffect = XML::getProperty(node, "particle", ""); - - return ed; -} - -static EffectDescription *getEffectDescription(int effectId) -{ - if (!effects_initialized) - { - XML::Document doc(BEING_EFFECTS_FILE); - xmlNodePtr root = doc.rootNode(); - - if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) - { - logger->log("Error loading being effects file: " - BEING_EFFECTS_FILE); - return NULL; - } - - for_each_xml_child_node(node, root) - { - int id; - - if (xmlStrEqual(node->name, BAD_CAST "effect")) - { - EffectDescription *EffectDescription = - getEffectDescription(node, &id); - effects[id] = EffectDescription; - } else if (xmlStrEqual(node->name, BAD_CAST "default")) - { - EffectDescription *EffectDescription = - getEffectDescription(node, &id); - - if (default_effect) - delete default_effect; - - default_effect = EffectDescription; - } - } - - effects_initialized = true; - } // done initializing - - EffectDescription *ed = effects[effectId]; - - if (!ed) - return default_effect; - else - return ed; -} - -void Being::internalTriggerEffect(int effectId, bool sfx, bool gfx) -{ - logger->log("Special effect #%d on %s", effectId, - getId() == player_node->getId() ? "self" : "other"); - - EffectDescription *ed = getEffectDescription(effectId); - - if (!ed) { - logger->log("Unknown special effect and no default recorded"); - return; - } - - if (gfx && ed->mGFXEffect != "" && mParticleEffects) { - Particle *selfFX; - - selfFX = particleEngine->addEffect(ed->mGFXEffect, 0, 0); - controlParticle(selfFX); - } - - if (sfx && ed->mSFXEffect != "") { - sound.playSfx(ed->mSFXEffect); - } -} diff --git a/src/being.h b/src/being.h index 325ec51a..958e8f60 100644 --- a/src/being.h +++ b/src/being.h @@ -29,6 +29,7 @@ #include #include "animatedsprite.h" +#include "effectmanager.h" #include "map.h" #include "sprite.h" @@ -358,15 +359,6 @@ class Being : public Sprite mEmotionTime = emote_time; } - /** - * Triggers a visual effect, such as `level up' - * - * Only draws the visual effect, does not play sound effects - * - * \param effectId ID of the effect to trigger - */ - virtual void triggerEffect(int effectId) { internalTriggerEffect(effectId, false, true); } - // Target cursor being used by the being Image *mTargetCursor; diff --git a/src/game.cpp b/src/game.cpp index 16bc082b..e8ba9046 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -31,6 +31,7 @@ #include "beingmanager.h" #include "configuration.h" +#include "effectmanager.h" #include "engine.h" #include "flooritemmanager.h" #include "graphics.h" @@ -126,6 +127,7 @@ ItemShortcutWindow *itemShortcutWindow; BeingManager *beingManager = NULL; FloorItemManager *floorItemManager = NULL; Particle* particleEngine = NULL; +EffectManager *effectManager = NULL; const int MAX_TIME = 10000; @@ -277,6 +279,8 @@ Game::Game(Network *network): beingManager = new BeingManager(network); floorItemManager = new FloorItemManager(); + effectManager = new EffectManager(); + particleEngine = new Particle(NULL); particleEngine->setupEngine(); diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 8a7e61a1..b016b5cf 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -28,6 +28,7 @@ #include "../being.h" #include "../beingmanager.h" +#include "../effectmanager.h" #include "../game.h" #include "../localplayer.h" #include "../log.h" @@ -269,8 +270,10 @@ void BeingHandler::handleMessage(MessageIn *msg) break; int effectType = msg->readInt32(); + Being* being = beingManager->findBeing(id); - beingManager->findBeing(id)->triggerEffect(effectType); + effectManager->trigger(effectType, (int) being->getPixelX(), + (int) being->getPixelY()); break; } diff --git a/src/player.h b/src/player.h index 8b1c8dcb..c91ad3c2 100644 --- a/src/player.h +++ b/src/player.h @@ -78,14 +78,6 @@ class Player : public Being */ void flash(int time); - /** - * Triggers a visual/audio effect, such as `level up' - * - * \param effect_id ID of the effect to trigger - */ - virtual void - triggerEffect(int effectId) { internalTriggerEffect(effectId, true, true); } - protected: void updateCoords(); private: diff --git a/src/vector.cpp b/src/vector.cpp new file mode 100644 index 00000000..7d5f055a --- /dev/null +++ b/src/vector.cpp @@ -0,0 +1,28 @@ +/* + * The Mana World + * Copyright 2007 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "vector.h" + +std::ostream& operator <<(std::ostream &os, const Vector &v) +{ + os << "Vector(" << v.x << ", " << v.y << ", " << v.z << ")"; + return os; +} diff --git a/src/vector.h b/src/vector.h index b19f6c64..f32b201a 100644 --- a/src/vector.h +++ b/src/vector.h @@ -22,6 +22,10 @@ #ifndef _TMW_VECTOR_H_ #define _TMW_VECTOR_H_ +#include + +#include + /** * Vector class. Represents either a 3D point in space, a velocity or a force. * Provides several convenient operator overloads. @@ -41,7 +45,7 @@ class Vector /** * Constructor. */ - Vector(float x, float y, float z): + Vector(float x, float y, float z = 0.0f): x(x), y(y), z(z) @@ -69,11 +73,12 @@ class Vector /** * In-place scale vector operator. */ - void operator*=(float c) + Vector &operator*=(float c) { x *= c; y *= c; z *= c; + return *this; } /** @@ -86,6 +91,17 @@ class Vector z / c); } + /** + * In-place scale vector operator. + */ + Vector &operator/=(float c) + { + x /= c; + y /= c; + z /= c; + return *this; + } + /** * Add vector operator. */ @@ -99,11 +115,12 @@ class Vector /** * In-place add vector operator. */ - void operator+=(const Vector &v) + Vector &operator+=(const Vector &v) { x += v.x; y += v.y; z += v.z; + return *this; } /** @@ -119,14 +136,55 @@ class Vector /** * In-place substract vector operator. */ - void operator-=(const Vector &v) + Vector &operator-=(const Vector &v) { x -= v.x; y -= v.y; z -= v.z; + return *this; + } + + /** + * Returns the length of this vector. This method does a relatively + * slow square root. + */ + float length() const + { + return sqrtf(x * x + y * y + z * z); + } + + /** + * Returns the squared length of this vector. Avoids the square root. + */ + float squaredLength() const + { + return x * x + y * y + z * z; + } + + /** + * Returns the manhattan length of this vector. + */ + float manhattanLength() const + { + return fabsf(x) + fabsf(y) + fabsf(z); + } + + /** + * Returns a normalized version of this vector. This is a unit vector + * running parallel to it. + */ + Vector normalized() const + { + const float l = length(); + return Vector(x / l, y / l, z / l); } float x, y, z; }; -#endif +/** + * Appends a string representation of a vector to the output stream. + */ +std::ostream& operator <<(std::ostream &os, const Vector &v); + +#endif // _TMW_VECTOR_H_ -- cgit v1.2.3-70-g09d2 From 712744c5c985a906891a41679adbe6468e82649b Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Sun, 14 Dec 2008 03:43:37 +0100 Subject: Fixed follow-parent of nested and being-following particle emitters --- src/being.cpp | 6 ++++-- src/particle.cpp | 47 ++++++++++++++++++++++++++++++++++++----------- src/particle.h | 17 +++++------------ src/particlecontainer.cpp | 20 ++++++++------------ src/particlecontainer.h | 6 +++--- src/particleemitter.cpp | 11 ++++++----- 6 files changed, 62 insertions(+), 45 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index d98af29c..3f4c5d9c 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -424,8 +424,10 @@ void Being::logic() } } - //Update particle effects - mChildParticleEffects.setPositions((float)mPx + 16.0f, (float)mPy + 32.0f); + // Update particle effects + mChildParticleEffects.moveTo((float) mPx + 16.0f, + (float) mPy + 32.0f); + } void Being::draw(Graphics *graphics, int offsetX, int offsetY) const diff --git a/src/particle.cpp b/src/particle.cpp index fd86195c..adc4aa5b 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -193,7 +193,7 @@ bool Particle::update() p++ ) { - (*p)->moveBy(mPos.x, mPos.y, mPos.z); + (*p)->moveBy(mPos); mChildParticles.push_back (*p); } } @@ -228,6 +228,30 @@ bool Particle::update() } return true; +} + +void Particle::moveBy(Vector change) +{ + mPos += change; + for (ParticleIterator p = mChildParticles.begin(); + p != mChildParticles.end(); + p++) + { + if ((*p)->doesFollow()) + { + (*p)->moveBy(change); + } + } + return; +} + +void Particle::moveTo(float x, float y) +{ + Vector pos; + pos.x = x; + pos.y = y; + pos.z = mPos.z; + moveTo(pos); } Particle* Particle::addEffect(const std::string &particleEffectFile, @@ -275,17 +299,18 @@ Particle* Particle::addEffect(const std::string &particleEffectFile, } // Read and set the basic properties of the particle - int offsetX = XML::getProperty(effectChildNode, "position-x", 0); - int offsetY = XML::getProperty(effectChildNode, "position-y", 0); - int offsetZ = XML::getProperty(effectChildNode, "position-z", 0); - - int particleX = (int) mPos.x + pixelX + offsetX; - int particleY = (int) mPos.y + pixelY + offsetY; - int particleZ = (int) mPos.z + offsetZ; + float offsetX = XML::getFloatProperty(effectChildNode, "position-x", 0); + float offsetY = XML::getFloatProperty(effectChildNode, "position-y", 0); + float offsetZ = XML::getFloatProperty(effectChildNode, "position-z", 0); + + Vector position; + position.x = mPos.x + (float)pixelX + offsetX; + position.y = mPos.y + (float)pixelY + offsetY; + position.z = mPos.z + offsetZ; int lifetime = XML::getProperty(effectChildNode, "lifetime", -1); - newParticle->setPosition(particleX, particleY, particleZ); + newParticle->moveTo(position); newParticle->setLifetime(lifetime); // Look for additional emitters for this particle @@ -311,7 +336,7 @@ Particle *Particle::addTextSplashEffect(const std::string &text, { Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB, font); - newParticle->setPosition(x, y, 0); + newParticle->moveTo(x, y); newParticle->setVelocity(((rand() % 100) - 50) / 200.0f, // X ((rand() % 100) - 50) / 200.0f, // Y ((rand() % 100) / 200.0f) + 4.0f); // Z @@ -330,7 +355,7 @@ Particle *Particle::addTextRiseFadeOutEffect(const std::string &text, int x, int y) { Particle *newParticle = new TextParticle(mMap, text, 255, 255, 255, font); - newParticle->setPosition(x, y, 0); + newParticle->moveTo(x, y); newParticle->setVelocity(0.0f, 0.0f, 0.5f); newParticle->setGravity(0.0015f); newParticle->setLifetime(300); diff --git a/src/particle.h b/src/particle.h index ab08968f..8359ab55 100644 --- a/src/particle.h +++ b/src/particle.h @@ -127,14 +127,13 @@ class Particle : public Sprite /** * Sets the position in 3 dimensional space in pixels relative to map. */ - void setPosition(float x, float y, float z) - { mPos.x = x; mPos.y = y; mPos.z = z; } + void moveTo(Vector pos) + { moveBy (pos - mPos);} /** * Sets the position in 2 dimensional space in pixels relative to map. */ - void setPosition(float x, float y) - { mPos.x = x; mPos.y = y; } + void moveTo(float x, float y); /** * Returns the particle position. @@ -144,14 +143,8 @@ class Particle : public Sprite /** * Changes the particle position relative - */ - void moveBy(float x, float y, float z) - { mPos.x += x; mPos.y += y; mPos.z += z; } - - void moveChildren(Vector change); - - void moveBy (Vector change) - { mPos += change; } + */ + void moveBy (Vector change); /** * Sets the time in game ticks until the particle is destroyed. diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index 12ef5733..fbfb1505 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -44,12 +44,10 @@ ParticleContainer::clear() mNext->clear(); } - -void -ParticleContainer::setPositions(float x, float y) +void ParticleContainer::moveTo(float x, float y) { if (mNext) - mNext->setPositions(x, y); + mNext->moveTo(x, y); } // -- particle list ---------------------------------------- @@ -91,15 +89,14 @@ ParticleList::clearLocally() mElements.clear(); } -void -ParticleList::setPositions(float x, float y) +void ParticleList::moveTo(float x, float y) { - ParticleContainer::setPositions(x, y); + ParticleContainer::moveTo(x, y); for (std::list::iterator it = mElements.begin(); it != mElements.end();) { - (*it)->setPosition(x, y); + (*it)->moveTo(x, y); if ((*it)->isExtinct()) { (*it)->kill(); @@ -156,16 +153,15 @@ ParticleVector::clearLocally() delLocally(i); } -void -ParticleVector::setPositions(float x, float y) +void ParticleVector::moveTo(float x, float y) { - ParticleContainer::setPositions(x, y); + ParticleContainer::moveTo(x, y); for (std::vector::iterator it = mIndexedElements.begin(); it != mIndexedElements.end(); it++) if (*it) { - (*it)->setPosition(x, y); + (*it)->moveTo(x, y); if ((*it)->isExtinct()) { diff --git a/src/particlecontainer.h b/src/particlecontainer.h index cf002fbc..ae02326e 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -58,7 +58,7 @@ public: /** * Sets the positions of all elements */ - virtual void setPositions(float x, float y); + virtual void moveTo(float x, float y); protected: bool mDelParent; /**< Delete mNext in destructor */ @@ -88,7 +88,7 @@ public: virtual void clearLocally(); - virtual void setPositions(float x, float y); + virtual void moveTo(float x, float y); protected: std::list mElements; /**< Contained particle effects */ @@ -116,7 +116,7 @@ public: virtual void delLocally(int index); virtual void clearLocally(); - virtual void setPositions(float x, float y); + virtual void moveTo(float x, float y); protected: std::vector mIndexedElements; diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 03fe4672..d1ba92ca 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -360,12 +360,13 @@ ParticleEmitter::createParticles(int tick) { newParticle = new Particle(mMap); } + + Vector position; + position.x = mParticlePosX.value(tick); + position.y = mParticlePosY.value(tick); + position.z = mParticlePosZ.value(tick); - - newParticle->setPosition( - mParticlePosX.value(tick), - mParticlePosY.value(tick), - mParticlePosZ.value(tick)); + newParticle->moveTo(position); float angleH = mParticleAngleHorizontal.value(tick); float angleV = mParticleAngleVertical.value(tick); -- cgit v1.2.3-70-g09d2 From 4854bc433cd74bb072d02e25aa416f06ff6257b4 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 26 Dec 2008 22:45:24 -0700 Subject: Fixed a potential leak in setup, changed the default border color to white for wallpapers (matches our wallpapers better), and fixed the effect manager. Signed-off-by: Ira Rice --- src/CMakeLists.txt | 4 ++-- src/being.cpp | 4 ---- src/effectmanager.cpp | 27 ++++++++++++++++++++++++--- src/effectmanager.h | 18 ++++++++++++++---- src/graphics.cpp | 3 ++- src/gui/setup_video.cpp | 3 +++ src/main.cpp | 2 +- src/net/beinghandler.cpp | 3 +-- 8 files changed, 47 insertions(+), 17 deletions(-) (limited to 'src/being.cpp') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e2403b8f..fea11c55 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -284,6 +284,8 @@ SET(SRCS configlistener.h configuration.cpp configuration.h + effectmanager.cpp + effectmanager.h engine.cpp engine.h equipment.cpp @@ -348,8 +350,6 @@ SET(SRCS textparticle.h tileset.h vector.h - effectmanager.cpp - effectmanager.h ) ADD_EXECUTABLE(aethyra ${SRCS}) diff --git a/src/being.cpp b/src/being.cpp index 3f4c5d9c..edacbc26 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -47,10 +47,6 @@ #include "utils/tostring.h" #include "utils/xml.h" -#define BEING_EFFECTS_FILE "effects.xml" - -#include "utils/xml.h" - #define BEING_EFFECTS_FILE "effects.xml" #define HAIR_FILE "hair.xml" diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 4b835355..89bbf8f5 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -21,14 +21,12 @@ */ #include "effectmanager.h" - -#include "particle.h" #include "log.h" +#include "particle.h" #include "sound.h" #include "utils/xml.h" - EffectManager::EffectManager() { XML::Document doc("effects.xml"); @@ -64,6 +62,29 @@ EffectManager::~EffectManager() } +bool EffectManager::trigger(int id, Being* being) +{ + bool rValue = false; + for (std::list::iterator i = mEffects.begin(); i != mEffects.end(); ++i) + { + if ((*i).id == id) + { + printf("Found effect, playing it"); + rValue = true; + if((*i).GFX != "") + { + Particle *selfFX; + selfFX = particleEngine->addEffect((*i).GFX, 0, 0); + being->controlParticle(selfFX); + } + if((*i).SFX != "") + sound.playSfx((*i).SFX); + break; + } + } + return rValue; +} + bool EffectManager::trigger(int id, int x, int y) { bool rValue = false; diff --git a/src/effectmanager.h b/src/effectmanager.h index b5451f27..e6671498 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -23,8 +23,12 @@ #ifndef _EFFECT_MANAGER_H #define _EFFECT_MANAGER_H -#include #include +#include + +#include "being.h" + +class Being; class EffectManager { @@ -42,10 +46,16 @@ class EffectManager ~EffectManager(); /** - * Triggers a effect with the id, at x,y - * returns true if ID exists + * Triggers a effect with the id, at + * the specified being. + */ + bool trigger(int id, Being* being); + + /** + * Triggers a effect with the id, at + * the specified x and y coordinate. */ - bool trigger(int id, int x = 0, int y = 0); + bool trigger(int id, int x, int y); private: std::list mEffects; diff --git a/src/graphics.cpp b/src/graphics.cpp index 82404bce..4854d5fa 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -59,6 +59,7 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel) displayFlags |= SDL_SWSURFACE; } + delete mScreen; mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags); if (!mScreen) { @@ -71,7 +72,7 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel) logger->log("Using video driver: %s", videoDriverName); } else { - logger->log("Using video driver: unkown"); + logger->log("Using video driver: unknown"); } const SDL_VideoInfo *vi = SDL_GetVideoInfo(); diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 262c17e1..2e620095 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -401,6 +401,7 @@ void Setup_Video::action(const gcn::ActionEvent &event) const int bpp = 0; const bool fullscreen = ((int) config.getValue("screen", 0) == 1); const bool hwaccel = ((int) config.getValue("hwaccel", 0) == 1); + // Try to set the desired video mode if (!graphics->setVideoMode(width, height, bpp, fullscreen, hwaccel)) { @@ -411,7 +412,9 @@ void Setup_Video::action(const gcn::ActionEvent &event) } // Initialize for drawing + graphics->_endDraw(); graphics->_beginDraw(); + graphics->updateScreen(); // TODO: Find out why the drawing area doesn't resize without a restart. new OkDialog("Screen resolution changed", diff --git a/src/main.cpp b/src/main.cpp index 378e913e..818a4e32 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -822,7 +822,7 @@ int main(int argc, char *argv[]) if (graphics->getWidth() > login_wallpaper->getWidth() || graphics->getHeight() > login_wallpaper->getHeight()) { - graphics->setColor(gcn::Color(64, 64, 64)); + graphics->setColor(gcn::Color(255, 255, 255)); graphics->fillRectangle(gcn::Rectangle( 0, 0, graphics->getWidth(), graphics->getHeight())); } diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 3c022af6..4f525e8d 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -265,8 +265,7 @@ void BeingHandler::handleMessage(MessageIn *msg) int effectType = msg->readInt32(); Being* being = beingManager->findBeing(id); - effectManager->trigger(effectType, (int) being->getPixelX(), - (int) being->getPixelY()); + effectManager->trigger(effectType, being); break; } -- cgit v1.2.3-70-g09d2 From b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7 Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Fri, 22 Feb 2008 19:58:29 +0000 Subject: Handling gender with an enum everywhere. (cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h --- src/being.cpp | 4 ++-- src/being.h | 12 +++++++++--- src/gui/char_select.cpp | 4 ++-- src/gui/char_select.h | 7 ++++--- src/main.cpp | 4 +++- src/net/beinghandler.cpp | 6 ++++-- src/net/charserverhandler.cpp | 5 +++-- src/npc.cpp | 2 +- src/npc.h | 2 +- src/player.cpp | 20 ++++++-------------- src/player.h | 2 +- src/resources/itemdb.cpp | 8 ++++---- src/resources/iteminfo.cpp | 2 +- src/resources/iteminfo.h | 6 ++++-- 14 files changed, 45 insertions(+), 39 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index edacbc26..07895eb2 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -73,7 +73,7 @@ Being::Being(int id, int job, Map *map): mParticleEffects(config.getValue("particleeffects", 1)), mEquippedWeapon(NULL), mHairStyle(1), mHairColor(0), - mGender(2), + mGender(GENDER_UNSPECIFIED), mSpeechTime(0), mPx(0), mPy(0), mSprites(VECTOREND_SPRITE, NULL), @@ -95,7 +95,7 @@ Being::Being(int id, int job, Map *map): // Hairstyles are encoded as negative numbers. Count how far negative we can go. int hairstyles = 1; - while (ItemDB::get(-hairstyles).getSprite(0) != "error.xml") + while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml") { hairstyles++; } diff --git a/src/being.h b/src/being.h index ca051811..ccb1c4c4 100644 --- a/src/being.h +++ b/src/being.h @@ -70,6 +70,12 @@ struct PATH_NODE typedef std::list Path; typedef Path::iterator PathIterator; +enum Gender { + GENDER_MALE = 0, + GENDER_FEMALE = 1, + GENDER_UNSPECIFIED = 2 +}; + class Being : public Sprite { public: @@ -222,12 +228,12 @@ class Being : public Sprite /** * Sets the gender of this being. */ - virtual void setGender(int gender) { mGender = gender; } + virtual void setGender(Gender gender) { mGender = gender; } /** * Gets the gender of this being. */ - int getGender() const { return mGender; } + Gender getGender() const { return mGender; } /** * Makes this being take the next step of his path. @@ -419,7 +425,7 @@ class Being : public Sprite std::string mSpeech; Text *mText; Uint16 mHairStyle, mHairColor; - Uint8 mGender; + Gender mGender; Uint32 mSpeechTime; Sint32 mPx, mPy; /**< Pixel coordinates */ Uint16 mStunMode; /**< Stun mode; zero if not stunned */ diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 53cc1e8d..6a52a745 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -73,7 +73,7 @@ void CharDeleteConfirm::action(const gcn::ActionEvent &event) CharSelectDialog::CharSelectDialog(Network *network, LockedArray *charInfo, - unsigned char gender): + Gender gender): Window("Select Character"), mNetwork(network), mCharInfo(charInfo), mGender(gender), mCharSelected(false) { @@ -248,7 +248,7 @@ bool CharSelectDialog::selectByName(const std::string &name) } CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network, - unsigned char gender): + Gender gender): Window("Create Character", true, parent), mNetwork(network), mSlot(slot) { mPlayer = new Player(0, 0, NULL); diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 63630736..d592ce48 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -28,6 +28,7 @@ #include "../guichanfwd.h" #include "../lockedarray.h" +#include "../being.h" class LocalPlayer; class Network; @@ -48,7 +49,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener */ CharSelectDialog(Network *network, LockedArray *charInfo, - unsigned char gender); + Gender gender); void action(const gcn::ActionEvent &event); @@ -76,7 +77,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener PlayerBox *mPlayerBox; - unsigned char mGender; + Gender mGender; bool mCharSelected; /** @@ -102,7 +103,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener * Constructor. */ CharCreateDialog(Window *parent, int slot, Network *network, - unsigned char gender); + Gender gender); /** * Destructor. diff --git a/src/main.cpp b/src/main.cpp index 12789d80..7de3823f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -937,8 +937,10 @@ int main(int argc, char *argv[]) case CHAR_SELECT_STATE: logger->log("State: CHAR_SELECT"); currentDialog = new CharSelectDialog(network, &charInfo, - 1 - loginData.sex); + (loginData.sex == 0) ? + GENDER_FEMALE : GENDER_MALE); positionDialog(currentDialog, screenWidth, screenHeight); + if (((CharSelectDialog*) currentDialog)-> selectByName(options.playername)) options.chooseDefault = true; diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 4f525e8d..5b689266 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -137,7 +137,8 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt16(); // manner msg->readInt16(); // karma msg->readInt8(); // unknown - dstBeing->setGender(1 - msg->readInt8()); // gender + dstBeing->setGender( + (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE); // Set these after the gender, as the sprites may be gender-specific dstBeing->setSprite(Being::BOTTOMCLOTHES_SPRITE, headBottom); @@ -404,7 +405,8 @@ void BeingHandler::handleMessage(MessageIn *msg) msg->readInt32(); // emblem msg->readInt16(); // manner msg->readInt8(); // karma - dstBeing->setGender(1 - msg->readInt8()); // gender + dstBeing->setGender( + (msg->readInt8() == 0) ? GENDER_FEMALE : GENDER_MALE); // Set these after the gender, as the sprites may be gender-specific dstBeing->setSprite(Being::WEAPON_SPRITE, weapon); diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index 11754b6f..eb724630 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -187,10 +187,11 @@ void CharServerHandler::handleMessage(MessageIn *msg) } } -LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot) +LocalPlayer *CharServerHandler::readPlayerData(MessageIn &msg, int &slot) { LocalPlayer *tempPlayer = new LocalPlayer(mLoginData->account_ID, 0, NULL); - tempPlayer->setGender(1 - mLoginData->sex); + tempPlayer->setGender( + (mLoginData->sex == 0) ? GENDER_FEMALE : GENDER_MALE); tempPlayer->mCharId = msg.readInt32(); tempPlayer->setXp(msg.readInt32()); diff --git a/src/npc.cpp b/src/npc.cpp index 8dbbf83c..2aa15209 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -94,7 +94,7 @@ void NPC::setName(const std::string &name) Being::setName(displayName + " (NPC)"); } -void NPC::setGender(int gender) +void NPC::setGender(Gender gender) { Being::setGender(gender); } diff --git a/src/npc.h b/src/npc.h index a37e8c66..6e150e2b 100644 --- a/src/npc.h +++ b/src/npc.h @@ -36,7 +36,7 @@ class NPC : public Player ~NPC(); void setName(const std::string &name); - void setGender(int gender); + void setGender(Gender gender); void setSprite(int slot, int id, std::string color); virtual Type diff --git a/src/player.cpp b/src/player.cpp index e6244bb5..47275c81 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -124,25 +124,17 @@ Player::flash(int time) } } -void Player::setGender(int gender) +void Player::setGender(Gender gender) { - // Players can only be male or female - if (gender > 1) - { - logger->log("Warning: unsupported gender %i, assuming male.", gender); - gender = 0; - } - - if (gender != mGender) { Being::setGender(gender); - setSprite(Being::BASE_SPRITE, -100); /* Human base sprite. When implementing - * different races remove this line - * and set the base sprite when setting - * the race of the player character. - */ + /* Human base sprite. When implementing different races remove this + * line and set the base sprite when setting the race of the player + * character. + */ + setSprite(Being::BASE_SPRITE, -100); // Reload all subsprites for (int i = 1; i < VECTOREND_SPRITE; i++) diff --git a/src/player.h b/src/player.h index c91ad3c2..97ff15d9 100644 --- a/src/player.h +++ b/src/player.h @@ -53,7 +53,7 @@ class Player : public Being getType() const; virtual void - setGender(int gender); + setGender(Gender gender); /** * Sets the hair style and color for this player. diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index f4ccc511..bca2b030 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -53,8 +53,8 @@ void ItemDB::load() mUnknown = new ItemInfo(); mUnknown->setName("Unknown item"); mUnknown->setImageName(""); - mUnknown->setSprite("error.xml", 0); - mUnknown->setSprite("error.xml", 1); + mUnknown->setSprite("error.xml", GENDER_MALE); + mUnknown->setSprite("error.xml", GENDER_FEMALE); XML::Document doc("items.xml"); xmlNodePtr rootNode = doc.rootNode(); @@ -172,11 +172,11 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node) if (gender == "male" || gender == "unisex") { - itemInfo->setSprite(filename, 0); + itemInfo->setSprite(filename, GENDER_MALE); } if (gender == "female" || gender == "unisex") { - itemInfo->setSprite(filename, 1); + itemInfo->setSprite(filename, GENDER_FEMALE); } } diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 5daeafe6..6f669376 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -23,7 +23,7 @@ #include "iteminfo.h" const std::string& -ItemInfo::getSprite(int gender) const +ItemInfo::getSprite(Gender gender) const { if (mView) { diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 4678bc08..b7729d2c 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -28,6 +28,8 @@ #include "spritedef.h" +#include "../being.h" + enum EquipmentSoundEvent { EQUIP_EVENT_STRIKE, @@ -91,10 +93,10 @@ class ItemInfo void setView(int view) { mView = view; } - void setSprite(const std::string &animationFile, int gender) + void setSprite(const std::string &animationFile, Gender gender) { mAnimationFiles[gender] = animationFile; } - const std::string& getSprite(int gender) const; + const std::string& getSprite(Gender gender) const; void setWeaponType(int); -- cgit v1.2.3-70-g09d2 From 4b540f3007e18a85a6d31d301526217393792451 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 5 Jan 2009 00:15:27 +0100 Subject: Renamed PATH_NODE to Position as on mainline --- src/CMakeLists.txt | 2 ++ src/Makefile.am | 2 ++ src/being.cpp | 16 +++++++-------- src/being.h | 19 +----------------- src/map.cpp | 2 +- src/map.h | 20 +++++++++---------- src/position.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++ src/position.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 126 insertions(+), 38 deletions(-) create mode 100644 src/position.cpp create mode 100644 src/position.h (limited to 'src/being.cpp') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a7735e41..83f35dfb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -337,6 +337,8 @@ SET(SRCS player.h player_relations.cpp player_relations.h + position.cpp + position.h properties.h sdltruetypefont.cpp sdltruetypefont.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 382f33e0..e89afd8f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -306,6 +306,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ player.h \ player_relations.cpp \ player_relations.h \ + position.cpp \ + position.h \ properties.h \ recorder.cpp \ recorder.h \ diff --git a/src/being.cpp b/src/being.cpp index 07895eb2..aff52757 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -351,29 +351,29 @@ void Being::nextStep() return; } - PATH_NODE node = mPath.front(); + Position pos = mPath.front(); mPath.pop_front(); int dir = 0; - if (node.x > mX) + if (pos.x > mX) dir |= RIGHT; - else if (node.x < mX) + else if (pos.x < mX) dir |= LEFT; - if (node.y > mY) + if (pos.y > mY) dir |= DOWN; - else if (node.y < mY) + else if (pos.y < mY) dir |= UP; setDirection(dir); - if (mMap->tileCollides(node.x, node.y)) + if (mMap->tileCollides(pos.x, pos.y)) { setAction(STAND); return; } - mX = node.x; - mY = node.y; + mX = pos.x; + mY = pos.y; setAction(WALK); mWalkTime += mWalkSpeed / 10; } diff --git a/src/being.h b/src/being.h index ccb1c4c4..54c9d717 100644 --- a/src/being.h +++ b/src/being.h @@ -33,6 +33,7 @@ #include "effectmanager.h" #include "map.h" #include "particlecontainer.h" +#include "position.h" #include "sprite.h" #include "gui/speechbubble.h" @@ -52,24 +53,6 @@ class Particle; class SpeechBubble; class Text; -/** - * A position along a being's path. - */ -struct PATH_NODE -{ - /** - * Constructor. - */ - PATH_NODE(unsigned short x, unsigned short y): - x(x), y(y) - { } - - unsigned short x; - unsigned short y; -}; -typedef std::list Path; -typedef Path::iterator PathIterator; - enum Gender { GENDER_MALE = 0, GENDER_FEMALE = 1, diff --git a/src/map.cpp b/src/map.cpp index 02b046fb..217a14e3 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -480,7 +480,7 @@ Path Map::findPath(int startX, int startY, int destX, int destY) while (pathX != startX || pathY != startY) { // Add the new path node to the start of the path list - path.push_front(PATH_NODE(pathX, pathY)); + path.push_front(Position(pathX, pathY)); // Find out the next parent MetaTile *tile = getMetaTile(pathX, pathY); diff --git a/src/map.h b/src/map.h index 6eaf9e43..56183abf 100644 --- a/src/map.h +++ b/src/map.h @@ -25,6 +25,7 @@ #include #include +#include "position.h" #include "properties.h" class AmbientOverlay; @@ -35,8 +36,6 @@ class Particle; class Sprite; class Tileset; -struct PATH_NODE; - typedef std::vector Tilesets; typedef std::list Sprites; typedef Sprites::iterator SpriteIterator; @@ -55,13 +54,13 @@ struct MetaTile MetaTile():whichList(0) {}; // Pathfinding members - int Fcost; /**< Estimation of total path cost */ - int Gcost; /**< Cost from start to this location */ - int Hcost; /**< Estimated cost to goal */ - int whichList; /**< No list, open list or closed list */ - int parentX; /**< X coordinate of parent tile */ - int parentY; /**< Y coordinate of parent tile */ - bool walkable; /**< Can beings walk on this tile */ + int Fcost; /**< Estimation of total path cost */ + int Gcost; /**< Cost from start to this location */ + int Hcost; /**< Estimated cost to goal */ + int whichList; /**< No list, open list or closed list */ + int parentX; /**< X coordinate of parent tile */ + int parentY; /**< Y coordinate of parent tile */ + bool walkable; /**< Can beings walk on this tile */ }; /** @@ -204,8 +203,7 @@ class Map : public Properties /** * Find a path from one location to the next. */ - std::list - findPath(int startX, int startY, int destX, int destY); + Path findPath(int startX, int startY, int destX, int destY); /** * Adds a sprite to the map. diff --git a/src/position.cpp b/src/position.cpp new file mode 100644 index 00000000..cc39a1af --- /dev/null +++ b/src/position.cpp @@ -0,0 +1,45 @@ +/* + * The Mana World + * Copyright 2007 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "position.h" + +std::ostream& operator <<(std::ostream &os, const Position &p) +{ + os << "(" << p.x << ", " << p.y << ")"; + return os; +} + +std::ostream& operator <<(std::ostream &os, const Path &path) +{ + Path::const_iterator i = path.begin(); + + os << "("; + while (i != path.end()) + { + os << *i; + ++i; + if (i != path.end()) + os << ", "; + } + os << ")"; + + return os; +} diff --git a/src/position.h b/src/position.h new file mode 100644 index 00000000..7beb3ef7 --- /dev/null +++ b/src/position.h @@ -0,0 +1,58 @@ +/* + * The Mana World + * Copyright 2008 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef TMW_POSITION_H +#define TMW_POSITION_H + +#include +#include + +/** + * A position along a being's path. + */ +struct Position +{ + /** + * Constructor. + */ + Position(int x, int y): + x(x), y(y) + { } + + int x; + int y; +}; + +typedef std::list Path; +typedef Path::iterator PathIterator; + +/** + * Appends a string representation of a position to the output stream. + */ +std::ostream& operator <<(std::ostream &os, const Position &p); + +/** + * Appends a string representation of a path (sequence of positions) to the + * output stream. + */ +std::ostream& operator <<(std::ostream &os, const Path &path); + +#endif // TMW_POSITION_H -- cgit v1.2.3-70-g09d2 From 0dabbade690301ef89da2fb2562da8e48afc22d3 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 9 Jan 2009 21:24:13 -0700 Subject: Added the ability to see your own name in game. Signed-off-by: Ira Rice --- src/being.cpp | 1 + src/gui/chat.cpp | 12 ++++++++++-- src/gui/setup_video.cpp | 22 +++++++++++++++++++++- src/gui/setup_video.h | 2 ++ src/gui/viewport.cpp | 11 +++++++++++ src/localplayer.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/localplayer.h | 32 +++++++++++++++++++++++--------- src/main.cpp | 1 + src/player.cpp | 15 ++++----------- src/player.h | 19 +++++++------------ 10 files changed, 124 insertions(+), 35 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index aff52757..ba3107db 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -69,6 +69,7 @@ Being::Being(int id, int job, Map *map): mWalkSpeed(150), mDirection(DOWN), mMap(NULL), + mName(""), mIsGM(false), mParticleEffects(config.getValue("particleeffects", 1)), mEquippedWeapon(NULL), diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 35976963..d4818504 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -95,8 +95,7 @@ ChatWindow::~ChatWindow() delete mRecorder; } -void - ChatWindow::logic() +void ChatWindow::logic() { // todo: only do this when the size changes (updateWidgets?) @@ -296,6 +295,15 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) } // Prepare ordinary message if (msg.substr(0, 1) != "/") { + // The server never tells you about your own GM status, so work around + // this for now by intercepting it here. NOTE: This assumes that the + // assert works, when it's not guaranteed to. + + std::size_t space = msg.find(" "); + const std::string command = msg.substr(1, space); + if (msg.at(0) == '@' && command == "assert") + player_node->setGM(); + msg = nick + " : " + msg; MessageOut outMsg(mNetwork); diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 724ce8b4..a23f5923 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -38,6 +38,7 @@ #include "../configuration.h" #include "../graphics.h" +#include "../localplayer.h" #include "../log.h" #include "../main.h" #include "../particle.h" @@ -106,6 +107,7 @@ Setup_Video::Setup_Video(): mCustomCursorEnabled(config.getValue("customcursor", 1)), mParticleEffectsEnabled(config.getValue("particleeffects", 1)), mSpeechBubbleEnabled(config.getValue("speechbubble", 1)), + mNameEnabled(config.getValue("showownname", 0)), mOpacity(config.getValue("guialpha", 0.8)), mFps((int) config.getValue("fpslimit", 0)), mModeListModel(new ModeListModel), @@ -115,6 +117,7 @@ Setup_Video::Setup_Video(): mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)), mParticleEffectsCheckBox(new CheckBox(_("Particle effects"), mParticleEffectsEnabled)), mSpeechBubbleCheckBox(new CheckBox(_("Speech bubbles"), mSpeechBubbleEnabled)), + mNameCheckBox(new CheckBox(_("Show name"), mNameEnabled)), mAlphaSlider(new Slider(0.2, 1.0)), mFpsCheckBox(new CheckBox(_("FPS Limit:"))), mFpsSlider(new Slider(10, 200)), @@ -145,8 +148,9 @@ Setup_Video::Setup_Video(): mModeList->setDimension(gcn::Rectangle(0, 0, 60, 70)); scrollArea->setDimension(gcn::Rectangle(10, 10, 90, 70)); mFsCheckBox->setPosition(110, 10); + mNameCheckBox->setPosition(195, 10); mOpenGLCheckBox->setPosition(110, 30); - mParticleEffectsCheckBox->setPosition(175, 30); + mParticleEffectsCheckBox->setPosition(180, 30); mCustomCursorCheckBox->setPosition(110, 50); mSpeechBubbleCheckBox->setPosition(110, 70); mAlphaSlider->setDimension(gcn::Rectangle(10, 100, 75, 10)); @@ -170,6 +174,7 @@ Setup_Video::Setup_Video(): mCustomCursorCheckBox->setActionEventId("customcursor"); mParticleEffectsCheckBox->setActionEventId("particleeffects"); mSpeechBubbleCheckBox->setActionEventId("speechbubble"); + mNameCheckBox->setActionEventId("showownname"); mAlphaSlider->setActionEventId("guialpha"); mFpsCheckBox->setActionEventId("fpslimitcheckbox"); mFpsSlider->setActionEventId("fpslimitslider"); @@ -186,6 +191,7 @@ Setup_Video::Setup_Video(): mCustomCursorCheckBox->addActionListener(this); mParticleEffectsCheckBox->addActionListener(this); mSpeechBubbleCheckBox->addActionListener(this); + mNameCheckBox->addActionListener(this); mAlphaSlider->addActionListener(this); mFpsCheckBox->addActionListener(this); mFpsSlider->addActionListener(this); @@ -262,6 +268,7 @@ Setup_Video::Setup_Video(): add(mCustomCursorCheckBox); add(mParticleEffectsCheckBox); add(mSpeechBubbleCheckBox); + add(mNameCheckBox); add(mAlphaSlider); add(alphaLabel); add(mFpsCheckBox); @@ -344,6 +351,7 @@ void Setup_Video::apply() mCustomCursorEnabled = config.getValue("customcursor", 1); mParticleEffectsEnabled = config.getValue("particleeffects", 1); mSpeechBubbleEnabled = config.getValue("speechbubble", 1); + mNameEnabled = config.getValue("showownname", 0); mOpacity = config.getValue("guialpha", 0.8); mOverlayDetail = (int)config.getValue("OverlayDetail", 2); mOpenGLEnabled = config.getValue("opengl", 0); @@ -375,6 +383,9 @@ void Setup_Video::cancel() mFsCheckBox->setSelected(mFullScreenEnabled); mOpenGLCheckBox->setSelected(mOpenGLEnabled); mCustomCursorCheckBox->setSelected(mCustomCursorEnabled); + mParticleEffectsCheckBox->setSelected(mParticleEffectsEnabled); + mSpeechBubbleCheckBox->setSelected(mSpeechBubbleEnabled); + mNameCheckBox->setSelected(mNameEnabled); mAlphaSlider->setValue(mOpacity); mOverlayDetailSlider->setValue(mOverlayDetail); mParticleDetailSlider->setValue(mParticleDetail); @@ -388,6 +399,7 @@ void Setup_Video::cancel() config.setValue("customcursor", mCustomCursorEnabled ? 1 : 0); config.setValue("particleeffects", mParticleEffectsEnabled ? 1 : 0); config.setValue("speechbubble", mSpeechBubbleEnabled ? 1 : 0); + config.setValue("showownname", mNameEnabled ? 1 : 0); config.setValue("guialpha", mOpacity); config.setValue("opengl", mOpenGLEnabled ? 1 : 0); } @@ -445,6 +457,14 @@ void Setup_Video::action(const gcn::ActionEvent &event) config.setValue("speechbubble", mSpeechBubbleCheckBox->isSelected() ? 1 : 0); } + else if (event.getId() == "showownname") + { + // Notify the local player that settings have changed for the name + // and requires an update + player_node->mUpdateName = true; + config.setValue("showownname", + mNameCheckBox->isSelected() ? 1 : 0); + } else if (event.getId() == "fpslimitslider") { mFps = (int) mFpsSlider->getValue(); diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 4103c5ef..dfc3da38 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -51,6 +51,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, bool mCustomCursorEnabled; bool mParticleEffectsEnabled; bool mSpeechBubbleEnabled; + bool mNameEnabled; double mOpacity; int mFps; @@ -62,6 +63,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, gcn::CheckBox *mCustomCursorCheckBox; gcn::CheckBox *mParticleEffectsCheckBox; gcn::CheckBox *mSpeechBubbleCheckBox; + gcn::CheckBox *mNameCheckBox; gcn::Slider *mAlphaSlider; gcn::CheckBox *mFpsCheckBox; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 080ebddc..75b756f5 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -93,6 +93,10 @@ Viewport::draw(gcn::Graphics *gcnGraphics) Graphics *graphics = static_cast(gcnGraphics); + // Ensure the client doesn't freak out if a feature localplayer uses + // is dependent on a map. + player_node->mMapInitialized = true; + // Avoid freaking out when tick_time overflows if (tick_time < lastTick) { @@ -196,6 +200,13 @@ Viewport::draw(gcn::Graphics *gcnGraphics) } } + if (player_node->mUpdateName) + { + player_node->mUpdateName = false; + player_node->setName(player_node->getName()); + } + + // Draw text if (textManager) { diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 24b50d03..fb568d20 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -20,6 +20,7 @@ */ #include +#include "configuration.h" #include "equipment.h" #include "floor_item.h" #include "game.h" @@ -44,6 +45,9 @@ LocalPlayer *player_node = NULL; +static const int NAME_X_OFFSET = 15; +static const int NAME_Y_OFFSET = 30; + LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): Player(id, job, map), mCharId(0), @@ -68,6 +72,13 @@ LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): mInventory(new Inventory(INVENTORY_SIZE)), mStorage(new Inventory(STORAGE_SIZE)) { + // Variable to keep the local player from doing certain actions before a map + // is initialized. e.g. drawing a player's name using the TextManager, since + // it appears to be dependant upon map coordinates for updating drawing. + mMapInitialized = false; + + mUpdateName = true; + initTargetCursor(); } @@ -75,6 +86,7 @@ LocalPlayer::~LocalPlayer() { delete mInventory; delete mStorage; + delete mName; for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++) { @@ -158,6 +170,38 @@ void LocalPlayer::logic() Being::logic(); } +void LocalPlayer::setGM() +{ + mIsGM = !mIsGM; + setName(getName()); +} + +void LocalPlayer::setName(const std::string &name) +{ + if (mName) + { + delete mName; + mName = 0; + } + + if (config.getValue("showownname", false) && mMapInitialized) + { + Player::setName(name); + } + else + { + Being::setName(name); + } +} + +void LocalPlayer::updateCoords() +{ + if (mName) + { + mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET); + } +} + void LocalPlayer::nextStep() { if (mPath.empty()) diff --git a/src/localplayer.h b/src/localplayer.h index 0760f226..28551a22 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -57,7 +57,7 @@ class LocalPlayer : public Player */ ~LocalPlayer(); - void setName(const std::string &name) {Being::setName(name); } + virtual void setName(const std::string &name); void setNetwork(Network *network) { mNetwork = network; } Network *getNetwork() {return mNetwork; } virtual void logic(); @@ -126,6 +126,14 @@ class LocalPlayer : public Player void attack(Being *target = NULL, bool keep = false); + /** + * Triggers whether or not to show the name as a GM name. + * NOTE: This doesn't mean that just anyone can use this. + * If the server doesn't acknowlege you, you won't be shown + * as a GM on other people's clients. + */ + virtual void setGM(); + void stopAttack(); Being* getTarget() const; @@ -212,6 +220,10 @@ class LocalPlayer : public Player Uint16 mStatPoint, mSkillPoint; Uint16 mStatsPointsToAttribute; + bool mUpdateName; /** Whether or not the name settings have changed */ + + bool mMapInitialized; /** Whether or not the map is available yet */ + float mLastAttackTime; /**< Used to synchronize the charge dialog */ void drawTargetCursor(Graphics *graphics, int offsetX, int offsetY); @@ -232,15 +244,15 @@ class LocalPlayer : public Player FloorItem *mPickUpTarget; bool mTrading; - bool mInStorage; /**< Whether storage is currently accessible */ + bool mInStorage; /**< Whether storage is currently accessible */ bool mGoingToTarget; - bool mKeepAttacking;/** Whether or not to continue to attack */ - int mTargetTime; /** How long the being has been targeted **/ - int mLastAction; /**< Time stamp of the last action, -1 if none. */ - int mLastTarget; /** Time stamp of last targeting action, -1 if none. */ - int mWalkingDir; /**< The direction the player is walking in. */ - int mDestX; /**< X coordinate of destination. */ - int mDestY; /**< Y coordinate of destination. */ + bool mKeepAttacking; /** Whether or not to continue to attack */ + int mTargetTime; /** How long the being has been targeted **/ + int mLastAction; /**< Time stamp of the last action, -1 if none. */ + int mLastTarget; /** Time stamp of last targeting action, -1 if none. */ + int mWalkingDir; /**< The direction the player is walking in. */ + int mDestX; /**< X coordinate of destination. */ + int mDestY; /**< Y coordinate of destination. */ Inventory *mInventory; Inventory *mStorage; @@ -259,6 +271,8 @@ class LocalPlayer : public Player // Load the target cursors into memory void initTargetCursor(); + + virtual void updateCoords(); }; extern LocalPlayer *player_node; diff --git a/src/main.cpp b/src/main.cpp index 5f508c52..d9ebaefa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -968,6 +968,7 @@ int main(int argc, char *argv[]) if (options.chooseDefault) ((CharSelectDialog*) currentDialog)->action( gcn::ActionEvent(NULL, "ok")); + break; case GAME_STATE: diff --git a/src/player.cpp b/src/player.cpp index 47275c81..ca728bef 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -41,15 +41,11 @@ Player::Player(int id, int job, Map *map): Being(id, job, map) { mName = 0; - mIsGM = false; } Player::~Player() { - if (mName) - { - delete mName; - } + delete mName; } void Player::setName(const std::string &name) @@ -69,8 +65,7 @@ void Player::setName(const std::string &name) } } -void -Player::logic() +void Player::logic() { switch (mAction) { case STAND: @@ -109,14 +104,12 @@ Player::logic() Being::logic(); } -Being::Type -Player::getType() const +Being::Type Player::getType() const { return PLAYER; } -void -Player::flash(int time) +void Player::flash(int time) { if (mName) { diff --git a/src/player.h b/src/player.h index 97ff15d9..a082a92b 100644 --- a/src/player.h +++ b/src/player.h @@ -43,17 +43,13 @@ class Player : public Being /** * Set up mName to be the character's name */ - virtual void - setName(const std::string &name); + virtual void setName(const std::string &name); - virtual void - logic(); + virtual void logic(); - virtual Type - getType() const; + virtual Type getType() const; - virtual void - setGender(Gender gender); + virtual void setGender(Gender gender); /** * Sets the hair style and color for this player. @@ -70,8 +66,7 @@ class Player : public Being /** * Sets visible equipments for this player. */ - virtual void - setSprite(int slot, int id, std::string color = ""); + virtual void setSprite(int slot, int id, std::string color = ""); /** * Flash the player's name @@ -79,8 +74,8 @@ class Player : public Being void flash(int time); protected: - void updateCoords(); - private: + virtual void updateCoords(); + FlashText *mName; }; -- cgit v1.2.3-70-g09d2 From 4018856d2d30532ad2404de4462ff3e473938a22 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sat, 10 Jan 2009 18:19:25 -0700 Subject: Changed a few emote variable names to be more sensible, as well as removing emotions.png from the client data files (should have never been there to begin with, IMO). TODO: Simplify the emote code so that there is a lot less redundant code, as well as make filling out the possible emotes more flexible. Signed-off-by: Ira Rice --- data/graphics/gui/Makefile.am | 1 - data/graphics/gui/emotions.png | Bin 19386 -> 0 bytes po/POTFILES.in | 1 + src/Makefile.am | 20 ++++++++++---------- src/being.cpp | 5 +++-- src/gui/smileycontainer.cpp | 26 +++++++++++++------------- src/gui/smileycontainer.h | 8 ++++---- src/gui/smileyshortcutcontainer.cpp | 6 +++--- src/gui/smileywindow.cpp | 14 +++++++------- src/gui/smileywindow.h | 2 +- 10 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 data/graphics/gui/emotions.png (limited to 'src/being.cpp') diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 32028bfd..b2c499f0 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -11,7 +11,6 @@ gui_DATA = \ close_button.png \ deepbox.png \ default.png \ - emotions.png \ gui.xml \ hits_blue.png \ hits_red.png \ diff --git a/data/graphics/gui/emotions.png b/data/graphics/gui/emotions.png deleted file mode 100644 index 146f2d24..00000000 Binary files a/data/graphics/gui/emotions.png and /dev/null differ diff --git a/po/POTFILES.in b/po/POTFILES.in index 11bb6aa0..1816a886 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,5 +38,6 @@ src/gui/trade.cpp src/gui/updatewindow.cpp src/net/playerhandler.cpp src/resources/itemdb.cpp +src/being.cpp src/game.cpp src/main.cpp diff --git a/src/Makefile.am b/src/Makefile.am index d267022b..e189b793 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,20 +47,10 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/inttextbox.cpp \ gui/inventorywindow.cpp \ gui/inventorywindow.h \ - gui/smileywindow.cpp \ - gui/smileywindow.h \ - gui/smileycontainer.cpp \ - gui/smileycontainer.h \ gui/itemcontainer.cpp \ gui/itemcontainer.h \ gui/itemshortcutcontainer.cpp \ gui/itemshortcutcontainer.h \ - gui/shortcutwindow.cpp \ - gui/shortcutwindow.h \ - gui/smileyshortcutcontainer.cpp \ - gui/smileyshortcutcontainer.h \ - gui/shortcutcontainer.cpp \ - gui/shortcutcontainer.h \ gui/item_amount.cpp \ gui/item_amount.h \ gui/linkhandler.h \ @@ -119,10 +109,20 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/shop.h \ gui/shoplistbox.cpp \ gui/shoplistbox.h \ + gui/shortcutwindow.cpp \ + gui/shortcutwindow.h \ + gui/shortcutcontainer.cpp \ + gui/shortcutcontainer.h \ gui/skill.cpp \ gui/skill.h \ gui/slider.cpp \ gui/slider.h \ + gui/smileycontainer.cpp \ + gui/smileycontainer.h \ + gui/smileyshortcutcontainer.cpp \ + gui/smileyshortcutcontainer.h \ + gui/smileywindow.cpp \ + gui/smileywindow.h \ gui/speechbubble.cpp \ gui/speechbubble.h \ gui/status.cpp \ diff --git a/src/being.cpp b/src/being.cpp index ba3107db..5eb62b2d 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -44,6 +44,7 @@ #include "gui/speechbubble.h" #include "utils/dtor.h" +#include "utils/gettext.h" #include "utils/tostring.h" #include "utils/xml.h" @@ -91,8 +92,8 @@ Being::Being(int id, int job, Map *map): { // Load the emotion set ResourceManager *rm = ResourceManager::getInstance(); - emotionSet = rm->getImageSet("graphics/gui/emotions.png", 30, 32); - if (!emotionSet) logger->error("Unable to load emotions!"); + emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32); + if (!emotionSet) logger->error(_("Unable to load emotions")); // Hairstyles are encoded as negative numbers. Count how far negative we can go. int hairstyles = 1; diff --git a/src/gui/smileycontainer.cpp b/src/gui/smileycontainer.cpp index d221f55c..f8f57c45 100644 --- a/src/gui/smileycontainer.cpp +++ b/src/gui/smileycontainer.cpp @@ -36,17 +36,17 @@ #include "../utils/gettext.h" #include "../utils/tostring.h" -const int SmileyContainer::gridWidth = 34; // item icon width + 4 -const int SmileyContainer::gridHeight = 36; // item icon height + 4 +const int SmileyContainer::gridWidth = 34; // emote icon width + 4 +const int SmileyContainer::gridHeight = 36; // emote icon height + 4 -static const int NO_ITEM = -1; +static const int NO_EMOTE = -1; SmileyContainer::SmileyContainer(): - mSelectedItemIndex(NO_ITEM) + mSelectedEmoteIndex(NO_EMOTE) { ResourceManager *resman = ResourceManager::getInstance(); - mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32); + mSmileyImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32); if (!mSmileyImg) logger->error(_("Unable to load emotions")); mSelImg = resman->getImage("graphics/gui/selection.png"); @@ -95,7 +95,7 @@ void SmileyContainer::draw(gcn::Graphics *graphics) mSmileyImg->get(i), itemX, itemY); // Draw selection image below selected item - if (mSelectedItemIndex == i) + if (mSelectedEmoteIndex == i) { static_cast(graphics)->drawImage( mSelImg, itemX, itemY); @@ -123,23 +123,23 @@ void SmileyContainer::recalculateHeight() int SmileyContainer::getSelectedSmiley() { - if (mSelectedItemIndex == NO_ITEM) + if (mSelectedEmoteIndex == NO_EMOTE) return 0; - return 1+mSelectedItemIndex; + return 1+mSelectedEmoteIndex; } void SmileyContainer::selectNone() { - setSelectedItemIndex(NO_ITEM); + setSelectedEmoteIndex(NO_EMOTE); } -void SmileyContainer::setSelectedItemIndex(int index) +void SmileyContainer::setSelectedEmoteIndex(int index) { if (index < 0 || index >= mMaxSmiley ) - mSelectedItemIndex = NO_ITEM; + mSelectedEmoteIndex = NO_EMOTE; else - mSelectedItemIndex = index; + mSelectedEmoteIndex = index; } void SmileyContainer::distributeValueChangedEvent() @@ -165,7 +165,7 @@ void SmileyContainer::mousePressed(gcn::MouseEvent &event) int index = mx / gridWidth + ((my / gridHeight) * columns); if (index setSmileySelected(index+1); } } diff --git a/src/gui/smileycontainer.h b/src/gui/smileycontainer.h index ddfe9ec5..88ca0b48 100644 --- a/src/gui/smileycontainer.h +++ b/src/gui/smileycontainer.h @@ -33,7 +33,7 @@ class Image; class Inventory; -class Item; +class Emote; namespace gcn { class SelectionListener; @@ -107,12 +107,12 @@ class SmileyContainer : public gcn::Widget, * Sets the currently selected item. Invalid (e.g., negative) indices set `no item'. */ - void setSelectedItemIndex(int index); + void setSelectedEmoteIndex(int index); /** * Find the current item index by the most recently used item ID */ - void refindSelectedItem(void); + void refindSelectedEmote(void); /** * Determine and set the height of the container. @@ -126,7 +126,7 @@ class SmileyContainer : public gcn::Widget, ImageSet *mSmileyImg; Image *mSelImg; - int mSelectedItemIndex; + int mSelectedEmoteIndex; int mMaxSmiley; diff --git a/src/gui/smileyshortcutcontainer.cpp b/src/gui/smileyshortcutcontainer.cpp index 6028939f..c3cd056d 100644 --- a/src/gui/smileyshortcutcontainer.cpp +++ b/src/gui/smileyshortcutcontainer.cpp @@ -41,15 +41,15 @@ SmileyShortcutContainer::SmileyShortcutContainer(): mSmileyClicked(false), mSmileyMoved(0) { - mGridWidth=1, - mGridHeight=1, + mGridWidth = 1, + mGridHeight = 1, addMouseListener(this); addWidgetListener(this); ResourceManager *resman = ResourceManager::getInstance(); mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png"); - mSmileyImg = resman->getImageSet("graphics/gui/emotions.png",30,32); + mSmileyImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32); if (!mSmileyImg) logger->error(_("Unable to load emotions")); mMaxItems = smileyShortcut->getSmileyCount(); diff --git a/src/gui/smileywindow.cpp b/src/gui/smileywindow.cpp index 570eb45c..e3e821ff 100644 --- a/src/gui/smileywindow.cpp +++ b/src/gui/smileywindow.cpp @@ -45,10 +45,10 @@ SmileyWindow::SmileyWindow(): mUseButton = new Button(_("Use"), "use", this); - mItems = new SmileyContainer(); - mItems->addSelectionListener(this); + mEmotes = new SmileyContainer(); + mEmotes->addSelectionListener(this); - mInvenScroll = new ScrollArea(mItems); + mInvenScroll = new ScrollArea(mEmotes); mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); draw(); @@ -63,12 +63,12 @@ SmileyWindow::SmileyWindow(): void SmileyWindow::action(const gcn::ActionEvent &event) { - int item = mItems->getSelectedSmiley(); + int emote = mEmotes->getSelectedSmiley(); - if (!item) + if (!emote) return; - player_node->emote(item); + player_node->emote(emote); } @@ -95,5 +95,5 @@ void SmileyWindow::widgetResized(const gcn::Event &event) int SmileyWindow::getSelectedSmiley() const { - return mItems->getSelectedSmiley(); + return mEmotes->getSelectedSmiley(); } diff --git a/src/gui/smileywindow.h b/src/gui/smileywindow.h index 81ec6663..db27fcbd 100644 --- a/src/gui/smileywindow.h +++ b/src/gui/smileywindow.h @@ -69,7 +69,7 @@ class SmileyWindow : public Window, gcn::ActionListener, private: - SmileyContainer *mItems; + SmileyContainer *mEmotes; gcn::Button *mUseButton; gcn::ScrollArea *mInvenScroll; -- cgit v1.2.3-70-g09d2 From 10a9dbacd9334caede10f1b21d42cdf7e1efcd03 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Thu, 15 Jan 2009 11:06:32 -0700 Subject: Style cleanups throughout most of the code. Splitting function type from the function names should no longer be around. Signed-off-by: Ira Rice --- po/POTFILES.in | 4 + po/ar.po | 243 ++++++++++++++++++++++++++++------ po/ca.po | 237 +++++++++++++++++++++++++++++----- po/cs.po | 238 +++++++++++++++++++++++++++++----- po/da.po | 239 +++++++++++++++++++++++++++++----- po/de.po | 239 +++++++++++++++++++++++++++++----- po/en_GB.po | 239 +++++++++++++++++++++++++++++----- po/eo.po | 237 +++++++++++++++++++++++++++++----- po/es.po | 239 +++++++++++++++++++++++++++++----- po/fi.po | 239 +++++++++++++++++++++++++++++----- po/fr.po | 239 +++++++++++++++++++++++++++++----- po/he.po | 239 +++++++++++++++++++++++++++++----- po/hr.po | 238 +++++++++++++++++++++++++++++----- po/id.po | 239 +++++++++++++++++++++++++++++----- po/it.po | 239 +++++++++++++++++++++++++++++----- po/ja.po | 238 +++++++++++++++++++++++++++++----- po/nl.po | 239 +++++++++++++++++++++++++++++----- po/pl.po | 239 +++++++++++++++++++++++++++++----- po/pt.po | 244 +++++++++++++++++++++++++++++------ po/pt_BR.po | 239 +++++++++++++++++++++++++++++----- po/ru.po | 239 +++++++++++++++++++++++++++++----- po/sk.po | 238 +++++++++++++++++++++++++++++----- po/sv.po | 239 +++++++++++++++++++++++++++++----- po/th.po | 238 +++++++++++++++++++++++++++++----- po/zh_CN.po | 239 +++++++++++++++++++++++++++++----- src/animatedsprite.h | 24 ++-- src/being.cpp | 3 - src/configuration.cpp | 2 - src/equipment.cpp | 3 +- src/floor_item.h | 18 +-- src/graphics.cpp | 18 ++- src/graphics.h | 20 ++- src/gui/browserbox.cpp | 9 +- src/gui/button.cpp | 3 +- src/gui/buttonbox.cpp | 3 +- src/gui/buttonbox.h | 3 +- src/gui/char_select.cpp | 12 +- src/gui/char_server.cpp | 9 +- src/gui/chat.h | 265 +++++++++++++++++++------------------- src/gui/debugwindow.cpp | 3 +- src/gui/emotecontainer.h | 14 +- src/gui/emotewindow.h | 1 - src/gui/inttextbox.cpp | 3 +- src/gui/inttextbox.h | 3 +- src/gui/itempopup.cpp | 113 ---------------- src/gui/itempopup.h | 51 -------- src/gui/listbox.cpp | 3 +- src/gui/login.cpp | 29 ++--- src/gui/login.h | 9 +- src/gui/passwordfield.h | 3 +- src/gui/playerbox.cpp | 6 +- src/gui/playerbox.h | 3 +- src/gui/progressbar.cpp | 9 +- src/gui/progressbar.h | 24 ++-- src/gui/register.cpp | 21 +-- src/gui/register.h | 9 +- src/gui/setup_video.h | 11 +- src/gui/status.h | 1 - src/gui/table.cpp | 84 ++++-------- src/gui/table_model.cpp | 39 ++---- src/gui/truetypefont.cpp | 11 +- src/gui/truetypefont.h | 2 - src/gui/updatewindow.cpp | 6 +- src/gui/viewport.cpp | 2 - src/gui/widgets/resizegrip.cpp | 3 +- src/gui/window.h | 9 +- src/item.h | 36 ++---- src/map.h | 26 ++-- src/monster.h | 3 +- src/net/messagein.cpp | 21 +-- src/net/messagein.h | 20 +-- src/net/network.cpp | 3 +- src/net/network.h | 54 +++----- src/net/partyhandler.cpp | 3 +- src/net/playerhandler.cpp | 2 +- src/net/tradehandler.cpp | 38 +++--- src/npc.cpp | 15 +-- src/particlecontainer.cpp | 21 +-- src/particleemitter.cpp | 3 +- src/particleemitter.h | 3 +- src/player_relations.cpp | 57 +++----- src/properties.h | 9 +- src/resources/action.h | 6 +- src/resources/animation.cpp | 9 +- src/resources/animation.h | 18 +-- src/resources/buddylist.cpp | 2 +- src/resources/buddylist.h | 2 +- src/resources/colordb.cpp | 11 +- src/resources/image.h | 29 ++--- src/resources/imagewriter.h | 2 +- src/resources/itemdb.cpp | 16 +-- src/resources/iteminfo.cpp | 10 +- src/resources/monsterdb.cpp | 16 +-- src/resources/monsterdb.h | 6 +- src/resources/monsterinfo.cpp | 6 +- src/resources/monsterinfo.h | 40 +++--- src/resources/music.cpp | 6 +- src/resources/music.h | 6 +- src/resources/npcdb.cpp | 15 +-- src/resources/npcdb.h | 6 +- src/resources/resource.cpp | 6 +- src/resources/resource.h | 6 +- src/resources/resourcemanager.cpp | 3 +- src/resources/soundeffect.cpp | 3 +- src/resources/soundeffect.h | 3 +- src/resources/spritedef.cpp | 25 ++-- src/resources/spritedef.h | 23 ++-- src/sprite.h | 12 +- src/utils/xml.cpp | 9 +- src/utils/xml.h | 9 +- 110 files changed, 5422 insertions(+), 1801 deletions(-) delete mode 100644 src/gui/itempopup.cpp delete mode 100644 src/gui/itempopup.h (limited to 'src/being.cpp') diff --git a/po/POTFILES.in b/po/POTFILES.in index 5f244d22..a3a9f01c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -37,7 +37,11 @@ src/gui/status.cpp src/gui/trade.cpp src/gui/updatewindow.cpp src/net/playerhandler.cpp +src/net/tradehandler.cpp +src/resources/colordb.cpp src/resources/itemdb.cpp +src/resources/monsterdb.cpp +src/resources/npcdb.cpp src/being.cpp src/game.cpp src/main.cpp diff --git a/po/ar.po b/po/ar.po index baa6ca73..3710bf45 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-07-16 18:28+0000\n" "Last-Translator: صقر بن عبدالله \n" "Language-Team: Arabic \n" @@ -57,8 +57,8 @@ msgstr "بيع" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "إلغاء" @@ -136,7 +136,7 @@ msgstr "إنشاء شخصيّة" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "الاسم:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "الخادوم:" @@ -331,9 +331,8 @@ msgid "Cannot use a '/' as the prefix." msgstr "" #: ../src/gui/chat.cpp:663 -#, fuzzy msgid "Changing prefix to " -msgstr "تغيير OpenGL" +msgstr "" #: ../src/gui/chat.cpp:673 msgid "-- Help --" @@ -539,12 +538,12 @@ msgstr "نعم" msgid "No" msgstr "لا" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "جار٠الاتّصال..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +641,11 @@ msgstr "انتقاء كمّيّة من المواد لإسقاطها." msgid "Login" msgstr "ولوج" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "كلمة السرّ:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "المنÙØ°:" @@ -658,8 +657,8 @@ msgstr "" msgid "Keep" msgstr "ترك" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "تسجيل" @@ -766,49 +765,49 @@ msgstr "@@إسقاط|إسقاط@@" msgid "@@description|Description@@" msgstr "@@الوصÙ|الوصÙ@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "تأكيد:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارÙ." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارÙ." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارÙ." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارÙ." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "كلمات السرّ غير متطابقة." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "خطأ" @@ -859,7 +858,6 @@ msgid "Players" msgstr "" #: ../src/gui/setup_colours.cpp:38 -#, fuzzy msgid "Color:" msgstr "لون الشعر:" @@ -1229,58 +1227,58 @@ msgstr "أنت تقدّم:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1409,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1422,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@تجارة|متاجرة مع %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "إلغاء" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/ca.po b/po/ca.po index 0f69f976..71f6c6da 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-07-03 17:21+0000\n" "Last-Translator: Habari \n" "Language-Team: Catalan \n" @@ -56,8 +56,8 @@ msgstr "" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "" @@ -135,7 +135,7 @@ msgstr "" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "nom" @@ -179,7 +179,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "" @@ -534,12 +534,12 @@ msgstr "si" msgid "No" msgstr "no" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "" #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -633,11 +633,11 @@ msgstr "" msgid "Login" msgstr "" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "" @@ -649,8 +649,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "" @@ -753,49 +753,49 @@ msgstr "" msgid "@@description|Description@@" msgstr "" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "" -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "" @@ -1199,58 +1199,58 @@ msgstr "" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1381,6 +1381,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1390,10 +1394,175 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +msgid "Trade with " +msgstr "" + +#: ../src/net/tradehandler.cpp:128 +msgid " cancelled" +msgstr "" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/cs.po b/po/cs.po index b8e8c402..e046aad8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-12-17 16:31+0000\n" "Last-Translator: Lubos \n" "Language-Team: Czech \n" @@ -56,8 +56,8 @@ msgstr "Prodej" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "ZruÅ¡it" @@ -136,7 +136,7 @@ msgstr "VytvoÅ™it postavu" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Jméno:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -538,12 +538,12 @@ msgstr "Ano" msgid "No" msgstr "Ne" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "PÅ™ipojuji se..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -639,11 +639,11 @@ msgstr "Vyberte množství zboží, které chcete upustit." msgid "Login" msgstr "" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Heslo:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port:" @@ -655,8 +655,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registrace" @@ -760,49 +760,49 @@ msgstr "" msgid "@@description|Description@@" msgstr "" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Muž" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Žena" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Uživatelské jméno musí být nejménÄ› %d znaků dlouhé." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Uživatelské jméno musí být kratší než %d znaků." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Heslo musí být kratší než %d znaků." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Hesla se neshodují." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Chyba" @@ -1218,58 +1218,58 @@ msgstr "" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1400,6 +1400,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1409,10 +1413,176 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +msgid "Trade with " +msgstr "" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "ZruÅ¡it" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/da.po b/po/da.po index b6468804..d3ffa234 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-12-28 14:45+0000\n" "Last-Translator: Niels L Ellegaard \n" "Language-Team: Danish \n" @@ -57,8 +57,8 @@ msgstr "Sælg" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Fortryd" @@ -136,7 +136,7 @@ msgstr "Lav figur." #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Navn:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -539,12 +539,12 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Opretter forbindelse..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Vælg hvor mange du vil smide," msgid "Login" msgstr "Log Ind" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Adgangskode:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Behold" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registrer" @@ -766,49 +766,49 @@ msgstr "@@drop|Smid@@" msgid "@@description|Description@@" msgstr "@@description|Beskrivelse@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Bekræft:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Mand" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Kvinde" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Brugernavnet skal mindst være %d bogstaver langt." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Brugernavnet skal være mindre end %d bogstaver langt." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Adgangskoden skal mindst være %d bogstaver langt." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Adgangskoden skal være mindre end %d bogstaver langt." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Adgangskoder stemmer ikke overens." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Fejl" @@ -1229,58 +1229,58 @@ msgstr "Du giver:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1411,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1424,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Byt Med %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Fortryd" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/de.po b/po/de.po index 36f02ac3..e8a39a98 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-10-13 00:25+0000\n" "Last-Translator: Aeneas Jaißle \n" "Language-Team: German\n" @@ -57,8 +57,8 @@ msgstr "Verkaufen" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Abbrechen" @@ -136,7 +136,7 @@ msgstr "Charakter erstellen" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Name :" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -539,12 +539,12 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Verbinde..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest." msgid "Login" msgstr "Anmelden" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Passwort:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Erinnern" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registrieren" @@ -766,49 +766,49 @@ msgstr "@@drop|Fallen lassen@@" msgid "@@description|Description@@" msgstr "@@description|Beschreibung@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Bestätigen:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Männlich" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Weiblich" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Der Nutzername muss kürzer als %d Zeichen sein." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Das Passwort muss aus mindestens %d bestehen." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Das Passwort muss kürzer als %d Zeichen sein." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Passwörter stimmen nicht überein." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Fehler" @@ -1231,58 +1231,58 @@ msgstr "Du gibst:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1413,6 +1413,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1422,10 +1426,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Mit %s handeln@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Abbrechen" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 3a4e4e56..93256370 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 16:41-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-05-10 16:51+0000\n" "Last-Translator: Me \n" "Language-Team: English (United Kingdom) \n" @@ -57,8 +57,8 @@ msgstr "Sell" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Cancel" @@ -136,7 +136,7 @@ msgstr "Create Character" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Name:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -539,12 +539,12 @@ msgstr "Yes" msgid "No" msgstr "No" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Connecting..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Select amount of items to drop." msgid "Login" msgstr "Login" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Password:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Keep" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Register" @@ -766,49 +766,49 @@ msgstr "@@drop|Drop@@" msgid "@@description|Description@@" msgstr "@@description|Description@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Confirm:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "The username needs to be at least %d characters long." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "The username needs to be less than %d characters long." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "The password needs to be at least %d characters long." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "The password needs to be less than %d characters long." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Passwords do not match." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Error" @@ -1227,58 +1227,58 @@ msgstr "You give:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1409,6 +1409,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1418,10 +1422,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Trade With %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Cancel" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/eo.po b/po/eo.po index 9b8d53a4..d7d627c8 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-11-10 22:03+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Esperanto \n" @@ -56,8 +56,8 @@ msgstr "" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "" @@ -135,7 +135,7 @@ msgstr "" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "" @@ -178,7 +178,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "" @@ -533,12 +533,12 @@ msgstr "" msgid "No" msgstr "" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "" #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -631,11 +631,11 @@ msgstr "" msgid "Login" msgstr "" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "" @@ -647,8 +647,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "" @@ -751,49 +751,49 @@ msgstr "" msgid "@@description|Description@@" msgstr "" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "" -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "" @@ -1196,58 +1196,58 @@ msgstr "" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1378,6 +1378,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1387,10 +1391,175 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +msgid "Trade with " +msgstr "" + +#: ../src/net/tradehandler.cpp:128 +msgid " cancelled" +msgstr "" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/es.po b/po/es.po index a9750855..6e88cb57 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-10-15 01:37+0000\n" "Last-Translator: catalania \n" "Language-Team: Spanish \n" @@ -57,8 +57,8 @@ msgstr "Vender" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Cancelar" @@ -136,7 +136,7 @@ msgstr "Crear Personaje" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Nombre:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Servidor:" @@ -539,12 +539,12 @@ msgstr "Sí" msgid "No" msgstr "No" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Conectando…" #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Seleccione objetos para soltar." msgid "Login" msgstr "conectarse" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Contraseña:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Puerto:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Mantener" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registrar" @@ -766,49 +766,49 @@ msgstr "@@drop|Tirar@@" msgid "@@description|Description@@" msgstr "@@description|Descripción@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Confirmar:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "El nombre de usuario debe tener al menos %d caracteres." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "El nombre de usuario puede tener como máximo %d caracteres." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "La contraseña debe tener al menos %d caracteres." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "La contraseña puede tener como máximo %d caracteres." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Las contraseñas no coinciden." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Error" @@ -1229,58 +1229,58 @@ msgstr "Tu das:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1411,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1424,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Comerciar con %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Cancelar" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/fi.po b/po/fi.po index 16f6e5ab..472fbd83 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-12-30 10:23+0000\n" "Last-Translator: ville-v \n" "Language-Team: Finnish \n" @@ -57,8 +57,8 @@ msgstr "Myy" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Peru" @@ -137,7 +137,7 @@ msgstr "Luo hahmo" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Nimi:" @@ -182,7 +182,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Palvelin:" @@ -540,12 +540,12 @@ msgstr "Kyllä" msgid "No" msgstr "Ei" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Yhdistetään..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -643,11 +643,11 @@ msgstr "Anna pudotettavien tavaroiden määrä." msgid "Login" msgstr "Kirjaudu sisään" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Salasana:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Portti:" @@ -659,8 +659,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Rekisteröidy" @@ -767,49 +767,49 @@ msgstr "@@drop|Pudota maahan@@" msgid "@@description|Description@@" msgstr "@@description|Kuvaus@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Vahvista:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Miespuolinen" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Naispuolinen" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Salasanan tulee olla alle %d merkkiä pitkä." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Salasanat eivät täsmää." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Virhe" @@ -1230,58 +1230,58 @@ msgstr "Annat:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1412,6 +1412,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1421,10 +1425,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Vaihda tavaroita %s kanssa@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Peru" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/fr.po b/po/fr.po index b1821706..7f522152 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-12-26 10:43+0000\n" "Last-Translator: Johan Serre \n" "Language-Team: French\n" @@ -58,8 +58,8 @@ msgstr "Vendre" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Annuler" @@ -137,7 +137,7 @@ msgstr "Création du personnage" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Nom :" @@ -182,7 +182,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Serveur :" @@ -540,12 +540,12 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Connexion..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -643,11 +643,11 @@ msgstr "Choisissez le nombre d'objets à lâcher." msgid "Login" msgstr "Connexion" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Mot de passe :" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port :" @@ -659,8 +659,8 @@ msgstr "" msgid "Keep" msgstr "Conserver" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "S'inscrire" @@ -767,49 +767,49 @@ msgstr "@@drop|Lâcher@@" msgid "@@description|Description@@" msgstr "@@description|Description@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Vérification :" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Masculin" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Féminin" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Le nom d'utilisateur doit faire au moins %d caractères." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Le nom d'utilisateur doit faire moins de %d caractères." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Le mot de passe doit faire au moins %d caractères." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Le mot de passe doit faire moins de %d caractères." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Les deux mots de passe ne correspondent pas." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Erreur" @@ -1234,58 +1234,58 @@ msgstr "Vous donnez :" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1416,6 +1416,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1425,10 +1429,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Troquer avec %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Annuler" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/he.po b/po/he.po index c8a6d581..a098c887 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-10-20 00:23+0000\n" "Last-Translator: Ddorda \n" "Language-Team: Hebrew \n" @@ -57,8 +57,8 @@ msgstr "מכר" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "ביטול" @@ -137,7 +137,7 @@ msgstr "צור שחקן" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "ש×:" @@ -182,7 +182,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "שרת:" @@ -540,12 +540,12 @@ msgstr "כן" msgid "No" msgstr "ל×" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "מתחבר..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -643,11 +643,11 @@ msgstr "בחר כמות ×—×¤×¦×™× ×œ×”×©×œ×™×š." msgid "Login" msgstr "התחברות" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "סיסמה:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "פורט:" @@ -659,8 +659,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "הרש×" @@ -767,49 +767,49 @@ msgstr "@@drop|השלך@@" msgid "@@description|Description@@" msgstr "@@description|תי×ור@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "×שר:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "זכר" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "נקבה" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "×©× ×”×ž×©×ª×ž×© חייב להכיל לפחות %d תוי×." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "×©× ×”×ž×©×ª×ž×© חייב להכיל פחות מ-%d תוי×." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "הסיסמה חייבת להכיל לפחות %d תוי×." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "הסיסמה חייבת להכיל פחות מ-%d תוי×." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "הסיסמ×ות ×ינן תו×מות." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "שגי××”" @@ -1230,58 +1230,58 @@ msgstr "×תה נותן:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1412,6 +1412,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1421,10 +1425,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|סחור ×¢× %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "ביטול" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/hr.po b/po/hr.po index 786f7b3b..10e68177 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-12-28 23:36+0000\n" "Last-Translator: Dino Paskvan \n" "Language-Team: Croatian \n" @@ -56,8 +56,8 @@ msgstr "" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "PoniÅ¡ti" @@ -136,7 +136,7 @@ msgstr "Stvori Lika" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Ime:" @@ -180,7 +180,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "" @@ -535,12 +535,12 @@ msgstr "Da" msgid "No" msgstr "Ne" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Spajanje..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -638,11 +638,11 @@ msgstr "Odaberi koliÄinu predmeta za ispuÅ¡tanje." msgid "Login" msgstr "KorisniÄko ime" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Lozinka" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "" @@ -654,8 +654,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registriraj se" @@ -760,49 +760,49 @@ msgstr "" msgid "@@description|Description@@" msgstr "" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "MuÅ¡ko" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Žensko" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "" -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "GreÅ¡ka" @@ -1216,58 +1216,58 @@ msgstr "" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1398,6 +1398,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1407,10 +1411,176 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +msgid "Trade with " +msgstr "" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "PoniÅ¡ti" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/id.po b/po/id.po index 084898ad..cf39a880 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-03-26 09:11+0000\n" "Last-Translator: ActiveFile \n" "Language-Team: Indonesian \n" @@ -57,8 +57,8 @@ msgstr "Jual" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Batal" @@ -136,7 +136,7 @@ msgstr "Buat Karakter" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Nama:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -539,12 +539,12 @@ msgstr "Ya" msgid "No" msgstr "Tidak" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Menyambung..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Pilih jumlah item yang mau di buang" msgid "Login" msgstr "Login" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Kata Sandi:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Pertahankan" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Mendaftar" @@ -766,49 +766,49 @@ msgstr "@@drop|Buang@@" msgid "@@description|Description@@" msgstr "@@description|Deskripsi@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Konfirmasi:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Panjang username setidak-tidaknya %d karakter" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Panjang kata-sandi setidak-tidaknya %d karakter" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Kata sandi tidak sama." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Kesalahan" @@ -1229,58 +1229,58 @@ msgstr "Anda memberikan:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1411,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1424,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Dagang Dengan %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Batal" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/it.po b/po/it.po index 760ea76d..342aab49 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2007-12-03 01:45+0000\n" "Last-Translator: Bjørn Lindeijer \n" "Language-Team: Italian\n" @@ -59,8 +59,8 @@ msgstr "Vendi" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Cancella" @@ -138,7 +138,7 @@ msgstr "Crea Personaggio" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Nome :" @@ -183,7 +183,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -541,12 +541,12 @@ msgstr "Si" msgid "No" msgstr "No" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Connessione..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -644,11 +644,11 @@ msgstr "Seleziona la quantità di oggetti da lasciare." msgid "Login" msgstr "Autenticazione" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Password:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Porta:" @@ -660,8 +660,8 @@ msgstr "" msgid "Keep" msgstr "Mantieni" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registra" @@ -768,49 +768,49 @@ msgstr "@@drop|Lascia@@" msgid "@@description|Description@@" msgstr "@@description|Descrizione@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Conferma:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Il nome utente deve contenere almeno %d caratteri." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Il nome utente deve avere meno di %d caratteri." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "La password deve essere lunga almeno %d caratteri." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "La password deve contenere meno di %d caratteri." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Le password non corrispondono." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Errore" @@ -1231,58 +1231,58 @@ msgstr "Dai:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1413,6 +1413,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1422,10 +1426,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Scambia Con %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Cancella" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/ja.po b/po/ja.po index 07dff2f7..2f0cf9f4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-06-28 16:27+0000\n" "Last-Translator: fate \n" "Language-Team: Japanese \n" @@ -56,8 +56,8 @@ msgstr "" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "å–消" @@ -135,7 +135,7 @@ msgstr "キャラを作æˆ" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "åå‰:" @@ -180,7 +180,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "サーãƒ:" @@ -537,12 +537,12 @@ msgstr "ã¯ã„" msgid "No" msgstr "ã„ã„ãˆ" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "接続ã—ã¦ã„ã¾ã™..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -640,11 +640,11 @@ msgstr "" msgid "Login" msgstr "ログイン" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "パスワード:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "ãƒãƒ¼ãƒˆ:" @@ -656,8 +656,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "" @@ -762,49 +762,49 @@ msgstr "" msgid "@@description|Description@@" msgstr "" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "パスワードãŒä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“。" -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "エラー" @@ -1218,58 +1218,58 @@ msgstr "" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1400,6 +1400,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1409,10 +1413,176 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +msgid "Trade with " +msgstr "" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "å–消" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/nl.po b/po/nl.po index 3cbd5247..2ee556d1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-10-10 00:04+0000\n" "Last-Translator: Bjørn Lindeijer \n" "Language-Team: Dutch\n" @@ -57,8 +57,8 @@ msgstr "" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Annuleren" @@ -136,7 +136,7 @@ msgstr "Personage Aanmaken" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Naam:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -539,12 +539,12 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Verbinden..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Selecteer het aantal exemplaren om neer te leggen" msgid "Login" msgstr "Inloggen" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Wachtword:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Poort:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Behouden" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Aanmelden" @@ -766,49 +766,49 @@ msgstr "@@drop|Neerleggen@@" msgid "@@description|Description@@" msgstr "@@description|Beschrijving@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Bevestigen:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Wachtwoorden komen niet overeen." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Fout" @@ -1225,58 +1225,58 @@ msgstr "Je geeft:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1407,6 +1407,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1416,10 +1420,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Handelen met %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Annuleren" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/pl.po b/po/pl.po index 55371e43..d1e98691 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Mana World 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-10-10 05:26+0000\n" "Last-Translator: MichaÅ‚ Trzebiatowski \n" "Language-Team: \n" @@ -59,8 +59,8 @@ msgstr "Sprzedaj" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Anuluj" @@ -138,7 +138,7 @@ msgstr "Stwórz postać" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "ImiÄ™:" @@ -183,7 +183,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Serwer:" @@ -541,12 +541,12 @@ msgstr "Tak" msgid "No" msgstr "Nie" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "ÅÄ…czenie..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -644,11 +644,11 @@ msgstr "Wybierz ilość przedmiotów do upuszczenia." msgid "Login" msgstr "Użytkownik" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "HasÅ‚o:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port:" @@ -660,8 +660,8 @@ msgstr "" msgid "Keep" msgstr "Zachowaj" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Rejestruj" @@ -768,49 +768,49 @@ msgstr "@@drop|Upuść@@" msgid "@@description|Description@@" msgstr "@@description|Opis@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Potwierdź:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Mężczyzna" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Kobieta" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Nazwa użytkownika musi być dÅ‚uga na conajmniej %d znaków." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "HasÅ‚o musi mieć conajmniej %d znaków." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "HasÅ‚o nie może mieć wiÄ™cej jak %d znaków." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "HasÅ‚a nie zgadzajÄ… siÄ™." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "BÅ‚Ä…d" @@ -1232,58 +1232,58 @@ msgstr "Dajesz:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1414,6 +1414,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1423,10 +1427,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Targ z %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Anuluj" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/pt.po b/po/pt.po index 09f31b9b..72737624 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 16:41-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-02-03 10:14+0000\n" "Last-Translator: Tiago Silva \n" "Language-Team: Portuguese \n" @@ -57,8 +57,8 @@ msgstr "Vender" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Cancelar" @@ -136,7 +136,7 @@ msgstr "Criar Personagem" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Nome:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Servidor:" @@ -539,12 +539,12 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Conectando..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Seleccionar a quantidade de itens a largar." msgid "Login" msgstr "Autenticar" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Senha:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Porta:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Manter" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registo" @@ -766,49 +766,49 @@ msgstr "@@drop|Largar@@" msgid "@@description|Description@@" msgstr "@@descrição|Descrição@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Confirmar:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "O nome de utilizador necessita de pelo menos %d caracteres." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "O nome de utilizador só pode ter %d caracteres." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "A password necessita de pelo menos %d caracteres." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "A password só pode ter até %d caracteres." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "As senhas não coincidem." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Erro" @@ -850,8 +850,9 @@ msgid "Keyboard" msgstr "" #: ../src/gui/setup.cpp:97 -msgid "Colours" -msgstr "" +#, fuzzy +msgid "Colors" +msgstr "Cor de Cabelo:" #: ../src/gui/setup.cpp:101 msgid "Players" @@ -1236,58 +1237,58 @@ msgstr "Dá:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1418,6 +1419,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1427,10 +1432,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Negociar com %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Cancelar" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index aaf8de44..58ec5d1b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-12-14 21:37+0000\n" "Last-Translator: Enrico Nicoletto \n" "Language-Team: Brazilian Portuguese \n" @@ -57,8 +57,8 @@ msgstr "Vender" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Cancelar" @@ -136,7 +136,7 @@ msgstr "Criar Personagem" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Nome:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Servidor:" @@ -539,12 +539,12 @@ msgstr "Sim" msgid "No" msgstr "Não" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Conectando..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Selecionar montante de itens para descartar." msgid "Login" msgstr "Login" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Senha:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Porta:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "Manter" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registrar" @@ -766,49 +766,49 @@ msgstr "@@descartar|Descartar@@" msgid "@@description|Description@@" msgstr "@@descrição|Descrição@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Confirmar:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Homem" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Mulher" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "O nome do usuário precisa ter pelo menos %d caracteres." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "O nome do usuário tem que ser inferior a %d caracteres." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "A senha deve ter pelo menos %d caracteres." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "A senha deve ser menor que %d caracteres." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Senhas não conferem." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Erro" @@ -1229,58 +1229,58 @@ msgstr "Você dá:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1411,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1424,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@Negociar|Negociar com %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Cancelar" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/ru.po b/po/ru.po index 82955c54..6d1d3a98 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-01-08 11:50+0000\n" "Last-Translator: idle sign \n" "Language-Team: Russian \n" @@ -57,8 +57,8 @@ msgstr "Продать" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Отмена" @@ -136,7 +136,7 @@ msgstr "Создать перÑонажа" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "ИмÑ:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Сервер:" @@ -539,12 +539,12 @@ msgstr "Да" msgid "No" msgstr "Ðет" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Соединение..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Сколько предметов ÑброÑить." msgid "Login" msgstr "Вход" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Пароль:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Порт:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "ОÑтавить" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "ЗарегиÑтрироватьÑÑ" @@ -766,49 +766,49 @@ msgstr "@@drop|СброÑить@@" msgid "@@description|Description@@" msgstr "@@description|ОпиÑание@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Подтвердите:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать не менее %d Ñимволов." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ðµ должно Ñодержать более %d Ñимволов." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Пароль должен Ñодержать не менее %d Ñимволов." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Пароль не должен Ñодержать более %d Ñимволов." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Пароли не Ñовпадают." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Ошибка" @@ -1229,58 +1229,58 @@ msgstr "Ð’Ñ‹ отдаете:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1411,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1424,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Торговать Ñ %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Отмена" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/sk.po b/po/sk.po index ef9d85bf..8b0eec38 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-12-30 14:07+0000\n" "Last-Translator: TomasKovacik \n" "Language-Team: Slovak \n" @@ -56,8 +56,8 @@ msgstr "" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "ZruÅ¡iÅ¥" @@ -136,7 +136,7 @@ msgstr "VytvoriÅ¥ postavu" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Meno" @@ -180,7 +180,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "" @@ -535,12 +535,12 @@ msgstr "" msgid "No" msgstr "" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "" #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -638,11 +638,11 @@ msgstr "" msgid "Login" msgstr "" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "" @@ -654,8 +654,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "" @@ -758,49 +758,49 @@ msgstr "" msgid "@@description|Description@@" msgstr "" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "Muž" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "Žena" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "" -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "" @@ -1209,58 +1209,58 @@ msgstr "" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1391,6 +1391,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1400,10 +1404,176 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +msgid "Trade with " +msgstr "" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "ZruÅ¡iÅ¥" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/sv.po b/po/sv.po index b0b4dc07..88148c62 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-05-07 19:04+0000\n" "Last-Translator: Kess Vargavind \n" "Language-Team: Swedish \n" @@ -57,8 +57,8 @@ msgstr "Sälj" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "Avbryt" @@ -136,7 +136,7 @@ msgstr "Skapa karaktär" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "Namn:" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "Server:" @@ -539,12 +539,12 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "Ansluter..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "Välj antal föremÃ¥l att släppa." msgid "Login" msgstr "Användarnamn" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "Lösenord:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "Port:" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "BehÃ¥ll" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "Registrera" @@ -766,49 +766,49 @@ msgstr "@@drop|Släpp@@" msgid "@@description|Description@@" msgstr "@@description|Beskrivning@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "Bekräfta:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "Användarnamnet mÃ¥ste vara minst %d tecken lÃ¥ngt." -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "Användarnamnet mÃ¥ste vara kortare än %d tecken." -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "Lösenordet mÃ¥ste vara minst %d tecken lÃ¥ngt." -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "Lösenordet mÃ¥ste vara kortare än %d tecken." #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "Lösenorden stämmer inte överens." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "Fel" @@ -1229,58 +1229,58 @@ msgstr "Du ger:" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1411,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1424,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@trade|Handla med %s@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "Avbryt" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/th.po b/po/th.po index 866c30ee..70a4bc2c 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-11-25 06:16+0000\n" "Last-Translator: Tharawut Paripaiboon \n" "Language-Team: Thai \n" @@ -56,8 +56,8 @@ msgstr "" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "ยà¸à¹€à¸¥à¸´à¸" @@ -136,7 +136,7 @@ msgstr "สร้างตัวละคร" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "ชื่อ:" @@ -180,7 +180,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "" @@ -535,12 +535,12 @@ msgstr "ใช่" msgid "No" msgstr "ไม่" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -634,11 +634,11 @@ msgstr "" msgid "Login" msgstr "เข้าระบบ" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "รหัสผ่าน:" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "" @@ -650,8 +650,8 @@ msgstr "" msgid "Keep" msgstr "" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "สมัครสมาชิà¸" @@ -754,49 +754,49 @@ msgstr "" msgid "@@description|Description@@" msgstr "" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "ยืนยัน:" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "ชาย" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "หà¸à¸´à¸‡" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "" -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "ผิดพลาด" @@ -1210,58 +1210,58 @@ msgstr "" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1392,6 +1392,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1401,10 +1405,176 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +msgid "Trade with " +msgstr "" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "ยà¸à¹€à¸¥à¸´à¸" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 05dc2b57..c69f2cf8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tmw\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-12 17:52-0700\n" +"POT-Creation-Date: 2009-01-15 11:01-0700\n" "PO-Revision-Date: 2008-09-17 14:41+0000\n" "Last-Translator: luojie-dune \n" "Language-Team: Simplified Chinese \n" @@ -57,8 +57,8 @@ msgstr "出售" #: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59 #: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60 #: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42 -#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 -#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115 +#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121 +#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114 msgid "Cancel" msgstr "å–消" @@ -136,7 +136,7 @@ msgstr "创建角色" #: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66 #: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51 -#: ../src/gui/register.cpp:66 +#: ../src/gui/register.cpp:64 msgid "Name:" msgstr "å称" @@ -181,7 +181,7 @@ msgstr "" msgid "Global announcement from " msgstr "" -#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69 +#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67 msgid "Server:" msgstr "æœåŠ¡å™¨ï¼š" @@ -539,12 +539,12 @@ msgstr "是" msgid "No" msgstr "å¦" -#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113 +#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112 msgid "Connecting..." msgstr "连接中..." #: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52 -#: ../src/being.cpp:96 +#: ../src/being.cpp:93 msgid "Unable to load emotions" msgstr "" @@ -642,11 +642,11 @@ msgstr "请选择丢弃的物å“æ•°é‡" msgid "Login" msgstr "登陆" -#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67 +#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65 msgid "Password:" msgstr "密ç ï¼š" -#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70 +#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68 msgid "Port:" msgstr "端å£ï¼š" @@ -658,8 +658,8 @@ msgstr "" msgid "Keep" msgstr "ä¿æŒ" -#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62 -#: ../src/gui/register.cpp:78 +#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60 +#: ../src/gui/register.cpp:76 msgid "Register" msgstr "注册" @@ -766,49 +766,49 @@ msgstr "@@丢弃|丢弃@@" msgid "@@description|Description@@" msgstr "@@æè¿°|æè¿°@@" -#: ../src/gui/register.cpp:68 +#: ../src/gui/register.cpp:66 msgid "Confirm:" msgstr "确定" -#: ../src/gui/register.cpp:76 +#: ../src/gui/register.cpp:74 msgid "Male" msgstr "" -#: ../src/gui/register.cpp:77 +#: ../src/gui/register.cpp:75 msgid "Female" msgstr "" -#: ../src/gui/register.cpp:186 +#: ../src/gui/register.cpp:183 #, c-format msgid "RegisterDialog::register Username is %s" msgstr "" -#: ../src/gui/register.cpp:195 +#: ../src/gui/register.cpp:192 #, c-format msgid "The username needs to be at least %d characters long." msgstr "用户å至少需è¦%d个字符" -#: ../src/gui/register.cpp:203 +#: ../src/gui/register.cpp:200 #, c-format msgid "The username needs to be less than %d characters long." msgstr "用户åä¸èƒ½å°‘于%d个字符" -#: ../src/gui/register.cpp:211 +#: ../src/gui/register.cpp:208 #, c-format msgid "The password needs to be at least %d characters long." msgstr "密ç éœ€è¦è‡³å°‘%d个字符" -#: ../src/gui/register.cpp:219 +#: ../src/gui/register.cpp:216 #, c-format msgid "The password needs to be less than %d characters long." msgstr "密ç ä¸èƒ½å°‘于%d个字符" #. Password does not match with the confirmation one -#: ../src/gui/register.cpp:226 +#: ../src/gui/register.cpp:223 msgid "Passwords do not match." msgstr "密ç ä¸ä¸€è‡´." -#: ../src/gui/register.cpp:246 ../src/main.cpp:1022 +#: ../src/gui/register.cpp:243 ../src/main.cpp:1022 msgid "Error" msgstr "错误" @@ -1229,58 +1229,58 @@ msgstr "你得到：" msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" -#: ../src/gui/updatewindow.cpp:79 +#: ../src/gui/updatewindow.cpp:78 #, c-format msgid "Couldn't load text file: %s" msgstr "" -#: ../src/gui/updatewindow.cpp:94 +#: ../src/gui/updatewindow.cpp:93 msgid "Updating..." msgstr "" -#: ../src/gui/updatewindow.cpp:116 +#: ../src/gui/updatewindow.cpp:115 msgid "Play" msgstr "" -#: ../src/gui/updatewindow.cpp:197 +#: ../src/gui/updatewindow.cpp:196 msgid "Couldn't load news" msgstr "" -#: ../src/gui/updatewindow.cpp:329 +#: ../src/gui/updatewindow.cpp:327 msgid "curl error " msgstr "" -#: ../src/gui/updatewindow.cpp:330 +#: ../src/gui/updatewindow.cpp:328 msgid " host: " msgstr "" -#: ../src/gui/updatewindow.cpp:365 +#: ../src/gui/updatewindow.cpp:363 #, c-format msgid "Checksum for file %s failed: (%lx/%lx)" msgstr "" -#: ../src/gui/updatewindow.cpp:415 +#: ../src/gui/updatewindow.cpp:413 msgid "Unable to create mThread" msgstr "" -#: ../src/gui/updatewindow.cpp:453 +#: ../src/gui/updatewindow.cpp:451 msgid "##1 The update process is incomplete." msgstr "" -#: ../src/gui/updatewindow.cpp:454 +#: ../src/gui/updatewindow.cpp:452 msgid "##1 It is strongly recommended that" msgstr "" -#: ../src/gui/updatewindow.cpp:455 +#: ../src/gui/updatewindow.cpp:453 msgid "##1 you try again later" msgstr "" -#: ../src/gui/updatewindow.cpp:509 +#: ../src/gui/updatewindow.cpp:507 #, c-format msgid "%s already here" msgstr "" -#: ../src/gui/updatewindow.cpp:522 +#: ../src/gui/updatewindow.cpp:520 msgid "Completed" msgstr "" @@ -1411,6 +1411,10 @@ msgstr "" msgid "You're pining for the fjords." msgstr "" +#: ../src/net/playerhandler.cpp:267 +msgid "You picked up " +msgstr "" + #: ../src/net/playerhandler.cpp:390 msgid "Equip arrows first" msgstr "" @@ -1420,10 +1424,177 @@ msgstr "" msgid "0x013b: Unhandled message %i" msgstr "" +#: ../src/net/tradehandler.cpp:91 +msgid "Request for trade" +msgstr "" + +#: ../src/net/tradehandler.cpp:93 +msgid " wants to trade with you, do you accept?" +msgstr "" + +#. Too far away +#: ../src/net/tradehandler.cpp:107 +msgid "Trading isn't possible. Trade partner is too far away." +msgstr "" + +#. Character doesn't exist +#: ../src/net/tradehandler.cpp:111 +msgid "Trading isn't possible. Character doesn't exist." +msgstr "" + +#. Invite request check failed... +#: ../src/net/tradehandler.cpp:115 +msgid "Trade cancelled due to an unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:121 +msgid "Trade: You and " +msgstr "" + +#: ../src/net/tradehandler.cpp:127 +#, fuzzy +msgid "Trade with " +msgstr "@@交易|与%s交易@@" + +#: ../src/net/tradehandler.cpp:128 +#, fuzzy +msgid " cancelled" +msgstr "å–消" + +#. Shouldn't happen as well, but to be sure +#: ../src/net/tradehandler.cpp:135 +msgid "Unhandled trade cancel packet" +msgstr "" + +#. Add item failed - player overweighted +#: ../src/net/tradehandler.cpp:185 +msgid "Failed adding item. Trade partner is over weighted." +msgstr "" + +#. Add item failed - player has no free slot +#: ../src/net/tradehandler.cpp:190 +msgid "Failed adding item. Trade partner has no free slot." +msgstr "" + +#: ../src/net/tradehandler.cpp:194 +msgid "Failed adding item for unknown reason." +msgstr "" + +#: ../src/net/tradehandler.cpp:207 +msgid "Trade canceled." +msgstr "" + +#: ../src/net/tradehandler.cpp:214 +msgid "Trade completed." +msgstr "" + +#: ../src/resources/colordb.cpp:56 +#, c-format +msgid "Trying TMW's color file, %s." +msgstr "" + +#: ../src/resources/colordb.cpp:66 +msgid "ColorDB: Failed" +msgstr "" + +#: ../src/resources/colordb.cpp:83 +#, c-format +msgid "ColorDB: Redefinition of dye ID %d" +msgstr "" + +#: ../src/resources/colordb.cpp:98 +msgid "Unloading color database..." +msgstr "" + +#: ../src/resources/colordb.cpp:113 +#, c-format +msgid "ColorDB: Error, unknown dye ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:52 +msgid "Initializing item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:55 +msgid "Unknown item" +msgstr "" + +#: ../src/resources/itemdb.cpp:65 +msgid "ItemDB: Error while loading items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:77 +msgid "ItemDB: Invalid or missing item ID in items.xml!" +msgstr "" + +#: ../src/resources/itemdb.cpp:82 +#, c-format +msgid "ItemDB: Redefinition of item ID %d" +msgstr "" + #: ../src/resources/itemdb.cpp:99 msgid "Unnamed" msgstr "" +#: ../src/resources/itemdb.cpp:142 +msgid "Unloading item database..." +msgstr "" + +#: ../src/resources/itemdb.cpp:160 +#, c-format +msgid "ItemDB: Error, unknown item ID# %d" +msgstr "" + +#: ../src/resources/itemdb.cpp:199 +#, c-format +msgid "ItemDB: Ignoring unknown sound event '%s'" +msgstr "" + +#: ../src/resources/monsterdb.cpp:44 +msgid "unnamed" +msgstr "" + +#: ../src/resources/monsterdb.cpp:46 +msgid "Initializing monster database..." +msgstr "" + +#: ../src/resources/monsterdb.cpp:53 +msgid "Monster Database: Error while loading monster.xml!" +msgstr "" + +#: ../src/resources/monsterdb.cpp:84 +#, c-format +msgid "" +"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one" +msgstr "" + +#: ../src/resources/monsterdb.cpp:121 +#, c-format +msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s" +msgstr "" + +#: ../src/resources/monsterdb.cpp:159 +#, c-format +msgid "MonsterDB: Warning, unknown monster ID %d requested" +msgstr "" + +#: ../src/resources/npcdb.cpp:48 +msgid "Initializing NPC database..." +msgstr "" + +#: ../src/resources/npcdb.cpp:55 +msgid "NPC Database: Error while loading npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:67 +msgid "NPC Database: NPC with missing ID in npcs.xml!" +msgstr "" + +#: ../src/resources/npcdb.cpp:125 +#, c-format +msgid "NPCDB: Warning, unknown NPC ID %d requested" +msgstr "" + #: ../src/game.cpp:386 msgid "Screenshot saved to ~/" msgstr "" diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 405bf42e..ddc663f2 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -60,50 +60,42 @@ class AnimatedSprite /** * Resets the animated sprite. */ - void - reset(); + void reset(); /** * Plays an action using the current direction */ - void - play(SpriteAction action); + void play(SpriteAction action); /** * Inform the animation of the passed time so that it can output the * correct animation frame. */ - void - update(int time); + void update(int time); /** * Draw the current animation frame at the coordinates given in screen * pixels. */ - bool - draw(Graphics* graphics, int posX, int posY) const; + bool draw(Graphics* graphics, int posX, int posY) const; /** * gets the width in pixels of the image of the current frame */ - int - getWidth() const; + int getWidth() const; /** * gets the height in pixels of the image of the current frame */ - int - getHeight() const; + int getHeight() const; /** * Sets the direction. */ - void - setDirection(SpriteDirection direction); + void setDirection(SpriteDirection direction); private: - bool - updateCurrentAnimation(unsigned int dt); + bool updateCurrentAnimation(unsigned int dt); SpriteDirection mDirection; /**< The sprite direction. */ int mLastTime; /**< The last time update was called. */ diff --git a/src/being.cpp b/src/being.cpp index 5eb62b2d..69da1182 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -48,9 +48,6 @@ #include "utils/tostring.h" #include "utils/xml.h" -#define BEING_EFFECTS_FILE "effects.xml" -#define HAIR_FILE "hair.xml" - int Being::instances = 0; int Being::mNumberOfHairstyles = 1; ImageSet *Being::emotionSet = NULL; diff --git a/src/configuration.cpp b/src/configuration.cpp index a2ce4500..4fb6a42b 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -87,7 +87,6 @@ void ConfigurationObject::clear(void) mOptions.clear(); } - ConfigurationObject::~ConfigurationObject(void) { clear(); @@ -190,7 +189,6 @@ void ConfigurationObject::writeToXML(xmlTextWriterPtr writer) } } - void Configuration::write() { // Do not attempt to write to file that cannot be opened for writing diff --git a/src/equipment.cpp b/src/equipment.cpp index f1d1d4f2..828de46b 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -32,8 +32,7 @@ Equipment::Equipment(): std::fill_n(mEquipment, EQUIPMENT_SIZE, 0); } -void -Equipment::setEquipment(int index, int inventoryIndex) +void Equipment::setEquipment(int index, int inventoryIndex) { mEquipment[index] = inventoryIndex; Item* item = player_node->getInventory()->getItem(inventoryIndex); diff --git a/src/floor_item.h b/src/floor_item.h index b747310b..4a4e8fb3 100644 --- a/src/floor_item.h +++ b/src/floor_item.h @@ -51,42 +51,36 @@ class FloorItem : public Sprite /** * Returns instance id of this item. */ - unsigned int - getId() const { return mId; } + unsigned int getId() const { return mId; } /** * Returns the item id. */ - unsigned int - getItemId() const { return mItem->getId(); } + unsigned int getItemId() const { return mItem->getId(); } /** * Returns the x coordinate. */ - unsigned short - getX() const { return mX; } + unsigned short getX() const { return mX; } /** * Returns the y coordinate. */ - unsigned short - getY() const { return mY; } + unsigned short getY() const { return mY; } /** * Returns the pixel y coordinate. * * @see Sprite::getPixelY() */ - int - getPixelY() const { return mY * 32; } + int getPixelY() const { return mY * 32; } /** * Draws this floor item to the given graphics context. * * @see Sprite::draw(Graphics, int, int) */ - void - draw(Graphics *graphics, int offsetX, int offsetY) const + void draw(Graphics *graphics, int offsetX, int offsetY) const { graphics->drawImage(mItem->getImage(), mX * 32 + offsetX, diff --git a/src/graphics.cpp b/src/graphics.cpp index 784e6e77..55ccc3b4 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -178,13 +178,12 @@ void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h) } } -void -Graphics::drawImageRect(int x, int y, int w, int h, - Image *topLeft, Image *topRight, - Image *bottomLeft, Image *bottomRight, - Image *top, Image *right, - Image *bottom, Image *left, - Image *center) +void Graphics::drawImageRect(int x, int y, int w, int h, + Image *topLeft, Image *topRight, + Image *bottomLeft, Image *bottomRight, + Image *top, Image *right, + Image *bottom, Image *left, + Image *center) { pushClipArea(gcn::Rectangle(x, y, w, h)); @@ -222,9 +221,8 @@ Graphics::drawImageRect(int x, int y, int w, int h, popClipArea(); } -void -Graphics::drawImageRect(int x, int y, int w, int h, - const ImageRect &imgRect) +void Graphics::drawImageRect(int x, int y, int w, int h, + const ImageRect &imgRect) { drawImageRect(x, y, w, h, imgRect.grid[0], imgRect.grid[2], imgRect.grid[6], imgRect.grid[8], diff --git a/src/graphics.h b/src/graphics.h index efdd1ac1..bc9a95bd 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -95,17 +95,15 @@ class Graphics : public gcn::SDLGraphics { * @return true if the image was blitted properly * false otherwise. */ - virtual bool - drawImage(Image *image, - int srcX, int srcY, - int dstX, int dstY, - int width, int height, - bool useColor = false); - - virtual void - drawImagePattern(Image *image, - int x, int y, - int w, int h); + virtual bool drawImage(Image *image, + int srcX, int srcY, + int dstX, int dstY, + int width, int height, + bool useColor = false); + + virtual void drawImagePattern(Image *image, + int x, int y, + int w, int h); /** * Draws a rectangle using images. 4 corner images, 4 side images and 1 diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 8be32ebb..7621b856 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -210,8 +210,7 @@ struct MouseOverLink int mX, mY; }; -void -BrowserBox::mousePressed(gcn::MouseEvent &event) +void BrowserBox::mousePressed(gcn::MouseEvent &event) { LinkIterator i = find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); @@ -221,8 +220,7 @@ BrowserBox::mousePressed(gcn::MouseEvent &event) } } -void -BrowserBox::mouseMoved(gcn::MouseEvent &event) +void BrowserBox::mouseMoved(gcn::MouseEvent &event) { LinkIterator i = find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); @@ -230,8 +228,7 @@ BrowserBox::mouseMoved(gcn::MouseEvent &event) mSelectedLink = (i != mLinks.end()) ? (i - mLinks.begin()) : -1; } -void -BrowserBox::draw(gcn::Graphics *graphics) +void BrowserBox::draw(gcn::Graphics *graphics) { if (mOpaque) { diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 40ecd1b7..9653242c 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -122,8 +122,7 @@ Button::~Button() } } -void -Button::draw(gcn::Graphics *graphics) +void Button::draw(gcn::Graphics *graphics) { int mode; diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp index 903d971d..d29f3c58 100644 --- a/src/gui/buttonbox.cpp +++ b/src/gui/buttonbox.cpp @@ -34,8 +34,7 @@ ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt, add(button); } -void -ButtonBox::action(const gcn::ActionEvent &event) +void ButtonBox::action(const gcn::ActionEvent &event) { if (event.getId() == "activate") { diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h index edde4aa4..1741f7ba 100644 --- a/src/gui/buttonbox.h +++ b/src/gui/buttonbox.h @@ -60,8 +60,7 @@ class ButtonBox : public Window, public gcn::ActionListener * * @param event is the event that is generated */ - void - action(const gcn::ActionEvent &event); + void action(const gcn::ActionEvent &event); private: diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 08fcd2b2..750c6d6f 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -308,8 +308,7 @@ CharCreateDialog::~CharCreateDialog() charServerHandler.setCharCreateDialog(0); } -void -CharCreateDialog::action(const gcn::ActionEvent &event) +void CharCreateDialog::action(const gcn::ActionEvent &event) { int numberOfColors = ColorDB::size(); if (event.getId() == "create") { @@ -340,22 +339,19 @@ CharCreateDialog::action(const gcn::ActionEvent &event) } } -std::string -CharCreateDialog::getName() +std::string CharCreateDialog::getName() { std::string name = mNameField->getText(); trim(name); return name; } -void -CharCreateDialog::unlock() +void CharCreateDialog::unlock() { mCreateButton->setEnabled(true); } -void -CharCreateDialog::attemptCharCreate() +void CharCreateDialog::attemptCharCreate() { // Send character infos MessageOut outMsg(mNetwork); diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index ff401332..d5452532 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -98,8 +98,7 @@ ServerSelectDialog::~ServerSelectDialog() delete mServerListModel; } -void -ServerSelectDialog::action(const gcn::ActionEvent &event) +void ServerSelectDialog::action(const gcn::ActionEvent &event) { if (event.getId() == "ok") { mOkButton->setEnabled(false); @@ -114,14 +113,12 @@ ServerSelectDialog::action(const gcn::ActionEvent &event) } } -int -ServerListModel::getNumberOfElements() +int ServerListModel::getNumberOfElements() { return n_server; } -std::string -ServerListModel::getElementAt(int i) +std::string ServerListModel::getElementAt(int i) { const SERVER_INFO *si = server_info[i]; return si->name + " (" + toString(si->online_users) + ")"; diff --git a/src/gui/chat.h b/src/gui/chat.h index 437dc115..9e137499 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -107,149 +107,142 @@ struct CHATSKILL * \ingroup Interface */ class ChatWindow : public Window, public gcn::ActionListener, - public gcn::KeyListener + public gcn::KeyListener { public: - /** - * Constructor. - */ - ChatWindow(Network *network); - - /** - * Destructor: used to write back values to the config file - */ - ~ChatWindow(); - - /** - * Logic (updates components' size) - */ - void logic(); - - /** - * Adds a line of text to our message list. Parameters: - * - * @param line Text message. - * @parem own Type of message (usually the owner-type). - */ - void chatLog(std::string line, int own, bool ignoreRecord = false); - - /** - * Calls original chat_log() after processing the packet. - */ - void chatLog(CHATSKILL); - - /** - * Performs action. - */ - void action(const gcn::ActionEvent &event); - - /** - * Request focus for typing chat message. - */ - void requestChatFocus(); - - /** - * Checks whether ChatWindow is Focused or not. - */ - bool isInputFocused(); - - /** - * Determines whether to send a command or an ordinary message, then - * contructs packets & sends them. - * - * @param nick The character's name to display in front. - * @param msg The message text which is to be send. - * - * NOTE: - * The nickname is required by the server, if not specified - * the message may not be sent unless a command was intended - * which requires another packet to be constructed! you can - * achieve this by putting a slash ("/") infront of the - * message followed by the command name and the message. - * of course all slash-commands need implemented handler- - * routines. ;-) - * remember, a line starting with "@" is not a command that needs - * to be parsed rather is sent using the normal chat-packet. - * - * EXAMPLE: - * // for an global announcement /- command - * chatlog.chat_send("", "/announce Hello to all logged in users!"); - * // for simple message by a user /- message - * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!"); - */ - void - chatSend(const std::string &nick, std::string msg); - - /** Called when key is pressed */ - void - keyPressed(gcn::KeyEvent &event); - - /** Called to set current text */ - void - setInputText(std::string input_str); - - /** Override to reset mTmpVisible */ - void - setVisible(bool visible); + /** + * Constructor. + */ + ChatWindow(Network *network); + + /** + * Destructor: used to write back values to the config file + */ + ~ChatWindow(); + + /** + * Logic (updates components' size) + */ + void logic(); + + /** + * Adds a line of text to our message list. Parameters: + * + * @param line Text message. + * @parem own Type of message (usually the owner-type). + */ + void chatLog(std::string line, int own, bool ignoreRecord = false); + + /** + * Calls original chat_log() after processing the packet. + */ + void chatLog(CHATSKILL); + + /** + * Performs action. + */ + void action(const gcn::ActionEvent &event); + + /** + * Request focus for typing chat message. + */ + void requestChatFocus(); + + /** + * Checks whether ChatWindow is Focused or not. + */ + bool isInputFocused(); + + /** + * Determines whether to send a command or an ordinary message, then + * contructs packets & sends them. + * + * @param nick The character's name to display in front. + * @param msg The message text which is to be send. + * + * NOTE: + * The nickname is required by the server, if not specified + * the message may not be sent unless a command was intended + * which requires another packet to be constructed! you can + * achieve this by putting a slash ("/") infront of the + * message followed by the command name and the message. + * of course all slash-commands need implemented handler- + * routines. ;-) + * remember, a line starting with "@" is not a command that needs + * to be parsed rather is sent using the normal chat-packet. + * + * EXAMPLE: + * // for an global announcement /- command + * chatlog.chat_send("", "/announce Hello to all logged in users!"); + * // for simple message by a user /- message + * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!"); + */ + void chatSend(const std::string &nick, std::string msg); + + /** Called when key is pressed */ + void keyPressed(gcn::KeyEvent &event); + + /** Called to set current text */ + void setInputText(std::string input_str); + + /** Override to reset mTmpVisible */ + void setVisible(bool visible); /** - * Scrolls the chat window - * - * @param amount direction and amount to scroll. Negative numbers scroll - * up, positive numbers scroll down. The absolute amount indicates the - * amount of 1/8ths of chat window real estate that should be scrolled. - */ - void - scroll(int amount); - - /** - * party implements the partying chat commands - * - * @param command is the party command to perform - * @param msg is the remainder of the message - */ - void - party(const std::string &command, const std::string &msg); - - /** - * help implements the /help command - * - * @param msg1 is the command that the player needs help on - * @param msg2 is the sub-command relating to the command - */ - void - help(const std::string &msg1, const std::string &msg2); + * Scrolls the chat window + * + * @param amount direction and amount to scroll. Negative numbers scroll + * up, positive numbers scroll down. The absolute amount indicates the + * amount of 1/8ths of chat window real estate that should be scrolled. + */ + void scroll(int amount); + + /** + * party implements the partying chat commands + * + * @param command is the party command to perform + * @param msg is the remainder of the message + */ + void party(const std::string &command, const std::string &msg); + + /** + * help implements the /help command + * + * @param msg1 is the command that the player needs help on + * @param msg2 is the sub-command relating to the command + */ + void help(const std::string &msg1, const std::string &msg2); private: - Network *mNetwork; - bool mTmpVisible; - - /** One item in the chat log */ - struct CHATLOG - { - std::string nick; - std::string text; - int own; - }; - - /** Constructs failed messages for actions */ - std::string const_msg(CHATSKILL); - - gcn::TextField *mChatInput; /**< Input box for typing chat messages */ - BrowserBox *mTextOutput; /**< Text box for displaying chat history */ - ScrollArea *mScrollArea; /**< Scroll area around text output */ - - typedef std::list History; - typedef History::iterator HistoryIterator; - History mHistory; /**< Command history */ - HistoryIterator mCurHist; /**< History iterator */ - Recorder *mRecorder; /**< Recording class */ - char mPartyPrefix; /**< Messages beginning with the prefix are sent to - the party */ - bool mReturnToggles; /**< Marks whether toggles the chat log - or not */ - Party *mParty; + Network *mNetwork; + bool mTmpVisible; + + /** One item in the chat log */ + struct CHATLOG + { + std::string nick; + std::string text; + int own; + }; + + /** Constructs failed messages for actions */ + std::string const_msg(CHATSKILL); + + gcn::TextField *mChatInput; /**< Input box for typing chat messages */ + BrowserBox *mTextOutput; /**< Text box for displaying chat history */ + ScrollArea *mScrollArea; /**< Scroll area around text output */ + + typedef std::list History; + typedef History::iterator HistoryIterator; + History mHistory; /**< Command history */ + HistoryIterator mCurHist; /**< History iterator */ + Recorder *mRecorder; /**< Recording class */ + char mPartyPrefix; /**< Messages beginning with the prefix are sent to + the party */ + bool mReturnToggles; /**< Marks whether toggles the chat log + or not */ + Party *mParty; }; extern ChatWindow *chatWindow; diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 7fc63096..63f4762a 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -67,8 +67,7 @@ DebugWindow::DebugWindow(): add(mParticleCountLabel); } -void -DebugWindow::logic() +void DebugWindow::logic() { // Get the current mouse position int mouseX, mouseY; diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h index f5922a9c..2a115f0b 100644 --- a/src/gui/emotecontainer.h +++ b/src/gui/emotecontainer.h @@ -33,15 +33,13 @@ #include "../resources/imageset.h" class Image; -class Inventory; -class Emote; namespace gcn { class SelectionListener; } /** - * An item container. Used to show items in inventory and trade dialog. + * An emote container. Used to show emotes in inventory and trade dialog. * * \ingroup GUI */ @@ -61,7 +59,7 @@ class EmoteContainer : public gcn::Widget, virtual ~EmoteContainer(); /** - * Draws the items. + * Draws the emotes. */ void draw(gcn::Graphics *graphics); @@ -76,12 +74,12 @@ class EmoteContainer : public gcn::Widget, void mousePressed(gcn::MouseEvent &event); /** - * Returns the selected item. + * Returns the selected emote. */ int getSelectedEmote(); /** - * Sets selected item to NULL. + * Sets selected emote to NULL. */ void selectNone(); @@ -106,12 +104,12 @@ class EmoteContainer : public gcn::Widget, private: /** - * Sets the currently selected item. Invalid (e.g., negative) indices set `no item'. + * Sets the currently selected emote. Invalid (e.g., negative) indices set `no emotr'. */ void setSelectedEmoteIndex(int index); /** - * Find the current item index by the most recently used item ID + * Find the current emote index by the most recently used emote ID */ void refindSelectedEmote(void); diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h index a382e37d..dbe4efd7 100644 --- a/src/gui/emotewindow.h +++ b/src/gui/emotewindow.h @@ -67,7 +67,6 @@ class EmoteWindow : public Window, gcn::ActionListener, void widgetResized(const gcn::Event &event); private: - EmoteContainer *mEmotes; gcn::Button *mUseButton; diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp index df8cf24e..4cb885c3 100644 --- a/src/gui/inttextbox.cpp +++ b/src/gui/inttextbox.cpp @@ -29,8 +29,7 @@ IntTextBox::IntTextBox(int i): { } -void -IntTextBox::keyPressed(gcn::KeyEvent &event) +void IntTextBox::keyPressed(gcn::KeyEvent &event) { const gcn::Key &key = event.getKey(); diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h index 9c6e8bf4..d134fcd7 100644 --- a/src/gui/inttextbox.h +++ b/src/gui/inttextbox.h @@ -55,8 +55,7 @@ class IntTextBox : public TextField /** * Responds to key presses. */ - void - keyPressed(gcn::KeyEvent &event); + void keyPressed(gcn::KeyEvent &event); private: int mMin; /**< Minimum value */ diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp deleted file mode 100644 index 055cbe44..00000000 --- a/src/gui/itempopup.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* - * The Legend of Mazzeroth - * 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. - * - * The Legend of Mazzeroth 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, - * 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 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include - -#include "gui.h" -#include "itempopup.h" - -#include "widgets/layout.h" - -#include "../resources/image.h" -#include "../resources/iteminfo.h" -#include "../resources/resourcemanager.h" -#include "../utils/gettext.h" -#include "../utils/strprintf.h" - -ItemPopup::ItemPopup() -{ - - setResizable(false); - setTitleBarHeight(0); - - // Item Name - mItemName = new gcn::Label("Label"); - mItemName->setFont(gui->getFont()); - mItemName->setPosition(2, 2); - mItemName->setWidth(getWidth() - 4); - - // Item Description - mItemDesc = new TextBox(); - mItemDesc->setEditable(false); - mItemDescScroll = new ScrollArea(mItemDesc); - - mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14)); - mItemDescScroll->setOpaque(false); - mItemDescScroll->setPosition(2, 15); - - // Item Effect - mItemEffect = new TextBox(); - mItemEffect->setEditable(false); - mItemEffectScroll = new ScrollArea(mItemEffect); - - mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14)); - mItemEffectScroll->setOpaque(false); - mItemEffectScroll->setPosition(2, 35); - - add(mItemName); - add(mItemDescScroll); - add(mItemEffectScroll); - - setLocationRelativeTo(getParent()); - - // LEEOR / TODO: This causes an exception error. - //moveToBottom(getParent()); - - mItemDesc->setTextWrapped( "" ); - mItemEffect->setTextWrapped( "" ); -} - -void ItemPopup::setItem(Item *item) -{ - - ItemInfo const *info = item ? &item->getInfo() : NULL; - - mItemName->setCaption(info->getName()); - mItemDesc->setTextWrapped( info->getDescription() ); - mItemEffect->setTextWrapped( info->getEffect() ); - - int numRowsDesc = mItemDesc->getNumberOfRows(); - int numRowsEffect = mItemEffect->getNumberOfRows(); - - if(info->getEffect() == "") - { - setContentSize(200, (numRowsDesc * 14) + 30); - } else { - setContentSize(200, (numRowsDesc * 14) + (numRowsEffect*14) + 30); - } - - mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14)); - - mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14)); - - mItemDescScroll->setPosition(2, 20); - mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25); -} - -unsigned int ItemPopup::getNumRows() -{ - return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows(); -} diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h deleted file mode 100644 index 0082ec2c..00000000 --- a/src/gui/itempopup.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -* - * The Legend of Mazzeroth - * 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. - * - * The Legend of Mazzeroth 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, - * 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 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _LOM_ITEMPOPUP_H__ -#define _LOM_ITEMPOPUP_H__ - -#include "scrollarea.h" -#include "textbox.h" -#include "window.h" - -#include "../item.h" - -class ItemPopup : public Window - { - public: - - ItemPopup(); - - void setItem(Item *item); - unsigned int getNumRows(); - - private: - gcn::Label *mItemName; - TextBox *mItemDesc; - TextBox *mItemEffect; - ScrollArea *mItemDescScroll; - ScrollArea *mItemEffectScroll; - - }; - -#endif diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index 4dca66a0..7e28e1f5 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -57,8 +57,7 @@ void ListBox::draw(gcn::Graphics *graphics) } } -void -ListBox::mouseDragged(gcn::MouseEvent &event) +void ListBox::mouseDragged(gcn::MouseEvent &event) { // Pretend mouse is pressed continuously while dragged. Causes list // selection to be updated as is default in many GUIs. diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 18976b46..bba69754 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -188,8 +188,7 @@ bool LoginDialog::canSubmit() state == LOGIN_STATE; } -bool -LoginDialog::isUShort(const std::string &str) +bool LoginDialog::isUShort(const std::string &str) { if (str == "") { @@ -212,8 +211,7 @@ LoginDialog::isUShort(const std::string &str) return true; } -unsigned short -LoginDialog::getUShort(const std::string &str) +unsigned short LoginDialog::getUShort(const std::string &str) { unsigned long l = 0; for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); @@ -228,9 +226,8 @@ LoginDialog::getUShort(const std::string &str) * LoginDialog::DropDownList */ -void -LoginDialog::DropDownList::saveEntry(const std::string &server, - const std::string &port, int &saved) +void LoginDialog::DropDownList::saveEntry(const std::string &server, + const std::string &port, int &saved) { if (saved < MAX_SERVER_LIST_SIZE && server != "") { @@ -272,9 +269,8 @@ LoginDialog::DropDownList::DropDownList(std::string prefix, } } -void -LoginDialog::DropDownList::save(const std::string &server, - const std::string &port) +void LoginDialog::DropDownList::save(const std::string &server, + const std::string &port) { int position = 0; saveEntry(server, port, position); @@ -292,14 +288,12 @@ LoginDialog::DropDownList::save(const std::string &server, } } -int -LoginDialog::DropDownList::getNumberOfElements() +int LoginDialog::DropDownList::getNumberOfElements() { return mServers.size(); } -std::string -LoginDialog::DropDownList::getElementAt(int i) +std::string LoginDialog::DropDownList::getElementAt(int i) { if (i < 0 || i >= getNumberOfElements()) { @@ -308,8 +302,7 @@ LoginDialog::DropDownList::getElementAt(int i) return getServerAt(i) + ":" + getPortAt(i); } -std::string -LoginDialog::DropDownList::getServerAt(int i) +std::string LoginDialog::DropDownList::getServerAt(int i) { if (i < 0 || i >= getNumberOfElements()) { @@ -318,9 +311,7 @@ LoginDialog::DropDownList::getServerAt(int i) return mServers.at(i); } - -std::string -LoginDialog::DropDownList::getPortAt(int i) +std::string LoginDialog::DropDownList::getPortAt(int i) { if (i < 0 || i >= getNumberOfElements()) { diff --git a/src/gui/login.h b/src/gui/login.h index 3b911424..d1d75ebc 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -74,8 +74,7 @@ class LoginDialog : public Window, public gcn::ActionListener, * Returns whether submit can be enabled. This is true in the login * state, when all necessary fields have some text. */ - bool - canSubmit(); + bool canSubmit(); /** * Function to decide whether string is an unsigned short or not @@ -84,8 +83,7 @@ class LoginDialog : public Window, public gcn::ActionListener, * * @return true is str is an unsigned short, false otherwise */ - static bool - isUShort(const std::string &str); + static bool isUShort(const std::string &str); /** * Converts string to an unsigned short (undefined if invalid) @@ -94,8 +92,7 @@ class LoginDialog : public Window, public gcn::ActionListener, * * @return the value str represents */ - static unsigned short - getUShort(const std::string &str); + static unsigned short getUShort(const std::string &str); DropDown *mServerDropDown; gcn::TextField *mUserField; diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index 9aa6ab49..e31b1779 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -31,7 +31,8 @@ * * \ingroup GUI */ -class PasswordField : public TextField { +class PasswordField : public TextField +{ public: /** * Constructor, initializes the password field with the given string. diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index e5227e5a..92722417 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -76,8 +76,7 @@ PlayerBox::~PlayerBox() } } -void -PlayerBox::draw(gcn::Graphics *graphics) +void PlayerBox::draw(gcn::Graphics *graphics) { if (mPlayer) { @@ -90,8 +89,7 @@ PlayerBox::draw(gcn::Graphics *graphics) } } -void -PlayerBox::drawFrame(gcn::Graphics *graphics) +void PlayerBox::drawFrame(gcn::Graphics *graphics) { int w, h, bs; bs = getFrameSize(); diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h index 7aec87bf..3ccb5fad 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -53,8 +53,7 @@ class PlayerBox : public gcn::ScrollArea * player to NULL causes the box not to draw any * character. */ - void - setPlayer(const Player *player) { mPlayer = player; } + void setPlayer(const Player *player) { mPlayer = player; } /** * Draws the scroll area. diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 708a2991..b4117c80 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -88,8 +88,7 @@ void ProgressBar::logic() if (mBlueToGo < mBlue) mBlue--; } -void -ProgressBar::draw(gcn::Graphics *graphics) +void ProgressBar::draw(gcn::Graphics *graphics) { static_cast(graphics)-> drawImageRect(0, 0, getWidth(), getHeight(), mBorder); @@ -104,16 +103,14 @@ ProgressBar::draw(gcn::Graphics *graphics) } } -void -ProgressBar::setProgress(float progress) +void ProgressBar::setProgress(float progress) { if (progress < 0.0f) mProgress = 0.0; else if (progress > 1.0f) mProgress = 1.0; else mProgress = progress; } -void -ProgressBar::setColor(Uint8 red, Uint8 green, Uint8 blue) +void ProgressBar::setColor(Uint8 red, Uint8 green, Uint8 blue) { mRedToGo = red; mGreenToGo = green; diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h index a20c901f..d2ace66c 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -52,50 +52,42 @@ class ProgressBar : public gcn::Widget { /** * Performs progress bar logic (fading colors) */ - void - logic(); + void logic(); /** * Draws the progress bar. */ - void - draw(gcn::Graphics *graphics); + void draw(gcn::Graphics *graphics); /** * Sets the current progress. */ - void - setProgress(float progress); + void setProgress(float progress); /** * Returns the current progress. */ - float - getProgress() { return mProgress; } + float getProgress() { return mProgress; } /** * Change the filling of the progress bar. */ - void - setColor(Uint8, Uint8 green, Uint8 blue); + void setColor(Uint8, Uint8 green, Uint8 blue); /** * Get The red value of color */ - Uint8 - getRed() { return mRed; } + Uint8 getRed() { return mRed; } /** * Get The red value of color */ - Uint8 - getGreen() { return mGreen; } + Uint8 getGreen() { return mGreen; } /** * Get The red value of color */ - Uint8 - getBlue() { return mBlue; } + Uint8 getBlue() { return mBlue; } private: float mProgress; diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 5d687425..568ec5ff 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -43,14 +43,12 @@ #include "../utils/gettext.h" #include "../utils/strprintf.h" -void -WrongDataNoticeListener::setTarget(gcn::TextField *textField) +void WrongDataNoticeListener::setTarget(gcn::TextField *textField) { mTarget = textField; } -void -WrongDataNoticeListener::action(const gcn::ActionEvent &event) +void WrongDataNoticeListener::action(const gcn::ActionEvent &event) { if (event.getId() == "ok") { @@ -173,8 +171,7 @@ RegisterDialog::~RegisterDialog() delete mWrongDataNoticeListener; } -void -RegisterDialog::action(const gcn::ActionEvent &event) +void RegisterDialog::action(const gcn::ActionEvent &event) { if (event.getId() == "cancel") { @@ -263,14 +260,12 @@ RegisterDialog::action(const gcn::ActionEvent &event) } } -void -RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent) +void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent) { mRegisterButton->setEnabled(canSubmit()); } -bool -RegisterDialog::canSubmit() +bool RegisterDialog::canSubmit() { return !mUserField->getText().empty() && !mPasswordField->getText().empty() && @@ -280,8 +275,7 @@ RegisterDialog::canSubmit() state == REGISTER_STATE; } -bool -RegisterDialog::isUShort(const std::string &str) +bool RegisterDialog::isUShort(const std::string &str) { if (str == "") { @@ -304,8 +298,7 @@ RegisterDialog::isUShort(const std::string &str) return true; } -unsigned short -RegisterDialog::getUShort(const std::string &str) +unsigned short RegisterDialog::getUShort(const std::string &str) { unsigned long l = 0; for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); diff --git a/src/gui/register.h b/src/gui/register.h index 87a11bb9..4c1d9f88 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -84,8 +84,7 @@ class RegisterDialog : public Window, public gcn::ActionListener, * Returns whether submit can be enabled. This is true in the register * state, when all necessary fields have some text. */ - bool - canSubmit(); + bool canSubmit(); /** * Function to decide whether string is an unsigned short or not @@ -94,8 +93,7 @@ class RegisterDialog : public Window, public gcn::ActionListener, * * @return true if str is an unsigned short, false otherwise */ - static bool - isUShort(const std::string &str); + static bool isUShort(const std::string &str); /** * Converts string to an unsigned short (undefined if invalid) @@ -104,8 +102,7 @@ class RegisterDialog : public Window, public gcn::ActionListener, * * @return the value str represents */ - static unsigned short - getUShort(const std::string &str); + static unsigned short getUShort(const std::string &str); gcn::TextField *mUserField; gcn::TextField *mPasswordField; diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index dfc3da38..370a2d2e 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -42,8 +42,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, void action(const gcn::ActionEvent &event); /** Called when key is pressed */ - void - keyPressed(gcn::KeyEvent &event); + void keyPressed(gcn::KeyEvent &event); private: bool mFullScreenEnabled; @@ -86,12 +85,10 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, gcn::Slider *mParticleDetailSlider; gcn::Label *mParticleDetailField; - void - updateSliders(bool originalValues); + void updateSliders(bool originalValues); - int - updateSlider(gcn::Slider *slider, gcn::TextField *field, - const std::string &configName); + int updateSlider(gcn::Slider *slider, gcn::TextField *field, + const std::string &configName); }; #endif diff --git a/src/gui/status.h b/src/gui/status.h index eb4171c9..aa20d094 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -33,7 +33,6 @@ class LocalPlayer; class ProgressBar; - /** * The player status dialog. * diff --git a/src/gui/table.cpp b/src/gui/table.cpp index e4d7812e..264d9864 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -63,8 +63,7 @@ GuiTableActionListener::~GuiTableActionListener(void) } } -void -GuiTableActionListener::action(const gcn::ActionEvent& actionEvent) +void GuiTableActionListener::action(const gcn::ActionEvent& actionEvent) { mTable->setSelected(mRow, mColumn); mTable->distributeActionEvent(); @@ -88,14 +87,12 @@ GuiTable::~GuiTable(void) delete mModel; } -TableModel * -GuiTable::getModel(void) const +TableModel* GuiTable::getModel(void) const { return mModel; } -void -GuiTable::setModel(TableModel *new_model) +void GuiTable::setModel(TableModel *new_model) { if (mModel) { uninstallActionListeners(); @@ -112,9 +109,7 @@ GuiTable::setModel(TableModel *new_model) } } - -void -GuiTable::recomputeDimensions(void) +void GuiTable::recomputeDimensions(void) { int rows_nr = mModel->getRows(); int columns_nr = mModel->getColumns(); @@ -136,33 +131,28 @@ GuiTable::recomputeDimensions(void) setHeight(height); } -void -GuiTable::setSelected(int row, int column) +void GuiTable::setSelected(int row, int column) { mSelectedColumn = column; mSelectedRow = row; } -int -GuiTable::getSelectedRow(void) +int GuiTable::getSelectedRow(void) { return mSelectedRow; } -int -GuiTable::getSelectedColumn(void) +int GuiTable::getSelectedColumn(void) { return mSelectedColumn; } -void -GuiTable::setLinewiseSelection(bool linewise) +void GuiTable::setLinewiseSelection(bool linewise) { mLinewiseMode = linewise; } -int -GuiTable::getRowHeight(void) +int GuiTable::getRowHeight(void) { if (mModel) return mModel->getRowHeight() + 1; // border @@ -170,8 +160,7 @@ GuiTable::getRowHeight(void) return 0; } -int -GuiTable::getColumnWidth(int i) +int GuiTable::getColumnWidth(int i) { if (mModel) return mModel->getColumnWidth(i) + 1; // border @@ -179,16 +168,14 @@ GuiTable::getColumnWidth(int i) return 0; } -void -GuiTable::uninstallActionListeners(void) +void GuiTable::uninstallActionListeners(void) { for (std::vector::const_iterator it = action_listeners.begin(); it != action_listeners.end(); it++) delete *it; action_listeners.clear(); } -void -GuiTable::installActionListeners(void) +void GuiTable::installActionListeners(void) { if (!mModel) return; @@ -207,8 +194,7 @@ GuiTable::installActionListeners(void) } // -- widget ops -void -GuiTable::draw(gcn::Graphics* graphics) +void GuiTable::draw(gcn::Graphics* graphics) { graphics->setColor(getBackgroundColor()); graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight())); @@ -282,42 +268,35 @@ GuiTable::draw(gcn::Graphics* graphics) } } -void -GuiTable::logic(void) +void GuiTable::logic(void) { } -void -GuiTable::moveToTop(gcn::Widget *widget) +void GuiTable::moveToTop(gcn::Widget *widget) { gcn::Widget::moveToTop(widget); this->mTopWidget = widget; } -void -GuiTable::moveToBottom(gcn::Widget *widget) +void GuiTable::moveToBottom(gcn::Widget *widget) { gcn::Widget::moveToBottom(widget); if (widget == this->mTopWidget) this->mTopWidget = NULL; } -gcn::Rectangle -GuiTable::getChildrenArea(void) +gcn::Rectangle GuiTable::getChildrenArea(void) { return gcn::Rectangle(0, 0, getWidth(), getHeight()); } // -- KeyListener notifications -void -GuiTable::keyPressed(gcn::KeyEvent& keyEvent) +void GuiTable::keyPressed(gcn::KeyEvent& keyEvent) { } - // -- MouseListener notifications -void -GuiTable::mousePressed(gcn::MouseEvent& mouseEvent) +void GuiTable::mousePressed(gcn::MouseEvent& mouseEvent) { if (mouseEvent.getButton() == gcn::MouseEvent::LEFT) { int row = getRowForY(mouseEvent.getY()); @@ -332,24 +311,20 @@ GuiTable::mousePressed(gcn::MouseEvent& mouseEvent) } } -void -GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) +void GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) { } -void -GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) +void GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) { } -void -GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent) +void GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent) { } // -- TableModelListener notifications -void -GuiTable::modelUpdated(bool completed) +void GuiTable::modelUpdated(bool completed) { if (completed) { recomputeDimensions(); @@ -360,8 +335,7 @@ GuiTable::modelUpdated(bool completed) } } -gcn::Widget * -GuiTable::getWidgetAt(int x, int y) +gcn::Widget* GuiTable::getWidgetAt(int x, int y) { int row = getRowForY(y); int column = getColumnForX(x); @@ -381,8 +355,7 @@ GuiTable::getWidgetAt(int x, int y) return NULL; } -int -GuiTable::getRowForY(int y) +int GuiTable::getRowForY(int y) { int row = y / getRowHeight(); @@ -393,8 +366,7 @@ GuiTable::getRowForY(int y) return row; } -int -GuiTable::getColumnForX(int x) +int GuiTable::getColumnForX(int x) { int column; int delta = 0; @@ -412,9 +384,7 @@ GuiTable::getColumnForX(int x) return column; } - -void -GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) +void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) { gcn::Widget::_setFocusHandler(focusHandler); diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp index e1afef96..9911eec3 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -25,27 +25,23 @@ #include "table_model.h" -void -TableModel::installListener(TableModelListener *listener) +void TableModel::installListener(TableModelListener *listener) { listeners.insert(listener); } -void -TableModel::removeListener(TableModelListener *listener) +void TableModel::removeListener(TableModelListener *listener) { listeners.erase(listener); } -void -TableModel::signalBeforeUpdate(void) +void TableModel::signalBeforeUpdate(void) { for (std::set::const_iterator it = listeners.begin(); it != listeners.end(); it++) (*it)->modelUpdated(false); } -void -TableModel::signalAfterUpdate(void) +void TableModel::signalAfterUpdate(void) { for (std::set::const_iterator it = listeners.begin(); it != listeners.end(); it++) (*it)->modelUpdated(true); @@ -72,16 +68,14 @@ StaticTableModel::~StaticTableModel(void) delete *it; } -void -StaticTableModel::resize(void) +void StaticTableModel::resize(void) { mRows = getRows(); mColumns = getColumns(); mTableModel.resize(mRows * mColumns, NULL); } -void -StaticTableModel::set(int row, int column, gcn::Widget *widget) +void StaticTableModel::set(int row, int column, gcn::Widget *widget) { if (row >= mRows || row < 0 || column >= mColumns || column < 0) @@ -106,14 +100,12 @@ StaticTableModel::set(int row, int column, gcn::Widget *widget) signalAfterUpdate(); } -gcn::Widget * -StaticTableModel::getElementAt(int row, int column) +gcn::Widget* StaticTableModel::getElementAt(int row, int column) { return mTableModel[WIDGET_AT(row, column)]; } -void -StaticTableModel::fixColumnWidth(int column, int width) +void StaticTableModel::fixColumnWidth(int column, int width) { if (width < 0 || column < 0 || column >= mColumns) @@ -122,8 +114,7 @@ StaticTableModel::fixColumnWidth(int column, int width) mWidths[column] = -width; // Negate to tag as fixed } -void -StaticTableModel::fixRowHeight(int height) +void StaticTableModel::fixRowHeight(int height) { if (height < 0) return; @@ -131,14 +122,12 @@ StaticTableModel::fixRowHeight(int height) mHeight = -height; } -int -StaticTableModel::getRowHeight(void) +int StaticTableModel::getRowHeight(void) { return abs(mHeight); } -int -StaticTableModel::getColumnWidth(int column) +int StaticTableModel::getColumnWidth(int column) { if (column < 0 || column >= mColumns) return 0; @@ -146,14 +135,12 @@ StaticTableModel::getColumnWidth(int column) return abs(mWidths[column]); } -int -StaticTableModel::getRows(void) +int StaticTableModel::getRows(void) { return mRows; } -int -StaticTableModel::getColumns(void) +int StaticTableModel::getColumns(void) { return mColumns; } diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index 7f9abd3a..248afcbf 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "truetypefont.h" - #include #include +#include "truetypefont.h" + #include "../graphics.h" #include "../resources/image.h" @@ -77,7 +75,6 @@ class TextChunk gcn::Color color; }; - // Word surfaces cache static std::list cache; typedef std::list::iterator CacheIterator; @@ -114,8 +111,8 @@ TrueTypeFont::~TrueTypeFont() } void TrueTypeFont::drawString(gcn::Graphics *graphics, - const std::string &text, - int x, int y) + const std::string &text, + int x, int y) { if (text.empty()) { diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index 7a4ee9ac..67c39e6a 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_TRUETYPEFONT_H diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index fab048fc..9311b59b 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -69,8 +69,7 @@ static unsigned long fadler32(FILE *file) /** * Load the given file into a vector of strings. */ -std::vector -loadTextFile(const std::string &fileName) +std::vector loadTextFile(const std::string &fileName) { std::vector lines; std::ifstream fin(fileName.c_str()); @@ -242,8 +241,7 @@ int UpdaterWindow::updateProgress(void *ptr, return 0; } -size_t -UpdaterWindow::memoryWrite(void *ptr, size_t size, size_t nmemb, FILE *stream) +size_t UpdaterWindow::memoryWrite(void *ptr, size_t size, size_t nmemb, FILE *stream) { UpdaterWindow *uw = reinterpret_cast(stream); size_t totalMem = size * nmemb; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 5bb29987..5fcb7dc9 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -46,8 +46,6 @@ extern volatile int tick_time; -extern volatile int tick_time; - Viewport::Viewport(): mMap(0), mPixelViewX(0.0f), diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 87527f0a..6009d5f5 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -56,8 +56,7 @@ ResizeGrip::~ResizeGrip() } } -void -ResizeGrip::draw(gcn::Graphics *graphics) +void ResizeGrip::draw(gcn::Graphics *graphics) { static_cast(graphics)->drawImage(gripImage, 0, 0); } diff --git a/src/gui/window.h b/src/gui/window.h index 89cc75a5..d864290c 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -157,8 +157,7 @@ class Window : public gcn::Window, gcn::WidgetListener * * @return The parent window or NULL if there is none. */ - Window* - getParentWindow() { return mParent; } + Window* getParentWindow() { return mParent; } /** * Schedule this window for deletion. It will be deleted at the start @@ -198,14 +197,12 @@ class Window : public gcn::Window, gcn::WidgetListener /** * Sets the name of the window. This is not the window title. */ - void - setWindowName(const std::string &name) { mWindowName = name; } + void setWindowName(const std::string &name) { mWindowName = name; } /** * Returns the name of the window. This is not the window title. */ - const std::string& - getWindowName() { return mWindowName; } + const std::string& getWindowName() { return mWindowName; } /** * Reads the position (and the size for resizable windows) in the diff --git a/src/item.h b/src/item.h index eb6fed77..bb6fcbdc 100644 --- a/src/item.h +++ b/src/item.h @@ -46,14 +46,12 @@ class Item /** * Sets the item id, identifying the item type. */ - void - setId(int id); + void setId(int id); /** * Returns the item id. */ - int - getId() const { return mId; } + int getId() const { return mId; } /** * Returns the item image. @@ -63,62 +61,52 @@ class Item /** * Sets the number of items. */ - void - setQuantity(int quantity) { mQuantity = quantity; } + void setQuantity(int quantity) { mQuantity = quantity; } /** * Increases the number of items by the given amount. */ - void - increaseQuantity(int amount) { mQuantity += amount; } + void increaseQuantity(int amount) { mQuantity += amount; } /** * Returns the number of items. */ - int - getQuantity() const { return mQuantity; } + int getQuantity() const { return mQuantity; } /** * Sets whether this item is considered equipment. */ - void - setEquipment(bool equipment) { mEquipment = equipment; } + void setEquipment(bool equipment) { mEquipment = equipment; } /** * Returns whether this item is considered equipment. */ - bool - isEquipment() const { return mEquipment; } + bool isEquipment() const { return mEquipment; } /** * Sets whether this item is equipped. */ - void - setEquipped(bool equipped) { mEquipped = equipped; } + void setEquipped(bool equipped) { mEquipped = equipped; } /** * Returns whether this item is equipped. */ - bool - isEquipped() const { return mEquipped; } + bool isEquipped() const { return mEquipped; } /** * Sets the inventory index of this item. */ - void - setInvIndex(int index) { mInvIndex = index; } + void setInvIndex(int index) { mInvIndex = index; } /** * Returns the inventory index of this item. */ - int - getInvIndex() const { return mInvIndex; } + int getInvIndex() const { return mInvIndex; } /** * Returns information about this item type. */ - const ItemInfo& - getInfo() const { return ItemDB::get(mId); } + const ItemInfo& getInfo() const { return ItemDB::get(mId); } protected: int mId; /**< Item type id. */ diff --git a/src/map.h b/src/map.h index 81d0b629..b299fdb5 100644 --- a/src/map.h +++ b/src/map.h @@ -182,8 +182,7 @@ class Map : public Properties /** * Finds the tile set that a tile with the given global id is part of. */ - Tileset* - getTilesetWithGid(int gid) const; + Tileset* getTilesetWithGid(int gid) const; /** * Get tile reference. @@ -203,26 +202,22 @@ class Map : public Properties /** * Returns the width of this map. */ - int - getWidth() const { return mWidth; } + int getWidth() const { return mWidth; } /** * Returns the height of this map. */ - int - getHeight() const { return mHeight; } + int getHeight() const { return mHeight; } /** * Returns the tile width of this map. */ - int - getTileWidth() const { return mTileWidth; } + int getTileWidth() const { return mTileWidth; } /** * Returns the tile height used by this map. */ - int - getTileHeight() const { return mTileHeight; } + int getTileHeight() const { return mTileHeight; } /** * Find a path from one location to the next. @@ -232,14 +227,12 @@ class Map : public Properties /** * Adds a sprite to the map. */ - SpriteIterator - addSprite(Sprite *sprite); + SpriteIterator addSprite(Sprite *sprite); /** * Removes a sprite from the map. */ - void - removeSprite(SpriteIterator iterator); + void removeSprite(SpriteIterator iterator); /** * Adds a particle effect @@ -266,9 +259,8 @@ class Map : public Properties /** * Draws the overlay graphic to the given graphics output. */ - void - drawOverlay(Graphics *graphics, float scrollX, float scrollY, - int detail); + void drawOverlay(Graphics *graphics, float scrollX, float scrollY, + int detail); /** * Tells whether a tile is occupied by a being. diff --git a/src/monster.h b/src/monster.h index cb8f7f18..7a8cd2a7 100644 --- a/src/monster.h +++ b/src/monster.h @@ -62,8 +62,7 @@ class Monster : public Being /** * Returns the MonsterInfo, with static data about this monster. */ - const MonsterInfo& - getInfo() const; + const MonsterInfo& getInfo() const; /** * Determine whether the mob should show it's name diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 345e02fc..387af70c 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -38,15 +38,13 @@ MessageIn::MessageIn(const char *data, unsigned int length): mId = readInt16(); } -Sint8 -MessageIn::readInt8() +Sint8 MessageIn::readInt8() { assert(mPos < mLength); return mData[mPos++]; } -Sint16 -MessageIn::readInt16() +Sint16 MessageIn::readInt16() { assert(mPos + 2 <= mLength); mPos += 2; @@ -57,8 +55,7 @@ MessageIn::readInt16() #endif } -Sint32 -MessageIn::readInt32() +Sint32 MessageIn::readInt32() { assert(mPos + 4 <= mLength); mPos += 4; @@ -69,8 +66,7 @@ MessageIn::readInt32() #endif } -void -MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) +void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) { assert(mPos + 3 <= mLength); @@ -119,8 +115,7 @@ MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) mPos += 3; } -void -MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY, +void MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY, Uint16 &dstX, Uint16 &dstY) { assert(mPos + 5 <= mLength); @@ -142,15 +137,13 @@ MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY, mPos += 5; } -void -MessageIn::skip(unsigned int length) +void MessageIn::skip(unsigned int length) { assert(mPos + length <= mLength); mPos += length; } -std::string -MessageIn::readString(int length) +std::string MessageIn::readString(int length) { // Get string length if (length < 0) { diff --git a/src/net/messagein.h b/src/net/messagein.h index 81db6cdc..90804497 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -43,14 +43,12 @@ class MessageIn /** * Returns the message ID. */ - short - getId() { return mId; } + short getId() { return mId; } /** * Returns the message length. */ - unsigned int - getLength() { return mLength; } + unsigned int getLength() { return mLength; } Sint8 readInt8(); /**< Reads a byte. */ Sint16 readInt16(); /**< Reads a short. */ @@ -60,30 +58,26 @@ class MessageIn * Reads a special 3 byte block used by eAthena, containing x and y * coordinates and direction. */ - void - readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction); + void readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction); /** * Reads a special 5 byte block used by eAthena, containing a source * and destination coordinate pair. */ - void - readCoordinatePair(Uint16 &srcX, Uint16 &srcY, - Uint16 &dstX, Uint16 &dstY); + void readCoordinatePair(Uint16 &srcX, Uint16 &srcY, + Uint16 &dstX, Uint16 &dstY); /** * Skips a given number of bytes. */ - void - skip(unsigned int length); + void skip(unsigned int length); /** * Reads a string. If a length is not given (-1), it is assumed * that the length of the string is stored in a short at the * start of the string. */ - std::string - readString(int length = -1); + std::string readString(int length = -1); private: const char* mData; /**< The message data. */ diff --git a/src/net/network.cpp b/src/net/network.cpp index c9f8d1bd..60d54a7a 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -431,8 +431,7 @@ char *iptostring(int address) return asciiIP; } -void -Network::setError(const std::string& error) +void Network::setError(const std::string& error) { logger->log("Network error: %s", error.c_str()); mError = error; diff --git a/src/net/network.h b/src/net/network.h index 43b4dbbc..6270e0de 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -46,47 +46,33 @@ class Network ~Network(); - bool - connect(const std::string &address, short port); + bool connect(const std::string &address, short port); - void - disconnect(); + void disconnect(); - void - registerHandler(MessageHandler *handler); + void registerHandler(MessageHandler *handler); - void - unregisterHandler(MessageHandler *handler); + void unregisterHandler(MessageHandler *handler); - void - clearHandlers(); + void clearHandlers(); - int - getState() const { return mState; } + int getState() const { return mState; } - const std::string& - getError() const { return mError; } + const std::string& getError() const { return mError; } - bool - isConnected() const { return mState == CONNECTED; } + bool isConnected() const { return mState == CONNECTED; } - int - getInSize() const { return mInSize; } + int getInSize() const { return mInSize; } - void - skip(int len); + void skip(int len); - bool - messageReady(); + bool messageReady(); - MessageIn - getNextMessage(); + MessageIn getNextMessage(); - void - dispatchMessages(); + void dispatchMessages(); - void - flush(); + void flush(); // ERROR replaced by NET_ERROR because already defined in Windows enum { @@ -98,17 +84,13 @@ class Network }; protected: - void - setError(const std::string& error); + void setError(const std::string& error); - Uint16 - readWord(int pos); + Uint16 readWord(int pos); - bool - realConnect(); + bool realConnect(); - void - receive(); + void receive(); TCPsocket mSocket; diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp index 9b5f3080..d4b7455b 100644 --- a/src/net/partyhandler.cpp +++ b/src/net/partyhandler.cpp @@ -50,8 +50,7 @@ PartyHandler::PartyHandler(Party *party) : mParty(party) handledMessages = _messages; } -void -PartyHandler::handleMessage(MessageIn *msg) +void PartyHandler::handleMessage(MessageIn *msg) { switch (msg->getId()) { diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index 83b26743..59c7d0d6 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -264,7 +264,7 @@ void PlayerHandler::handleMessage(MessageIn *msg) Uint32 curGp = player_node->mGp; player_node->mGp = msg->readInt32(); if (player_node->mGp > curGp) - chatWindow->chatLog("You picked up " + + chatWindow->chatLog(_("You picked up ") + toString(player_node->mGp - curGp) + " GP", BY_SERVER); } diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 746e1d06..07134746 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -32,6 +32,8 @@ #include "../gui/confirm_dialog.h" #include "../gui/trade.h" +#include "../utils/gettext.h" + std::string tradePartnerName; /** @@ -86,9 +88,9 @@ void TradeHandler::handleMessage(MessageIn *msg) player_node->setTrading(true); ConfirmDialog *dlg; - dlg = new ConfirmDialog("Request for trade", + dlg = new ConfirmDialog(_("Request for trade"), tradePartnerName + - " wants to trade with you, do you accept?"); + _(" wants to trade with you, do you accept?")); dlg->addActionListener(&listener); } else @@ -102,37 +104,35 @@ void TradeHandler::handleMessage(MessageIn *msg) switch (msg->readInt8()) { case 0: // Too far away - chatWindow->chatLog("Trading isn't possible. " - "Trade partner is too far away.", + chatWindow->chatLog(_("Trading isn't possible. Trade partner is too far away."), BY_SERVER); break; case 1: // Character doesn't exist - chatWindow->chatLog("Trading isn't possible. " - "Character doesn't exist.", + chatWindow->chatLog(_("Trading isn't possible. Character doesn't exist."), BY_SERVER); break; case 2: // Invite request check failed... - chatWindow->chatLog("Trade cancelled due to an " - "unknown reason.", BY_SERVER); + chatWindow->chatLog(_("Trade cancelled due to an unknown reason."), + BY_SERVER); break; case 3: // Trade accepted tradeWindow->reset(); tradeWindow->setCaption( - "Trade: You and " + tradePartnerName); + _("Trade: You and ") + tradePartnerName); tradeWindow->setVisible(true); break; case 4: // Trade cancelled if (player_relations.hasPermission(tradePartnerName, PlayerRelation::SPEECH_LOG)) - chatWindow->chatLog("Trade with " + tradePartnerName + - " cancelled", BY_SERVER); + chatWindow->chatLog(_("Trade with ") + tradePartnerName + + _(" cancelled"), BY_SERVER); // otherwise ignore silently tradeWindow->setVisible(false); player_node->setTrading(false); break; default: // Shouldn't happen as well, but to be sure - chatWindow->chatLog("Unhandled trade cancel packet", + chatWindow->chatLog(_("Unhandled trade cancel packet"), BY_SERVER); break; } @@ -182,19 +182,17 @@ void TradeHandler::handleMessage(MessageIn *msg) break; case 1: // Add item failed - player overweighted - chatWindow->chatLog("Failed adding item. Trade " - "partner is over weighted.", + chatWindow->chatLog(_("Failed adding item. Trade partner is over weighted."), BY_SERVER); break; case 2: // Add item failed - player has no free slot - chatWindow->chatLog("Failed adding item. Trade " - "partner has no free slot.", + chatWindow->chatLog(_("Failed adding item. Trade partner has no free slot."), BY_SERVER); break; default: - chatWindow->chatLog("Failed adding item for " - "unknown reason.", BY_SERVER); + chatWindow->chatLog(_("Failed adding item for unknown reason."), + BY_SERVER); break; } } @@ -206,14 +204,14 @@ void TradeHandler::handleMessage(MessageIn *msg) break; case SMSG_TRADE_CANCEL: - chatWindow->chatLog("Trade canceled.", BY_SERVER); + chatWindow->chatLog(_("Trade canceled."), BY_SERVER); tradeWindow->setVisible(false); tradeWindow->reset(); player_node->setTrading(false); break; case SMSG_TRADE_COMPLETE: - chatWindow->chatLog("Trade completed.", BY_SERVER); + chatWindow->chatLog(_("Trade completed."), BY_SERVER); tradeWindow->setVisible(false); tradeWindow->reset(); player_node->setTrading(false); diff --git a/src/npc.cpp b/src/npc.cpp index 2aa15209..a2fb7d38 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -111,8 +111,7 @@ NPC::getType() const return Being::NPC; } -void -NPC::talk() +void NPC::talk() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_TALK); @@ -121,16 +120,14 @@ NPC::talk() current_npc = this; } -void -NPC::nextDialog() +void NPC::nextDialog() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_NEXT_REQUEST); outMsg.writeInt32(mId); } -void -NPC::dialogChoice(char choice) +void NPC::dialogChoice(char choice) { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_LIST_CHOICE); @@ -142,8 +139,7 @@ NPC::dialogChoice(char choice) * TODO Unify the buy() and sell() methods, without sacrificing readability of * the code calling the method. buy(bool buySell) would be bad... */ -void -NPC::buy() +void NPC::buy() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST); @@ -151,8 +147,7 @@ NPC::buy() outMsg.writeInt8(0); } -void -NPC::sell() +void NPC::sell() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST); diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index fbfb1505..b90db9f1 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -36,8 +36,7 @@ ParticleContainer::~ParticleContainer() delete mNext; } -void -ParticleContainer::clear() +void ParticleContainer::clear() { clearLocally(); if (mNext) @@ -57,8 +56,7 @@ ParticleList::ParticleList(ParticleContainer *parent, bool delParent) : ParticleList::~ParticleList() {} -void -ParticleList::addLocally(Particle *particle) +void ParticleList::addLocally(Particle *particle) { if (particle) { @@ -68,8 +66,7 @@ ParticleList::addLocally(Particle *particle) } } -void -ParticleList::removeLocally(Particle *particle) +void ParticleList::removeLocally(Particle *particle) { for (std::list::iterator it = mElements.begin(); it != mElements.end(); it++) @@ -79,8 +76,7 @@ ParticleList::removeLocally(Particle *particle) } } -void -ParticleList::clearLocally() +void ParticleList::clearLocally() { for (std::list::iterator it = mElements.begin(); it != mElements.end(); it++) @@ -117,8 +113,7 @@ ParticleVector::ParticleVector(ParticleContainer *parent, bool delParent) : ParticleVector::~ParticleVector() {}; -void -ParticleVector::setLocally(int index, Particle *particle) +void ParticleVector::setLocally(int index, Particle *particle) { assert(index >= 0); @@ -130,8 +125,7 @@ ParticleVector::setLocally(int index, Particle *particle) mIndexedElements[index] = particle; } -void -ParticleVector::delLocally(int index) +void ParticleVector::delLocally(int index) { assert(index >= 0); @@ -146,8 +140,7 @@ ParticleVector::delLocally(int index) } } -void -ParticleVector::clearLocally() +void ParticleVector::clearLocally() { for (unsigned int i = 0; i < mIndexedElements.size(); i++) delLocally(i); diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index bdfaa5ba..fef34b22 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -329,8 +329,7 @@ ParticleEmitter::readParticleEmitterProp(xmlNodePtr propertyNode, T def) } -std::list -ParticleEmitter::createParticles(int tick) +std::list ParticleEmitter::createParticles(int tick) { std::list newParticles; diff --git a/src/particleemitter.h b/src/particleemitter.h index 809a6ded..e16ee241 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -70,8 +70,7 @@ class ParticleEmitter /** * Sets the target of the particles that are created */ - void - setTarget(Particle *target) + void setTarget(Particle *target) { mParticleTarget = target; }; private: diff --git a/src/player_relations.cpp b/src/player_relations.cpp index ef00a738..5eb47433 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -91,8 +91,7 @@ PlayerRelationsManager::PlayerRelationsManager() : { } -void -PlayerRelationsManager::clear() +void PlayerRelationsManager::clear() { std::vector *names = getPlayers(); for (std::vector::const_iterator @@ -105,8 +104,7 @@ PlayerRelationsManager::clear() #define PLAYER_IGNORE_STRATEGY "player-ignore-strategy" #define DEFAULT_PERMISSIONS "default-player-permissions" -int -PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name) +int PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name) { std::vector *strategies = getPlayerIgnoreStrategies(); for (unsigned int i = 0; i < strategies->size(); i++) @@ -116,8 +114,7 @@ PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name) return -1; } -void -PlayerRelationsManager::load() +void PlayerRelationsManager::load() { clear(); @@ -134,8 +131,7 @@ PlayerRelationsManager::load() } -void -PlayerRelationsManager::init() +void PlayerRelationsManager::init() { load(); @@ -143,8 +139,7 @@ PlayerRelationsManager::init() clear(); // Yes, we still keep them around in the config file until the next update. } -void -PlayerRelationsManager::store() +void PlayerRelationsManager::store() { config.setList::const_iterator, std::pair, @@ -161,8 +156,7 @@ PlayerRelationsManager::store() config.write(); } -void -PlayerRelationsManager::signalUpdate(const std::string &name) +void PlayerRelationsManager::signalUpdate(const std::string &name) { store(); @@ -170,8 +164,7 @@ PlayerRelationsManager::signalUpdate(const std::string &name) (*it)->updatedPlayer(name); } -unsigned int -PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags) +unsigned int PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags) { PlayerRelation *r = mRelations[player_name]; if (!r) @@ -196,16 +189,14 @@ PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, } } -bool -PlayerRelationsManager::hasPermission(Being *being, unsigned int flags) +bool PlayerRelationsManager::hasPermission(Being *being, unsigned int flags) { if (being->getType() == Being::PLAYER) return hasPermission(being->getName(), flags) == flags; return true; } -bool -PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags) +bool PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags) { unsigned int rejections = flags & ~checkPermissionSilently(name, flags); bool permitted = rejections == 0; @@ -224,8 +215,7 @@ PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flag return permitted; } -void -PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation) +void PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation) { PlayerRelation *r = mRelations[player_name]; if (r == NULL) @@ -236,8 +226,7 @@ PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelati signalUpdate(player_name); } -std::vector * -PlayerRelationsManager::getPlayers() +std::vector * PlayerRelationsManager::getPlayers() { std::vector *retval = new std::vector(); @@ -250,8 +239,7 @@ PlayerRelationsManager::getPlayers() return retval; } -void -PlayerRelationsManager::removePlayer(const std::string &name) +void PlayerRelationsManager::removePlayer(const std::string &name) { if (mRelations[name]) delete mRelations[name]; @@ -262,8 +250,7 @@ PlayerRelationsManager::removePlayer(const std::string &name) } -PlayerRelation::relation -PlayerRelationsManager::getRelation(const std::string &name) +PlayerRelation::relation PlayerRelationsManager::getRelation(const std::string &name) { if (mRelations[name]) return mRelations[name]->mRelation; @@ -274,14 +261,12 @@ PlayerRelationsManager::getRelation(const std::string &name) //////////////////////////////////////// // defaults -unsigned int -PlayerRelationsManager::getDefault() const +unsigned int PlayerRelationsManager::getDefault() const { return mDefaultPermissions; } -void -PlayerRelationsManager::setDefault(unsigned int permissions) +void PlayerRelationsManager::setDefault(unsigned int permissions) { mDefaultPermissions = permissions; @@ -303,8 +288,7 @@ public: mShortName = PLAYER_IGNORE_STRATEGY_NOP; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { } }; @@ -318,8 +302,7 @@ public: mShortName = "dotdotdot"; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { player->setSpeech("...", 5); } @@ -335,8 +318,7 @@ public: mShortName = "blinkname"; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { player->flash(200); } @@ -352,8 +334,7 @@ public: mShortName = shortname; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { player->setEmote(mEmotion, IGNORE_EMOTE_TIME); } diff --git a/src/properties.h b/src/properties.h index 86fffea3..038acd91 100644 --- a/src/properties.h +++ b/src/properties.h @@ -46,8 +46,7 @@ class Properties * @return the value of the given property or the given default when it * doesn't exist. */ - const std::string& - getProperty(const std::string &name, const std::string &def = "") const + const std::string& getProperty(const std::string &name, const std::string &def = "") const { PropertyMap::const_iterator i = mProperties.find(name); return (i != mProperties.end()) ? i->second : def; @@ -81,8 +80,7 @@ class Properties * @return true when a property is defined, * false otherwise. */ - bool - hasProperty(const std::string &name) const + bool hasProperty(const std::string &name) const { return (mProperties.find(name) != mProperties.end()); } @@ -93,8 +91,7 @@ class Properties * @param name The name of the property. * @param value The value of the property. */ - void - setProperty(const std::string &name, const std::string &value) + void setProperty(const std::string &name, const std::string &value) { mProperties[name] = value; } diff --git a/src/resources/action.h b/src/resources/action.h index 09eb066e..5f159a00 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -44,11 +44,9 @@ class Action */ ~Action(); - void - setAnimation(int direction, Animation *animation); + void setAnimation(int direction, Animation *animation); - Animation* - getAnimation(int direction) const; + Animation* getAnimation(int direction) const; protected: typedef std::map Animations; diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 596c5fac..5721c7f0 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -30,22 +30,19 @@ Animation::Animation(): { } -void -Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY) +void Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY) { Frame frame = { image, delay, offsetX, offsetY }; mFrames.push_back(frame); mDuration += delay; } -void -Animation::addTerminator() +void Animation::addTerminator() { addFrame(NULL, 0, 0, 0); } -bool -Animation::isTerminator(const Frame &candidate) +bool Animation::isTerminator(const Frame &candidate) { return (candidate.image == NULL); } diff --git a/src/resources/animation.h b/src/resources/animation.h index 8dfe8614..93e100bd 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -54,39 +54,33 @@ class Animation /** * Appends a new animation at the end of the sequence. */ - void - addFrame(Image *image, unsigned int delay, int offsetX, int offsetY); + void addFrame(Image *image, unsigned int delay, int offsetX, int offsetY); /** * Appends an animation terminator that states that the animation * should not loop. */ - void - addTerminator(); + void addTerminator(); /** * Returns the frame at the specified index. */ - Frame* - getFrame(int index) { return &(mFrames[index]); } + Frame* getFrame(int index) { return &(mFrames[index]); } /** * Returns the length of this animation in frames. */ - unsigned int - getLength() const { return mFrames.size(); } + unsigned int getLength() const { return mFrames.size(); } /** * Returns the duration of this animation. */ - int - getDuration() const { return mDuration; } + int getDuration() const { return mDuration; } /** * Determines whether the given animation frame is a terminator. */ - static bool - isTerminator(const Frame &phase); + static bool isTerminator(const Frame &phase); protected: std::vector mFrames; diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index 1bd98680..8c02735a 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -111,7 +111,7 @@ bool BuddyList::removeBuddy(const std::string buddy) return false; } -int BuddyList::getNumberOfElements() +int BuddyList::getNumberOfElements() { return mBuddylist.size(); } diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h index 6a3de8c4..092abc6a 100644 --- a/src/resources/buddylist.h +++ b/src/resources/buddylist.h @@ -52,7 +52,7 @@ class BuddyList : public gcn::ListModel { /** * Returns the number of buddy on the list */ - int getNumberOfElements(); + int getNumberOfElements(); /** * Returns the buddy of the number or null diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index bdc6211a..f80ca6b3 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -27,6 +27,7 @@ #include "../log.h" #include "../utils/dtor.h" +#include "../utils/gettext.h" #include "../utils/xml.h" #define HAIR_COLOR_FILE "colors.xml" @@ -52,7 +53,7 @@ void ColorDB::load() if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) { - logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE); + logger->log(_("Trying TMW's color file, %s."), TMW_COLOR_FILE); TMWHair = true; @@ -62,7 +63,7 @@ void ColorDB::load() root = doc->rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) { - logger->log("ColorDB: Failed"); + logger->log(_("ColorDB: Failed")); mColors[0] = mFail; mLoaded = true; @@ -79,7 +80,7 @@ void ColorDB::load() if (mColors.find(id) != mColors.end()) { - logger->log("ColorDB: Redefinition of dye ID %d", id); + logger->log(_("ColorDB: Redefinition of dye ID %d"), id); } TMWHair ? mColors[id] = XML::getProperty(node, "value", "#FFFFFF") : @@ -94,7 +95,7 @@ void ColorDB::load() void ColorDB::unload() { - logger->log("Unloading color database..."); + logger->log(_("Unloading color database...")); mColors.clear(); mLoaded = false; @@ -109,7 +110,7 @@ std::string& ColorDB::get(int id) if (i == mColors.end()) { - logger->log("ColorDB: Error, unknown dye ID# %d", id); + logger->log(_("ColorDB: Error, unknown dye ID# %d"), id); return mFail; } else diff --git a/src/resources/image.h b/src/resources/image.h index 6eb33ed9..a2e52d3d 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -55,8 +55,7 @@ class Image : public Resource /** * Destructor. */ - virtual - ~Image(); + virtual ~Image(); /** * Loads an image from a buffer in memory. @@ -89,21 +88,17 @@ class Image : public Resource /** * Frees the resources created by SDL. */ - virtual void - unload(); + virtual void unload(); /** * Returns the width of the image. */ - virtual int - getWidth() const { return mBounds.w; } - + virtual int getWidth() const { return mBounds.w; } /** * Returns the height of the image. */ - virtual int - getHeight() const { return mBounds.h; } + virtual int getHeight() const { return mBounds.h; } /** * Creates a new image with the desired clipping rectangle. @@ -111,20 +106,17 @@ class Image : public Resource * @return NULL if creation failed and a valid * object otherwise. */ - virtual Image* - getSubImage(int x, int y, int width, int height); + virtual Image* getSubImage(int x, int y, int width, int height); /** * Sets the alpha value of this image. */ - void - setAlpha(float alpha); + void setAlpha(float alpha); /** * Returns the alpha value of this image. */ - float - getAlpha(); + float getAlpha(); #ifdef USE_OPENGL /** @@ -134,7 +126,6 @@ class Image : public Resource static void setLoadAsOpenGL(bool useOpenGL); #endif - protected: /** * Constructor. @@ -146,8 +137,7 @@ class Image : public Resource /** * Returns the first power of two equal or bigger than the input. */ - static int - powerOfTwo(int input); + static int powerOfTwo(int input); #endif Image(SDL_Surface *image); @@ -193,8 +183,7 @@ class SubImage : public Image * @return NULL if creation failed and a valid * image otherwise. */ - Image* - getSubImage(int x, int y, int width, int height); + Image* getSubImage(int x, int y, int width, int height); private: Image *mParent; diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index 632e2ae4..0dcc0c33 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -27,5 +27,5 @@ class ImageWriter { public: static bool writePNG(SDL_Surface *surface, - const std::string &filename); + const std::string &filename); }; diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 027b9e16..270083ef 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -49,10 +49,10 @@ void ItemDB::load() if (mLoaded) return; - logger->log("Initializing item database..."); + logger->log(_("Initializing item database...")); mUnknown = new ItemInfo(); - mUnknown->setName("Unknown item"); + mUnknown->setName(_("Unknown item")); mUnknown->setImageName(""); mUnknown->setSprite("error.xml", GENDER_MALE); mUnknown->setSprite("error.xml", GENDER_FEMALE); @@ -62,7 +62,7 @@ void ItemDB::load() if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items")) { - logger->error("ItemDB: Error while loading items.xml!"); + logger->error(_("ItemDB: Error while loading items.xml!")); } for_each_xml_child_node(node, rootNode) @@ -74,12 +74,12 @@ void ItemDB::load() if (id == 0) { - logger->log("ItemDB: Invalid or missing item ID in items.xml!"); + logger->log(_("ItemDB: Invalid or missing item ID in items.xml!")); continue; } else if (mItemInfos.find(id) != mItemInfos.end()) { - logger->log("ItemDB: Redefinition of item ID %d", id); + logger->log(_("ItemDB: Redefinition of item ID %d"), id); } int type = XML::getProperty(node, "type", 0); @@ -139,7 +139,7 @@ void ItemDB::load() void ItemDB::unload() { - logger->log("Unloading item database..."); + logger->log(_("Unloading item database...")); delete mUnknown; mUnknown = NULL; @@ -157,7 +157,7 @@ const ItemInfo& ItemDB::get(int id) if (i == mItemInfos.end()) { - logger->log("ItemDB: Error, unknown item ID# %d", id); + logger->log(_("ItemDB: Error, unknown item ID# %d"), id); return *mUnknown; } else @@ -196,7 +196,7 @@ void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node) } else { - logger->log("ItemDB: Ignoring unknown sound event '%s'", + logger->log(_("ItemDB: Ignoring unknown sound event '%s'"), event.c_str()); } } diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 6f669376..4c04678a 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -22,8 +22,7 @@ #include "itemdb.h" #include "iteminfo.h" -const std::string& -ItemInfo::getSprite(Gender gender) const +const std::string& ItemInfo::getSprite(Gender gender) const { if (mView) { @@ -66,15 +65,12 @@ void ItemInfo::setWeaponType(int type) } } -void -ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename) +void ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename) { mSounds[event].push_back("sfx/" + filename); } - -const std::string& -ItemInfo::getSound(EquipmentSoundEvent event) const +const std::string& ItemInfo::getSound(EquipmentSoundEvent event) const { static const std::string empty; std::map< EquipmentSoundEvent, std::vector >::const_iterator i; diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 7e2d7a1d..92009826 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -25,6 +25,7 @@ #include "../log.h" #include "../utils/dtor.h" +#include "../utils/gettext.h" #include "../utils/xml.h" namespace @@ -34,23 +35,22 @@ namespace bool mLoaded = false; } -void -MonsterDB::load() +void MonsterDB::load() { if (mLoaded) return; mUnknown.addSprite("error.xml"); - mUnknown.setName("unnamed"); + mUnknown.setName(_("unnamed")); - logger->log("Initializing monster database..."); + logger->log(_("Initializing monster database...")); XML::Document doc("monsters.xml"); xmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters")) { - logger->error("Monster Database: Error while loading monster.xml!"); + logger->error(_("Monster Database: Error while loading monster.xml!")); } //iterate s @@ -81,7 +81,7 @@ MonsterDB::load() } else { - logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one", + logger->log(_("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"), targetCursor.c_str(), currentInfo->getName().c_str()); currentInfo->setTargetCursorSize(Being::TC_MEDIUM); } @@ -118,7 +118,7 @@ MonsterDB::load() } else { - logger->log("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s", + logger->log(_("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"), filename, event.c_str(), currentInfo->getName().c_str()); } } @@ -156,7 +156,7 @@ const MonsterInfo &MonsterDB::get(int id) if (i == mMonsterInfos.end()) { - logger->log("MonsterDB: Warning, unknown monster ID %d requested", id); + logger->log(_("MonsterDB: Warning, unknown monster ID %d requested"), id); return mUnknown; } else diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index f1d69e72..2e186c15 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -31,11 +31,9 @@ */ namespace MonsterDB { - void - load(); + void load(); - void - unload(); + void unload(); const MonsterInfo& get(int id); diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 4a71a122..faa759af 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -36,8 +36,7 @@ MonsterInfo::~MonsterInfo() } -void -MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) +void MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) { if (mSounds.find(event) == mSounds.end()) { @@ -48,8 +47,7 @@ MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) } -std::string -MonsterInfo::getSound(MonsterSoundEvent event) const +std::string MonsterInfo::getSound(MonsterSoundEvent event) const { std::map* >::const_iterator i; diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index 05a78c5a..8d36cc06 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -56,43 +56,35 @@ class MonsterInfo */ ~MonsterInfo(); - void - setName(std::string name) { mName = name; } + void setName(std::string name) { mName = name; } - void - addSprite(std::string filename) { mSprites.push_back(filename); } + void addSprite(std::string filename) { mSprites.push_back(filename); } - void - setTargetCursorSize(Being::TargetCursorSize targetCursorSize) + void setTargetCursorSize(Being::TargetCursorSize targetCursorSize) { mTargetCursorSize = targetCursorSize; } - void - addSound(MonsterSoundEvent event, std::string filename); + void addSound(MonsterSoundEvent event, std::string filename); - void - addParticleEffect(std::string filename); + void addParticleEffect(std::string filename); - const std::string& - getName() const { return mName; } + const std::string& getName() const + { return mName; } - const std::list& - getSprites() const { return mSprites; } + const std::list& getSprites() const + { return mSprites; } - Being::TargetCursorSize - getTargetCursorSize() const { return mTargetCursorSize; } + Being::TargetCursorSize getTargetCursorSize() const + { return mTargetCursorSize; } - std::string - getSound(MonsterSoundEvent event) const; + std::string getSound(MonsterSoundEvent event) const; - std::string - getAttackParticleEffect() const { return mAttackParticle; } + std::string getAttackParticleEffect() const { return mAttackParticle; } - void - addAttackParticleEffect(const std::string &particleEffect) + void addAttackParticleEffect(const std::string &particleEffect) { mAttackParticle = particleEffect; } - const std::list& - getParticleEffects() const { return mParticleEffects; } + const std::list& getParticleEffects() const + { return mParticleEffects; } private: std::string mName; diff --git a/src/resources/music.cpp b/src/resources/music.cpp index 2386aa43..ed71d62c 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -55,8 +55,7 @@ Resource *Music::load(void *buffer, unsigned bufferSize) } } -bool -Music::play(int loops) +bool Music::play(int loops) { /* * Warning: loops should be always set to -1 (infinite) with current @@ -71,8 +70,7 @@ Music::play(int loops) return mChannel != -1; } -void -Music::stop() +void Music::stop() { /* * Warning: very dungerous trick, it could try to stop channels occupied diff --git a/src/resources/music.h b/src/resources/music.h index d50150b8..322cfecd 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -56,14 +56,12 @@ class Music : public Resource * @return true if the playback started properly * false otherwise. */ - virtual bool - play(int loops); + virtual bool play(int loops); /** * Stops the music. */ - virtual void - stop(); + virtual void stop(); protected: /** diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index 3ae58067..bfa22214 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -25,6 +25,7 @@ #include "../log.h" #include "../utils/dtor.h" +#include "../utils/gettext.h" #include "../utils/xml.h" namespace @@ -44,14 +45,14 @@ void NPCDB::load() unknownSprite->variant = 0; mUnknown.sprites.push_back(unknownSprite); - logger->log("Initializing NPC database..."); + logger->log(_("Initializing NPC database...")); XML::Document doc("npcs.xml"); xmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs")) { - logger->error("NPC Database: Error while loading items.xml!"); + logger->error(_("NPC Database: Error while loading npcs.xml!")); } //iterate s @@ -63,7 +64,7 @@ void NPCDB::load() int id = XML::getProperty(npcNode, "id", 0); if (id == 0) { - logger->log("NPC Database: NPC with missing ID in npcs.xml!"); + logger->log(_("NPC Database: NPC with missing ID in npcs.xml!")); continue; } @@ -90,8 +91,7 @@ void NPCDB::load() mLoaded = true; } -void -NPCDB::unload() +void NPCDB::unload() { for ( NPCInfosIterator i = mNPCInfos.begin(); i != mNPCInfos.end(); @@ -116,14 +116,13 @@ NPCDB::unload() mLoaded = false; } -const NPCInfo& -NPCDB::get(int id) +const NPCInfo& NPCDB::get(int id) { NPCInfosIterator i = mNPCInfos.find(id); if (i == mNPCInfos.end()) { - logger->log("NPCDB: Warning, unknown NPC ID %d requested", id); + logger->log(_("NPCDB: Warning, unknown NPC ID %d requested"), id); return mUnknown; } else diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index b4539866..1883d747 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -45,11 +45,9 @@ typedef std::map NPCInfos; */ namespace NPCDB { - void - load(); + void load(); - void - unload(); + void unload(); const NPCInfo& get(int id); diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index e9310905..82562691 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -28,14 +28,12 @@ Resource::~Resource() { } -void -Resource::incRef() +void Resource::incRef() { mRefCount++; } -void -Resource::decRef() +void Resource::decRef() { // Reference may not already have reached zero assert(mRefCount != 0); diff --git a/src/resources/resource.h b/src/resources/resource.h index e85e3147..168fd70a 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -41,8 +41,7 @@ class Resource /** * Increments the internal reference count. */ - void - incRef(); + void incRef(); /** * Decrements the reference count and deletes the object @@ -51,8 +50,7 @@ class Resource * @return true if the object was deleted * false otherwise. */ - void - decRef(); + void decRef(); /** * Return the path identifying this resource. diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index a317e445..99b84506 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -418,8 +418,7 @@ void *ResourceManager::loadFile(const std::string &fileName, int &fileSize) return buffer; } -std::vector -ResourceManager::loadTextFile(const std::string &fileName) +std::vector ResourceManager::loadTextFile(const std::string &fileName) { int contentsLength; char *fileContents = (char*)loadFile(fileName, contentsLength); diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index e21fd2b0..f7b2b874 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -47,8 +47,7 @@ Resource *SoundEffect::load(void *buffer, unsigned bufferSize) } } -bool -SoundEffect::play(int loops, int volume) +bool SoundEffect::play(int loops, int volume) { Mix_VolumeChunk(mChunk, volume); diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index c3ff6668..b9abefd7 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -58,8 +58,7 @@ class SoundEffect : public Resource * @return true if the playback started properly * false otherwise. */ - virtual bool - play(int loops, int volume); + virtual bool play(int loops, int volume); protected: /** diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index b4193fd3..41b1e789 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -32,8 +32,7 @@ #include "../log.h" #include "../utils/xml.h" -Action* -SpriteDef::getAction(SpriteAction action) const +Action* SpriteDef::getAction(SpriteAction action) const { Actions::const_iterator i = mActions.find(action); @@ -146,8 +145,7 @@ void SpriteDef::loadImageSet(xmlNodePtr node, std::string const &palettes) mImageSets[name] = imageSet; } -void -SpriteDef::loadAction(xmlNodePtr node, int variant_offset) +void SpriteDef::loadAction(xmlNodePtr node, int variant_offset) { const std::string actionName = XML::getProperty(node, "name", ""); const std::string imageSetName = XML::getProperty(node, "imageset", ""); @@ -187,10 +185,9 @@ SpriteDef::loadAction(xmlNodePtr node, int variant_offset) } } -void -SpriteDef::loadAnimation(xmlNodePtr animationNode, - Action *action, ImageSet *imageSet, - int variant_offset) +void SpriteDef::loadAnimation(xmlNodePtr animationNode, + Action *action, ImageSet *imageSet, + int variant_offset) { const std::string directionName = XML::getProperty(animationNode, "direction", ""); @@ -267,8 +264,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, } // for frameNode } -void -SpriteDef::includeSprite(xmlNodePtr includeNode) +void SpriteDef::includeSprite(xmlNodePtr includeNode) { // TODO: Perform circular dependency check, since it's easy to crash the // client this way. @@ -289,8 +285,7 @@ SpriteDef::includeSprite(xmlNodePtr includeNode) loadSprite(rootNode, 0); } -void -SpriteDef::substituteAction(SpriteAction complete, SpriteAction with) +void SpriteDef::substituteAction(SpriteAction complete, SpriteAction with) { if (mActions.find(complete) == mActions.end()) { @@ -324,8 +319,7 @@ SpriteDef::~SpriteDef() } } -SpriteAction -SpriteDef::makeSpriteAction(const std::string& action) +SpriteAction SpriteDef::makeSpriteAction(const std::string& action) { if (action == "" || action == "default") { return ACTION_DEFAULT; @@ -377,8 +371,7 @@ SpriteDef::makeSpriteAction(const std::string& action) } } -SpriteDirection -SpriteDef::makeSpriteDirection(const std::string& direction) +SpriteDirection SpriteDef::makeSpriteDirection(const std::string& direction) { if (direction == "" || direction == "default") { return DIRECTION_DEFAULT; diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 4b712340..033de6cd 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -103,22 +103,19 @@ class SpriteDef : public Resource /** * Loads an action element. */ - void - loadAction(xmlNodePtr node, int variant_offset); + void loadAction(xmlNodePtr node, int variant_offset); /** * Loads an animation element. */ - void - loadAnimation(xmlNodePtr animationNode, - Action *action, ImageSet *imageSet, - int variant_offset); + void loadAnimation(xmlNodePtr animationNode, + Action *action, ImageSet *imageSet, + int variant_offset); /** * Include another sprite into this one. */ - void - includeSprite(xmlNodePtr includeNode); + void includeSprite(xmlNodePtr includeNode); /** * Complete missing actions by copying existing ones. @@ -129,21 +126,17 @@ class SpriteDef : public Resource * When there are no animations defined for the action "complete", its * animations become a copy of those of the action "with". */ - void - substituteAction(SpriteAction complete, SpriteAction with); + void substituteAction(SpriteAction complete, SpriteAction with); /** * Converts a string into a SpriteAction enum. */ - static SpriteAction - makeSpriteAction(const std::string &action); + static SpriteAction makeSpriteAction(const std::string &action); /** * Converts a string into a SpriteDirection enum. */ - static SpriteDirection - makeSpriteDirection(const std::string &direction); - + static SpriteDirection makeSpriteDirection(const std::string &direction); typedef std::map ImageSets; typedef ImageSets::iterator ImageSetIterator; diff --git a/src/sprite.h b/src/sprite.h index 0e0a95db..52825db2 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -44,30 +44,26 @@ class Sprite * would support setting a translation offset. It already does this * partly with the clipping rectangle support. */ - virtual void - draw(Graphics *graphics, int offsetX, int offsetY) const = 0; + virtual void draw(Graphics *graphics, int offsetX, int offsetY) const = 0; /** * Returns the horizontal size of the sprites graphical representation * in pixels or 0 when it is undefined. */ - virtual int - getWidth() const + virtual int getWidth() const { return 0; } /** * Returns the vertical size of the sprites graphical representation * in pixels or 0 when it is undefined. */ - virtual int - getHeight() const + virtual int getHeight() const { return 0; } /** * Returns the pixel Y coordinate of the sprite. */ - virtual int - getPixelY() const = 0; + virtual int getPixelY() const = 0; }; #endif diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index e511ced3..db78d08c 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -61,8 +61,7 @@ namespace XML return mDoc ? xmlDocGetRootElement(mDoc) : 0; } - int - getProperty(xmlNodePtr node, const char* name, int def) + int getProperty(xmlNodePtr node, const char* name, int def) { int &ret = def; @@ -75,8 +74,7 @@ namespace XML return ret; } - double - getFloatProperty(xmlNodePtr node, const char* name, double def) + double getFloatProperty(xmlNodePtr node, const char* name, double def) { double &ret = def; @@ -89,8 +87,7 @@ namespace XML return ret; } - std::string - getProperty(xmlNodePtr node, const char *name, const std::string &def) + std::string getProperty(xmlNodePtr node, const char *name, const std::string &def) { xmlChar *prop = xmlGetProp(node, BAD_CAST name); if (prop) { diff --git a/src/utils/xml.h b/src/utils/xml.h index 9e691963..403fe6d9 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -71,20 +71,17 @@ namespace XML /** * Gets an integer property from an xmlNodePtr. */ - int - getProperty(xmlNodePtr node, const char *name, int def); + int getProperty(xmlNodePtr node, const char *name, int def); /** * Gets an floating point property from an xmlNodePtr. */ - double - getFloatProperty(xmlNodePtr node, const char *name, double def); + double getFloatProperty(xmlNodePtr node, const char *name, double def); /** * Gets a string property from an xmlNodePtr. */ - std::string - getProperty(xmlNodePtr node, const char *name, const std::string &def); + std::string getProperty(xmlNodePtr node, const char *name, const std::string &def); /** * Finds the first child node with the given name -- cgit v1.2.3-70-g09d2 From 0a18932056e2a72f41cdd14c831344ad80cfb35b Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Thu, 15 Jan 2009 19:48:00 -0700 Subject: Added emote database, which is loosely based off of the NPC database. Also changed all emotes to be animated sprites now, and to load from emotes.xml. This gives us a bit more flexibility to not only add more emotes in the future, but allowing them to be animated as well. NOTE: This commit, unlike the previous emote commits, breaks emotes if you don't have the xml file. This will be available on Aethyra soon, but is not rolled into an update at the moment. Signed-off-by: Ira Rice --- po/POTFILES.in | 1 + src/CMakeLists.txt | 2 + src/Makefile.am | 3 +- src/being.cpp | 26 ++++--- src/being.h | 4 +- src/gui/emotecontainer.cpp | 29 +++++--- src/gui/emotecontainer.h | 6 +- src/gui/emoteshortcutcontainer.cpp | 42 +++++++---- src/gui/emoteshortcutcontainer.h | 7 +- src/gui/emotewindow.cpp | 10 +-- src/gui/emotewindow.h | 2 +- src/main.cpp | 7 +- src/npc.cpp | 3 +- src/npc.h | 3 +- src/resources/emotedb.cpp | 148 +++++++++++++++++++++++++++++++++++++ src/resources/emotedb.h | 62 ++++++++++++++++ src/resources/npcdb.cpp | 2 +- 17 files changed, 301 insertions(+), 56 deletions(-) create mode 100644 src/resources/emotedb.cpp create mode 100644 src/resources/emotedb.h (limited to 'src/being.cpp') diff --git a/po/POTFILES.in b/po/POTFILES.in index a3a9f01c..534bdd70 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -39,6 +39,7 @@ src/gui/updatewindow.cpp src/net/playerhandler.cpp src/net/tradehandler.cpp src/resources/colordb.cpp +src/resources/emotedb.cpp src/resources/itemdb.cpp src/resources/monsterdb.cpp src/resources/npcdb.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 657d8e6b..dbdd64b6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -233,6 +233,8 @@ SET(SRCS resources/colordb.h resources/dye.cpp resources/dye.h + resources/emotedb.cpp + resources/emotedb.h resources/image.cpp resources/image.h resources/imageloader.cpp diff --git a/src/Makefile.am b/src/Makefile.am index a54bb5c8..5c519832 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -131,7 +131,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/speechbubble.h \ gui/status.cpp \ gui/status.h \ - gui/table.h \ gui/table.cpp \ gui/table.h \ gui/table_model.cpp \ @@ -200,6 +199,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ resources/colordb.h \ resources/dye.cpp \ resources/dye.h \ + resources/emotedb.cpp \ + resources/emotedb.h \ resources/image.cpp \ resources/image.h \ resources/imageloader.cpp \ diff --git a/src/being.cpp b/src/being.cpp index 69da1182..883344d8 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -35,6 +35,7 @@ #include "sound.h" #include "text.h" +#include "resources/emotedb.h" #include "resources/imageset.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" @@ -50,7 +51,7 @@ int Being::instances = 0; int Being::mNumberOfHairstyles = 1; -ImageSet *Being::emotionSet = NULL; +std::vector Being::emotionSet; static const int X_SPEECH_OFFSET = 18; static const int Y_SPEECH_OFFSET = 60; @@ -87,10 +88,18 @@ Being::Being(int id, int job, Map *map): if (instances == 0) { - // Load the emotion set - ResourceManager *rm = ResourceManager::getInstance(); - emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32); - if (!emotionSet) logger->error(_("Unable to load emotions")); + // Setup emote sprites + for (int i = 0; i <= EmoteDB::getLast(); i++) + { + EmoteInfo info = EmoteDB::get(i); + + if (info.sprites != EmoteDB::getUnknown().sprites) + { + std::string file = "graphics/sprites/" + info.sprites.front()->sprite; + int variant = info.sprites.front()->variant; + emotionSet.push_back(AnimatedSprite::load(file, variant)); + } + } // Hairstyles are encoded as negative numbers. Count how far negative we can go. int hairstyles = 1; @@ -117,8 +126,7 @@ Being::~Being() if (instances == 0) { - emotionSet->decRef(); - emotionSet = NULL; + delete_all(emotionSet); } delete mSpeechBubble; @@ -448,8 +456,8 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) const int py = mPy + offsetY - 60; const int emotionIndex = mEmotion - 1; - if (emotionIndex >= 0 && emotionIndex < (int) emotionSet->size()) - graphics->drawImage(emotionSet->get(emotionIndex), px, py); + if (emotionIndex >= 0 && emotionIndex < EmoteDB::getLast()) + emotionSet[emotionIndex]->draw(graphics, px, py); } void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) diff --git a/src/being.h b/src/being.h index 54c9d717..4534b1ea 100644 --- a/src/being.h +++ b/src/being.h @@ -431,8 +431,8 @@ class Being : public Sprite // Speech Bubble components SpeechBubble *mSpeechBubble; - static int instances; /**< Number of Being instances */ - static ImageSet *emotionSet; /**< Emoticons used by beings */ + static int instances; /**< Number of Being instances */ + static std::vector emotionSet; /**< Emoticons used by beings */ }; #endif diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp index c3e20c41..691211ca 100644 --- a/src/gui/emotecontainer.cpp +++ b/src/gui/emotecontainer.cpp @@ -25,14 +25,17 @@ #include "emotecontainer.h" #include "emoteshortcut.h" +#include "../animatedsprite.h" #include "../configuration.h" #include "../graphics.h" #include "../log.h" +#include "../resources/emotedb.h" #include "../resources/image.h" #include "../resources/iteminfo.h" #include "../resources/resourcemanager.h" +#include "../utils/dtor.h" #include "../utils/gettext.h" #include "../utils/tostring.h" @@ -46,15 +49,25 @@ EmoteContainer::EmoteContainer(): { ResourceManager *resman = ResourceManager::getInstance(); - mEmoteImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32); - if (!mEmoteImg) logger->error(_("Unable to load emotions")); + // Setup emote sprites + for (int i = 0; i <= EmoteDB::getLast(); i++) + { + EmoteInfo info = EmoteDB::get(i); + + if (info.sprites != EmoteDB::getUnknown().sprites) + { + std::string file = "graphics/sprites/" + info.sprites.front()->sprite; + int variant = info.sprites.front()->variant; + mEmoteImg.push_back(AnimatedSprite::load(file, variant)); + } + } mSelImg = resman->getImage("graphics/gui/selection.png"); if (!mSelImg) logger->error(_("Unable to load selection.png")); mSelImg->setAlpha(config.getValue("guialpha", 0.8)); - mMaxEmote = mEmoteImg->size(); + mMaxEmote = EmoteDB::getLast() + 1; addMouseListener(this); addWidgetListener(this); @@ -62,11 +75,8 @@ EmoteContainer::EmoteContainer(): EmoteContainer::~EmoteContainer() { - if (mEmoteImg) - { - mEmoteImg->decRef(); - mEmoteImg = NULL; - } + delete_all(mEmoteImg); + if (!mSelImg) { mSelImg->decRef(); @@ -90,8 +100,7 @@ void EmoteContainer::draw(gcn::Graphics *graphics) int emoteY = ((i) / columns) * gridHeight; // Draw emote icon - static_cast(graphics)->drawImage( - mEmoteImg->get(i), emoteX, emoteY); + mEmoteImg[i]->draw(static_cast(graphics), emoteX, emoteY); // Draw selection image below selected item if (mSelectedEmoteIndex == i) diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h index 2a115f0b..2231e01a 100644 --- a/src/gui/emotecontainer.h +++ b/src/gui/emotecontainer.h @@ -23,6 +23,7 @@ #define _AETHYRA_EMOTECONTAINER_H__ #include +#include #include #include @@ -30,8 +31,7 @@ #include "../guichanfwd.h" -#include "../resources/imageset.h" - +class AnimatedSprite; class Image; namespace gcn { @@ -123,7 +123,7 @@ class EmoteContainer : public gcn::Widget, */ void distributeValueChangedEvent(void); - ImageSet *mEmoteImg; + std::vector mEmoteImg; Image *mSelImg; int mSelectedEmoteIndex; diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp index de9f8bab..edaa8602 100644 --- a/src/gui/emoteshortcutcontainer.cpp +++ b/src/gui/emoteshortcutcontainer.cpp @@ -21,6 +21,7 @@ #include "emoteshortcutcontainer.h" +#include "../animatedsprite.h" #include "../emoteshortcut.h" #include "../graphics.h" #include "../inventory.h" @@ -30,12 +31,16 @@ #include "../localplayer.h" #include "../log.h" +#include "../resources/emotedb.h" #include "../resources/image.h" #include "../resources/resourcemanager.h" +#include "../utils/dtor.h" #include "../utils/gettext.h" #include "../utils/tostring.h" +static const int MAX_ITEMS = 12; + EmoteShortcutContainer::EmoteShortcutContainer(): mEmoteClicked(false), mEmoteMoved(0) @@ -48,10 +53,21 @@ EmoteShortcutContainer::EmoteShortcutContainer(): ResourceManager *resman = ResourceManager::getInstance(); mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png"); - mEmoteImg = resman->getImageSet("graphics/sprites/emotions.png", 30, 32); - if (!mEmoteImg) logger->error(_("Unable to load emotions")); - mMaxItems = emoteShortcut->getEmoteCount(); + // Setup emote sprites + for (int i = 0; i <= EmoteDB::getLast(); i++) + { + EmoteInfo info = EmoteDB::get(i); + + if (info.sprites != EmoteDB::getUnknown().sprites) + { + std::string file = "graphics/sprites/" + info.sprites.front()->sprite; + int variant = info.sprites.front()->variant; + mEmoteImg.push_back(AnimatedSprite::load(file, variant)); + } + } + + mMaxItems = MAX_ITEMS; mBoxHeight = mBackgroundImg->getHeight(); mBoxWidth = mBackgroundImg->getWidth(); @@ -60,11 +76,8 @@ EmoteShortcutContainer::EmoteShortcutContainer(): EmoteShortcutContainer::~EmoteShortcutContainer() { mBackgroundImg->decRef(); - if (mEmoteImg) - { - mEmoteImg->decRef(); - mEmoteImg=NULL; - } + + delete_all(mEmoteImg); } void EmoteShortcutContainer::draw(gcn::Graphics *graphics) @@ -88,21 +101,20 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics) if (emoteShortcut->getEmote(i)) { - static_cast(graphics)->drawImage( - mEmoteImg->get(emoteShortcut->getEmote(i) - 1), emoteX + 2, emoteY + 10); + mEmoteImg[emoteShortcut->getEmote(i) - 1]->draw(g, emoteX + 2, emoteY + 10); } } if (mEmoteMoved) { // Draw the emote image being dragged by the cursor. - Image* image = mEmoteImg->get(mEmoteMoved-1); - if (image) + AnimatedSprite* sprite = mEmoteImg[mEmoteMoved - 1]; + if (sprite) { - const int tPosX = mCursorPosX - (image->getWidth() / 2); - const int tPosY = mCursorPosY - (image->getHeight() / 2); + const int tPosX = mCursorPosX - (sprite->getWidth() / 2); + const int tPosY = mCursorPosY - (sprite->getHeight() / 2); - g->drawImage(image, tPosX, tPosY); + sprite->draw(g, tPosX, tPosY); } } } diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h index 5b3f61cd..f8a07dcc 100644 --- a/src/gui/emoteshortcutcontainer.h +++ b/src/gui/emoteshortcutcontainer.h @@ -22,6 +22,8 @@ #ifndef _AETHYRA_EMOTESHORTCUTCONTAINER_H__ #define _AETHYRA_EMOTESHORTCUTCONTAINER_H__ +#include + #include #include #include @@ -30,8 +32,7 @@ #include "../guichanfwd.h" -#include "../resources/imageset.h" - +class AnimatedSprite; class Image; /** @@ -73,7 +74,7 @@ class EmoteShortcutContainer : public ShortcutContainer void mouseReleased(gcn::MouseEvent &event); private: - ImageSet *mEmoteImg; + std::vector mEmoteImg; bool mEmoteClicked; int mEmoteMoved; diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp index af9648ef..9639d9b6 100644 --- a/src/gui/emotewindow.cpp +++ b/src/gui/emotewindow.cpp @@ -48,13 +48,13 @@ EmoteWindow::EmoteWindow(): mEmotes = new EmoteContainer(); mEmotes->addSelectionListener(this); - mInvenScroll = new ScrollArea(mEmotes); - mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); + mEmoteScroll = new ScrollArea(mEmotes); + mEmoteScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); draw(); add(mUseButton); - add(mInvenScroll); + add(mEmoteScroll); mUseButton->setSize(60, mUseButton->getHeight()); @@ -80,8 +80,8 @@ void EmoteWindow::draw() mUseButton->setPosition(8, height - 8 - mUseButton->getHeight()); - mInvenScroll->setSize(width - 16, mUseButton->getY() - 18); - mInvenScroll->setPosition(8, 10); + mEmoteScroll->setSize(width - 16, mUseButton->getY() - 18); + mEmoteScroll->setPosition(8, 10); setMinHeight(130); } diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h index dbe4efd7..a996db99 100644 --- a/src/gui/emotewindow.h +++ b/src/gui/emotewindow.h @@ -70,7 +70,7 @@ class EmoteWindow : public Window, gcn::ActionListener, EmoteContainer *mEmotes; gcn::Button *mUseButton; - gcn::ScrollArea *mInvenScroll; + gcn::ScrollArea *mEmoteScroll; }; extern EmoteWindow *emoteWindow; diff --git a/src/main.cpp b/src/main.cpp index 61b90b12..a1109092 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -74,6 +74,7 @@ #include "net/network.h" #include "resources/colordb.h" +#include "resources/emotedb.h" #include "resources/image.h" #include "resources/itemdb.h" #include "resources/monsterdb.h" @@ -402,7 +403,7 @@ void init_engine(const Options &options) // Initialize the item shortcuts. itemShortcut = new ItemShortcut(); - + // Initialize the emote shortcuts. emoteShortcut = new EmoteShortcut(); @@ -437,7 +438,6 @@ void exit_engine() { // Before config.write() since it writes the shortcuts to the config delete itemShortcut; - delete emoteShortcut; config.write(); @@ -453,6 +453,7 @@ void exit_engine() // Unload XML databases ColorDB::unload(); + EmoteDB::unload(); ItemDB::unload(); MonsterDB::unload(); NPCDB::unload(); @@ -903,6 +904,8 @@ int main(int argc, char *argv[]) ItemDB::load(); MonsterDB::load(); NPCDB::load(); + EmoteDB::load(); + state = CHAR_CONNECT_STATE; break; diff --git a/src/npc.cpp b/src/npc.cpp index a2fb7d38..a9aa216c 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -105,8 +105,7 @@ void NPC::setSprite(int slot, int id, std::string color) Being::setSprite(slot, id, color); } -Being::Type -NPC::getType() const +Being::Type NPC::getType() const { return Being::NPC; } diff --git a/src/npc.h b/src/npc.h index 6e150e2b..af1dfc66 100644 --- a/src/npc.h +++ b/src/npc.h @@ -39,8 +39,7 @@ class NPC : public Player void setGender(Gender gender); void setSprite(int slot, int id, std::string color); - virtual Type - getType() const; + virtual Type getType() const; void talk(); void nextDialog(); diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp new file mode 100644 index 00000000..03096eff --- /dev/null +++ b/src/resources/emotedb.cpp @@ -0,0 +1,148 @@ +/* + * Aethyra + * Copyright 2009 Aethyra Development Team + * + * This file is part of Aethyra. + * + * Aethyra 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, + * 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, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "emotedb.h" +#include "resourcemanager.h" + +#include "../log.h" + +#include "../utils/dtor.h" +#include "../utils/gettext.h" +#include "../utils/xml.h" + +namespace +{ + EmoteInfos mEmoteInfos; + EmoteInfo mUnknown; + bool mLoaded = false; + int mLastEmote = 0; +} + +void EmoteDB::load() +{ + if (mLoaded) + return; + + mLastEmote = 0; + + EmoteSprite *unknownSprite = new EmoteSprite; + unknownSprite->sprite = "error.xml"; + unknownSprite->name = "unknown"; + unknownSprite->variant = 0; + mUnknown.sprites.push_back(unknownSprite); + + logger->log(_("Initializing emote database...")); + + XML::Document doc("emotes.xml"); + xmlNodePtr rootNode = doc.rootNode(); + + if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes")) + { + logger->log(_("Emote Database: Error while loading emotes.xml!")); + return; + } + + //iterate s + for_each_xml_child_node(emoteNode, rootNode) + { + if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote")) + continue; + + int id = XML::getProperty(emoteNode, "id", -1); + if (id == -1) + { + logger->log(_("Emote Database: Emote with missing ID in emotes.xml!")); + continue; + } + + EmoteInfo *currentInfo = new EmoteInfo; + + for_each_xml_child_node(spriteNode, emoteNode) + { + if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + { + EmoteSprite *currentSprite = new EmoteSprite; + currentSprite->sprite = (const char*) spriteNode->xmlChildrenNode->content; + currentSprite->variant = XML::getProperty(spriteNode, "variant", 0); + currentInfo->sprites.push_back(currentSprite); + } + else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + { + std::string particlefx = (const char*) spriteNode->xmlChildrenNode->content; + currentInfo->particles.push_back(particlefx); + } + } + mEmoteInfos[id] = currentInfo; + if (id > mLastEmote) mLastEmote = id; + } + + mLoaded = true; +} + +void EmoteDB::unload() +{ + for ( EmoteInfosIterator i = mEmoteInfos.begin(); + i != mEmoteInfos.end(); + i++) + { + while (!i->second->sprites.empty()) + { + delete i->second->sprites.front(); + i->second->sprites.pop_front(); + } + delete i->second; + } + + mEmoteInfos.clear(); + + while (!mUnknown.sprites.empty()) + { + delete mUnknown.sprites.front(); + mUnknown.sprites.pop_front(); + } + + mLoaded = false; +} + +const EmoteInfo& EmoteDB::get(int id) +{ + EmoteInfosIterator i = mEmoteInfos.find(id); + + if (i == mEmoteInfos.end()) + { + logger->log(_("EmoteDB: Warning, unknown emote ID %d requested"), id); + return mUnknown; + } + else + { + return *(i->second); + } +} + +const EmoteInfo& EmoteDB::getUnknown() +{ + return mUnknown; +} + +const int& EmoteDB::getLast() +{ + return mLastEmote; +} diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h new file mode 100644 index 00000000..9e904cc1 --- /dev/null +++ b/src/resources/emotedb.h @@ -0,0 +1,62 @@ +/* + * Aethyra + * Copyright 2009 Aethyra Development Team + * + * This file is part of Aethyra. + * + * Aethyra 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, + * 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, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _AETHYRA_EMOTE_DB_H +#define _AETHYRA_EMOTE_DB_H + +#include +#include +#include + +struct EmoteSprite +{ + std::string sprite; + std::string name; + int variant; +}; + +struct EmoteInfo +{ + std::list sprites; + std::list particles; +}; + +typedef std::map EmoteInfos; + +/** + * Emote information database. + */ +namespace EmoteDB +{ + void load(); + + void unload(); + + const EmoteInfo& get(int id); + + const EmoteInfo& getUnknown(); + + const int& getLast(); + + typedef EmoteInfos::iterator EmoteInfosIterator; +} + +#endif diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index bfa22214..0908d67d 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -55,7 +55,7 @@ void NPCDB::load() logger->error(_("NPC Database: Error while loading npcs.xml!")); } - //iterate s + //iterate s for_each_xml_child_node(npcNode, rootNode) { if (!xmlStrEqual(npcNode->name, BAD_CAST "npc")) -- cgit v1.2.3-70-g09d2 From 50335c6b1470c45753d720cebdf4af830ba7a46c Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Fri, 16 Jan 2009 08:36:33 -0700 Subject: Made emotes load in only one location, as well as fixing the code on the being so that the last emote draws (which got broken). Signed-off-by: Ira Rice --- src/being.cpp | 11 ++++------- src/being.h | 2 ++ src/gui/emotecontainer.cpp | 10 ++-------- src/gui/emoteshortcutcontainer.cpp | 9 +-------- 4 files changed, 9 insertions(+), 23 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 883344d8..98aaeec2 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -93,12 +93,9 @@ Being::Being(int id, int job, Map *map): { EmoteInfo info = EmoteDB::get(i); - if (info.sprites != EmoteDB::getUnknown().sprites) - { - std::string file = "graphics/sprites/" + info.sprites.front()->sprite; - int variant = info.sprites.front()->variant; - emotionSet.push_back(AnimatedSprite::load(file, variant)); - } + std::string file = "graphics/sprites/" + info.sprites.front()->sprite; + int variant = info.sprites.front()->variant; + emotionSet.push_back(AnimatedSprite::load(file, variant)); } // Hairstyles are encoded as negative numbers. Count how far negative we can go. @@ -456,7 +453,7 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) const int py = mPy + offsetY - 60; const int emotionIndex = mEmotion - 1; - if (emotionIndex >= 0 && emotionIndex < EmoteDB::getLast()) + if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast()) emotionSet[emotionIndex]->draw(graphics, px, py); } diff --git a/src/being.h b/src/being.h index 4534b1ea..6dbcdfdd 100644 --- a/src/being.h +++ b/src/being.h @@ -351,6 +351,8 @@ class Being : public Sprite */ void controlParticle(Particle *particle); + AnimatedSprite* getEmote(int index) { return emotionSet[index]; } + void setEmote(Uint8 emotion, Uint8 emote_time) { mEmotion = emotion; diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp index 691211ca..cba744dd 100644 --- a/src/gui/emotecontainer.cpp +++ b/src/gui/emotecontainer.cpp @@ -28,6 +28,7 @@ #include "../animatedsprite.h" #include "../configuration.h" #include "../graphics.h" +#include "../localplayer.h" #include "../log.h" #include "../resources/emotedb.h" @@ -52,14 +53,7 @@ EmoteContainer::EmoteContainer(): // Setup emote sprites for (int i = 0; i <= EmoteDB::getLast(); i++) { - EmoteInfo info = EmoteDB::get(i); - - if (info.sprites != EmoteDB::getUnknown().sprites) - { - std::string file = "graphics/sprites/" + info.sprites.front()->sprite; - int variant = info.sprites.front()->variant; - mEmoteImg.push_back(AnimatedSprite::load(file, variant)); - } + mEmoteImg.push_back(player_node->getEmote(i)); } mSelImg = resman->getImage("graphics/gui/selection.png"); diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp index edaa8602..a7347bb0 100644 --- a/src/gui/emoteshortcutcontainer.cpp +++ b/src/gui/emoteshortcutcontainer.cpp @@ -57,14 +57,7 @@ EmoteShortcutContainer::EmoteShortcutContainer(): // Setup emote sprites for (int i = 0; i <= EmoteDB::getLast(); i++) { - EmoteInfo info = EmoteDB::get(i); - - if (info.sprites != EmoteDB::getUnknown().sprites) - { - std::string file = "graphics/sprites/" + info.sprites.front()->sprite; - int variant = info.sprites.front()->variant; - mEmoteImg.push_back(AnimatedSprite::load(file, variant)); - } + mEmoteImg.push_back(player_node->getEmote(i)); } mMaxItems = MAX_ITEMS; -- cgit v1.2.3-70-g09d2 From f404997629d9a34f5a15261073536903a59a604c Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 20 Jan 2009 11:57:14 -0700 Subject: Trim displayed speech to not show links. Signed-off-by: Ira Rice --- src/being.cpp | 34 +++++++++++++++++++++++++++++++++- src/gui/speechbubble.cpp | 5 ----- 2 files changed, 33 insertions(+), 6 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 98aaeec2..3e621295 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -171,7 +171,39 @@ void Being::setSpeech(const std::string &text, Uint32 time) { mSpeech = text; - mSpeechTime = 500; + // Trim whitespace + while (mSpeech[0] == ' ') + { + mSpeech = mSpeech.substr(1, mSpeech.size()); + } + while (mSpeech[mSpeech.size()] == ' ') + { + mSpeech = mSpeech.substr(0, mSpeech.size() - 1); + } + + // check for links + const std::string::size_type start = mSpeech.find('['); + const std::string::size_type end = mSpeech.find(']', start); + + if (start != std::string::npos && end != std::string::npos) + { + mSpeech.erase(end); + std::string::size_type pos = mSpeech.find('@'); + + while (pos != std::string::npos) + { + mSpeech.erase(pos, 2); + pos = mSpeech.find('@'); + } + + pos = mSpeech.find('|'); + + if (pos != std::string::npos) + mSpeech = mSpeech.substr(pos + 1, mSpeech.size()); + } + + if (mSpeech != "") + mSpeechTime = 500; } void Being::takeDamage(int amount) diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 5539202e..4fa63973 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -61,11 +61,6 @@ SpeechBubble::SpeechBubble(): void SpeechBubble::setText(std::string mText) { - while (mText[0] == ' ') - { - mText = mText.substr(1, mText.size()); - } - mSpeechBox->setMinWidth(140); mSpeechBox->setTextWrapped( mText ); -- cgit v1.2.3-70-g09d2 From 567cd92eae386c28b6af90121d0f8f575dce0687 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 20 Jan 2009 16:55:46 -0700 Subject: Repaired text messages. While trimming out the link code is still a good idea for the speech, I accidently trimmed it down to just the item name before. Signed-off-by: Ira Rice --- src/being.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 3e621295..7643c91b 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -187,19 +187,16 @@ void Being::setSpeech(const std::string &text, Uint32 time) if (start != std::string::npos && end != std::string::npos) { - mSpeech.erase(end); - std::string::size_type pos = mSpeech.find('@'); + std::string::size_type position = mSpeech.find('|'); + mSpeech.erase(end, 1); + mSpeech.erase(start, (position - start) + 1); + position = mSpeech.find('@'); - while (pos != std::string::npos) + while (position != std::string::npos) { - mSpeech.erase(pos, 2); - pos = mSpeech.find('@'); + mSpeech.erase(position, 2); + position = mSpeech.find('@'); } - - pos = mSpeech.find('|'); - - if (pos != std::string::npos) - mSpeech = mSpeech.substr(pos + 1, mSpeech.size()); } if (mSpeech != "") -- cgit v1.2.3-70-g09d2 From c6d75d9aad1775e60cc63516e844cf54623a3974 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Tue, 20 Jan 2009 18:05:26 -0700 Subject: Added the ability to parse multiple item links, as well as removing extra spaces before or after the [] tags. Signed-off-by: Ira Rice --- src/being.cpp | 9 ++++++--- src/gui/chat.cpp | 19 +++++++++++++------ src/resources/itemdb.cpp | 8 ++++++++ 3 files changed, 27 insertions(+), 9 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 7643c91b..c5a98a2d 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -182,10 +182,10 @@ void Being::setSpeech(const std::string &text, Uint32 time) } // check for links - const std::string::size_type start = mSpeech.find('['); - const std::string::size_type end = mSpeech.find(']', start); + std::string::size_type start = mSpeech.find('['); + std::string::size_type end = mSpeech.find(']', start); - if (start != std::string::npos && end != std::string::npos) + while (start != std::string::npos && end != std::string::npos) { std::string::size_type position = mSpeech.find('|'); mSpeech.erase(end, 1); @@ -197,6 +197,9 @@ void Being::setSpeech(const std::string &text, Uint32 time) mSpeech.erase(position, 2); position = mSpeech.find('@'); } + + start = mSpeech.find('[', start + 1); + end = mSpeech.find(']', start); } if (mSpeech != "") diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 4c03f618..ef625753 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -358,27 +358,34 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) // check for item link std::string::size_type start = msg.find('['); - if (start != std::string::npos && msg[start+1] != '@') + while (start != std::string::npos && msg[start+1] != '@') { std::string::size_type end = msg.find(']', start); if (end != std::string::npos) { - std::string temp = msg.substr(start+1, end-1); + std::string temp = msg.substr(start+1, end - start - 1); + + while (temp[0] == ' ') + { + temp = temp.substr(1, temp.size()); + } + while (temp[temp.size()] == ' ') + { + temp = temp.substr(0, temp.size() - 1); + } for (unsigned int i = 0; i < temp.size(); i++) { temp[i] = (char) tolower(temp[i]); } - std::cout << temp << std::endl; - - ItemInfo itemInfo = ItemDB::get(temp); + const ItemInfo itemInfo = ItemDB::get(temp); msg.insert(end, "@@"); msg.insert(start+1, "|"); msg.insert(start+1, toString(itemInfo.getId())); msg.insert(start+1, "@@"); - } + start = msg.find('[', start + 1); } // Prepare ordinary message diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index d27ad23d..cb9fadab 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -125,6 +125,14 @@ void ItemDB::load() if (itr == mNamedItemInfos.end()) { std::string temp = name; + while (temp[0] == ' ') + { + temp = temp.substr(1, temp.size()); + } + while (temp[temp.size()] == ' ') + { + temp = temp.substr(0, temp.size() - 1); + } for (unsigned int i = 0; i < temp.size(); i++) { -- cgit v1.2.3-70-g09d2 From da2b9950c5785381e5e7ed541bc33dbecdb51f9c Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Wed, 21 Jan 2009 09:18:58 -0700 Subject: Fixed multiple embeddings of square brackets so that it doesn't crash the client. This commit makes it so that all brackets except for the innermost brackets are ignored. Signed-off-by: Ira Rice --- src/being.cpp | 7 +++++++ src/gui/chat.cpp | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index c5a98a2d..8ed66c7a 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -187,6 +187,13 @@ void Being::setSpeech(const std::string &text, Uint32 time) while (start != std::string::npos && end != std::string::npos) { + // Catch multiple embeds and ignore them so it doesn't crash the client. + while ((mSpeech.find('[', start + 1) != std::string::npos) && + (mSpeech.find('[', start + 1) < end)) + { + start = mSpeech.find('[', start + 1); + } + std::string::size_type position = mSpeech.find('|'); mSpeech.erase(end, 1); mSpeech.erase(start, (position - start) + 1); diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index ef625753..a0f12b2c 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -363,6 +363,13 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg) std::string::size_type end = msg.find(']', start); if (end != std::string::npos) { + // Catch multiple embeds and ignore them so it doesn't crash the client. + while ((msg.find('[', start + 1) != std::string::npos) && + (msg.find('[', start + 1) < end)) + { + start = msg.find('[', start + 1); + } + std::string temp = msg.substr(start+1, end - start - 1); while (temp[0] == ' ') -- cgit v1.2.3-70-g09d2 From 7b64259cbdf2987159671c3226b42d902942b275 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 23 Jan 2009 11:19:23 +0100 Subject: Removed unnecessary references to The Mana World in code headers This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections. --- src/animatedsprite.cpp | 8 ++++---- src/animatedsprite.h | 8 ++++---- src/animationparticle.cpp | 8 ++++---- src/animationparticle.h | 8 ++++---- src/being.cpp | 8 ++++---- src/being.h | 8 ++++---- src/beingmanager.cpp | 8 ++++---- src/beingmanager.h | 8 ++++---- src/configlistener.h | 8 ++++---- src/configuration.cpp | 8 ++++---- src/configuration.h | 8 ++++---- src/effectmanager.cpp | 12 ++++++------ src/effectmanager.h | 11 +++++------ src/engine.cpp | 8 ++++---- src/engine.h | 8 ++++---- src/equipment.cpp | 8 ++++---- src/equipment.h | 8 ++++---- src/floor_item.cpp | 8 ++++---- src/floor_item.h | 8 ++++---- src/flooritemmanager.cpp | 8 ++++---- src/flooritemmanager.h | 8 ++++---- src/game.cpp | 8 ++++---- src/game.h | 8 ++++---- src/graphics.cpp | 8 ++++---- src/graphics.h | 8 ++++---- src/gui/browserbox.cpp | 8 ++++---- src/gui/browserbox.h | 8 ++++---- src/gui/button.cpp | 8 ++++---- src/gui/button.h | 8 ++++---- src/gui/buy.cpp | 8 ++++---- src/gui/buy.h | 8 ++++---- src/gui/buysell.cpp | 8 ++++---- src/gui/buysell.h | 8 ++++---- src/gui/char_select.cpp | 8 ++++---- src/gui/char_select.h | 8 ++++---- src/gui/char_server.cpp | 8 ++++---- src/gui/char_server.h | 8 ++++---- src/gui/chat.cpp | 8 ++++---- src/gui/chat.h | 8 ++++---- src/gui/chatinput.cpp | 8 ++++---- src/gui/chatinput.h | 8 ++++---- src/gui/checkbox.cpp | 8 ++++---- src/gui/checkbox.h | 8 ++++---- src/gui/confirm_dialog.cpp | 8 ++++---- src/gui/confirm_dialog.h | 8 ++++---- src/gui/connection.cpp | 8 ++++---- src/gui/connection.h | 8 ++++---- src/gui/debugwindow.cpp | 8 ++++---- src/gui/debugwindow.h | 8 ++++---- src/gui/equipmentwindow.cpp | 8 ++++---- src/gui/equipmentwindow.h | 8 ++++---- src/gui/focushandler.cpp | 8 ++++---- src/gui/focushandler.h | 8 ++++---- src/gui/gccontainer.cpp | 8 ++++---- src/gui/gccontainer.h | 8 ++++---- src/gui/gui.cpp | 8 ++++---- src/gui/gui.h | 8 ++++---- src/gui/help.cpp | 8 ++++---- src/gui/help.h | 8 ++++---- src/gui/inttextfield.cpp | 8 ++++---- src/gui/inttextfield.h | 8 ++++---- src/gui/inventorywindow.cpp | 8 ++++---- src/gui/inventorywindow.h | 8 ++++---- src/gui/item_amount.cpp | 8 ++++---- src/gui/item_amount.h | 8 ++++---- src/gui/itemcontainer.cpp | 8 ++++---- src/gui/itemcontainer.h | 8 ++++---- src/gui/itemshortcutcontainer.cpp | 8 ++++---- src/gui/itemshortcutcontainer.h | 8 ++++---- src/gui/linkhandler.h | 8 ++++---- src/gui/listbox.cpp | 8 ++++---- src/gui/listbox.h | 8 ++++---- src/gui/login.cpp | 8 ++++---- src/gui/login.h | 8 ++++---- src/gui/menuwindow.cpp | 8 ++++---- src/gui/menuwindow.h | 8 ++++---- src/gui/minimap.cpp | 8 ++++---- src/gui/minimap.h | 8 ++++---- src/gui/ministatus.cpp | 8 ++++---- src/gui/ministatus.h | 8 ++++---- src/gui/npc_text.cpp | 8 ++++---- src/gui/npc_text.h | 8 ++++---- src/gui/npcintegerdialog.cpp | 8 ++++---- src/gui/npcintegerdialog.h | 8 ++++---- src/gui/npclistdialog.cpp | 8 ++++---- src/gui/npclistdialog.h | 8 ++++---- src/gui/npcstringdialog.cpp | 8 ++++---- src/gui/npcstringdialog.h | 8 ++++---- src/gui/ok_dialog.cpp | 8 ++++---- src/gui/ok_dialog.h | 8 ++++---- src/gui/passwordfield.cpp | 8 ++++---- src/gui/passwordfield.h | 8 ++++---- src/gui/playerbox.cpp | 8 ++++---- src/gui/playerbox.h | 8 ++++---- src/gui/popupmenu.cpp | 8 ++++---- src/gui/popupmenu.h | 8 ++++---- src/gui/progressbar.cpp | 8 ++++---- src/gui/progressbar.h | 8 ++++---- src/gui/radiobutton.cpp | 8 ++++---- src/gui/radiobutton.h | 8 ++++---- src/gui/register.cpp | 8 ++++---- src/gui/register.h | 8 ++++---- src/gui/scrollarea.cpp | 8 ++++---- src/gui/scrollarea.h | 8 ++++---- src/gui/sdlinput.cpp | 2 +- src/gui/sdlinput.h | 2 +- src/gui/sell.cpp | 8 ++++---- src/gui/sell.h | 8 ++++---- src/gui/setup.cpp | 8 ++++---- src/gui/setup.h | 8 ++++---- src/gui/setup_audio.cpp | 8 ++++---- src/gui/setup_audio.h | 8 ++++---- src/gui/setup_joystick.cpp | 8 ++++---- src/gui/setup_joystick.h | 8 ++++---- src/gui/setup_keyboard.cpp | 8 ++++---- src/gui/setup_keyboard.h | 8 ++++---- src/gui/setup_players.cpp | 8 ++++---- src/gui/setup_players.h | 8 ++++---- src/gui/setup_video.cpp | 8 ++++---- src/gui/setup_video.h | 8 ++++---- src/gui/setuptab.h | 8 ++++---- src/gui/shop.cpp | 8 ++++---- src/gui/shop.h | 8 ++++---- src/gui/shoplistbox.cpp | 8 ++++---- src/gui/shoplistbox.h | 8 ++++---- src/gui/shortcutwindow.cpp | 8 ++++---- src/gui/shortcutwindow.h | 8 ++++---- src/gui/skill.cpp | 8 ++++---- src/gui/skill.h | 8 ++++---- src/gui/slider.cpp | 8 ++++---- src/gui/slider.h | 8 ++++---- src/gui/status.cpp | 8 ++++---- src/gui/status.h | 8 ++++---- src/gui/table.cpp | 8 ++++---- src/gui/table.h | 8 ++++---- src/gui/table_model.cpp | 8 ++++---- src/gui/table_model.h | 8 ++++---- src/gui/textbox.cpp | 8 ++++---- src/gui/textbox.h | 8 ++++---- src/gui/textfield.cpp | 8 ++++---- src/gui/textfield.h | 8 ++++---- src/gui/trade.cpp | 8 ++++---- src/gui/trade.h | 8 ++++---- src/gui/truetypefont.cpp | 8 ++++---- src/gui/truetypefont.h | 8 ++++---- src/gui/updatewindow.cpp | 8 ++++---- src/gui/updatewindow.h | 8 ++++---- src/gui/viewport.cpp | 8 ++++---- src/gui/viewport.h | 8 ++++---- src/gui/widgets/layout.cpp | 8 ++++---- src/gui/widgets/layout.h | 8 ++++---- src/gui/widgets/layouthelper.cpp | 8 ++++---- src/gui/widgets/layouthelper.h | 8 ++++---- src/gui/widgets/resizegrip.cpp | 8 ++++---- src/gui/widgets/resizegrip.h | 8 ++++---- src/gui/widgets/tab.cpp | 8 ++++---- src/gui/widgets/tab.h | 8 ++++---- src/gui/widgets/tabbedarea.cpp | 8 ++++---- src/gui/widgets/tabbedarea.h | 8 ++++---- src/gui/window.cpp | 8 ++++---- src/gui/window.h | 8 ++++---- src/gui/windowcontainer.cpp | 8 ++++---- src/gui/windowcontainer.h | 8 ++++---- src/guichanfwd.h | 8 ++++---- src/imageparticle.cpp | 8 ++++---- src/imageparticle.h | 8 ++++---- src/inventory.cpp | 8 ++++---- src/inventory.h | 8 ++++---- src/item.cpp | 8 ++++---- src/item.h | 8 ++++---- src/itemshortcut.cpp | 8 ++++---- src/itemshortcut.h | 8 ++++---- src/joystick.cpp | 8 ++++---- src/joystick.h | 8 ++++---- src/keyboardconfig.cpp | 8 ++++---- src/keyboardconfig.h | 8 ++++---- src/localplayer.cpp | 8 ++++---- src/localplayer.h | 8 ++++---- src/lockedarray.h | 8 ++++---- src/log.cpp | 8 ++++---- src/log.h | 8 ++++---- src/logindata.h | 8 ++++---- src/main.cpp | 8 ++++---- src/main.h | 8 ++++---- src/map.cpp | 8 ++++---- src/map.h | 8 ++++---- src/monster.cpp | 8 ++++---- src/monster.h | 8 ++++---- src/net/beinghandler.cpp | 8 ++++---- src/net/beinghandler.h | 8 ++++---- src/net/buysellhandler.cpp | 8 ++++---- src/net/buysellhandler.h | 8 ++++---- src/net/charserverhandler.cpp | 8 ++++---- src/net/charserverhandler.h | 8 ++++---- src/net/chathandler.cpp | 8 ++++---- src/net/chathandler.h | 8 ++++---- src/net/equipmenthandler.cpp | 8 ++++---- src/net/equipmenthandler.h | 8 ++++---- src/net/inventoryhandler.cpp | 8 ++++---- src/net/inventoryhandler.h | 8 ++++---- src/net/itemhandler.cpp | 8 ++++---- src/net/itemhandler.h | 8 ++++---- src/net/loginhandler.cpp | 8 ++++---- src/net/loginhandler.h | 8 ++++---- src/net/maploginhandler.cpp | 8 ++++---- src/net/maploginhandler.h | 8 ++++---- src/net/messagehandler.cpp | 8 ++++---- src/net/messagehandler.h | 8 ++++---- src/net/messagein.cpp | 8 ++++---- src/net/messagein.h | 8 ++++---- src/net/messageout.cpp | 8 ++++---- src/net/messageout.h | 8 ++++---- src/net/network.cpp | 8 ++++---- src/net/network.h | 8 ++++---- src/net/npchandler.cpp | 8 ++++---- src/net/npchandler.h | 8 ++++---- src/net/playerhandler.cpp | 8 ++++---- src/net/playerhandler.h | 8 ++++---- src/net/protocol.cpp | 8 ++++---- src/net/protocol.h | 8 ++++---- src/net/skillhandler.cpp | 8 ++++---- src/net/skillhandler.h | 8 ++++---- src/net/tradehandler.cpp | 8 ++++---- src/net/tradehandler.h | 8 ++++---- src/npc.cpp | 8 ++++---- src/npc.h | 8 ++++---- src/openglgraphics.cpp | 8 ++++---- src/openglgraphics.h | 8 ++++---- src/particle.cpp | 8 ++++---- src/particle.h | 8 ++++---- src/particlecontainer.cpp | 8 ++++---- src/particlecontainer.h | 8 ++++---- src/particleemitter.cpp | 8 ++++---- src/particleemitter.h | 8 ++++---- src/particleemitterprop.h | 8 ++++---- src/player.cpp | 8 ++++---- src/player.h | 8 ++++---- src/player_relations.cpp | 8 ++++---- src/player_relations.h | 8 ++++---- src/position.cpp | 8 ++++---- src/position.h | 8 ++++---- src/properties.h | 8 ++++---- src/recorder.h | 8 ++++---- src/resources/action.cpp | 8 ++++---- src/resources/action.h | 8 ++++---- src/resources/ambientoverlay.cpp | 8 ++++---- src/resources/ambientoverlay.h | 8 ++++---- src/resources/animation.cpp | 8 ++++---- src/resources/animation.h | 8 ++++---- src/resources/buddylist.cpp | 8 ++++---- src/resources/buddylist.h | 8 ++++---- src/resources/dye.cpp | 8 ++++---- src/resources/dye.h | 8 ++++---- src/resources/image.cpp | 8 ++++---- src/resources/image.h | 8 ++++---- src/resources/imageloader.cpp | 8 ++++---- src/resources/imageloader.h | 8 ++++---- src/resources/imageset.cpp | 8 ++++---- src/resources/imageset.h | 8 ++++---- src/resources/imagewriter.cpp | 8 ++++---- src/resources/imagewriter.h | 8 ++++---- src/resources/itemdb.cpp | 8 ++++---- src/resources/itemdb.h | 8 ++++---- src/resources/iteminfo.cpp | 8 ++++---- src/resources/iteminfo.h | 8 ++++---- src/resources/mapreader.cpp | 8 ++++---- src/resources/mapreader.h | 8 ++++---- src/resources/monsterdb.cpp | 8 ++++---- src/resources/monsterdb.h | 8 ++++---- src/resources/monsterinfo.cpp | 8 ++++---- src/resources/monsterinfo.h | 8 ++++---- src/resources/music.cpp | 8 ++++---- src/resources/music.h | 8 ++++---- src/resources/npcdb.cpp | 8 ++++---- src/resources/npcdb.h | 8 ++++---- src/resources/resource.cpp | 8 ++++---- src/resources/resource.h | 8 ++++---- src/resources/resourcemanager.cpp | 8 ++++---- src/resources/resourcemanager.h | 8 ++++---- src/resources/soundeffect.cpp | 8 ++++---- src/resources/soundeffect.h | 8 ++++---- src/resources/spritedef.cpp | 8 ++++---- src/resources/spritedef.h | 8 ++++---- src/serverinfo.h | 8 ++++---- src/shopitem.cpp | 8 ++++---- src/shopitem.h | 8 ++++---- src/simpleanimation.cpp | 8 ++++---- src/simpleanimation.h | 8 ++++---- src/sound.cpp | 8 ++++---- src/sound.h | 8 ++++---- src/sprite.h | 8 ++++---- src/text.cpp | 3 +-- src/text.h | 3 +-- src/textmanager.cpp | 3 +-- src/textmanager.h | 3 +-- src/textparticle.cpp | 8 ++++---- src/textparticle.h | 8 ++++---- src/tileset.h | 8 ++++---- src/utils/dtor.h | 8 ++++---- src/utils/gettext.h | 8 ++++---- src/utils/mutex.h | 8 ++++---- src/utils/strprintf.cpp | 8 ++++---- src/utils/strprintf.h | 8 ++++---- src/utils/tostring.h | 8 ++++---- src/utils/trim.h | 8 ++++---- src/utils/xml.cpp | 8 ++++---- src/utils/xml.h | 8 ++++---- src/vector.cpp | 8 ++++---- src/vector.h | 8 ++++---- tools/tmxcopy/main.cpp | 9 ++++----- tools/tmxcopy/map.cpp | 9 ++++----- tools/tmxcopy/tostring.h | 8 ++++---- tools/tmxcopy/xmlutils.cpp | 8 ++++---- tools/tmxcopy/xmlutils.h | 8 ++++---- 314 files changed, 1241 insertions(+), 1248 deletions(-) (limited to 'src/being.cpp') diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index ba71d0e0..aa2fb4ee 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/animatedsprite.h b/src/animatedsprite.h index ddc663f2..c8a2b3c5 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/animationparticle.cpp b/src/animationparticle.cpp index 59eacb05..9c1f7ccb 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/animationparticle.h b/src/animationparticle.h index eabc2742..03065eb7 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/being.cpp b/src/being.cpp index 8ed66c7a..a0b870e0 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/being.h b/src/being.h index 6dbcdfdd..1e9954c5 100644 --- a/src/being.h +++ b/src/being.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/beingmanager.cpp b/src/beingmanager.cpp index ada1ddfa..b2dc330b 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/beingmanager.h b/src/beingmanager.h index 0179bed8..267b4655 100644 --- a/src/beingmanager.h +++ b/src/beingmanager.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/configlistener.h b/src/configlistener.h index 9fbc4544..e62d41ea 100644 --- a/src/configlistener.h +++ b/src/configlistener.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/configuration.cpp b/src/configuration.cpp index 4fb6a42b..04cb4f36 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/configuration.h b/src/configuration.h index 197e1a41..f7a44410 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/effectmanager.cpp b/src/effectmanager.cpp index 1fdf87e8..cf77de37 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -1,25 +1,25 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright 2008 The Mana World Development Team * - * 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 - * */ + #include "effectmanager.h" #include "log.h" #include "particle.h" diff --git a/src/effectmanager.h b/src/effectmanager.h index e6671498..a9efcdbc 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -1,23 +1,22 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright 2008 The Mana World Development Team * - * 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 - * */ #ifndef _EFFECT_MANAGER_H diff --git a/src/engine.cpp b/src/engine.cpp index 04e5f287..2a37d888 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/engine.h b/src/engine.h index 8d387f80..f2852351 100644 --- a/src/engine.h +++ b/src/engine.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/equipment.cpp b/src/equipment.cpp index 828de46b..d5e0f656 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/equipment.h b/src/equipment.h index e6145d12..50fcbb32 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/floor_item.cpp b/src/floor_item.cpp index 0b114e14..0c4c1c10 100644 --- a/src/floor_item.cpp +++ b/src/floor_item.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/floor_item.h b/src/floor_item.h index 4a4e8fb3..589835b4 100644 --- a/src/floor_item.h +++ b/src/floor_item.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/flooritemmanager.cpp b/src/flooritemmanager.cpp index 7445b1e9..65556abb 100644 --- a/src/flooritemmanager.cpp +++ b/src/flooritemmanager.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/flooritemmanager.h b/src/flooritemmanager.h index 3dbaf988..b527bbd2 100644 --- a/src/flooritemmanager.h +++ b/src/flooritemmanager.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/game.cpp b/src/game.cpp index 1d09ebe2..76cf792e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/game.h b/src/game.h index 1cc18cae..f674dbf0 100644 --- a/src/game.h +++ b/src/game.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/graphics.cpp b/src/graphics.cpp index 55ccc3b4..4af7b723 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/graphics.h b/src/graphics.h index bc9a95bd..8009ceda 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/browserbox.cpp b/src/gui/browserbox.cpp index 7621b856..6fd0482a 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/browserbox.h b/src/gui/browserbox.h index e4411637..c2c427f4 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/button.cpp b/src/gui/button.cpp index 9653242c..04b96810 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/button.h b/src/gui/button.h index eecd0dc0..2999a737 100644 --- a/src/gui/button.h +++ b/src/gui/button.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/buy.cpp b/src/gui/buy.cpp index 496c8cd7..0c8c4d9d 100644 --- a/src/gui/buy.cpp +++ b/src/gui/buy.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/buy.h b/src/gui/buy.h index 7f0f04ac..1b7ebe43 100644 --- a/src/gui/buy.h +++ b/src/gui/buy.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/buysell.cpp b/src/gui/buysell.cpp index 724ae8a1..d060db85 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buysell.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/buysell.h b/src/gui/buysell.h index d73205b6..0f41e9ed 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/char_select.cpp b/src/gui/char_select.cpp index 7bfa3c7a..af030280 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/char_select.h b/src/gui/char_select.h index d592ce48..23f5499c 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/char_server.cpp b/src/gui/char_server.cpp index d5452532..2e823b60 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/char_server.h b/src/gui/char_server.h index e05792f8..9419c92d 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/chat.cpp b/src/gui/chat.cpp index 7ce5d395..20065106 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/chat.h b/src/gui/chat.h index 2967e204..e5d0a4a9 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/chatinput.cpp b/src/gui/chatinput.cpp index afe7f037..43f3cde4 100644 --- a/src/gui/chatinput.cpp +++ b/src/gui/chatinput.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/chatinput.h b/src/gui/chatinput.h index 44e22956..fc5c18a3 100644 --- a/src/gui/chatinput.h +++ b/src/gui/chatinput.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/checkbox.cpp b/src/gui/checkbox.cpp index 20e24dee..b8fca2b8 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/checkbox.h b/src/gui/checkbox.h index f6d8f2e5..ea67ec02 100644 --- a/src/gui/checkbox.h +++ b/src/gui/checkbox.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp index 72ce3e16..569fd93f 100644 --- a/src/gui/confirm_dialog.cpp +++ b/src/gui/confirm_dialog.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/confirm_dialog.h b/src/gui/confirm_dialog.h index 109dcea0..63a867da 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/connection.cpp b/src/gui/connection.cpp index 174d98e7..15d85bbc 100644 --- a/src/gui/connection.cpp +++ b/src/gui/connection.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/connection.h b/src/gui/connection.h index c3a6208f..0cbb8768 100644 --- a/src/gui/connection.h +++ b/src/gui/connection.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/debugwindow.cpp b/src/gui/debugwindow.cpp index 3d729fe4..223b7fbd 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/debugwindow.h b/src/gui/debugwindow.h index 8d8b7822..185915a2 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 47ca61df..ff976b24 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/equipmentwindow.h b/src/gui/equipmentwindow.h index b669f5b1..c50e154e 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/focushandler.cpp b/src/gui/focushandler.cpp index f9ea8b7d..dd605be6 100644 --- a/src/gui/focushandler.cpp +++ b/src/gui/focushandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/focushandler.h b/src/gui/focushandler.h index a5218485..a183a1c8 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/gccontainer.cpp b/src/gui/gccontainer.cpp index ec3c8a5c..8325ccd4 100644 --- a/src/gui/gccontainer.cpp +++ b/src/gui/gccontainer.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/gccontainer.h b/src/gui/gccontainer.h index 2af7f6ad..03dcb785 100644 --- a/src/gui/gccontainer.h +++ b/src/gui/gccontainer.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/gui.cpp b/src/gui/gui.cpp index 6a399548..99883151 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/gui.h b/src/gui/gui.h index eb81b87c..2289ae0b 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/help.cpp b/src/gui/help.cpp index cd249943..6b14f6d8 100644 --- a/src/gui/help.cpp +++ b/src/gui/help.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/help.h b/src/gui/help.h index bd200ccf..b4627389 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/inttextfield.cpp b/src/gui/inttextfield.cpp index e8e6e69b..fcbe938d 100644 --- a/src/gui/inttextfield.cpp +++ b/src/gui/inttextfield.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/inttextfield.h b/src/gui/inttextfield.h index 3f9cd7ad..2a913ef6 100644 --- a/src/gui/inttextfield.h +++ b/src/gui/inttextfield.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 72507d23..da549841 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/inventorywindow.h b/src/gui/inventorywindow.h index 166bf1c4..e14994df 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/item_amount.cpp b/src/gui/item_amount.cpp index 03b22fa9..d8682c95 100644 --- a/src/gui/item_amount.cpp +++ b/src/gui/item_amount.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/item_amount.h b/src/gui/item_amount.h index 08852c8f..e6086f82 100644 --- a/src/gui/item_amount.h +++ b/src/gui/item_amount.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 681bf0ce..e07a997c 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/itemcontainer.h b/src/gui/itemcontainer.h index 558470bd..0eb940f5 100644 --- a/src/gui/itemcontainer.h +++ b/src/gui/itemcontainer.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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 40b435cc..5179ceb8 100644 --- a/src/gui/itemshortcutcontainer.cpp +++ b/src/gui/itemshortcutcontainer.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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 */ #include diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index 07e2c38d..d8ddf110 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/linkhandler.h b/src/gui/linkhandler.h index 44f906db..b238f38b 100644 --- a/src/gui/linkhandler.h +++ b/src/gui/linkhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/listbox.cpp b/src/gui/listbox.cpp index 7e28e1f5..21b59a07 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/listbox.h b/src/gui/listbox.h index 30eb4c79..69ba45f4 100644 --- a/src/gui/listbox.h +++ b/src/gui/listbox.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/login.cpp b/src/gui/login.cpp index 7ac76c63..84e10e97 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/login.h b/src/gui/login.h index d1d75ebc..c8fcc267 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/menuwindow.cpp b/src/gui/menuwindow.cpp index 2a175a61..0dcc999f 100644 --- a/src/gui/menuwindow.cpp +++ b/src/gui/menuwindow.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/menuwindow.h b/src/gui/menuwindow.h index 03ec3380..539cdc24 100644 --- a/src/gui/menuwindow.h +++ b/src/gui/menuwindow.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/minimap.cpp b/src/gui/minimap.cpp index 61a56445..9292ec05 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004-2005 The Mana World Development Team + * Copyright (C) 2004-2005 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/minimap.h b/src/gui/minimap.h index b6dbc322..6b2b7f52 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004-2005 The Mana World Development Team + * Copyright (C) 2004-2005 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/ministatus.cpp b/src/gui/ministatus.cpp index c4c834c7..04901379 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/ministatus.h b/src/gui/ministatus.h index d7f6f68c..d4804bef 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatus.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npc_text.cpp b/src/gui/npc_text.cpp index 898b9afe..3a0a86a6 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npc_text.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npc_text.h b/src/gui/npc_text.h index 90b15abd..f6b059ea 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp index 473c10f6..65a1a7f1 100644 --- a/src/gui/npcintegerdialog.cpp +++ b/src/gui/npcintegerdialog.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npcintegerdialog.h b/src/gui/npcintegerdialog.h index c1bdffe1..d2c5f058 100644 --- a/src/gui/npcintegerdialog.h +++ b/src/gui/npcintegerdialog.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npclistdialog.cpp b/src/gui/npclistdialog.cpp index 7ecd0a74..9f41be67 100644 --- a/src/gui/npclistdialog.cpp +++ b/src/gui/npclistdialog.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npclistdialog.h b/src/gui/npclistdialog.h index bc58cdcd..242e3a95 100644 --- a/src/gui/npclistdialog.h +++ b/src/gui/npclistdialog.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp index 500875be..ccb3c411 100644 --- a/src/gui/npcstringdialog.cpp +++ b/src/gui/npcstringdialog.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npcstringdialog.h b/src/gui/npcstringdialog.h index 22054994..e57003e9 100644 --- a/src/gui/npcstringdialog.h +++ b/src/gui/npcstringdialog.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/ok_dialog.cpp b/src/gui/ok_dialog.cpp index ad7b879c..dc66a900 100644 --- a/src/gui/ok_dialog.cpp +++ b/src/gui/ok_dialog.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/ok_dialog.h b/src/gui/ok_dialog.h index a06ddd7c..78b3d44f 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/ok_dialog.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/passwordfield.cpp b/src/gui/passwordfield.cpp index 01c7e15d..09b6abda 100644 --- a/src/gui/passwordfield.cpp +++ b/src/gui/passwordfield.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/passwordfield.h b/src/gui/passwordfield.h index e31b1779..033c4bf9 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/playerbox.cpp b/src/gui/playerbox.cpp index 92722417..e8c19ad4 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/playerbox.h b/src/gui/playerbox.h index 3ccb5fad..75dfe14c 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/popupmenu.cpp b/src/gui/popupmenu.cpp index fde81cd8..88fd273e 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/popupmenu.h b/src/gui/popupmenu.h index 3cf949b3..734b826f 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/progressbar.cpp b/src/gui/progressbar.cpp index b4117c80..6671d388 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/progressbar.h b/src/gui/progressbar.h index d2ace66c..670b4ab4 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/radiobutton.cpp b/src/gui/radiobutton.cpp index 619ec84f..245112a7 100644 --- a/src/gui/radiobutton.cpp +++ b/src/gui/radiobutton.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/radiobutton.h b/src/gui/radiobutton.h index ef4c128c..84c552b9 100644 --- a/src/gui/radiobutton.h +++ b/src/gui/radiobutton.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/register.cpp b/src/gui/register.cpp index a9cf57cf..9c337d9e 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/register.h b/src/gui/register.h index 480a7c03..58106a41 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/scrollarea.cpp b/src/gui/scrollarea.cpp index 07b4027b..1d7f8472 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/scrollarea.h b/src/gui/scrollarea.h index ebe2c77b..26cba4a6 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/sdlinput.cpp b/src/gui/sdlinput.cpp index ee94b2c6..f68dc9c8 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -7,7 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * Js_./ * Per Larsson a.k.a finalman _RqZ{a<^_aa diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index 72d949e1..67eb13a8 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -7,7 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * Js_./ * Per Larsson a.k.a finalman _RqZ{a<^_aa diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index fac0a0b8..7976e32e 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/sell.h b/src/gui/sell.h index 0bf8b5a6..0aba2909 100644 --- a/src/gui/sell.h +++ b/src/gui/sell.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup.cpp b/src/gui/setup.cpp index bd5a25f9..dd0f94e5 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup.h b/src/gui/setup.h index 8a775093..1e0359aa 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_audio.cpp b/src/gui/setup_audio.cpp index 7ffff913..7090136e 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_audio.h b/src/gui/setup_audio.h index 9835a8fb..a91cb6cb 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 187b3e2b..2c726b87 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_joystick.h b/src/gui/setup_joystick.h index d2973a89..fec38353 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 83c556a2..7ff2ea7f 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_keyboard.h b/src/gui/setup_keyboard.h index 937790af..86dd920b 100644 --- a/src/gui/setup_keyboard.h +++ b/src/gui/setup_keyboard.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_players.cpp b/src/gui/setup_players.cpp index 4bfca983..a4582b48 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_players.h b/src/gui/setup_players.h index b693a952..a1f1e8aa 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_video.cpp b/src/gui/setup_video.cpp index 16a7172f..2ba8b6e8 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setup_video.h b/src/gui/setup_video.h index 360daff0..e9cfb36e 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/setuptab.h b/src/gui/setuptab.h index 9e668a20..c1171fdb 100644 --- a/src/gui/setuptab.h +++ b/src/gui/setuptab.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/shop.cpp b/src/gui/shop.cpp index a4478a62..a5f59bac 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/shop.h b/src/gui/shop.h index 97b8d173..22b649d0 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/shoplistbox.cpp b/src/gui/shoplistbox.cpp index e31eee58..b6a12658 100644 --- a/src/gui/shoplistbox.cpp +++ b/src/gui/shoplistbox.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/shoplistbox.h b/src/gui/shoplistbox.h index e856c076..c55db889 100644 --- a/src/gui/shoplistbox.h +++ b/src/gui/shoplistbox.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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 d2b939f5..3a7cf0e0 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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.h b/src/gui/shortcutwindow.h index 9ac1a52a..3c9bfbea 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/skill.cpp b/src/gui/skill.cpp index bc28123a..9d23cc3c 100644 --- a/src/gui/skill.cpp +++ b/src/gui/skill.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/skill.h b/src/gui/skill.h index 2095e098..33298e96 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/slider.cpp b/src/gui/slider.cpp index afeecf17..37136012 100644 --- a/src/gui/slider.cpp +++ b/src/gui/slider.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/slider.h b/src/gui/slider.h index 36bfe698..c2add662 100644 --- a/src/gui/slider.h +++ b/src/gui/slider.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/status.cpp b/src/gui/status.cpp index e140c42b..f7a5c137 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/status.h b/src/gui/status.h index aa20d094..795ed533 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/table.cpp b/src/gui/table.cpp index 264d9864..c4265097 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/table.h b/src/gui/table.h index b4c607ae..39a48dd5 100644 --- a/src/gui/table.h +++ b/src/gui/table.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/table_model.cpp b/src/gui/table_model.cpp index f7f0ab54..a6904fd1 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/table_model.h b/src/gui/table_model.h index 304500bb..cd4bc6db 100644 --- a/src/gui/table_model.h +++ b/src/gui/table_model.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/textbox.cpp b/src/gui/textbox.cpp index d7b589fa..ee03c79d 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/textbox.h b/src/gui/textbox.h index a0f0f947..62385b1e 100644 --- a/src/gui/textbox.h +++ b/src/gui/textbox.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/textfield.cpp b/src/gui/textfield.cpp index 80e3bbcf..3ecf5c82 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/textfield.h b/src/gui/textfield.h index 3235e3f6..4c887546 100644 --- a/src/gui/textfield.h +++ b/src/gui/textfield.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/trade.cpp b/src/gui/trade.cpp index 4ae81e44..c89e55a2 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/trade.h b/src/gui/trade.h index ec7a2a39..910a5183 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/truetypefont.cpp b/src/gui/truetypefont.cpp index 248afcbf..27b327f2 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/truetypefont.h b/src/gui/truetypefont.h index 3d5d52ff..bb3663cd 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/updatewindow.cpp b/src/gui/updatewindow.cpp index ba802876..67e05bbd 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/updatewindow.h b/src/gui/updatewindow.h index 9cd3405e..6450ece2 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/viewport.cpp b/src/gui/viewport.cpp index 5fcb7dc9..f258aba8 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/viewport.h b/src/gui/viewport.h index ef8e7a38..0a140ff9 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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 bcc54cf7..4ffdda36 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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.h b/src/gui/widgets/layout.h index 9ba97fa1..b9b8b0f8 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp index 4dddaab3..410de98a 100644 --- a/src/gui/widgets/layouthelper.cpp +++ b/src/gui/widgets/layouthelper.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2009 The Mana World Development Team + * Copyright (C) 2009 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/layouthelper.h b/src/gui/widgets/layouthelper.h index b1039fb0..afa92a18 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2009 The Mana World Development Team + * Copyright (C) 2009 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 6009d5f5..4b8bb4da 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resizegrip.h b/src/gui/widgets/resizegrip.h index acb934d2..6c517de8 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tab.cpp b/src/gui/widgets/tab.cpp index c53ac85c..c54b2390 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tab.h b/src/gui/widgets/tab.h index 42964b0f..6b6e06af 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 205fdc99..c4e22bff 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 2199264b..8d60409a 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/window.cpp b/src/gui/window.cpp index d1ada53d..dba65143 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/window.h b/src/gui/window.h index d864290c..fc808cf4 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/windowcontainer.cpp b/src/gui/windowcontainer.cpp index d8535f73..2846b1c1 100644 --- a/src/gui/windowcontainer.cpp +++ b/src/gui/windowcontainer.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/windowcontainer.h b/src/gui/windowcontainer.h index d783fefd..f087db2c 100644 --- a/src/gui/windowcontainer.h +++ b/src/gui/windowcontainer.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/guichanfwd.h b/src/guichanfwd.h index 4fb7ea3e..5fd05dbc 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/imageparticle.cpp b/src/imageparticle.cpp index 6d74801e..557b3553 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/imageparticle.h b/src/imageparticle.h index c18b30b8..317b17ea 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/inventory.cpp b/src/inventory.cpp index da9aed02..8824e1ba 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/inventory.h b/src/inventory.h index 91bb7d04..2c5d99e3 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/item.cpp b/src/item.cpp index bc6b7cc7..9165c6c8 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/item.h b/src/item.h index bb6fcbdc..2543b594 100644 --- a/src/item.h +++ b/src/item.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/itemshortcut.cpp b/src/itemshortcut.cpp index cfe46238..7bfbc88e 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/itemshortcut.h b/src/itemshortcut.h index 57800d96..5e448010 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/joystick.cpp b/src/joystick.cpp index 4cee4464..1233c37f 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/joystick.h b/src/joystick.h index 2baf3e61..867bf96a 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/keyboardconfig.cpp b/src/keyboardconfig.cpp index 932f6ad2..d7288796 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/keyboardconfig.h b/src/keyboardconfig.h index 716f9a17..038a33af 100644 --- a/src/keyboardconfig.h +++ b/src/keyboardconfig.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/localplayer.cpp b/src/localplayer.cpp index 7d3ff3ab..db7a25f8 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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 */ #include diff --git a/src/localplayer.h b/src/localplayer.h index 76c810bb..236d63dc 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/lockedarray.h b/src/lockedarray.h index a3e5dc0a..e32f6305 100644 --- a/src/lockedarray.h +++ b/src/lockedarray.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/log.cpp b/src/log.cpp index 96630a96..e50edeb2 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/log.h b/src/log.h index 30078e35..fcd48757 100644 --- a/src/log.h +++ b/src/log.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/logindata.h b/src/logindata.h index 6b733269..ea494e15 100644 --- a/src/logindata.h +++ b/src/logindata.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/main.cpp b/src/main.cpp index a0066c66..8490ec94 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/main.h b/src/main.h index a0fe65cb..0fe2b296 100644 --- a/src/main.h +++ b/src/main.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/map.cpp b/src/map.cpp index 5d36d772..01844409 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/map.h b/src/map.h index b299fdb5..57d5b9ac 100644 --- a/src/map.h +++ b/src/map.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/monster.cpp b/src/monster.cpp index 04624b8c..f42258bc 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/monster.h b/src/monster.h index 7a8cd2a7..ecd90766 100644 --- a/src/monster.h +++ b/src/monster.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/beinghandler.cpp b/src/net/beinghandler.cpp index 5b689266..69bc462c 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/beinghandler.h b/src/net/beinghandler.h index 9e736751..cb5941fd 100644 --- a/src/net/beinghandler.h +++ b/src/net/beinghandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/buysellhandler.cpp b/src/net/buysellhandler.cpp index b2fe99b9..5292b6f9 100644 --- a/src/net/buysellhandler.cpp +++ b/src/net/buysellhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/buysellhandler.h b/src/net/buysellhandler.h index 49984840..eb1f5853 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index eb724630..909100e5 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/charserverhandler.h b/src/net/charserverhandler.h index 05f547d0..7e711fd9 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/chathandler.cpp b/src/net/chathandler.cpp index b73b86b4..bf5a5a37 100644 --- a/src/net/chathandler.cpp +++ b/src/net/chathandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/chathandler.h b/src/net/chathandler.h index 53ea61d8..6393e401 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp index 2e0cc562..973de0f6 100644 --- a/src/net/equipmenthandler.cpp +++ b/src/net/equipmenthandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/equipmenthandler.h b/src/net/equipmenthandler.h index 31a747c3..d477885d 100644 --- a/src/net/equipmenthandler.h +++ b/src/net/equipmenthandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp index 12b7d5ef..3ce0899a 100644 --- a/src/net/inventoryhandler.cpp +++ b/src/net/inventoryhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/inventoryhandler.h b/src/net/inventoryhandler.h index 002fa938..d18e428a 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/itemhandler.cpp b/src/net/itemhandler.cpp index 9cf85ce7..8c4af4e4 100644 --- a/src/net/itemhandler.cpp +++ b/src/net/itemhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/itemhandler.h b/src/net/itemhandler.h index 99fc6b62..621b7097 100644 --- a/src/net/itemhandler.h +++ b/src/net/itemhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/loginhandler.cpp b/src/net/loginhandler.cpp index 2b98e4e4..f240618d 100644 --- a/src/net/loginhandler.cpp +++ b/src/net/loginhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/loginhandler.h b/src/net/loginhandler.h index 047434b4..9024136f 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/maploginhandler.cpp b/src/net/maploginhandler.cpp index bc08d5d6..1b0919fa 100644 --- a/src/net/maploginhandler.cpp +++ b/src/net/maploginhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/maploginhandler.h b/src/net/maploginhandler.h index 4d9fa75b..a7267372 100644 --- a/src/net/maploginhandler.h +++ b/src/net/maploginhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/messagehandler.cpp b/src/net/messagehandler.cpp index 7a41e1ad..f1561a31 100644 --- a/src/net/messagehandler.cpp +++ b/src/net/messagehandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/messagehandler.h b/src/net/messagehandler.h index 952e76a9..f46da788 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/messagein.cpp b/src/net/messagein.cpp index 387af70c..a288d936 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/messagein.h b/src/net/messagein.h index 90804497..5cf7cbb5 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/messageout.cpp b/src/net/messageout.cpp index 6aa25411..bf4957be 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/messageout.h b/src/net/messageout.h index 3c4cc241..d377229a 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/network.cpp b/src/net/network.cpp index 60d54a7a..941995c9 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/network.h b/src/net/network.h index 6270e0de..db4d7f07 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/npchandler.cpp b/src/net/npchandler.cpp index 3cea2d64..82b07d41 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/npchandler.h b/src/net/npchandler.h index abb16b7a..f47af523 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/playerhandler.cpp b/src/net/playerhandler.cpp index 59c7d0d6..d06f1108 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/playerhandler.h b/src/net/playerhandler.h index ec22e704..ceefadf6 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/protocol.cpp b/src/net/protocol.cpp index a0e21d2e..69d69901 100644 --- a/src/net/protocol.cpp +++ b/src/net/protocol.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/protocol.h b/src/net/protocol.h index 0538abf4..8f2a2392 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/skillhandler.cpp b/src/net/skillhandler.cpp index b9a232fb..e2185524 100644 --- a/src/net/skillhandler.cpp +++ b/src/net/skillhandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/skillhandler.h b/src/net/skillhandler.h index 80095bd3..44a0f894 100644 --- a/src/net/skillhandler.h +++ b/src/net/skillhandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/tradehandler.cpp b/src/net/tradehandler.cpp index 07134746..0c7c9205 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/net/tradehandler.h b/src/net/tradehandler.h index 37ec5024..730c6971 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npc.cpp b/src/npc.cpp index 2dbf7f43..d8bd5468 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/npc.h b/src/npc.h index 1cb9a90f..00494060 100644 --- a/src/npc.h +++ b/src/npc.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/openglgraphics.cpp b/src/openglgraphics.cpp index 24be9438..d3278c1a 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/openglgraphics.h b/src/openglgraphics.h index ea30e019..6ff80bcc 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/particle.cpp b/src/particle.cpp index 1f067de3..4de9fe29 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/particle.h b/src/particle.h index e1ea92d9..87e4d69d 100644 --- a/src/particle.h +++ b/src/particle.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/particlecontainer.cpp b/src/particlecontainer.cpp index b90db9f1..d100ba27 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/particlecontainer.h b/src/particlecontainer.h index ae02326e..0181f6e1 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/particleemitter.cpp b/src/particleemitter.cpp index fef34b22..ca9f7bf5 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/particleemitter.h b/src/particleemitter.h index e16ee241..cc77f215 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/particleemitterprop.h b/src/particleemitterprop.h index f9c329a9..fde78f8f 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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 ca728bef..a72e754d 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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.h b/src/player.h index a082a92b..11cccd04 100644 --- a/src/player.h +++ b/src/player.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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_relations.cpp b/src/player_relations.cpp index 5eb47433..057eea94 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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_relations.h b/src/player_relations.h index 56f3d5a4..07ec7fcb 100644 --- a/src/player_relations.h +++ b/src/player_relations.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/position.cpp b/src/position.cpp index cc39a1af..69d50476 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/position.h b/src/position.h index 7beb3ef7..7ef01466 100644 --- a/src/position.h +++ b/src/position.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/properties.h b/src/properties.h index 038acd91..81714dde 100644 --- a/src/properties.h +++ b/src/properties.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/recorder.h b/src/recorder.h index eeaf4821..c9955fd9 100644 --- a/src/recorder.h +++ b/src/recorder.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/action.cpp b/src/resources/action.cpp index a017e11c..e2cb11f2 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/action.h b/src/resources/action.h index 5f159a00..1b5f1fc8 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp index 38d8fc46..32ed47d1 100644 --- a/src/resources/ambientoverlay.cpp +++ b/src/resources/ambientoverlay.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/ambientoverlay.h b/src/resources/ambientoverlay.h index 56c70066..1b03a19c 100644 --- a/src/resources/ambientoverlay.h +++ b/src/resources/ambientoverlay.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/animation.cpp b/src/resources/animation.cpp index 5721c7f0..8d7156a9 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/animation.h b/src/resources/animation.h index 93e100bd..8ebebc6f 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/buddylist.cpp b/src/resources/buddylist.cpp index 8c02735a..541acabe 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/buddylist.h b/src/resources/buddylist.h index 092abc6a..40dd125d 100644 --- a/src/resources/buddylist.h +++ b/src/resources/buddylist.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/dye.cpp b/src/resources/dye.cpp index 3be105d8..fd760c3f 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/dye.h b/src/resources/dye.h index 4fb8fd40..6bec8eb1 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/image.cpp b/src/resources/image.cpp index 35b9c254..c3310849 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/image.h b/src/resources/image.h index a2e52d3d..a0ae66c5 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/imageloader.cpp b/src/resources/imageloader.cpp index a7e813d7..8ad6c5d4 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/imageloader.h b/src/resources/imageloader.h index 7979fd2f..05d7a838 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/imageset.cpp b/src/resources/imageset.cpp index b321439a..92bb3242 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/imageset.h b/src/resources/imageset.h index 26ce99ea..f8939263 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index 36805646..c350ac07 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/imagewriter.h b/src/resources/imagewriter.h index 0dcc0c33..a9133846 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/itemdb.cpp b/src/resources/itemdb.cpp index cb9fadab..c32c3459 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/itemdb.h b/src/resources/itemdb.h index 2cc23ec9..78279f4d 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 4c04678a..2f118284 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/iteminfo.h b/src/resources/iteminfo.h index 773fd17c..5e98d040 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/mapreader.cpp b/src/resources/mapreader.cpp index 9dd1dc62..a4ec3b69 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/mapreader.h b/src/resources/mapreader.h index c85e00d9..bf797690 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 4ee7b89e..c7926260 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/monsterdb.h b/src/resources/monsterdb.h index 2e186c15..cee1390b 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index faa759af..503990e7 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/monsterinfo.h b/src/resources/monsterinfo.h index 8d36cc06..77130be0 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/music.cpp b/src/resources/music.cpp index ed71d62c..ed78a541 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/music.h b/src/resources/music.h index 322cfecd..4d2ffd29 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/npcdb.cpp b/src/resources/npcdb.cpp index 0908d67d..88572481 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/npcdb.h b/src/resources/npcdb.h index 1883d747..c2bd04e4 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/resource.cpp b/src/resources/resource.cpp index 82562691..d1c3ada4 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/resource.h b/src/resources/resource.h index 168fd70a..855d09b8 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 7f2cba1d..f193d55d 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/resourcemanager.h b/src/resources/resourcemanager.h index 95519da3..4372195d 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index f7b2b874..3a285730 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/soundeffect.h b/src/resources/soundeffect.h index b9abefd7..b19142b3 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/spritedef.cpp b/src/resources/spritedef.cpp index 41b1e789..e8d064d4 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/resources/spritedef.h b/src/resources/spritedef.h index 033de6cd..4759ef4e 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/serverinfo.h b/src/serverinfo.h index 4d2bb525..d3be62fa 100644 --- a/src/serverinfo.h +++ b/src/serverinfo.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/shopitem.cpp b/src/shopitem.cpp index 9888f829..3b90dfdd 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/shopitem.h b/src/shopitem.h index f0c00ef0..7da77cdf 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/simpleanimation.cpp b/src/simpleanimation.cpp index 544d02b5..17d9ce60 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/simpleanimation.h b/src/simpleanimation.h index 577268a8..ce8832c3 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/sound.cpp b/src/sound.cpp index 6d440134..78538c09 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/sound.h b/src/sound.h index 72180607..1b47e4c7 100644 --- a/src/sound.h +++ b/src/sound.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/sprite.h b/src/sprite.h index 52825db2..321d6abe 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/text.cpp b/src/text.cpp index 4d36b8fc..5624bc0a 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -7,8 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * This program is distributed with The Mana Experiment * - * 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/text.h b/src/text.h index 173a5686..c2ec4154 100644 --- a/src/text.h +++ b/src/text.h @@ -7,8 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * This program is distributed with The Mana Experiment * - * 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/textmanager.cpp b/src/textmanager.cpp index cb5d0bf2..7c5d2713 100644 --- a/src/textmanager.cpp +++ b/src/textmanager.cpp @@ -7,8 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * This program is distributed with The Mana Experiment * - * 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/textmanager.h b/src/textmanager.h index 5b21ba81..6497c335 100644 --- a/src/textmanager.h +++ b/src/textmanager.h @@ -7,8 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * This program is distributed with The Mana Experiment * - * 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/textparticle.cpp b/src/textparticle.cpp index ed9d5717..7e329b4e 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/textparticle.h b/src/textparticle.h index 039c18d7..bc7cd88c 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2006 The Mana World Development Team + * Copyright (C) 2006 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tileset.h b/src/tileset.h index fb855831..040f7ef8 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/dtor.h b/src/utils/dtor.h index 514ea9e7..399cb8c2 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/gettext.h b/src/utils/gettext.h index 0cd9114b..74502bb0 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/mutex.h b/src/utils/mutex.h index 62c6b4e1..31e43e33 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2008 The Mana World Development Team + * Copyright (C) 2008 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/strprintf.cpp b/src/utils/strprintf.cpp index c532dd0d..07fb3508 100644 --- a/src/utils/strprintf.cpp +++ b/src/utils/strprintf.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/strprintf.h b/src/utils/strprintf.h index 382ab6e0..98ef5065 100644 --- a/src/utils/strprintf.h +++ b/src/utils/strprintf.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/tostring.h b/src/utils/tostring.h index d2dd941a..0c3b600f 100644 --- a/src/utils/tostring.h +++ b/src/utils/tostring.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/trim.h b/src/utils/trim.h index a7c40ca2..9d0d5600 100644 --- a/src/utils/trim.h +++ b/src/utils/trim.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/xml.cpp b/src/utils/xml.cpp index db78d08c..24058558 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/utils/xml.h b/src/utils/xml.h index 403fe6d9..6af5f1ca 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/vector.cpp b/src/vector.cpp index 7d5f055a..9b573e88 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/vector.h b/src/vector.h index f32b201a..cd477301 100644 --- a/src/vector.h +++ b/src/vector.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2007 The Mana World Development Team + * Copyright (C) 2007 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tools/tmxcopy/main.cpp b/tools/tmxcopy/main.cpp index 92a69c54..ab67afe6 100644 --- a/tools/tmxcopy/main.cpp +++ b/tools/tmxcopy/main.cpp @@ -1,20 +1,19 @@ /* * TMXCopy - * Copyright 2007 Philipp Sehmisch + * Copyright (C) 2007 Philipp Sehmisch * - * - * TMXCopy 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. * - * TMXCopy 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 TMXCopy; 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/tools/tmxcopy/map.cpp b/tools/tmxcopy/map.cpp index b554aac2..92e661fd 100644 --- a/tools/tmxcopy/map.cpp +++ b/tools/tmxcopy/map.cpp @@ -1,20 +1,19 @@ /* * TMXCopy - * Copyright 2007 Philipp Sehmisch + * Copyright (C) 2007 Philipp Sehmisch * - * - * TMXCopy 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. * - * TMXCopy 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 TMXCopy; 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/tools/tmxcopy/tostring.h b/tools/tmxcopy/tostring.h index d2dd941a..0c3b600f 100644 --- a/tools/tmxcopy/tostring.h +++ b/tools/tmxcopy/tostring.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tools/tmxcopy/xmlutils.cpp b/tools/tmxcopy/xmlutils.cpp index 8b1b62cf..54dd0869 100644 --- a/tools/tmxcopy/xmlutils.cpp +++ b/tools/tmxcopy/xmlutils.cpp @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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/tools/tmxcopy/xmlutils.h b/tools/tmxcopy/xmlutils.h index 60e8f3cd..9a1f7dab 100644 --- a/tools/tmxcopy/xmlutils.h +++ b/tools/tmxcopy/xmlutils.h @@ -1,21 +1,21 @@ /* * The Mana World - * Copyright 2004 The Mana World Development Team + * Copyright (C) 2004 The Mana World Development Team * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This 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 */ -- cgit v1.2.3-70-g09d2 From 581206ab0fecbb3afc7afebedac541be51097cf5 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 24 Jan 2009 19:43:26 +0100 Subject: Use standard GUI font also for speech and names The speech bitmap font can't handle unicode, so it has now been replaced by the standard GUI font, drawn with a shadow for chat and with a full outline for names. --- data/graphics/gui/CMakeLists.txt | 1 - data/graphics/gui/Makefile.am | 4 -- data/graphics/gui/rpgfont_wider-blue.png | Bin 4431 -> 0 bytes data/graphics/gui/rpgfont_wider-green.png | Bin 4423 -> 0 bytes data/graphics/gui/rpgfont_wider-orange.png | Bin 4415 -> 0 bytes data/graphics/gui/rpgfont_wider.png | Bin 4382 -> 0 bytes src/being.cpp | 3 +- src/gui/gui.cpp | 67 +++-------------------------- src/gui/gui.h | 11 ----- src/gui/ministatus.cpp | 8 ---- src/monster.cpp | 5 +-- src/npc.cpp | 5 +-- src/player.cpp | 8 +--- src/text.cpp | 35 ++++++++++----- src/text.h | 7 +-- 15 files changed, 38 insertions(+), 116 deletions(-) delete mode 100644 data/graphics/gui/rpgfont_wider-blue.png delete mode 100644 data/graphics/gui/rpgfont_wider-green.png delete mode 100644 data/graphics/gui/rpgfont_wider-orange.png delete mode 100644 data/graphics/gui/rpgfont_wider.png (limited to 'src/being.cpp') diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index e5ecaa12..e569463c 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -27,7 +27,6 @@ SET (FILES radioin.png radioout.png resize.png - rpgfont_wider.png selection.png slider.png speech_bubble.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 1878fe5a..aaccd79a 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -30,10 +30,6 @@ gui_DATA = \ radioin.png \ radioout.png \ resize.png \ - rpgfont_wider.png \ - rpgfont_wider-blue.png \ - rpgfont_wider-green.png \ - rpgfont_wider-orange.png \ selection.png \ slider.png \ speech_bubble.png \ diff --git a/data/graphics/gui/rpgfont_wider-blue.png b/data/graphics/gui/rpgfont_wider-blue.png deleted file mode 100644 index b4a27434..00000000 Binary files a/data/graphics/gui/rpgfont_wider-blue.png and /dev/null differ diff --git a/data/graphics/gui/rpgfont_wider-green.png b/data/graphics/gui/rpgfont_wider-green.png deleted file mode 100644 index 00098746..00000000 Binary files a/data/graphics/gui/rpgfont_wider-green.png and /dev/null differ diff --git a/data/graphics/gui/rpgfont_wider-orange.png b/data/graphics/gui/rpgfont_wider-orange.png deleted file mode 100644 index 18dd67e9..00000000 Binary files a/data/graphics/gui/rpgfont_wider-orange.png and /dev/null differ diff --git a/data/graphics/gui/rpgfont_wider.png b/data/graphics/gui/rpgfont_wider.png deleted file mode 100644 index 55ccbbd6..00000000 Binary files a/data/graphics/gui/rpgfont_wider.png and /dev/null differ diff --git a/src/being.cpp b/src/being.cpp index a0b870e0..65e9f9d1 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -527,8 +527,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) delete mText; mText = new Text(mSpeech, mPx + X_SPEECH_OFFSET, mPy - Y_SPEECH_OFFSET, - gcn::Graphics::CENTER, speechFont, - gcn::Color(255, 255, 255)); + gcn::Graphics::CENTER, gcn::Color(255, 255, 255)); } else if (mSpeechTime == 0) { diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 99883151..5314b9ba 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -42,14 +42,14 @@ #include "../resources/resourcemanager.h" // Guichan stuff -Gui *gui; -Viewport *viewport; /**< Viewport on the map. */ -SDLInput *guiInput; +Gui *gui = 0; +Viewport *viewport = 0; /**< Viewport on the map. */ +SDLInput *guiInput = 0; // Fonts used in showing hits -gcn::Font *hitRedFont; -gcn::Font *hitBlueFont; -gcn::Font *hitYellowFont; +gcn::Font *hitRedFont = 0; +gcn::Font *hitBlueFont = 0; +gcn::Font *hitYellowFont = 0; // Font used to display speech and player names gcn::Font *speechFont; @@ -122,60 +122,6 @@ Gui::Gui(Graphics *graphics): + e.getMessage()); } - // Set speech font - try { - speechFont = new gcn::ImageFont("graphics/gui/rpgfont_wider.png", - " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\" - "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ" - ); - } - catch (gcn::Exception e) - { - logger->error(std::string("Unable to load rpgfont_wider.png: ") - + e.getMessage()); - } - - // Set npc name font - try { - npcNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-blue.png", - " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\" - "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ" - ); - } - catch (gcn::Exception e) - { - logger->error("Unable to load rpgfont_wider-blue.png!"); - } - - // Set monster name font - try { - mobNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-orange.png", - " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\" - "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ" - ); - } - catch (gcn::Exception e) - { - logger->error("Unable to load rpgfont_wider-orange.png!"); - } - - // Set GM name font - try { - gmNameFont = new gcn::ImageFont("graphics/gui/rpgfont_wider-green.png", - " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\" - "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ" - ); - } - catch (gcn::Exception e) - { - logger->error("Unable to load rpgfont_wider-green.png!"); - } - - gcn::Widget::setGlobalFont(mGuiFont); // Load hits' colourful fonts @@ -219,7 +165,6 @@ Gui::~Gui() mMouseCursors->decRef(); delete mGuiFont; - delete speechFont; delete viewport; delete getTop(); diff --git a/src/gui/gui.h b/src/gui/gui.h index 2289ae0b..bb14d4dc 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -124,17 +124,6 @@ extern SDLInput *guiInput; /**< GUI input */ extern gcn::Font *hitRedFont; extern gcn::Font *hitBlueFont; extern gcn::Font *hitYellowFont; -/** - * Font used to display speech and player names - */ -extern gcn::Font *speechFont; - -/** - * being name fonts - */ -extern gcn::Font *npcNameFont; -extern gcn::Font *mobNameFont; -extern gcn::Font *gmNameFont; #endif diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 04901379..f2e466f4 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -54,14 +54,6 @@ MiniStatusWindow::MiniStatusWindow(): mMpLabel->setDimension(mMpBar->getDimension()); mXpLabel->setDimension(mXpBar->getDimension()); - mHpLabel->setForegroundColor(gcn::Color(255, 255, 255)); - mMpLabel->setForegroundColor(gcn::Color(255, 255, 255)); - mXpLabel->setForegroundColor(gcn::Color(255, 255, 255)); - - mHpLabel->setFont(speechFont); - mMpLabel->setFont(speechFont); - mXpLabel->setFont(speechFont); - mHpLabel->setAlignment(gcn::Graphics::CENTER); mMpLabel->setAlignment(gcn::Graphics::CENTER); mXpLabel->setAlignment(gcn::Graphics::CENTER); diff --git a/src/monster.cpp b/src/monster.cpp index f42258bc..4006315b 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -27,8 +27,6 @@ #include "sound.h" #include "text.h" -#include "gui/gui.h" - #include "resources/monsterdb.h" #include "utils/tostring.h" @@ -200,8 +198,7 @@ void Monster::showName(bool show) { mText = new Text(getInfo().getName(), mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET - getHeight(), - gcn::Graphics::CENTER, - mobNameFont, gcn::Color(255, 32, 32)); + gcn::Graphics::CENTER, gcn::Color(255, 32, 32)); } else { diff --git a/src/npc.cpp b/src/npc.cpp index d8bd5468..27388880 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -31,8 +31,6 @@ #include "resources/npcdb.h" -#include "gui/gui.h" - NPC *current_npc = 0; static const int NAME_X_OFFSET = 15; @@ -89,8 +87,7 @@ void NPC::setName(const std::string &name) std::string displayName = name.substr(0, name.find('#', 0)); mName = new Text(displayName, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, - gcn::Graphics::CENTER, npcNameFont, - gcn::Color(200, 200, 255)); + gcn::Graphics::CENTER, gcn::Color(200, 200, 255)); Being::setName(displayName + " (NPC)"); } diff --git a/src/player.cpp b/src/player.cpp index a72e754d..d62018f2 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -27,8 +27,6 @@ #include "log.h" #include "player.h" -#include "gui/gui.h" - #include "resources/itemdb.h" #include "resources/iteminfo.h" @@ -54,12 +52,10 @@ void Player::setName(const std::string &name) { if (mIsGM) { mName = new FlashText("(GM) " + name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, - gcn::Graphics::CENTER, - gmNameFont, gcn::Color(255, 255, 255)); + gcn::Graphics::CENTER, gcn::Color(0, 255, 0)); } else { mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, - gcn::Graphics::CENTER, - speechFont, gcn::Color(255, 255, 255)); + gcn::Graphics::CENTER, gcn::Color(255, 255, 255)); } Being::setName(name); } diff --git a/src/text.cpp b/src/text.cpp index 5624bc0a..ba581dab 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -25,12 +25,12 @@ #include "text.h" #include "textmanager.h" -int Text::mInstances = 0; +#include "gui/gui.h" +int Text::mInstances = 0; Text::Text(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Font *font, - gcn::Color colour) : + gcn::Graphics::Alignment alignment, gcn::Color colour) : mText(text), mColour(colour) { if (textManager == 0) @@ -38,8 +38,8 @@ Text::Text(const std::string &text, int x, int y, textManager = new TextManager(); } ++mInstances; - mHeight = font->getHeight(); - mWidth = font->getWidth(text); + mHeight = gui->getFont()->getHeight(); + mWidth = gui->getFont()->getWidth(text); switch (alignment) { case gcn::Graphics::LEFT: @@ -55,7 +55,6 @@ Text::Text(const std::string &text, int x, int y, mX = x - mXOffset; mY = y; textManager->addText(this); - mFont = font; } void Text::adviseXY(int x, int y) @@ -75,15 +74,31 @@ Text::~Text() void Text::draw(Graphics *graphics, int xOff, int yOff) { - graphics->setFont(mFont); + graphics->setFont(gui->getFont()); + + // Text shadow + graphics->setColor(gcn::Color(0, 0, 0)); + graphics->drawText(mText, mX - xOff + 1, mY - yOff + 1, + gcn::Graphics::LEFT); + + // Text outline + graphics->drawText(mText, mX - xOff + 1, mY - yOff, + gcn::Graphics::LEFT); + graphics->drawText(mText, mX - xOff - 1, mY - yOff, + gcn::Graphics::LEFT); + graphics->drawText(mText, mX - xOff, mY - yOff + 1, + gcn::Graphics::LEFT); + graphics->drawText(mText, mX - xOff, mY - yOff - 1, + gcn::Graphics::LEFT); + graphics->setColor(mColour); 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::Font *font, - gcn::Color colour) : - Text(text, x, y, alignment, font, colour), mTime(0) + gcn::Graphics::Alignment alignment, gcn::Color colour) : + Text(text, x, y, alignment, colour), + mTime(0) { } diff --git a/src/text.h b/src/text.h index c2ec4154..03f2dcbc 100644 --- a/src/text.h +++ b/src/text.h @@ -37,8 +37,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::Font *font, - gcn::Color colour); + gcn::Graphics::Alignment alignment, gcn::Color colour); /** * Destructor. The text is removed from the screen. @@ -62,7 +61,6 @@ class Text int mHeight; /**< The height of the text. */ int mXOffset; /**< The offset of mX from the desired x. */ static int mInstances; /**< Instances of text. */ - gcn::Font *mFont; /**< The font used. */ std::string mText; /**< The text to display. */ gcn::Color mColour; /**< The colour of the text. */ }; @@ -71,8 +69,7 @@ class FlashText : public Text { public: FlashText(const std::string &text, int x, int y, - gcn::Graphics::Alignment alignment, gcn::Font *font, - gcn::Color colour); + gcn::Graphics::Alignment alignment, gcn::Color colour); /** * Remove the text from the screen -- cgit v1.2.3-70-g09d2 From 5e1dc59411cd7973fb4208ae76d0970bd2ea87d6 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sat, 24 Jan 2009 16:44:27 -0700 Subject: Updated DejaVuSans ttf file, as well as adding the bolded version, which is used in a few spots. Signed-off-by: Ira Rice --- data/fonts/CMakeLists.txt | 1 + data/fonts/Makefile.am | 3 ++- data/fonts/dejavusans-bold.ttf | Bin 0 -> 569880 bytes data/fonts/dejavusans.ttf | Bin 569716 -> 619108 bytes src/being.cpp | 7 ++++--- src/gui/gui.cpp | 21 +++++++++++++-------- src/gui/gui.h | 4 ++++ src/gui/ministatus.cpp | 8 ++++++++ src/gui/speechbubble.cpp | 25 ++++++++++++++++++------- src/gui/speechbubble.h | 1 + src/text.cpp | 6 +++--- 11 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 data/fonts/dejavusans-bold.ttf (limited to 'src/being.cpp') diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt index 8393b923..d5b6ed85 100644 --- a/data/fonts/CMakeLists.txt +++ b/data/fonts/CMakeLists.txt @@ -1,5 +1,6 @@ SET (FILES dejavusans.ttf + dejavusans-bold.ttf ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts) diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am index 1384818c..1b575f7d 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -2,7 +2,8 @@ fontdir = $(pkgdatadir)/data/fonts font_DATA = \ - dejavusans.ttf + dejavusans.ttf \ + dejavusans-bold.ttf EXTRA_DIST = \ $(font_DATA) diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf new file mode 100644 index 00000000..ebefb0ca Binary files /dev/null and b/data/fonts/dejavusans-bold.ttf differ diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf index 627cef46..6253857c 100644 Binary files a/data/fonts/dejavusans.ttf and b/data/fonts/dejavusans.ttf differ diff --git a/src/being.cpp b/src/being.cpp index 65e9f9d1..e30ccee4 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -510,11 +510,12 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) mText = 0; } - mSpeechBubble->setCaption(mName); - mSpeechBubble->setWindowName(mName); + if (mName != mSpeechBubble->getCaption()) + mSpeechBubble->setName(mName); + // Not quite centered, but close enough. However, it's not too important to get // it right right now, as it doesn't take bubble collision into account yet. - mSpeechBubble->setText( mSpeech ); + mSpeechBubble->setText(mSpeech); mSpeechBubble->setPosition(px - (mSpeechBubble->getWidth() * 4 / 11), py - 70 - (mSpeechBubble->getNumRows()*14)); mSpeechBubble->setVisible(true); diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 5314b9ba..fe8cae78 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -50,15 +50,9 @@ SDLInput *guiInput = 0; gcn::Font *hitRedFont = 0; gcn::Font *hitBlueFont = 0; gcn::Font *hitYellowFont = 0; -// Font used to display speech and player names -gcn::Font *speechFont; -// Font for displaying NPC names -gcn::Font *npcNameFont; -// Font for displaying mob names -gcn::Font *mobNameFont; -// Font for displaying GM names -gcn::Font *gmNameFont; +// Bolded font +gcn::Font *boldFont = 0; class GuiConfigListener : public ConfigListener { @@ -122,6 +116,17 @@ Gui::Gui(Graphics *graphics): + e.getMessage()); } + // Set bold font + path = resman->getPath("fonts/dejavusans-bold.ttf"); + try { + boldFont = new TrueTypeFont(path, 11); + } + catch (gcn::Exception e) + { + logger->error(std::string("Unable to load dejavusans-bold.ttf: ") + + e.getMessage()); + } + gcn::Widget::setGlobalFont(mGuiFont); // Load hits' colourful fonts diff --git a/src/gui/gui.h b/src/gui/gui.h index bb14d4dc..9f45a3f3 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -125,5 +125,9 @@ extern gcn::Font *hitRedFont; extern gcn::Font *hitBlueFont; extern gcn::Font *hitYellowFont; +/** + * Bolded text font + */ +extern gcn::Font *boldFont; #endif diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index f2e466f4..6e162141 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -46,6 +46,14 @@ MiniStatusWindow::MiniStatusWindow(): mMpLabel = new gcn::Label(""); mXpLabel = new gcn::Label(""); + mHpLabel->setForegroundColor(gcn::Color(50, 50, 50)); + mMpLabel->setForegroundColor(gcn::Color(50, 50, 50)); + mXpLabel->setForegroundColor(gcn::Color(50, 50, 50)); + + mHpLabel->setFont(boldFont); + mMpLabel->setFont(boldFont); + mXpLabel->setFont(boldFont); + mHpBar->setPosition(0, 3); mMpBar->setPosition(mHpBar->getWidth() + 3, 3); mXpBar->setPosition(mMpBar->getX() + mMpBar->getWidth() + 3, 3); diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 4fa63973..eb3232ea 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -22,6 +22,7 @@ #include +#include "gui.h" #include "speechbubble.h" #include "../resources/image.h" @@ -32,7 +33,7 @@ // TODO: Fix windows so that they can each load their own skins without the // other windows overriding another window's skin. SpeechBubble::SpeechBubble(): - Window(_("Message"), false, NULL, "graphics/gui/speechbubble.xml") + Window(_(""), false, NULL, "graphics/gui/speechbubble.xml") { mSpeechBox = new TextBox(); mSpeechBox->setEditable(false); @@ -59,28 +60,38 @@ SpeechBubble::SpeechBubble(): mSpeechBox->setTextWrapped( "" ); } +void SpeechBubble::setName(const std::string &name) +{ + setWindowName(name); + setCaption(name); +} + void SpeechBubble::setText(std::string mText) { mSpeechBox->setMinWidth(140); mSpeechBox->setTextWrapped( mText ); + const int fontHeight = getFont()->getHeight(); int numRows = mSpeechBox->getNumberOfRows(); if (numRows > 1) { // 15 == height of each line of text (based on font heights) // 14 == speechbubble Top + Bottom graphic pixel heights - setContentSize(mSpeechBox->getMinWidth() + 15, 15 + (numRows * 15)); - mSpeechArea->setDimension(gcn::Rectangle(4, 15, mSpeechBox->getMinWidth() + 5, - 3 +(numRows * 14))); + setContentSize(mSpeechBox->getMinWidth() + fontHeight, fontHeight + + (numRows * fontHeight)); + mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight, + mSpeechBox->getMinWidth() + 5, + 3 + (numRows * fontHeight))); } else { - int width = getFont()->getWidth(this->getCaption()); + int width = boldFont->getWidth(this->getCaption()); if (width < getFont()->getWidth(mText)) width = getFont()->getWidth(mText); - setContentSize(width + 15, 30); - mSpeechArea->setDimension(gcn::Rectangle(4, 15, width + 5, 17)); + setContentSize(width + fontHeight, fontHeight * 2); + mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight, + width + 5, fontHeight + 2)); } } diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 9b8eab70..6d8a94d4 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -33,6 +33,7 @@ class SpeechBubble : public Window SpeechBubble(); + void setName(const std::string &name); void setText(std::string mText); void setLocation(int x, int y); unsigned int getNumRows(); diff --git a/src/text.cpp b/src/text.cpp index ba581dab..14ee3919 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -38,8 +38,8 @@ Text::Text(const std::string &text, int x, int y, textManager = new TextManager(); } ++mInstances; - mHeight = gui->getFont()->getHeight(); - mWidth = gui->getFont()->getWidth(text); + mHeight = boldFont->getHeight(); + mWidth = boldFont->getWidth(text); switch (alignment) { case gcn::Graphics::LEFT: @@ -74,7 +74,7 @@ Text::~Text() void Text::draw(Graphics *graphics, int xOff, int yOff) { - graphics->setFont(gui->getFont()); + graphics->setFont(boldFont); // Text shadow graphics->setColor(gcn::Color(0, 0, 0)); -- cgit v1.2.3-70-g09d2 From 5c79b920eefb219f0dd4491b709af4f116d3a988 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sat, 24 Jan 2009 18:16:17 -0700 Subject: Tweaks to the speech bubbles so that being status (GM, mob, npc, regular player) is displayed in the speech bubbles now. No need to view your own name to be able to see whether you're showing as a GM now. Signed-off-by: Ira Rice --- src/being.cpp | 4 ++-- src/being.h | 2 ++ src/gui/speechbubble.cpp | 52 +++++++++++++++++++++++++++++------------------- src/gui/speechbubble.h | 4 +++- src/localplayer.cpp | 1 + src/monster.cpp | 2 ++ src/npc.cpp | 2 ++ src/player.cpp | 9 +++++++-- 8 files changed, 50 insertions(+), 26 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index e30ccee4..3fc679da 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -109,6 +109,7 @@ Being::Being(int id, int job, Map *map): instances++; mSpeech = ""; + mNameColor = 0x202020; mText = 0; } @@ -510,8 +511,7 @@ void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) mText = 0; } - if (mName != mSpeechBubble->getCaption()) - mSpeechBubble->setName(mName); + mSpeechBubble->setCaption(mName, mNameColor); // Not quite centered, but close enough. However, it's not too important to get // it right right now, as it doesn't take bubble collision into account yet. diff --git a/src/being.h b/src/being.h index 1e9954c5..c47864e8 100644 --- a/src/being.h +++ b/src/being.h @@ -416,6 +416,8 @@ class Being : public Sprite Uint16 mStunMode; /**< Stun mode; zero if not stunned */ StatusEffects mStatusEffects; /**< Bitset of active status effects */ + gcn::Color mNameColor; + std::vector mSprites; std::vector mSpriteIDs; std::vector mSpriteColors; diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index eb3232ea..97e3fd73 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -22,6 +22,8 @@ #include +#include + #include "gui.h" #include "speechbubble.h" @@ -33,23 +35,30 @@ // TODO: Fix windows so that they can each load their own skins without the // other windows overriding another window's skin. SpeechBubble::SpeechBubble(): - Window(_(""), false, NULL, "graphics/gui/speechbubble.xml") + Window(_("Speech"), false, NULL, "graphics/gui/speechbubble.xml") { + // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px) + setContentSize(140, 46); + setShowTitle(false); + setTitleBarHeight(0); + + mCaption = new gcn::Label(""); + mCaption->setFont(boldFont); + mCaption->setPosition(5, 3); + mSpeechBox = new TextBox(); mSpeechBox->setEditable(false); mSpeechBox->setOpaque(false); mSpeechArea = new ScrollArea(mSpeechBox); - // Height == Top Graphic (14px) + 1 Row of Text (15px) + Bottom Graphic (17px) - setContentSize(140, 46); - setTitleBarHeight(5); - mSpeechArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); mSpeechArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mSpeechArea->setDimension(gcn::Rectangle(4, 15, 130, 28)); + mSpeechArea->setDimension(gcn::Rectangle(4, boldFont->getHeight() + 3, + 130, 28)); mSpeechArea->setOpaque(false); + add(mCaption); add(mSpeechArea); setLocationRelativeTo(getParent()); @@ -60,38 +69,39 @@ SpeechBubble::SpeechBubble(): mSpeechBox->setTextWrapped( "" ); } -void SpeechBubble::setName(const std::string &name) +void SpeechBubble::setCaption(const std::string &name, const gcn::Color &color) { - setWindowName(name); - setCaption(name); + mCaption->setCaption(name); + mCaption->adjustSize(); + mCaption->setForegroundColor(color); } void SpeechBubble::setText(std::string mText) { mSpeechBox->setMinWidth(140); - mSpeechBox->setTextWrapped( mText ); + mSpeechBox->setTextWrapped(mText); const int fontHeight = getFont()->getHeight(); - int numRows = mSpeechBox->getNumberOfRows(); + const int numRows = mSpeechBox->getNumberOfRows() + 1; - if (numRows > 1) + if (numRows > 2) { // 15 == height of each line of text (based on font heights) // 14 == speechbubble Top + Bottom graphic pixel heights - setContentSize(mSpeechBox->getMinWidth() + fontHeight, fontHeight + - (numRows * fontHeight)); - mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight, - mSpeechBox->getMinWidth() + 5, - 3 + (numRows * fontHeight))); + setContentSize(mSpeechBox->getMinWidth() + fontHeight, + (numRows * fontHeight) + 6); + mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, + mSpeechBox->getMinWidth() + 5, + (numRows * fontHeight))); } else { - int width = boldFont->getWidth(this->getCaption()); + int width = mCaption->getWidth() + 8; if (width < getFont()->getWidth(mText)) width = getFont()->getWidth(mText); - setContentSize(width + fontHeight, fontHeight * 2); - mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight, - width + 5, fontHeight + 2)); + setContentSize(width + fontHeight, (fontHeight * 2) + 6); + mSpeechArea->setDimension(gcn::Rectangle(4, fontHeight + 3, + width + 5, fontHeight)); } } diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 6d8a94d4..23733813 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -33,12 +33,14 @@ class SpeechBubble : public Window SpeechBubble(); - void setName(const std::string &name); + void setCaption(const std::string &name, + const gcn::Color &color = 0x000000); void setText(std::string mText); void setLocation(int x, int y); unsigned int getNumRows(); private: + gcn::Label *mCaption; TextBox *mSpeechBox; ScrollArea *mSpeechArea; }; diff --git a/src/localplayer.cpp b/src/localplayer.cpp index db7a25f8..c6fde7a8 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -173,6 +173,7 @@ void LocalPlayer::logic() void LocalPlayer::setGM() { mIsGM = !mIsGM; + mNameColor = mIsGM ? 0x009000: 0x202020; setName(getName()); config.setValue(getName() + "GMassert", mIsGM); } diff --git a/src/monster.cpp b/src/monster.cpp index 814a5904..4f2c97e7 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -71,6 +71,8 @@ Monster::Monster(Uint32 id, Uint16 job, Map *map): controlParticle(particleEngine->addEffect((*i), 0, 0)); } } + + mNameColor = 0xff2020; } Monster::~Monster() diff --git a/src/npc.cpp b/src/npc.cpp index 27388880..cef98e45 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -67,6 +67,8 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network): } } mName = 0; + + mNameColor = 0x21bbbb; } NPC::~NPC() diff --git a/src/player.cpp b/src/player.cpp index d62018f2..ad5b568b 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -50,10 +50,15 @@ void Player::setName(const std::string &name) { if (mName == 0) { - if (mIsGM) { + if (mIsGM) + { + mNameColor = 0x009000; mName = new FlashText("(GM) " + name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, gcn::Graphics::CENTER, gcn::Color(0, 255, 0)); - } else { + } + else + { + mNameColor = 0x202020; mName = new FlashText(name, mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET, gcn::Graphics::CENTER, gcn::Color(255, 255, 255)); } -- cgit v1.2.3-70-g09d2 From 062f4065f5a2117fc5fd5f408e1f3163e2f63afc Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 26 Jan 2009 01:26:25 -0700 Subject: Fixed offset of right-click hitboxes and made NPCs without sprites clickable. Also set a minimum clickable area so that small mobs like maggots aren't too difficult to click. Been wanting this patched for a while, but didn't know where to look until Crush's patch for mainline click zones on TMW. Signed-off-by: Ira Rice --- src/being.cpp | 14 ++++++++++---- src/being.h | 3 +++ src/beingmanager.cpp | 10 +++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 3fc679da..ad5f4204 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -571,11 +571,14 @@ int Being::getWidth() const { if (mSprites[BASE_SPRITE]) { - return mSprites[BASE_SPRITE]->getWidth(); + const int width = mSprites[BASE_SPRITE]->getWidth() > Being::DEFAULT_WIDTH ? + mSprites[BASE_SPRITE]->getWidth() : + Being::DEFAULT_WIDTH; + return width; } else { - return 0; + return Being::DEFAULT_WIDTH; } } @@ -584,11 +587,14 @@ int Being::getHeight() const { if (mSprites[BASE_SPRITE]) { - return mSprites[BASE_SPRITE]->getHeight(); + const int height = mSprites[BASE_SPRITE]->getHeight() > Being::DEFAULT_HEIGHT ? + mSprites[BASE_SPRITE]->getHeight() : + Being::DEFAULT_HEIGHT; + return height; } else { - return 0; + return Being::DEFAULT_HEIGHT; } } diff --git a/src/being.h b/src/being.h index 80295db8..a43297ad 100644 --- a/src/being.h +++ b/src/being.h @@ -432,6 +432,9 @@ class Being : public Sprite */ int getOffset(char pos, char neg) const; + static const int DEFAULT_WIDTH = 32; + static const int DEFAULT_HEIGHT = 32; + // Speech Bubble components SpeechBubble *mSpeechBubble; diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index b2dc330b..6b71b3bf 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -129,12 +129,16 @@ Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y) for (; itr != itr_end; ++itr) { Being *being = (*itr); + + int xtol = being->getWidth(); + int uptol = being->getHeight(); + if ((being->mAction != Being::DEAD) && (being != player_node) && (being->getPixelX() <= x) && - (being->getPixelX() + being->getWidth() >= x) && - (being->getPixelY() <= y) && - (being->getPixelY() + being->getHeight() >= y)) + (being->getPixelX() + xtol >= x) && + (being->getPixelY() - (uptol / 2) <= y) && + (being->getPixelY() + (uptol / 2) >= y)) { return being; } -- cgit v1.2.3-70-g09d2 From 803e0dae01f09afbe529799cf89a8f57fe518ddb Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 26 Jan 2009 01:56:55 -0700 Subject: Bit of code cleanup for the last commit (moved default width and height out of being.h, so that they aren't included in any classes that don't need them and cut the number of divisions in half in the being manager) Signed-off-by: Ira Rice --- src/being.cpp | 15 +++++++++------ src/being.h | 3 --- src/beingmanager.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index ad5f4204..985be69c 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -56,6 +56,9 @@ std::vector Being::emotionSet; static const int X_SPEECH_OFFSET = 18; static const int Y_SPEECH_OFFSET = 60; +static const int DEFAULT_WIDTH = 32; +static const int DEFAULT_HEIGHT = 32; + Being::Being(int id, int job, Map *map): mJob(job), mX(0), mY(0), @@ -571,14 +574,14 @@ int Being::getWidth() const { if (mSprites[BASE_SPRITE]) { - const int width = mSprites[BASE_SPRITE]->getWidth() > Being::DEFAULT_WIDTH ? + const int width = mSprites[BASE_SPRITE]->getWidth() > DEFAULT_WIDTH ? mSprites[BASE_SPRITE]->getWidth() : - Being::DEFAULT_WIDTH; + DEFAULT_WIDTH; return width; } else { - return Being::DEFAULT_WIDTH; + return DEFAULT_WIDTH; } } @@ -587,14 +590,14 @@ int Being::getHeight() const { if (mSprites[BASE_SPRITE]) { - const int height = mSprites[BASE_SPRITE]->getHeight() > Being::DEFAULT_HEIGHT ? + const int height = mSprites[BASE_SPRITE]->getHeight() > DEFAULT_HEIGHT ? mSprites[BASE_SPRITE]->getHeight() : - Being::DEFAULT_HEIGHT; + DEFAULT_HEIGHT; return height; } else { - return Being::DEFAULT_HEIGHT; + return DEFAULT_HEIGHT; } } diff --git a/src/being.h b/src/being.h index a43297ad..80295db8 100644 --- a/src/being.h +++ b/src/being.h @@ -432,9 +432,6 @@ class Being : public Sprite */ int getOffset(char pos, char neg) const; - static const int DEFAULT_WIDTH = 32; - static const int DEFAULT_HEIGHT = 32; - // Speech Bubble components SpeechBubble *mSpeechBubble; diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp index 6b71b3bf..9e620ca0 100644 --- a/src/beingmanager.cpp +++ b/src/beingmanager.cpp @@ -131,14 +131,14 @@ Being* BeingManager::findBeingByPixel(Uint16 x, Uint16 y) Being *being = (*itr); int xtol = being->getWidth(); - int uptol = being->getHeight(); + int uptol = being->getHeight() / 2; if ((being->mAction != Being::DEAD) && (being != player_node) && (being->getPixelX() <= x) && (being->getPixelX() + xtol >= x) && - (being->getPixelY() - (uptol / 2) <= y) && - (being->getPixelY() + (uptol / 2) >= y)) + (being->getPixelY() - uptol <= y) && + (being->getPixelY() + uptol >= y)) { return being; } -- cgit v1.2.3-70-g09d2