From 30e89c08e26cb0988afc33da18bcebed1d177883 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 27 Nov 2011 04:05:38 +0300 Subject: Fix players and mobs hp bar. Draw damage bar part in some situations. --- src/being.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/being.cpp b/src/being.cpp index 736d64f1a..31f1eac59 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2071,7 +2071,8 @@ void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage, int dx = static_cast(static_cast(width) / p); - if (!damage || (!hp && maxHP == damage)) + if ((!damage && (this != player_node || hp == maxHP)) + || (!hp && maxHP == damage)) { graphics->setColor(userPalette->getColorWithAlpha(color1)); -- cgit v1.2.3-70-g09d2 From a7f59172b83910f9e2dc17c116f70530f46cf6a1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 27 Nov 2011 19:03:11 +0300 Subject: Fix recursive directory creation for windows. --- src/utils/mkdir.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp index 84c205b33..dc2ab63ef 100644 --- a/src/utils/mkdir.cpp +++ b/src/utils/mkdir.cpp @@ -43,6 +43,7 @@ int mkdir_r(const char *pathname) { char tmp[PATH_MAX]; + char tmp2[PATH_MAX]; char *p; if (strlen(pathname) >= PATH_MAX - 2) @@ -72,9 +73,13 @@ int mkdir_r(const char *pathname) continue; } + strcpy(tmp2, tmp); + char *p2 = tmp2 + strlen(tmp2) - 1; + if (*p2 == '/' || *p2 == '\\') + *p2 = 0; // check if the name already exists, but not as directory struct stat statbuf; - if (!stat(tmp, &statbuf)) + if (!stat(tmp2, &statbuf)) { if (S_ISDIR(statbuf.st_mode)) { @@ -85,13 +90,12 @@ int mkdir_r(const char *pathname) return -1; } - if (!CreateDirectory(tmp, 0)) + if (!CreateDirectory(tmp2, 0)) { // hack, hack. just assume that x: might be a drive // letter, and try again - if (!(strlen(tmp) == 2 && - !strcmp(tmp + 1, ":"))) - return -1; + if (!(strlen(tmp2) == 2 && !strcmp(tmp2 + 1, ":"))) + return -1; } #ifdef M_MKDIR_TEST_ -- cgit v1.2.3-70-g09d2 From 8871ef8ba38a11213de3cc7f35f5f9f0f3000dc0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 29 Nov 2011 18:34:59 +0300 Subject: Update fr and pl (Derpella) translations. --- AUTHORS | 1 + po/LINGUAS | 2 +- po/cs.po | 52 +- po/de.po | 52 +- po/es.po | 53 +- po/fi.po | 52 +- po/fr.po | 227 +-- po/id.po | 52 +- po/ja.po | 52 +- po/manaplus.pot | 52 +- po/nl_BE.po | 52 +- po/pl.po | 4959 ++++++++++++++++++++++++----------------------- po/pt.po | 52 +- po/pt_BR.po | 52 +- po/ru.po | 53 +- po/zh_CN.po | 52 +- src/gui/setup_theme.cpp | 3 +- 17 files changed, 2974 insertions(+), 2844 deletions(-) (limited to 'src') diff --git a/AUTHORS b/AUTHORS index fd0ac2d5e..c96baedfa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,7 @@ Mihail Barer (Necromonger) <> Aline Ferraz de Souza (Freya) (pt, pt_BR) Andrei Karas (4144) (ru) Bernard Hugonnet (Nard) <> (fr) +Derpella (pl) Maarten Vanraes (AL13N) (nl_BE) Mihail Barer (Necromonger) <> (ru) Petr Varkoček (pitriss) <> (cs) diff --git a/po/LINGUAS b/po/LINGUAS index 9d3dffda2..c0a376b55 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -23,7 +23,7 @@ ja #nds # Not enough translations #nl # Not enough translations nl_BE -#pl # Not enough translations +pl pt pt_BR ru diff --git a/po/cs.po b/po/cs.po index 84f1af652..9c1700a73 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/" @@ -736,7 +736,7 @@ msgstr "duhová 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2392,74 +2392,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Téma" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Téma GUI" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Hlavní font" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Tučný font" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Font částic" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Pomocný font" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "Bezpečný font" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "Japonský font" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Velikost písma" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Téma změněno" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Restartujte klient pro aplikováni změn." @@ -3249,23 +3253,23 @@ msgstr "Hranice domácího místa" msgid "Road Point" msgstr "Bod cesty" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Kdo je online - Obnovuji" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Obnovit" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Kdo je online - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Kdo je online - chyba" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "" diff --git a/po/de.po b/po/de.po index 9e299cd03..7ffe42a8a 100644 --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/" @@ -735,7 +735,7 @@ msgstr "Regenbogen 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2390,74 +2390,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Theme" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "GUI Theme" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Hauptschriftart" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Dicke Schrift" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Schrift von Spieleraktionen" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Schriftgröße" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Theme geändert" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Starte das Spiel neu um die Änderungen zu übernehmen." @@ -3254,23 +3258,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "" diff --git a/po/es.po b/po/es.po index a29cd35e8..62059f919 100644 --- a/po/es.po +++ b/po/es.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-20 19:51+0000\n" "Last-Translator: nelson6e65 \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" @@ -734,7 +734,7 @@ msgstr "arco iris 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2389,74 +2389,79 @@ msgid "Indonesian" msgstr "Indonesio" #: src/gui/setup_theme.cpp:153 +#, fuzzy +msgid "Polish" +msgstr "Inglés" + +#: src/gui/setup_theme.cpp:154 msgid "Japanese" msgstr "Japonés" -#: src/gui/setup_theme.cpp:154 +#: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" msgstr "Holanda (Bélgica/Flandes)" -#: src/gui/setup_theme.cpp:155 +#: src/gui/setup_theme.cpp:156 msgid "Portuguese" msgstr "Portugués" -#: src/gui/setup_theme.cpp:156 +#: src/gui/setup_theme.cpp:157 msgid "Portuguese (Brazilian)" msgstr "Portugués (Brasileño)" -#: src/gui/setup_theme.cpp:157 +#: src/gui/setup_theme.cpp:158 msgid "Russian" msgstr "Ruso" -#: src/gui/setup_theme.cpp:158 +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "Español (Castellano)" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Tema" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Tema de interfáz gráfica" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "Idioma" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Fuente principal" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Fuente negrita" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Fuente de partícula" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Fuente de la ayuda" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "Fuente segura" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "Fuente japonesa" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Tamaño de fuente" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Tema cambiado" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Reincie el juego para que los cambios tengan efecto." @@ -3248,23 +3253,23 @@ msgstr "Limites de Lugar de Inicio" msgid "Road Point" msgstr "Mostrar camino" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Quién está conectado - Actualizando" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Actualizar" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Quienes están conectados - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Quienes están conectados - error" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "Quienes están conectados - Actualizar" diff --git a/po/fi.po b/po/fi.po index d5c0b53c9..01406e0ac 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: LANGUAGE \n" @@ -731,7 +731,7 @@ msgstr "sateenkaari 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2386,74 +2386,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Teema" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Käyttöliittymän teema" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Pääkirjasin" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Lihavoitu kirjasin" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Hiukkaskirjasin" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Ohjekirjasin" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Kirjasimen koko" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Ulkoasua muutettu" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan." @@ -3241,23 +3245,23 @@ msgstr "Kotipaikan raja" msgid "Road Point" msgstr "Väyläpiste" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Kuka on linjoila - päivitän" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Päivitä" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Kuka on linjoilla - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Kuka on linjoilla - virhe" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "Kuka on linjoilla - päivitä" diff --git a/po/fr.po b/po/fr.po index 8aab19ce2..1c295ffda 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" -"PO-Revision-Date: 2011-11-11 21:38+0000\n" -"Last-Translator: akaras \n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" +"PO-Revision-Date: 2011-11-28 21:35+0000\n" +"Last-Translator: reid \n" "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/" "fr/)\n" "Language: fr\n" @@ -241,7 +241,7 @@ msgstr "sous liste noir" #: src/commandhandler.cpp:594 msgid "enemy" -msgstr "" +msgstr "ennemi" #: src/commandhandler.cpp:609 msgid "Player already erased!" @@ -737,7 +737,7 @@ msgstr "arc en ciel 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -1351,7 +1351,7 @@ msgstr "Liste noir" #: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658 #: src/gui/popupmenu.cpp:666 msgid "Set as enemy" -msgstr "" +msgstr "Définir comme ennemi" #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 @@ -1976,7 +1976,7 @@ msgstr "Activer la manette de jeu" #: src/gui/setup_joystick.cpp:75 msgid "Use joystick if client window inactive" -msgstr "" +msgstr "Continuer d'utiliser le joystick si la fenêtre est minimisée." #: src/gui/setup_joystick.cpp:78 msgid "Joystick" @@ -1988,7 +1988,7 @@ msgstr "Stop" #: src/gui/setup_joystick.cpp:149 msgid "Rotate the stick and dont press buttons" -msgstr "" +msgstr "Tournez le manche et n'appuyer pas sur les boutons" #: src/gui/setup_keyboard.cpp:80 msgid "Keyboard" @@ -2172,7 +2172,7 @@ msgstr "Activer le testeur de robots" #: src/gui/setup_other.cpp:174 msgid "Enable buggy servers protection (do not disable)" -msgstr "" +msgstr "Active la protection pour serveurs defaillant (ne pas désactiver)" #: src/gui/setup_other.cpp:178 msgid "Enable debug log" @@ -2318,7 +2318,7 @@ msgstr "Sous liste noir" #: src/gui/setup_relations.cpp:76 msgid "Enemy" -msgstr "" +msgstr "Ennemi" #: src/gui/setup_relations.cpp:240 msgid "Allow trading" @@ -2366,101 +2366,106 @@ msgstr "Immense (15)" #: src/gui/setup_theme.cpp:146 msgid "Chinese (China)" -msgstr "" +msgstr "Chinois (Chine)" #: src/gui/setup_theme.cpp:147 msgid "Czech" -msgstr "" +msgstr "Tchèque" #: src/gui/setup_theme.cpp:148 msgid "English" -msgstr "" +msgstr "Anglais" #: src/gui/setup_theme.cpp:149 msgid "Finnish" -msgstr "" +msgstr "Finnois" #: src/gui/setup_theme.cpp:150 msgid "French" -msgstr "" +msgstr "Français" #: src/gui/setup_theme.cpp:151 msgid "German" -msgstr "" +msgstr "Allemand" #: src/gui/setup_theme.cpp:152 msgid "Indonesian" -msgstr "" +msgstr "Indonésien" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" -msgstr "" +#, fuzzy +msgid "Polish" +msgstr "Anglais" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" -msgstr "" +msgid "Japanese" +msgstr "Japonais" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" -msgstr "" +msgid "Dutch (Belgium/Flemish)" +msgstr "Néerlandais (Belgique / Flandre)" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" -msgstr "" +msgid "Portuguese" +msgstr "Portugais" #: src/gui/setup_theme.cpp:157 -msgid "Russian" -msgstr "" +msgid "Portuguese (Brazilian)" +msgstr "Portugais (Brésilien)" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "Russe" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" -msgstr "" +msgstr "Espagnol (Castillan)" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Thème" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Thème de l'interface" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" -msgstr "" +msgstr "Langue" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Police principale" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Police grasse" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Taille des effets de particules" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Police de l'aide" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "Police sécurisée" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "police japonaise" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Taille de police" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Thème changé" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Redémarrez le jeu pour que les changements soient appliqués." @@ -3261,23 +3266,23 @@ msgstr "Limites de votre position" msgid "Road Point" msgstr "Étape" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Qui est en ligne - Mise à jour" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Mise à jour" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Qui est en ligne - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Qui est en ligne - Erreur" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "Qui est en ligne - Mise à jour" @@ -3900,11 +3905,11 @@ msgstr "Vers la droite" #: src/keyboardconfig.cpp:310 msgid "Crazy moves" -msgstr "Mouvements de dingue" +msgstr "Mouvements de fous" #: src/keyboardconfig.cpp:312 msgid "Change Crazy Move mode" -msgstr "Changer le mode de mouvement de dingue" +msgstr "Changer le mode de mouvement de fou" #: src/keyboardconfig.cpp:314 msgid "Quick Drop N Items from 0 slot" @@ -3936,7 +3941,7 @@ msgstr "Changer d'attaque magique" #: src/keyboardconfig.cpp:329 msgid "Switch pvp attack" -msgstr "" +msgstr "Commutateur d'attaque en PVP" #: src/keyboardconfig.cpp:330 msgid "Change move type" @@ -4042,33 +4047,32 @@ msgstr "(I) Mouvements inversés" #: src/localplayer.cpp:1889 msgid "(c) moves with some crazy moves" -msgstr "(c) Mouvements un peu fous" +msgstr "(c) mouvements un peu fous" #: src/localplayer.cpp:1890 msgid "(C) moves with crazy moves" -msgstr "(C) Mouvement complètement fous" +msgstr "(C) mouvements complètements fous" #: src/localplayer.cpp:1891 msgid "(d) double normal + crazy" msgstr "(d) double normal et fou" #: src/localplayer.cpp:1892 -#, fuzzy msgid "(?) unknown move" -msgstr "(?) Suivre : mode inconnu" +msgstr "(?) déplacement inconnue" #: src/localplayer.cpp:1914 -#, fuzzy, c-format +#, c-format msgid "(%d) crazy move number %d" -msgstr "(?) Mouvements fous" +msgstr "(%d) mouvement de fou numerique %d" #: src/localplayer.cpp:1919 msgid "(a) custom crazy move" -msgstr "(a) Mouvements fous personnalisés" +msgstr "(a) mouvements fous personnalisés" #: src/localplayer.cpp:1923 msgid "(?) crazy move" -msgstr "(?) Mouvements fous" +msgstr "(?) mouvements fous" #: src/localplayer.cpp:1937 msgid "(0) default moves to target" @@ -4236,23 +4240,23 @@ msgstr "(?) Sorts d'attaque" #: src/localplayer.cpp:2115 msgid "(a) attack all players" -msgstr "" +msgstr "(a) attaque tous les joueurs" #: src/localplayer.cpp:2116 msgid "(f) attack not friends" -msgstr "" +msgstr "(f) n'attaque pas des amis" #: src/localplayer.cpp:2117 msgid "(b) attack bad relations" -msgstr "" +msgstr "(b) attaque les mauvaises relations" #: src/localplayer.cpp:2118 msgid "(d) dont attack players" -msgstr "" +msgstr "(d) Ne pas attaquer les joueurs" #: src/localplayer.cpp:2119 msgid "(?) pvp attack" -msgstr "" +msgstr "(?) attaque en PVP" #: src/localplayer.cpp:2138 msgid "(D) default imitation" @@ -4299,9 +4303,8 @@ msgid "Game modifiers are disabled" msgstr "Modificateurs de mode de jeu désactivés" #: src/localplayer.cpp:2230 -#, fuzzy msgid "Game modifiers are unknown" -msgstr "Modificateurs de mode de jeu activés" +msgstr "Les modificateurs de jeux sont inconnus" #: src/localplayer.cpp:3746 msgid "Follow: " @@ -5679,99 +5682,3 @@ msgstr "PM %+d" #: src/resources/itemdb.cpp:169 msgid "Unknown item" msgstr "Objet inconnu" - -#~ msgid "(?) move" -#~ msgstr "(?) Mouvements" - -#~ msgid "(?) map view" -#~ msgstr "(?) Carte" - -#~ msgid "(D) design camera mode" -#~ msgstr "(D) Définir le mode camera" - -#~ msgid "(D)" -#~ msgstr "(D)" - -#~ msgid "(I)" -#~ msgstr "(I)" - -#~ msgid "(c)" -#~ msgstr "(c)" - -#~ msgid "(C)" -#~ msgstr "(C)" - -#~ msgid "(d)" -#~ msgstr "(d)" - -#~ msgid "(?)" -#~ msgstr "(?)" - -#~ msgid "(a)" -#~ msgstr "(a)" - -#~ msgid "(0)" -#~ msgstr "(0)" - -#~ msgid "(1)" -#~ msgstr "(1)" - -#~ msgid "(2)" -#~ msgstr "(2)" - -#~ msgid "(3)" -#~ msgstr "(3)" - -#~ msgid "(5)" -#~ msgstr "(5)" - -#~ msgid "(7)" -#~ msgstr "(7)" - -#~ msgid "(A)" -#~ msgstr "(A)" - -#~ msgid "(R)" -#~ msgstr "(R)" - -#~ msgid "(M)" -#~ msgstr "(M)" - -#~ msgid "(P)" -#~ msgstr "(P)" - -#~ msgid "(s)" -#~ msgstr "(s)" - -#~ msgid "(S)" -#~ msgstr "(S)" - -#~ msgid "(G)" -#~ msgstr "(G)" - -#~ msgid "(f)" -#~ msgstr "(f)" - -#~ msgid "(F)" -#~ msgstr "(F)" - -#~ msgid "(U)" -#~ msgstr "(U)" - -#~ msgid "(b)" -#~ msgstr "(b)" - -#~ msgid "(g)" -#~ msgstr "(g)" - -#~ msgid "(N)" -#~ msgstr "(N)" - -#~ msgid "(u)" -#~ msgstr "(u)" - -#~ msgid "(e)" -#~ msgstr "(e)" - -#~ msgid "(O)" -#~ msgstr "(O)" diff --git a/po/id.po b/po/id.po index f24788aaa..c8cadfc39 100644 --- a/po/id.po +++ b/po/id.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/" @@ -727,7 +727,7 @@ msgstr "pelangi 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2378,74 +2378,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Tema" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Tema Gui" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Jenis huruf utama" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Jenis huruf tebal" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "Jenis huruf/Karakter yang diperbolehkan" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Ukuran huruf" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Tema diganti" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Restart client anda untuk memberikan efek." @@ -3232,23 +3236,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "" diff --git a/po/ja.po b/po/ja.po index d417f15f5..f902dbc77 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/" @@ -729,7 +729,7 @@ msgstr "虹 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2382,74 +2382,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "テーマ" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "GUIテーマ" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "メインフォント" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "太字フォント" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "粒子のフォント" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "ヘルプフォント" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "フォントサイズ" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "テーマは変えました" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "設定変更のため、アプリケーションを再起動してください。" @@ -3238,23 +3242,23 @@ msgstr "" msgid "Road Point" msgstr "ロードのポイント" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "アップデート" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "" diff --git a/po/manaplus.pot b/po/manaplus.pot index ade60fbc7..cd6782d0e 100644 --- a/po/manaplus.pot +++ b/po/manaplus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -726,7 +726,7 @@ msgstr "" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2379,74 +2379,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "" @@ -3233,23 +3237,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "" -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index e33843673..69b255427 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/" @@ -731,7 +731,7 @@ msgstr "regenboog 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2386,74 +2386,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Thema" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Standaard Lettertype" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Vet lettertype" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Help lettertype" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Lettergrootte" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Thema is gewijzigd" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Herstart de client om de wijzigingen in werking te doen treden." @@ -3248,23 +3252,23 @@ msgstr "" msgid "Road Point" msgstr "" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Wie Is Online - Bijwerken" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Bijwerken" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Wie Is Online - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Wie Is Online - fout" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "Wie Is Online - Bijgewerkt" diff --git a/po/pl.po b/po/pl.po index 8402fc357..cf2ce25c3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,474 +1,502 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR The ManaPlus Developers # This file is distributed under the same license as the PACKAGE package. -# +# +# Translators: # Andrei Karas , 2011. +# , 2011. msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-08-10 01:11+0300\n" -"PO-Revision-Date: 2011-08-09 22:16+0000\n" -"Last-Translator: akaras \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" +"PO-Revision-Date: 2011-11-29 15:18+0000\n" +"Last-Translator: derpella \n" +"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/" +"pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2)\n" -#: src/actorspritemanager.cpp:1034 +#: src/actorspritemanager.cpp:1171 msgid "Visible on map" -msgstr "" +msgstr "Widoczne na mapie" -#: src/being.cpp:542 +#: src/being.cpp:553 msgid "dodge" -msgstr "" +msgstr "Unik!" -#: src/being.cpp:542 +#: src/being.cpp:553 msgid "miss" -msgstr "" +msgstr "Pudło!" #. TRANSLATORS: this away status writed in player nick -#: src/being.cpp:1514 +#: src/being.cpp:1534 msgid "A" -msgstr "" +msgstr "AFK" #. TRANSLATORS: this inactive status writed in player nick -#: src/being.cpp:1519 +#: src/being.cpp:1539 msgid "I" -msgstr "" +msgstr "I" -#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100 +#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100 msgid "Setup" msgstr "Konfiguracja" -#: src/client.cpp:908 +#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48 +msgid "Perfomance" +msgstr "Wydajność programu" + +#: src/client.cpp:890 src/gui/setup_video.cpp:315 +msgid "Video" +msgstr "Obraz" + +#: src/client.cpp:895 +msgid "Themes" +msgstr "Skórki" + +#: src/client.cpp:977 msgid "Connecting to server" -msgstr "" +msgstr "Łączenie z serwerem" -#: src/client.cpp:939 +#: src/client.cpp:1008 msgid "Logging in" -msgstr "" +msgstr "Logowanie" -#: src/client.cpp:972 +#: src/client.cpp:1041 msgid "Entering game world" -msgstr "" +msgstr "Wchodzenie do świata gry" -#: src/client.cpp:1072 +#: src/client.cpp:1142 msgid "Requesting characters" -msgstr "" +msgstr "Sprawdzanie postaci" -#: src/client.cpp:1103 +#: src/client.cpp:1173 msgid "Connecting to the game server" -msgstr "" +msgstr "Łączenie się z serwerem gry" -#: src/client.cpp:1113 +#: src/client.cpp:1183 msgid "Changing game servers" -msgstr "" +msgstr "Zmiana serwera" -#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294 +#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147 -#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254 -#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392 -#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154 -#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184 +#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254 +#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401 +#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167 +#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184 #: src/net/manaserv/charhandler.cpp:227 msgid "Error" msgstr "Błąd" -#: src/client.cpp:1166 +#: src/client.cpp:1242 msgid "Requesting registration details" -msgstr "" +msgstr "Sprawdzanie szczegółów rejestracji" -#: src/client.cpp:1193 +#: src/client.cpp:1268 msgid "Password Change" -msgstr "" +msgstr "Zmiana hasła" -#: src/client.cpp:1194 +#: src/client.cpp:1269 msgid "Password changed successfully!" -msgstr "" +msgstr "Hasło zmienione z powodzeniem!" -#: src/client.cpp:1213 +#: src/client.cpp:1288 msgid "Email Change" -msgstr "" +msgstr "Zmiana adresu e-mail" -#: src/client.cpp:1214 +#: src/client.cpp:1289 msgid "Email changed successfully!" -msgstr "" +msgstr "Adres e-mail zmieniony z powodzeniem!" -#: src/client.cpp:1234 +#: src/client.cpp:1309 msgid "Unregister Successful" -msgstr "" +msgstr "Wyrejestrowano z powodzeniem" -#: src/client.cpp:1235 +#: src/client.cpp:1310 msgid "Farewell, come back any time..." -msgstr "" +msgstr "Żegnaj, będziemy czekać na Twój powrót..." -#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498 -#: src/client.cpp:1919 +#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554 +#: src/client.cpp:1979 src/client.cpp:1986 #, c-format msgid "%s doesn't exist and can't be created! Exiting." -msgstr "" +msgstr "%s nie istnieje i nie może byś utworzone! Wyjście." -#: src/client.cpp:1629 +#: src/client.cpp:1685 #, c-format msgid "Invalid update host: %s" -msgstr "" +msgstr "Nieprawidłowy serwer aktualizacji: %s" -#: src/client.cpp:1663 src/client.cpp:1669 +#: src/client.cpp:1719 src/client.cpp:1725 msgid "Error creating updates directory!" msgstr "Błąd podczas tworzenia katalogu aktualizacji!" -#: src/client.cpp:1690 +#: src/client.cpp:1746 #, c-format msgid "Error: %s doesn't exist and can't be created! Exiting." -msgstr "" +msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście." -#: src/commandhandler.cpp:301 +#: src/commandhandler.cpp:209 msgid "Unknown command." msgstr "Nieznane polecenie." -#: src/commandhandler.cpp:401 +#: src/commandhandler.cpp:329 msgid "Cannot send empty whispers!" msgstr "Nie można wysłać pustych szeptów!" -#: src/commandhandler.cpp:409 +#: src/commandhandler.cpp:343 #, c-format msgid "" -"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is" -" you." +"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " +"you." msgstr "" -"Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to " -"ty." +"Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty." -#: src/commandhandler.cpp:429 +#: src/commandhandler.cpp:363 #, c-format msgid "Requesting to join channel %s." msgstr "Prośba o dołączenie do kanału %s." -#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Brakuje nazwy grupy." -#: src/commandhandler.cpp:456 +#: src/commandhandler.cpp:390 msgid "Guild name is missing." -msgstr "" +msgstr "Brak nazwy gildii." -#: src/commandhandler.cpp:469 src/commandhandler.cpp:576 -#: src/commandhandler.cpp:617 src/commandhandler.cpp:647 +#: src/commandhandler.cpp:403 src/commandhandler.cpp:521 +#: src/commandhandler.cpp:562 src/commandhandler.cpp:602 msgid "Please specify a name." -msgstr "" +msgstr "Proszę wpisać prawidłową nazwę." -#: src/commandhandler.cpp:510 +#: src/commandhandler.cpp:455 msgid "Return toggles chat." msgstr "Return włącza czat." -#: src/commandhandler.cpp:510 +#: src/commandhandler.cpp:455 msgid "Message closes chat." msgstr "Wiadomość zamyka czat." -#: src/commandhandler.cpp:521 +#: src/commandhandler.cpp:466 msgid "Return now toggles chat." msgstr "Return od teraz włącza czat." -#: src/commandhandler.cpp:527 +#: src/commandhandler.cpp:472 msgid "Message now closes chat." msgstr "Wiadomość od teraz zamyka czat." -#: src/commandhandler.cpp:555 +#: src/commandhandler.cpp:500 msgid "friend" -msgstr "" +msgstr "znajomy" -#: src/commandhandler.cpp:560 +#: src/commandhandler.cpp:505 msgid "disregarded" -msgstr "" +msgstr "lekceważony" -#: src/commandhandler.cpp:565 +#: src/commandhandler.cpp:510 msgid "neutral" -msgstr "" +msgstr "neutralny" -#: src/commandhandler.cpp:584 +#: src/commandhandler.cpp:529 #, c-format msgid "Player already %s!" -msgstr "" +msgstr "Gracz jest już %s!" -#: src/commandhandler.cpp:598 +#: src/commandhandler.cpp:543 #, c-format msgid "Player successfully %s!" -msgstr "" +msgstr "Gracz jest teraz %s!" -#: src/commandhandler.cpp:606 +#: src/commandhandler.cpp:551 #, c-format msgid "Player could not be %s!" -msgstr "" +msgstr "Gracz nie może być %s!" -#: src/commandhandler.cpp:628 +#: src/commandhandler.cpp:574 msgid "Player wasn't ignored!" -msgstr "" +msgstr "Gracz nie był ignorowany!" -#: src/commandhandler.cpp:635 +#: src/commandhandler.cpp:581 msgid "Player no longer ignored!" -msgstr "" +msgstr "Gracz już nie jest ignorowany!" -#: src/commandhandler.cpp:637 +#: src/commandhandler.cpp:583 msgid "Player could not be unignored!" -msgstr "" +msgstr "Gracz nie może być odignorowany!" + +#: src/commandhandler.cpp:589 +msgid "blacklisted" +msgstr "dodany/a do czarnej listy" -#: src/commandhandler.cpp:654 +#: src/commandhandler.cpp:594 +msgid "enemy" +msgstr "wróg" + +#: src/commandhandler.cpp:609 msgid "Player already erased!" -msgstr "" +msgstr "Gracz został usunięty!" -#: src/commandhandler.cpp:665 +#: src/commandhandler.cpp:620 msgid "Player successfully erased!" -msgstr "" +msgstr "Gracz usunięty z powodzeniem!" -#: src/commandhandler.cpp:667 +#: src/commandhandler.cpp:622 msgid "Player could not be erased!" -msgstr "" +msgstr "Gracz nie mógł zostać usunięty!" -#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006 +#: src/commandhandler.cpp:929 src/commandhandler.cpp:975 #, c-format msgid "Client uptime: %s" -msgstr "" +msgstr "Czas pracy programu: %s" -#: src/commandhandler.cpp:970 +#: src/commandhandler.cpp:939 #, c-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d tydzień" +msgstr[1] "%d tygodni/e" +msgstr[2] "%d tygodni/e" -#: src/commandhandler.cpp:979 +#: src/commandhandler.cpp:948 #, c-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d dzień" +msgstr[1] "%d dni" +msgstr[2] "%d dni" -#: src/commandhandler.cpp:987 +#: src/commandhandler.cpp:956 #, c-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d godzina" +msgstr[1] "%d godzin/y" +msgstr[2] "%d godzin/y" -#: src/commandhandler.cpp:995 +#: src/commandhandler.cpp:964 #, c-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d minuta" +msgstr[1] "%d minut/y" +msgstr[2] "%d minut/y" -#: src/commandhandler.cpp:1003 +#: src/commandhandler.cpp:972 #, c-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d sekunda" +msgstr[1] "%d sekund/y" +msgstr[2] "%d sekund/y" -#: src/commandhandler.cpp:1082 +#: src/commandhandler.cpp:1051 msgid "font cache size" -msgstr "" +msgstr "rozmiar cache czcionki" -#: src/commandhandler.cpp:1094 +#: src/commandhandler.cpp:1063 msgid "Cache size:" -msgstr "" +msgstr "Rozmiar cache:" -#: src/commandhandler.cpp:1098 +#: src/commandhandler.cpp:1067 msgid "Created:" -msgstr "" +msgstr "Stworzono:" -#: src/commandhandler.cpp:1100 +#: src/commandhandler.cpp:1069 msgid "Deleted:" -msgstr "" +msgstr "Usunięto:" -#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154 +#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178 msgid "Resource images:" -msgstr "" +msgstr "Obrazy źródłowe:" -#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156 +#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180 msgid "Resource orphaned images:" -msgstr "" +msgstr "Osierocone obrazy źródłowe:" -#: src/commandhandler.h:40 +#: src/commandhandler.h:34 #, c-format msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"." -#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410 +#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403 msgid "General" msgstr "Ogólny" -#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412 +#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405 msgid "Debug" -msgstr "" +msgstr "Debug" -#: src/game.cpp:475 +#: src/game.cpp:506 msgid "Screenshot saved as " -msgstr "" +msgstr "Zrzut ekranu zapisany jako" -#: src/game.cpp:483 +#: src/game.cpp:514 msgid "Saving screenshot failed!" msgstr "Zapisywanie zrzutu ekranu nie powiodło się!" -#: src/game.cpp:523 +#: src/game.cpp:554 msgid "The connection to the server was lost." -msgstr "" +msgstr "Połączenie z serwerem zostało zerwane." -#: src/game.cpp:537 +#: src/game.cpp:557 msgid "Network Error" msgstr "Błąd sieci" -#: src/game.cpp:1184 +#: src/game.cpp:1258 msgid "Ignoring incoming trade requests" msgstr "Ignorowanie przychodzących próśb o handel" -#: src/game.cpp:1191 +#: src/game.cpp:1268 msgid "Accepting incoming trade requests" msgstr "Akceptowanie przychodzących próśb o handel" -#: src/game.cpp:1576 +#: src/game.cpp:1773 msgid "Could Not Load Map" -msgstr "" +msgstr "Nie można załądować mapy" -#: src/game.cpp:1577 +#: src/game.cpp:1774 #, c-format msgid "Error while loading %s" msgstr "Błąd podczas łądowania %s" -#: src/gui/beingpopup.cpp:118 +#: src/gui/beingpopup.cpp:124 #, c-format msgid "Party: %s" -msgstr "" +msgstr "Grupa: %s" -#: src/gui/beingpopup.cpp:132 +#: src/gui/beingpopup.cpp:138 #, c-format msgid "Guild: %s" -msgstr "" +msgstr "Gildia: %s" -#: src/gui/beingpopup.cpp:145 +#: src/gui/beingpopup.cpp:151 #, c-format msgid "Pvp rank: %d" -msgstr "" +msgstr "Miejsce w PvP: %d" -#: src/gui/beingpopup.cpp:156 +#: src/gui/beingpopup.cpp:162 #, c-format msgid "Comment: %s" -msgstr "" +msgstr "Komentarz: %s" #: src/gui/botcheckerwindow.cpp:266 msgid "Bot Checker" -msgstr "" +msgstr "Wykrywacz botów" #: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64 msgid "Name" msgstr "Nazwa" -#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130 -#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604 -#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266 +#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133 +#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636 +#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269 msgid "Attack" msgstr "Atak" -#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275 +#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292 #: src/keyboardconfig.cpp:62 msgid "Talk" msgstr "Rozmowa" -#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241 -#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661 +#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264 +#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459 +#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789 msgid "Move" -msgstr "" +msgstr "Przesuń się" #: src/gui/botcheckerwindow.cpp:300 msgid "Result" -msgstr "" +msgstr "Rezultat" -#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123 +#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124 msgid "Reset" msgstr "Resetuj" -#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97 -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256 -#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675 +#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276 +#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714 msgid "Buy" msgstr "Kup" -#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302 -#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324 +#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332 +#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325 #, c-format msgid "Price: %s / Total: %s" msgstr "Cena: %s/ Razem: %s" +#: src/gui/buydialog.cpp:103 +msgid "Amount:" +msgstr "Ilość:" + #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'. #. You may change this symbol if your language uses another. -#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207 -#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113 -#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940 +#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207 +#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114 +#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755 msgid "+" -msgstr "" +msgstr "+" #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'. #. You may change this symbol if your language uses another. -#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206 -#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114 -#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952 +#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206 +#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115 +#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767 msgid "-" -msgstr "" +msgstr "-" -#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49 -#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55 -#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285 -#: src/keyboardconfig.cpp:290 +#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47 +#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51 +#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294 +#: src/keyboardconfig.cpp:84 msgid "Quit" msgstr "Wyjdź" -#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94 -#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539 -#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970 +#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95 +#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555 +#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785 msgid "Max" msgstr "Maks." #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49 -#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134 +#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142 msgid "Shop" msgstr "Sklep" -#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258 -#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677 +#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277 +#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60 -#: src/gui/selldialog.cpp:92 +#: src/gui/selldialog.cpp:93 msgid "Sell" msgstr "Sprzedaj" #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59 -#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93 +#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209 -#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330 -#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453 -#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499 -#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532 -#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760 -#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675 -#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774 -#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849 -#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935 -#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70 -#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238 +#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344 +#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500 +#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550 +#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581 +#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829 +#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803 +#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904 +#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978 +#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050 +#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72 +#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59 -#: src/gui/updatewindow.cpp:157 +#: src/gui/updaterwindow.cpp:161 msgid "Cancel" msgstr "Anuluj" #: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57 msgid "Change Email Address" -msgstr "Zmień adres Email" +msgstr "Zmień adres e-mail" #: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55 #, c-format @@ -477,24 +505,24 @@ msgstr "Konto: %s" #: src/gui/changeemaildialog.cpp:54 msgid "Type new email address twice:" -msgstr "" +msgstr "Proszę wpisać i potwierdzić adres e-mail:" #: src/gui/changeemaildialog.cpp:132 #, c-format msgid "The new email address needs to be at least %d characters long." -msgstr "" +msgstr "Nowy adres e-mail musi mieć co najmniej %d znaków." #: src/gui/changeemaildialog.cpp:139 #, c-format msgid "The new email address needs to be less than %d characters long." -msgstr "" +msgstr "Nowy adres e-mail może mieć najwyżej %d znaków." #: src/gui/changeemaildialog.cpp:146 msgid "The email address entries mismatch." -msgstr "" +msgstr "Pola adresu e-mail się nie zgadzają." #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59 -#: src/gui/charselectdialog.cpp:140 +#: src/gui/charselectdialog.cpp:139 msgid "Change Password" msgstr "Zmień hasło" @@ -505,209 +533,211 @@ msgstr "Hasło:" #: src/gui/changepassworddialog.cpp:66 msgid "Type new password twice:" -msgstr "" +msgstr "Proszę wpisać i potwierdzić hasło:" #: src/gui/changepassworddialog.cpp:114 msgid "Enter the old password first." -msgstr "" +msgstr "Proszę wpisać stare hasło." #: src/gui/changepassworddialog.cpp:120 #, c-format msgid "The new password needs to be at least %d characters long." -msgstr "" +msgstr "Nowe hasło musi mieć co najmniej %d znaków." #: src/gui/changepassworddialog.cpp:127 #, c-format msgid "The new password needs to be less than %d characters long." -msgstr "" +msgstr "Nowe hasło może mieć najwyżej %d znaków." #: src/gui/changepassworddialog.cpp:134 msgid "The new password entries mismatch." -msgstr "" +msgstr "Potwierdzenie hasła nie zgadza się." -#: src/gui/charcreatedialog.cpp:58 +#: src/gui/charcreatedialog.cpp:59 msgid "Create Character" msgstr "Stwórz postać" -#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94 +#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94 #: src/gui/register.cpp:75 msgid "Name:" msgstr "Imię:" #. TRANSLATORS: This is a narrow symbol used to denote 'next'. #. You may change this symbol if your language uses another. -#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81 -#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81 +#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93 +#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85 msgid ">" -msgstr "" +msgstr ">" #. TRANSLATORS: This is a narrow symbol used to denote 'previous'. #. You may change this symbol if your language uses another. -#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82 -#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80 +#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94 +#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84 msgid "<" -msgstr "" +msgstr "<" -#: src/gui/charcreatedialog.cpp:80 +#: src/gui/charcreatedialog.cpp:92 msgid "Hair color:" -msgstr "" +msgstr "Kolor włosów:" -#: src/gui/charcreatedialog.cpp:83 +#: src/gui/charcreatedialog.cpp:95 msgid "Hair style:" -msgstr "" +msgstr "Fryzura:" -#: src/gui/charcreatedialog.cpp:89 +#: src/gui/charcreatedialog.cpp:101 msgid "Race:" -msgstr "" +msgstr "Rasa:" -#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479 -#: src/gui/socialwindow.cpp:1033 +#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481 +#: src/gui/socialwindow.cpp:1139 msgid "Create" msgstr "Utwórz" -#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98 +#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98 msgid "Male" msgstr "Mężczyzna" -#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99 +#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99 msgid "Female" msgstr "Kobieta" -#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300 +#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312 #, c-format msgid "Please distribute %d points" msgstr "Proszę wykorzystać %d punktów" -#: src/gui/charcreatedialog.cpp:219 +#: src/gui/charcreatedialog.cpp:231 msgid "Your name needs to be at least 4 characters." -msgstr "Twoje imię musi mieć conajmniej 4 znaki." +msgstr "Twoje imię musi mieć co najmniej 4 znaki." -#: src/gui/charcreatedialog.cpp:291 +#: src/gui/charcreatedialog.cpp:303 msgid "Character stats OK" msgstr "Statystyki postaci w porządku." -#: src/gui/charcreatedialog.cpp:305 +#: src/gui/charcreatedialog.cpp:317 #, c-format msgid "Please remove %d points" msgstr "Proszę usunąć %d punktów" -#: src/gui/charselectdialog.cpp:77 +#: src/gui/charselectdialog.cpp:76 msgid "Confirm Character Delete" msgstr "Potwierdź usunięcie postaci" -#: src/gui/charselectdialog.cpp:78 +#: src/gui/charselectdialog.cpp:77 msgid "Are you sure you want to delete this character?" -msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?" +msgstr "Czy jesteś pewny/a, że chcesz usunąć tę postać?" -#: src/gui/charselectdialog.cpp:126 +#: src/gui/charselectdialog.cpp:125 msgid "Account and Character Management" msgstr "Zarządzanie kontem i postaciami" -#: src/gui/charselectdialog.cpp:139 +#: src/gui/charselectdialog.cpp:138 msgid "Switch Login" -msgstr "" +msgstr "Przeloguj się" -#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50 +#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50 #: src/gui/unregisterdialog.cpp:58 msgid "Unregister" msgstr "Wyrejestruj" -#: src/gui/charselectdialog.cpp:162 +#: src/gui/charselectdialog.cpp:161 msgid "Change Email" -msgstr "" +msgstr "Zmiana adresu e-mail" #: src/gui/charselectdialog.cpp:254 msgid "Incorrect password" -msgstr "" +msgstr "Nieprawidłowe hasło" #: src/gui/charselectdialog.cpp:287 msgid "Enter password for deleting character" -msgstr "" +msgstr "Wprowadź hasło aby usunąć postać" #: src/gui/charselectdialog.cpp:287 msgid "Enter password:" -msgstr "" +msgstr "Wprowadź hasło:" -#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289 -#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120 -#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241 +#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298 +#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122 +#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244 msgid "Delete" msgstr "Usuń" -#: src/gui/charselectdialog.cpp:467 +#: src/gui/charselectdialog.cpp:469 msgid "Choose" -msgstr "" +msgstr "Wybierz" -#: src/gui/charselectdialog.cpp:470 +#: src/gui/charselectdialog.cpp:472 #, c-format msgid "Level %d" -msgstr "" +msgstr "Poziom %d" -#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482 +#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484 msgid "(empty)" -msgstr "" +msgstr "(puste)" -#: src/gui/chatwindow.cpp:112 +#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70 msgid "default" -msgstr "" +msgstr "domyślny" #: src/gui/chatwindow.cpp:113 msgid "black" -msgstr "" +msgstr "czarny" #: src/gui/chatwindow.cpp:114 msgid "red" -msgstr "" +msgstr "czerwony" #: src/gui/chatwindow.cpp:115 msgid "green" -msgstr "" +msgstr "zielony" #: src/gui/chatwindow.cpp:116 msgid "blue" -msgstr "" +msgstr "niebieski" #: src/gui/chatwindow.cpp:117 msgid "gold" -msgstr "" +msgstr "złoty" #: src/gui/chatwindow.cpp:118 msgid "yellow" -msgstr "" +msgstr "żółty" #: src/gui/chatwindow.cpp:119 msgid "pink" -msgstr "" +msgstr "różowy" #: src/gui/chatwindow.cpp:120 msgid "purple" -msgstr "" +msgstr "fioletowy" #: src/gui/chatwindow.cpp:121 msgid "grey" -msgstr "" +msgstr "szary" #: src/gui/chatwindow.cpp:122 msgid "brown" -msgstr "" +msgstr "brązowy" #: src/gui/chatwindow.cpp:123 msgid "rainbow 1" -msgstr "" +msgstr "tęczowy 1" #: src/gui/chatwindow.cpp:124 msgid "rainbow 2" -msgstr "" +msgstr "tęczowy 2" #: src/gui/chatwindow.cpp:125 msgid "rainbow 3" -msgstr "" - -#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93 -#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220 -#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126 -#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102 -#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160 +msgstr "tęczowy 3" + +#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90 +#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 +#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 +#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 +#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 +#: src/gui/textcommandeditor.cpp:160 msgid "???" msgstr "???" @@ -715,12 +745,12 @@ msgstr "???" msgid "Chat" msgstr "Czat" -#: src/gui/chatwindow.cpp:605 +#: src/gui/chatwindow.cpp:615 #, c-format msgid "Present: %s; %d players are present." -msgstr "" +msgstr "%s obecny/a. %d graczy online." -#: src/gui/chatwindow.cpp:988 +#: src/gui/chatwindow.cpp:1002 #, c-format msgid "Whispering to %s: %s" msgstr "Szepczesz do %s: %s" @@ -734,183 +764,186 @@ msgid "No" msgstr "Nie" #: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146 -#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377 -#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619 -#: src/gui/popupmenu.cpp:627 +#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163 +#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391 +#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408 +#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648 +#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665 +#: src/gui/popupmenu.cpp:679 msgid "Ignore" -msgstr "" +msgstr "Ignoruj" -#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96 -#: src/gui/setup_other.cpp:65 +#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99 +#: src/gui/setup_other.cpp:64 msgid "Map" msgstr "Mapa" -#: src/gui/debugwindow.cpp:71 +#: src/gui/debugwindow.cpp:73 msgid "Target" -msgstr "" +msgstr "Cel" -#: src/gui/debugwindow.cpp:72 +#: src/gui/debugwindow.cpp:74 msgid "Net" -msgstr "" +msgstr "Siatka" -#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220 -#: src/gui/debugwindow.cpp:249 +#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222 +#: src/gui/debugwindow.cpp:251 msgid "Music:" -msgstr "" +msgstr "Muzyka:" -#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224 -#: src/gui/debugwindow.cpp:251 +#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226 +#: src/gui/debugwindow.cpp:253 msgid "Map:" -msgstr "" +msgstr "Mapa:" -#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222 -#: src/gui/debugwindow.cpp:250 +#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224 +#: src/gui/debugwindow.cpp:252 msgid "Minimap:" -msgstr "" +msgstr "Mini-mapa:" -#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218 -#: src/gui/debugwindow.cpp:247 +#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220 +#: src/gui/debugwindow.cpp:249 msgid "Cursor:" -msgstr "" +msgstr "Kursor:" -#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201 -#: src/gui/debugwindow.cpp:206 +#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203 +#: src/gui/debugwindow.cpp:208 msgid "Player Position:" -msgstr "" +msgstr "Pozycja gracza:" -#: src/gui/debugwindow.cpp:152 +#: src/gui/debugwindow.cpp:154 msgid "Particle count:" -msgstr "" +msgstr "Licznik cząsteczek:" -#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235 -#: src/gui/debugwindow.cpp:254 +#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237 +#: src/gui/debugwindow.cpp:256 msgid "Map actors count:" -msgstr "" +msgstr "Licznik aktorów na mapie:" -#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173 +#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175 #, c-format msgid "%d FPS (Software)" -msgstr "" +msgstr "%d FPS (Software)" -#: src/gui/debugwindow.cpp:166 +#: src/gui/debugwindow.cpp:168 #, c-format msgid "%d FPS (fast OpenGL)" -msgstr "" +msgstr "%d FPS (szybki OpenGL)" -#: src/gui/debugwindow.cpp:169 +#: src/gui/debugwindow.cpp:171 #, c-format msgid "%d FPS (old OpenGL)" -msgstr "" +msgstr "%d FPS (stary OpenGL)" -#: src/gui/debugwindow.cpp:176 +#: src/gui/debugwindow.cpp:178 #, c-format msgid "%d FPS" -msgstr "" +msgstr "%d FPS" -#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240 +#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242 msgid "Textures count:" -msgstr "" +msgstr "Licznik tekstur:" -#: src/gui/debugwindow.cpp:231 +#: src/gui/debugwindow.cpp:233 #, c-format msgid "Particle count: %d" -msgstr "" +msgstr "Licznik cząsteczek: %d" -#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299 -#: src/gui/debugwindow.cpp:343 +#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301 +#: src/gui/debugwindow.cpp:345 msgid "Target:" -msgstr "" +msgstr "Cel:" -#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304 -#: src/gui/debugwindow.cpp:344 +#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306 +#: src/gui/debugwindow.cpp:346 msgid "Target Id:" -msgstr "" +msgstr "ID celu:" -#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308 -#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345 +#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310 +#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347 msgid "Target Level:" -msgstr "" +msgstr "Poziom celu:" -#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316 -#: src/gui/debugwindow.cpp:346 +#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318 +#: src/gui/debugwindow.cpp:348 msgid "Target Party:" -msgstr "" +msgstr "Grupa celu:" -#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319 -#: src/gui/debugwindow.cpp:347 +#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321 +#: src/gui/debugwindow.cpp:349 msgid "Target Guild:" -msgstr "" +msgstr "Gildia celu:" -#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333 -#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348 +#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335 +#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350 msgid "Attack delay:" -msgstr "" +msgstr "Opóźnienie ataku:" -#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323 -#: src/gui/debugwindow.cpp:349 +#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325 +#: src/gui/debugwindow.cpp:351 msgid "Minimal hit:" -msgstr "" +msgstr "Najsłabsze uderzenie:" -#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325 -#: src/gui/debugwindow.cpp:350 +#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327 +#: src/gui/debugwindow.cpp:352 msgid "Maximum hit:" -msgstr "" +msgstr "Najmocniejsze uderzenie:" -#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327 -#: src/gui/debugwindow.cpp:351 +#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329 +#: src/gui/debugwindow.cpp:353 msgid "Critical hit:" -msgstr "" +msgstr "Uderzenie krytyczne:" -#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390 +#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392 #, c-format msgid "Ping: %s ms" -msgstr "" +msgstr "Ping: %s ms" -#: src/gui/debugwindow.cpp:393 +#: src/gui/debugwindow.cpp:395 #, c-format msgid "In: %d bytes/s" -msgstr "" +msgstr "Wejście: %d bajtów" -#: src/gui/debugwindow.cpp:395 +#: src/gui/debugwindow.cpp:397 #, c-format msgid "Out: %d bytes/s" -msgstr "" +msgstr "Wyjście: %d bajtów" #: src/gui/didyouknowwindow.cpp:47 msgid "Did You Know?" -msgstr "" +msgstr "Cz wiesz że..." -#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57 -#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53 -#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111 +#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59 +#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53 +#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113 msgid "Close" msgstr "Zamknij" -#: src/gui/didyouknowwindow.cpp:62 +#: src/gui/didyouknowwindow.cpp:64 msgid "< Previous" -msgstr "" +msgstr "< Cofnij" -#: src/gui/didyouknowwindow.cpp:63 +#: src/gui/didyouknowwindow.cpp:65 msgid "Next >" -msgstr "" +msgstr "Dalej>" -#: src/gui/didyouknowwindow.cpp:64 +#: src/gui/didyouknowwindow.cpp:66 msgid "Auto open this window" -msgstr "" +msgstr "Otwieraj to okno automatycznie" #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208 -#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50 +#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50 msgid "OK" msgstr "Ok" -#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74 +#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74 msgid "Equipment" msgstr "Ekwipunek" -#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130 -#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520 -#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701 -#: src/gui/popupmenu.cpp:1746 +#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160 +#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554 +#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829 +#: src/gui/popupmenu.cpp:1874 msgid "Unequip" msgstr "Zdejmij" @@ -918,80 +951,84 @@ msgstr "Zdejmij" msgid "Help" msgstr "Pomoc" -#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76 -#: src/inventory.cpp:246 +#: src/gui/inventorywindow.cpp:71 +msgid "by name" +msgstr "wg. nazwy" + +#: src/gui/inventorywindow.cpp:72 +msgid "by id" +msgstr "wg. ID" + +#: src/gui/inventorywindow.cpp:73 +msgid "by weight" +msgstr "wg. wagi" + +#: src/gui/inventorywindow.cpp:74 +msgid "by amount" +msgstr "wg. ilości" + +#: src/gui/inventorywindow.cpp:75 +msgid "by type" +msgstr "wg. typu" + +#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76 +#: src/inventory.cpp:249 msgid "Inventory" msgstr "Inwentarz" -#: src/gui/inventorywindow.cpp:104 +#: src/gui/inventorywindow.cpp:137 msgid "Slots:" msgstr "Miejsc:" -#: src/gui/inventorywindow.cpp:115 +#: src/gui/inventorywindow.cpp:149 msgid "Filter:" -msgstr "" - -#: src/gui/inventorywindow.cpp:116 -msgid "Sort:" -msgstr "" - -#: src/gui/inventorywindow.cpp:122 -msgid "na" -msgstr "" - -#: src/gui/inventorywindow.cpp:123 -msgid "az" -msgstr "" - -#: src/gui/inventorywindow.cpp:124 -msgid "id" -msgstr "" +msgstr "Filtr:" -#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513 -#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608 -#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748 +#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547 +#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739 +#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876 msgid "Equip" msgstr "Załóż" -#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514 -#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611 -#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707 -#: src/gui/popupmenu.cpp:1751 +#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548 +#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743 +#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835 +#: src/gui/popupmenu.cpp:1880 msgid "Use" msgstr "Użyj" -#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619 -#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712 -#: src/gui/popupmenu.cpp:1755 +#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652 +#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840 +#: src/gui/popupmenu.cpp:1885 msgid "Drop..." -msgstr "" +msgstr "Upuść..." -#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624 -#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764 +#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757 +#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894 msgid "Split" msgstr "Podziel" -#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59 -#: src/gui/popupmenu.cpp:508 +#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60 +#: src/gui/popupmenu.cpp:559 msgid "Outfits" -msgstr "" +msgstr "Stroje" -#: src/gui/inventorywindow.cpp:148 +#: src/gui/inventorywindow.cpp:178 msgid "Weight:" msgstr "Waga:" -#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610 -#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724 -#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71 +#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643 +#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852 +#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73 msgid "Store" msgstr "Przechowaj" -#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631 +#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764 msgid "Retrieve" msgstr "Pobierz" -#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620 -#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760 +#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753 +#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890 #: src/gui/windowmenu.cpp:97 msgid "Drop" msgstr "Upuść" @@ -1014,7 +1051,7 @@ msgstr "Podaj ilość rzeczy do przechowania." #: src/gui/itemamountwindow.cpp:270 msgid "Select amount of items to retrieve." -msgstr "Wybierz ilość przedmiotów do pobrania." +msgstr "Wybierz ilość przedmiotów do odbioru." #: src/gui/itemamountwindow.cpp:273 msgid "Select amount of items to split." @@ -1022,147 +1059,151 @@ msgstr "Wybierz ilość przedmiotów do podziału." #: src/gui/itemamountwindow.cpp:276 msgid "Add to buy shop." -msgstr "" +msgstr "Dodaj to sklepu (sprzedaj)" #: src/gui/itemamountwindow.cpp:279 msgid "Add to sell shop." -msgstr "" +msgstr "Dodaj do sklepu (kupuj)" #: src/gui/itemamountwindow.cpp:282 msgid "Unknown." -msgstr "" +msgstr "Nieznany obiekt" -#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182 +#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183 msgid ", " -msgstr "" +msgstr ", " -#: src/gui/itempopup.cpp:192 +#: src/gui/itempopup.cpp:193 #, c-format msgid "Weight: %s" -msgstr "" +msgstr "Waga: %s" #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69 msgid "Kill stats" -msgstr "" +msgstr "Statystyki ataku:" -#: src/gui/killstats.cpp:64 +#: src/gui/killstats.cpp:67 msgid "Reset stats" -msgstr "" +msgstr "Zresetuj statystyki" -#: src/gui/killstats.cpp:65 +#: src/gui/killstats.cpp:68 msgid "Reset timer" -msgstr "" +msgstr "Zresetuj zegar" -#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205 +#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208 #, c-format msgid "Level: %d at %f%%" -msgstr "" +msgstr "Poziom: %d w %f%%" -#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210 +#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213 #, c-format msgid "Exp: %d/%d Left: %d" -msgstr "" +msgstr "Exp: %d%d Zostało: %d" -#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216 -#: src/gui/killstats.cpp:225 +#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219 +#: src/gui/killstats.cpp:228 #, c-format msgid "1%% = %d exp, avg mob for 1%%: %s" -msgstr "" +msgstr "1%% = %d exp, avg mob na 1%%: %s" -#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142 -#: src/gui/killstats.cpp:234 +#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145 +#: src/gui/killstats.cpp:237 #, c-format msgid "Kills: %s, total exp: %s" -msgstr "" +msgstr "Moby: %s, całk. exp: %s" -#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144 -#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230 +#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147 +#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233 #, c-format msgid "Avg Exp: %s, No. of avg mob to next level: %s" -msgstr "" +msgstr "Avg Exp: %s, ilość mobów na nast. poziom: %s" -#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162 -#: src/gui/killstats.cpp:237 +#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165 +#: src/gui/killstats.cpp:240 #, c-format msgid "Kills/Min: %s, Exp/Min: %s" -msgstr "" +msgstr "Mob/Min: %s, Exp/Min: %s" -#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 -#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305 -#: src/gui/killstats.cpp:323 +#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308 +#: src/gui/killstats.cpp:326 #, c-format msgid "Exp speed per %d min: %s" msgid_plural "Exp speed per %d min: %s" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Szybkość exp na %d min: %s" +msgstr[1] "Szybkość exp na %d min: %s" +msgstr[2] "Szybkość exp na %d min: %s" -#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97 +#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100 #, c-format msgid "Time for next level per %d min: %s" msgid_plural "Time for next level per %d min: %s" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Czas do nast. poziomu z %d min: %s" +msgstr[1] "Czas do nast. poziomu z %d min: %s" +msgstr[2] "Czas do nast. poziomu z %d min: %s" -#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241 +#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244 msgid "Last kill exp:" -msgstr "" +msgstr "Ostatni exp:" -#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355 -#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367 -#: src/gui/killstats.cpp:372 +#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358 +#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370 +#: src/gui/killstats.cpp:375 msgid "Time before jacko spawn:" -msgstr "" +msgstr "Następny spawn Jack-O:" -#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301 -#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318 -#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337 +#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304 +#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321 +#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340 #, c-format msgid " Time for next level: %s" -msgstr "" +msgstr " Czas do nast. poziomu: %s" -#: src/gui/killstats.cpp:361 +#: src/gui/killstats.cpp:364 #, c-format msgid "%s %d?" -msgstr "" +msgstr "%s %d?" -#: src/gui/killstats.cpp:367 +#: src/gui/killstats.cpp:370 msgid "jacko spawning" -msgstr "" +msgstr "Jack-O spawnuje się" + +#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451 +msgid "You have left the guild." +msgstr "Opuściłeś/aś gildię." #: src/gui/logindialog.cpp:59 msgid "Normal" -msgstr "" +msgstr "Normalna" #: src/gui/logindialog.cpp:60 msgid "Auto Close" -msgstr "" +msgstr "Automatyczne zamykanie" #: src/gui/logindialog.cpp:61 msgid "Skip" -msgstr "" +msgstr "Omiń" #: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123 msgid "Login" msgstr "Użytkownik" -#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243 +#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252 #: src/gui/widgets/chattab.cpp:173 msgid "Server:" msgstr "Serwer:" #: src/gui/logindialog.cpp:96 msgid "Custom update host" -msgstr "" +msgstr "Zaawansowane ustawienia aktualizacji" #: src/gui/logindialog.cpp:110 msgid "Remember username" -msgstr "" +msgstr "Zapamiętaj login" #: src/gui/logindialog.cpp:111 msgid "Update:" -msgstr "" +msgstr "Aktualizacja:" #: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81 msgid "Register" @@ -1170,47 +1211,47 @@ msgstr "Rejestruj" #: src/gui/logindialog.cpp:122 msgid "Change Server" -msgstr "" +msgstr "Zmień serwer" -#: src/gui/ministatus.cpp:59 +#: src/gui/ministatuswindow.cpp:59 msgid "health bar" -msgstr "" +msgstr "pasek życia" -#: src/gui/ministatus.cpp:65 +#: src/gui/ministatuswindow.cpp:65 msgid "mana bar" -msgstr "" +msgstr "pasek many" -#: src/gui/ministatus.cpp:77 +#: src/gui/ministatuswindow.cpp:77 msgid "experience bar" -msgstr "" +msgstr "pasek punktów doświadczenia" -#: src/gui/ministatus.cpp:83 +#: src/gui/ministatuswindow.cpp:83 msgid "job bar" -msgstr "" +msgstr "pasek punktów umiejętności" -#: src/gui/ministatus.cpp:92 +#: src/gui/ministatuswindow.cpp:92 msgid "weight bar" -msgstr "" +msgstr "pasek obciążenia" -#: src/gui/ministatus.cpp:95 +#: src/gui/ministatuswindow.cpp:95 msgid "inventory slots bar" -msgstr "" +msgstr "pasek miejsc w inwentarzu" -#: src/gui/ministatus.cpp:98 +#: src/gui/ministatuswindow.cpp:98 msgid "money bar" -msgstr "" +msgstr "pasek pieniędzy" -#: src/gui/ministatus.cpp:101 +#: src/gui/ministatuswindow.cpp:101 msgid "arrows bar" -msgstr "" +msgstr "pasek strzał" -#: src/gui/ministatus.cpp:104 +#: src/gui/ministatuswindow.cpp:104 msgid "status bar" -msgstr "" +msgstr "pasek statusu" -#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336 +#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336 msgid "Need" -msgstr "" +msgstr "Potrzeba" #: src/gui/npcdialog.cpp:51 msgid "Waiting for server" @@ -1225,17 +1266,17 @@ msgid "Submit" msgstr "Zatwierdź" #: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42 -#: src/gui/setup_other.cpp:143 +#: src/gui/setup_other.cpp:151 msgid "NPC" msgstr "NPC" -#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549 +#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598 msgid "Clear" -msgstr "" +msgstr "Wyczyść" -#: src/gui/npcdialog.cpp:222 +#: src/gui/npcdialog.cpp:223 msgid "> Next" -msgstr "" +msgstr ">Następny" #: src/gui/npcpostdialog.cpp:48 msgid "To:" @@ -1249,345 +1290,373 @@ msgstr "Wyślij" msgid "Failed to send as sender or letter invalid." msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy." -#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886 +#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890 #, c-format msgid "Outfit: %d" -msgstr "" +msgstr "Strój: %d" -#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888 +#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892 #, c-format msgid "Key: %s" -msgstr "" +msgstr "Klawisz: %s" -#: src/gui/outfitwindow.cpp:87 +#: src/gui/outfitwindow.cpp:91 msgid "Unequip first" -msgstr "" +msgstr "Najpierw zdejmij" -#: src/gui/outfitwindow.cpp:90 +#: src/gui/outfitwindow.cpp:94 msgid "Away outfit" -msgstr "" +msgstr "Strój na afk" -#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603 +#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635 #: src/gui/widgets/tradetab.cpp:44 msgid "Trade" msgstr "Handel" -#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368 +#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383 msgid "Whisper" -msgstr "" +msgstr "Szept" -#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608 +#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640 msgid "Heal" -msgstr "" +msgstr "Lecz" -#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374 -#: src/gui/popupmenu.cpp:615 +#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389 +#: src/gui/popupmenu.cpp:646 msgid "Be friend" -msgstr "" - -#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153 -#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376 -#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401 -#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625 -#: src/gui/popupmenu.cpp:649 +msgstr "Dodaj do znajomych" + +#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153 +#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170 +#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390 +#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407 +#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434 +#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655 +#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678 +#: src/gui/popupmenu.cpp:691 msgid "Disregard" -msgstr "" - -#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157 -#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173 -#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384 -#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396 -#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628 -#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642 +msgstr "Lekceważ" + +#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155 +#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392 +#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428 +#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657 +#: src/gui/popupmenu.cpp:680 +msgid "Black list" +msgstr "Czarna lista" + +#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156 +#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393 +#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409 +#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658 +#: src/gui/popupmenu.cpp:666 +msgid "Set as enemy" +msgstr "Ustaw jako wroga" + +#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157 +#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173 +#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184 +#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402 +#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416 +#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429 +#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659 +#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673 +#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686 msgid "Erase" -msgstr "" +msgstr "Usuń" -#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171 -#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388 -#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400 -#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641 -#: src/gui/popupmenu.cpp:647 +#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169 +#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183 +#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406 +#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420 +#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433 +#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671 +#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685 +#: src/gui/popupmenu.cpp:690 msgid "Unignore" -msgstr "" +msgstr "Odignoruj" -#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182 -#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403 -#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651 -#: src/playerrelations.cpp:400 +#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190 +#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435 +#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692 +#: src/playerrelations.cpp:447 msgid "Completely ignore" -msgstr "" +msgstr "Całkowicie ignoruj" -#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411 -#: src/gui/popupmenu.cpp:659 +#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443 +#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779 msgid "Follow" -msgstr "" +msgstr "Podążaj" -#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412 -#: src/gui/popupmenu.cpp:660 +#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444 +#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780 msgid "Imitation" -msgstr "" +msgstr "Imituj" -#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697 +#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733 msgid "Invite to party" -msgstr "" +msgstr "Zaproś do grupy" -#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421 -#: src/gui/popupmenu.cpp:702 +#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455 +#: src/gui/popupmenu.cpp:738 msgid "Kick from party" -msgstr "" +msgstr "Wyrzuć z grupy" -#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432 -#: src/gui/popupmenu.cpp:716 +#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240 +#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755 msgid "Kick from guild" -msgstr "" +msgstr "Wyrzuć z gildii" -#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434 -#: src/gui/popupmenu.cpp:718 +#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245 +#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760 msgid "Change pos in guild" -msgstr "" +msgstr "Zmień pozycję w gildii" -#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439 -#: src/gui/popupmenu.cpp:724 +#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485 +#: src/gui/popupmenu.cpp:769 msgid "Invite to guild" -msgstr "" +msgstr "Zaproś do gildii" -#: src/gui/popupmenu.cpp:238 +#: src/gui/popupmenu.cpp:261 msgid "Kick player" -msgstr "" +msgstr "Wyrzuć gracza" -#: src/gui/popupmenu.cpp:240 +#: src/gui/popupmenu.cpp:263 msgid "Nuke" -msgstr "" +msgstr "Wysadź w powietrze" -#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662 +#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703 +#: src/gui/popupmenu.cpp:792 msgid "Show Items" -msgstr "" +msgstr "Pokaż przedmioty" -#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663 -#: src/gui/popupmenu.cpp:1932 +#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704 +#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047 msgid "Undress" -msgstr "" +msgstr "Rozbierz" -#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413 -#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732 +#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297 +#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705 +#: src/gui/popupmenu.cpp:794 msgid "Add comment" -msgstr "" +msgstr "Dodaj komentarz" -#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446 -#: src/gui/popupmenu.cpp:682 +#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493 +#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799 msgid "Buy (?)" -msgstr "" +msgstr "Kup (?)" -#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447 -#: src/gui/popupmenu.cpp:684 +#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494 +#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800 msgid "Sell (?)" -msgstr "" +msgstr "Sprzedaj (?)" -#: src/gui/popupmenu.cpp:292 +#: src/gui/popupmenu.cpp:308 msgid "Kick" -msgstr "" +msgstr "Wyrzuć" -#: src/gui/popupmenu.cpp:303 +#: src/gui/popupmenu.cpp:319 msgid "Remove from attack list" -msgstr "" +msgstr "Usuń z listy ataku" -#: src/gui/popupmenu.cpp:309 +#: src/gui/popupmenu.cpp:324 msgid "Add to priority attack list" -msgstr "" +msgstr "Dodaj do listy priorytetów" -#: src/gui/popupmenu.cpp:311 +#: src/gui/popupmenu.cpp:326 msgid "Add to attack list" -msgstr "" +msgstr "Dodaj do listy atakowanych" -#: src/gui/popupmenu.cpp:314 +#: src/gui/popupmenu.cpp:328 msgid "Add to ignore list" -msgstr "" +msgstr "Dodaj do listy ignorowanych" -#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450 +#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497 msgid "Add name to chat" -msgstr "" +msgstr "Wpisz do czatu" -#: src/gui/popupmenu.cpp:476 +#: src/gui/popupmenu.cpp:522 msgid "Pick up" -msgstr "" +msgstr "Podnieś" -#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645 -#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768 +#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773 +#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898 msgid "Add to chat" -msgstr "" +msgstr "Dodaj to czatu" -#: src/gui/popupmenu.cpp:494 +#: src/gui/popupmenu.cpp:540 msgid "Map Item" -msgstr "" +msgstr "Przedmiot mapy" -#: src/gui/popupmenu.cpp:495 +#: src/gui/popupmenu.cpp:541 msgid "Rename" -msgstr "" +msgstr "Zmień nazwę" -#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885 -#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908 +#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008 +#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023 msgid "Remove" -msgstr "" +msgstr "Usuń" -#: src/gui/popupmenu.cpp:510 +#: src/gui/popupmenu.cpp:547 +msgid "Warp" +msgstr "Teleport" + +#: src/gui/popupmenu.cpp:560 msgid "Load old outfits" -msgstr "" +msgstr "Przywróć stare stroje" -#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96 +#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96 msgid "Spells" -msgstr "" +msgstr "Zaklęcia" -#: src/gui/popupmenu.cpp:528 +#: src/gui/popupmenu.cpp:577 msgid "Load old spells" -msgstr "" +msgstr "Przywróć stare zaklęcia" -#: src/gui/popupmenu.cpp:529 +#: src/gui/popupmenu.cpp:578 msgid "Edit spell" -msgstr "" +msgstr "Edytuj zaklęcie" -#: src/gui/popupmenu.cpp:555 +#: src/gui/popupmenu.cpp:602 msgid "Disable highlight" -msgstr "" +msgstr "Wyłącz podświetlenie" -#: src/gui/popupmenu.cpp:560 +#: src/gui/popupmenu.cpp:604 msgid "Enable highlight" -msgstr "" +msgstr "Włącz podświetlenie" -#: src/gui/popupmenu.cpp:565 -msgid "Dont remove name" -msgstr "" +#: src/gui/popupmenu.cpp:606 +msgid "Don't remove name" +msgstr "Nie usuwaj imion" -#: src/gui/popupmenu.cpp:570 +#: src/gui/popupmenu.cpp:608 msgid "Remove name" -msgstr "" +msgstr "Usuń imię" -#: src/gui/popupmenu.cpp:575 +#: src/gui/popupmenu.cpp:610 msgid "Enable away" -msgstr "" +msgstr "Włącz tryb AFK" -#: src/gui/popupmenu.cpp:580 +#: src/gui/popupmenu.cpp:612 msgid "Disable away" -msgstr "" +msgstr "Wyłącz tryb AFK" -#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035 +#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141 msgid "Leave" -msgstr "" +msgstr "Opuść" -#: src/gui/popupmenu.cpp:744 +#: src/gui/popupmenu.cpp:813 msgid "Change guild position" -msgstr "" +msgstr "Zmień pozycję gildii" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1166 +#: src/gui/popupmenu.cpp:1286 msgid "Rename map sign " -msgstr "" +msgstr "Zmień nazwę drogowskazu" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1168 +#: src/gui/popupmenu.cpp:1288 msgid "Name: " -msgstr "" +msgstr "Imię:" #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1218 +#: src/gui/popupmenu.cpp:1338 msgid "Player comment " -msgstr "" +msgstr "Komentarz gracza " #. TRANSLATORS: number of chars in string should be near original -#: src/gui/popupmenu.cpp:1220 +#: src/gui/popupmenu.cpp:1340 msgid "Comment: " -msgstr "" +msgstr "Komentarz: " -#: src/gui/popupmenu.cpp:1570 +#: src/gui/popupmenu.cpp:1711 msgid "Add to trade" -msgstr "" +msgstr "Dodaj do handlu" -#: src/gui/popupmenu.cpp:1576 +#: src/gui/popupmenu.cpp:1715 msgid "Add to trade 10" -msgstr "" +msgstr "Dodaj 10 do handlu" -#: src/gui/popupmenu.cpp:1579 +#: src/gui/popupmenu.cpp:1716 msgid "Add to trade half" -msgstr "" +msgstr "Dodaj połowę do handlu" -#: src/gui/popupmenu.cpp:1581 +#: src/gui/popupmenu.cpp:1717 msgid "Add to trade all" -msgstr "" +msgstr "Dodaj wszystko do handlu" -#: src/gui/popupmenu.cpp:1593 +#: src/gui/popupmenu.cpp:1727 msgid "Store 10" -msgstr "" +msgstr "Przechowaj 10" -#: src/gui/popupmenu.cpp:1596 +#: src/gui/popupmenu.cpp:1728 msgid "Store half" -msgstr "" +msgstr "Przechowaj połowę" -#: src/gui/popupmenu.cpp:1598 +#: src/gui/popupmenu.cpp:1729 msgid "Store all" -msgstr "" +msgstr "Przechowaj wszystko" -#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713 -#: src/gui/popupmenu.cpp:1756 +#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841 +#: src/gui/popupmenu.cpp:1886 msgid "Drop all" -msgstr "" +msgstr "Upuść wszystko" -#: src/gui/popupmenu.cpp:1637 +#: src/gui/popupmenu.cpp:1768 msgid "Retrieve 10" -msgstr "" +msgstr "Odbierz 10" -#: src/gui/popupmenu.cpp:1640 +#: src/gui/popupmenu.cpp:1769 msgid "Retrieve half" -msgstr "" +msgstr "Odbierz połowę" -#: src/gui/popupmenu.cpp:1642 +#: src/gui/popupmenu.cpp:1770 msgid "Retrieve all" -msgstr "" +msgstr "Odbierz wszystko" -#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729 +#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857 msgid "Load old item shortcuts" -msgstr "" +msgstr "Przywróć stare skróty przedmiotów" -#: src/gui/popupmenu.cpp:1772 +#: src/gui/popupmenu.cpp:1902 msgid "Load old drop shortcuts" -msgstr "" +msgstr "Przywróć stare skróty upuszczania" -#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833 +#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963 msgid "Hide" -msgstr "" +msgstr "Ukryj" -#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839 +#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969 msgid "Show" -msgstr "" +msgstr "Pokaż" -#: src/gui/popupmenu.cpp:1846 +#: src/gui/popupmenu.cpp:1975 msgid "Reset yellow bar" -msgstr "" +msgstr "Zresetuj żółty pasek" -#: src/gui/popupmenu.cpp:1848 +#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242 msgid "Copy to chat" -msgstr "" +msgstr "Skopiuj do czatu" -#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854 -#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924 +#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88 +#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958 +#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028 msgid "(default)" -msgstr "" +msgstr "(domyślne)" -#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895 +#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016 msgid "Move up" -msgstr "" +msgstr "W górę" -#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900 +#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018 msgid "Move down" -msgstr "" - -#: src/gui/quitdialog.cpp:56 -msgid "Save state" -msgstr "" +msgstr "W dół" -#: src/gui/quitdialog.cpp:57 +#: src/gui/quitdialog.cpp:52 msgid "Switch server" msgstr "Zmień serwer" -#: src/gui/quitdialog.cpp:58 +#: src/gui/quitdialog.cpp:53 msgid "Switch character" msgstr "Zmień postać" @@ -1597,12 +1666,12 @@ msgstr "Potwierdź:" #: src/gui/register.cpp:108 msgid "Email:" -msgstr "Email:" +msgstr "E-mail:" #: src/gui/register.cpp:176 #, 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." +msgstr "Nazwa użytkownika musi być długa na co najmniej %d znaków." #: src/gui/register.cpp:184 #, c-format @@ -1612,102 +1681,102 @@ msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków." #: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121 #, c-format msgid "The password needs to be at least %d characters long." -msgstr "Hasło musi mieć conajmniej %d znaków." +msgstr "Hasło musi mieć co najmniej %d znaków." #: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128 #, 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." +msgstr "Hasło nie może mieć więcej niż %d znaków." #: src/gui/register.cpp:207 msgid "Passwords do not match." msgstr "Hasła nie zgadzają się." -#: src/gui/serverdialog.cpp:228 +#: src/gui/serverdialog.cpp:237 msgid "Choose Your Server" -msgstr "" +msgstr "Wybierz serwer" -#: src/gui/serverdialog.cpp:239 +#: src/gui/serverdialog.cpp:248 msgid "Choose Your Server *** SAFE MODE ***" -msgstr "" +msgstr "Wybierz serwer ***TRYB BEZPIECZEŃSTWA***" -#: src/gui/serverdialog.cpp:244 +#: src/gui/serverdialog.cpp:253 msgid "Port:" msgstr "Port:" -#: src/gui/serverdialog.cpp:248 +#: src/gui/serverdialog.cpp:257 msgid "Use same ip for game sub servers" -msgstr "" +msgstr "Użyj tego samego IP dla podserwerów" -#: src/gui/serverdialog.cpp:262 +#: src/gui/serverdialog.cpp:271 msgid "Server type:" -msgstr "" +msgstr "Typ serwera:" -#: src/gui/serverdialog.cpp:286 +#: src/gui/serverdialog.cpp:295 msgid "Load" -msgstr "" +msgstr "Załaduj" -#: src/gui/serverdialog.cpp:287 +#: src/gui/serverdialog.cpp:296 msgid "Connect" -msgstr "" +msgstr "Połącz" -#: src/gui/serverdialog.cpp:288 +#: src/gui/serverdialog.cpp:297 msgid "Custom Server" -msgstr "" +msgstr "Dodaj serwer" -#: src/gui/serverdialog.cpp:393 +#: src/gui/serverdialog.cpp:402 msgid "Please type both the address and the port of a server." msgstr "Proszę wpisać adres i port serwera" -#: src/gui/serverdialog.cpp:551 +#: src/gui/serverdialog.cpp:560 #, c-format msgid "Downloading server list...%2.2f%%" -msgstr "" +msgstr "Ściąganie listy serwerów... %2.2f%%" -#: src/gui/serverdialog.cpp:556 +#: src/gui/serverdialog.cpp:565 msgid "Waiting for server..." -msgstr "" +msgstr "Czekanie na serwer..." -#: src/gui/serverdialog.cpp:560 +#: src/gui/serverdialog.cpp:569 msgid "Preparing download" -msgstr "" +msgstr "Przygotowanie ściągania" -#: src/gui/serverdialog.cpp:564 +#: src/gui/serverdialog.cpp:573 msgid "Error retreiving server list!" -msgstr "" +msgstr "Błąd przy uzyskiwaniu listy serwerów!" -#: src/gui/serverdialog.cpp:662 +#: src/gui/serverdialog.cpp:678 msgid "requires a newer version" -msgstr "" +msgstr "wymaga nowszej wersji" -#: src/gui/serverdialog.cpp:664 +#: src/gui/serverdialog.cpp:680 #, c-format msgid "requires v%s" -msgstr "" +msgstr "wymaga v%s" #: src/gui/setup_audio.cpp:50 msgid "Enable Audio" -msgstr "" +msgstr "Włącz dźwięk" #: src/gui/setup_audio.cpp:51 msgid "Enable game sfx" -msgstr "" +msgstr "Włącz efekty gry" #: src/gui/setup_audio.cpp:52 msgid "Enable gui sfx" -msgstr "" +msgstr "Włącz efekty GUI" #: src/gui/setup_audio.cpp:53 msgid "Enable music" -msgstr "" +msgstr "Włącz muzykę" #: src/gui/setup_audio.cpp:54 msgid "Enable mumble voice chat" -msgstr "" +msgstr "Włącz integrację z Mumble" #: src/gui/setup_audio.cpp:56 msgid "Download music" -msgstr "" +msgstr "Ściągnij muzykę" #: src/gui/setup_audio.cpp:61 msgid "Audio" @@ -1723,15 +1792,15 @@ msgstr "Głośność muzyki" #: src/gui/setup_audio.cpp:120 msgid "Notice" -msgstr "" +msgstr "Powiadomienie" #: src/gui/setup_audio.cpp:120 msgid "You may have to restart your client if you want to download new music" -msgstr "" +msgstr "Musisz zrestartować program aby ściągnąć nową muzykę." #: src/gui/setup_audio.cpp:133 msgid "Sound Engine" -msgstr "" +msgstr "Silnik dźwięku" #: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54 msgid "Colors" @@ -1739,55 +1808,55 @@ msgstr "Kolory" #: src/gui/setup_chat.cpp:57 msgid "Remove colors from received chat messages" -msgstr "" +msgstr "Usuń kolory z odbieranych wiadomości" #: src/gui/setup_chat.cpp:60 msgid "Show chat colors list" -msgstr "" +msgstr "Pokazuj listę kolorów do czatu" #: src/gui/setup_chat.cpp:64 msgid "Commands" -msgstr "" +msgstr "Polecenia" #: src/gui/setup_chat.cpp:66 msgid "Allow magic and GM commands in all chat tabs" -msgstr "" +msgstr "Pozwól poleceniom magicznym i GM pojawiać się we wszystkich zakładkach" #: src/gui/setup_chat.cpp:70 msgid "Limits" -msgstr "" +msgstr "Limity" #: src/gui/setup_chat.cpp:72 msgid "Limit max chars in chat line" -msgstr "" +msgstr "Limit znaków w wierszu czatu" #: src/gui/setup_chat.cpp:75 msgid "Limit max lines in chat" -msgstr "" +msgstr "Limit wierszy w czacie" #: src/gui/setup_chat.cpp:79 msgid "Logs" -msgstr "" +msgstr "Logi" #: src/gui/setup_chat.cpp:81 msgid "Enable chat Log" -msgstr "" +msgstr "Włącz logowanie czatu" #: src/gui/setup_chat.cpp:84 msgid "Show chat history" -msgstr "" +msgstr "Pokazuj historię czatu" #: src/gui/setup_chat.cpp:88 msgid "Messages" -msgstr "" +msgstr "Wiadomości" #: src/gui/setup_chat.cpp:90 msgid "Hide shop messages" -msgstr "" +msgstr "Ukryj wiadomości od sklepów" #: src/gui/setup_chat.cpp:94 msgid "Tabs" -msgstr "" +msgstr "Zakładki" #: src/gui/setup_chat.cpp:96 msgid "Put all whispers in tabs" @@ -1795,35 +1864,47 @@ msgstr "Umieść wszystkie szepty w zakładkach" #: src/gui/setup_chat.cpp:99 msgid "Log magic messages in debug tab" -msgstr "" +msgstr "Loguj powiadomienia o magii w zakładce Debug" #: src/gui/setup_chat.cpp:102 msgid "Show server messages in debug tab" -msgstr "" +msgstr "Pokazuj wiadomości serwera w zakładce Debug" #: src/gui/setup_chat.cpp:105 msgid "Enable trade tab" -msgstr "" +msgstr "Włącz tab handlowy" #: src/gui/setup_chat.cpp:108 msgid "Enable battle tab" -msgstr "" +msgstr "Włącz zakładkę bitewną" #: src/gui/setup_chat.cpp:111 msgid "Show battle events" -msgstr "" +msgstr "Pokazuj wydarzenia bitewne" #: src/gui/setup_chat.cpp:114 msgid "Resize chat tabs if need" -msgstr "" +msgstr "Jeśli potrzeba, zmień rozmiaw zakładek czatu" #: src/gui/setup_chat.cpp:118 msgid "Time" -msgstr "" +msgstr "Czas" #: src/gui/setup_chat.cpp:120 msgid "Use local time" -msgstr "" +msgstr "Użyj lokalnego czasu" + +#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166 +msgid "Other" +msgstr "Inne" + +#: src/gui/setup_chat.cpp:125 +msgid "Highlight words (separated by comma)" +msgstr "Podświetlaj słowa (oddzielaj przecinkiem)" + +#: src/gui/setup_chat.cpp:128 +msgid "Show MVP messages" +msgstr "Pokazuj wiadomości MVP" #: src/gui/setup_colors.cpp:49 msgid "This is what the color looks like" @@ -1831,7 +1912,7 @@ msgstr "Kolor będzie wyglądał w ten sposób" #: src/gui/setup_colors.cpp:75 msgid "Type:" -msgstr "" +msgstr "Typ:" #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407 msgid "Static" @@ -1840,7 +1921,7 @@ msgstr "Statyczny" #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89 #: src/gui/setup_colors.cpp:408 msgid "Pulse" -msgstr "Puls" +msgstr "Pulsujący" #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91 #: src/gui/setup_colors.cpp:409 @@ -1854,59 +1935,59 @@ msgstr "Widmo" #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319 msgid "Delay:" -msgstr "" +msgstr "Opóźnienie:" #: src/gui/setup_colors.cpp:112 msgid "Red:" -msgstr "" +msgstr "Czerwony:" #: src/gui/setup_colors.cpp:127 msgid "Green:" -msgstr "" +msgstr "Zielony:" #: src/gui/setup_colors.cpp:142 msgid "Blue:" -msgstr "" +msgstr "Niebieski:" #: src/gui/setup_colors.cpp:314 msgid "Alpha:" -msgstr "" +msgstr "Alfa:" -#: src/gui/setup.cpp:69 +#: src/gui/setup.cpp:71 msgid "Apply" msgstr "Zastosuj" -#: src/gui/setup.cpp:72 +#: src/gui/setup.cpp:74 msgid "Reset Windows" msgstr "Zresetuj okna" -#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394 -msgid "Edit" -msgstr "" - -#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79 +#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142 msgid "Press the button to start calibration" msgstr "Naciśnij przycisk aby rozpocząć kalibrację" -#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77 +#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140 msgid "Calibrate" msgstr "Kalibruj" -#: src/gui/setup_joystick.cpp:42 +#: src/gui/setup_joystick.cpp:72 msgid "Enable joystick" msgstr "Włącz joystick" -#: src/gui/setup_joystick.cpp:44 +#: src/gui/setup_joystick.cpp:75 +msgid "Use joystick if client window inactive" +msgstr "Używaj joysticka jeśli okno klienta nieaktywne" + +#: src/gui/setup_joystick.cpp:78 msgid "Joystick" msgstr "Joystick" -#: src/gui/setup_joystick.cpp:84 +#: src/gui/setup_joystick.cpp:147 msgid "Stop" msgstr "Zatrzymaj" -#: src/gui/setup_joystick.cpp:85 -msgid "Rotate the stick" -msgstr "Obróć drążek" +#: src/gui/setup_joystick.cpp:149 +msgid "Rotate the stick and dont press buttons" +msgstr "Obracaj uchwytem i nie naciskaj guzików." #: src/gui/setup_keyboard.cpp:80 msgid "Keyboard" @@ -1918,7 +1999,7 @@ msgstr "Przypisz" #: src/gui/setup_keyboard.cpp:93 msgid "Unassign" -msgstr "" +msgstr "Odznacz" #: src/gui/setup_keyboard.cpp:97 msgid "Default" @@ -1928,217 +2009,233 @@ msgstr "Domyślny" msgid "Key Conflict(s) Detected." msgstr "Wykryto konflikt klawiszy." -#: src/gui/setup_other.cpp:40 +#: src/gui/setup_other.cpp:39 msgid "Misc" -msgstr "" +msgstr "Różne" -#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125 +#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125 msgid "Monsters" msgstr "Potwory" -#: src/gui/setup_other.cpp:48 +#: src/gui/setup_other.cpp:47 msgid "Show damage inflicted to monsters" -msgstr "" +msgstr "Pokaż zadane potworom obrażenia" -#: src/gui/setup_other.cpp:51 +#: src/gui/setup_other.cpp:50 msgid "Auto target only reachable monsters" -msgstr "" +msgstr "Automatycznie namierzaj tylko dosięgalne potwory" -#: src/gui/setup_other.cpp:54 +#: src/gui/setup_other.cpp:53 msgid "Highlight monster attack range" -msgstr "" +msgstr "Podświetl zasięg ataku potworów" -#: src/gui/setup_other.cpp:58 +#: src/gui/setup_other.cpp:57 msgid "Show monster hp bar" -msgstr "" +msgstr "Pokazuj pasek życia potworów" -#: src/gui/setup_other.cpp:61 +#: src/gui/setup_other.cpp:60 msgid "Cycle monster targets" -msgstr "" +msgstr "Przewijaj namierzanie potworów" -#: src/gui/setup_other.cpp:67 +#: src/gui/setup_other.cpp:66 msgid "Show warps particles" -msgstr "" +msgstr "Włącz efekty portali" -#: src/gui/setup_other.cpp:70 +#: src/gui/setup_other.cpp:69 msgid "Highlight map portals" -msgstr "" +msgstr "Podświetl portale na mapie" -#: src/gui/setup_other.cpp:73 +#: src/gui/setup_other.cpp:72 msgid "Highlight floor items" -msgstr "" +msgstr "Podświetl przedmioty na podłodze" -#: src/gui/setup_other.cpp:76 +#: src/gui/setup_other.cpp:75 msgid "Highlight player attack range" -msgstr "" +msgstr "Podświetl zasięg ataku graczy" -#: src/gui/setup_other.cpp:79 +#: src/gui/setup_other.cpp:78 msgid "Show extended minimaps" -msgstr "" +msgstr "Pokaż rozszerzone minimapy" -#: src/gui/setup_other.cpp:82 +#: src/gui/setup_other.cpp:81 msgid "Draw path" -msgstr "" +msgstr "Rysuj ścieżkę" -#: src/gui/setup_other.cpp:85 +#: src/gui/setup_other.cpp:84 msgid "Draw hotkeys on map" -msgstr "" +msgstr "Rysuj klawisze skrótu na mapie" + +#: src/gui/setup_other.cpp:87 +msgid "Enable lazy scrolling" +msgstr "Włącz leniwe przewijanie" -#: src/gui/setup_other.cpp:89 +#: src/gui/setup_other.cpp:90 +msgid "Scroll laziness" +msgstr "Leniwość przewijania" + +#: src/gui/setup_other.cpp:93 +msgid "Scroll radius" +msgstr "Promień przewijania" + +#: src/gui/setup_other.cpp:97 msgid "Moving" -msgstr "" +msgstr "Poruszanie się" -#: src/gui/setup_other.cpp:91 +#: src/gui/setup_other.cpp:99 msgid "Auto fix position" -msgstr "" +msgstr "Koryguj pozycję automatycznie" -#: src/gui/setup_other.cpp:94 +#: src/gui/setup_other.cpp:102 msgid "Attack while moving" -msgstr "" +msgstr "Atakuj podczas poruszania się" -#: src/gui/setup_other.cpp:97 +#: src/gui/setup_other.cpp:105 msgid "Sync player move" -msgstr "" +msgstr "Synchronizuj ruchy graczy" -#: src/gui/setup_other.cpp:100 +#: src/gui/setup_other.cpp:108 msgid "Crazy move A program" -msgstr "" +msgstr "Szalone ruchy: program A" -#: src/gui/setup_other.cpp:104 +#: src/gui/setup_other.cpp:112 msgid "Player" -msgstr "" +msgstr "Gracze" -#: src/gui/setup_other.cpp:106 +#: src/gui/setup_other.cpp:114 msgid "Show own hp bar" -msgstr "" +msgstr "Pokazuj własny pasek życia" -#: src/gui/setup_other.cpp:109 +#: src/gui/setup_other.cpp:117 msgid "Enable quick stats" -msgstr "" +msgstr "Włącz szybkie statystyki" -#: src/gui/setup_other.cpp:112 +#: src/gui/setup_other.cpp:120 msgid "Cycle player targets" -msgstr "" +msgstr "Przewijaj namierzanie graczy" -#: src/gui/setup_other.cpp:115 +#: src/gui/setup_other.cpp:123 msgid "Show job exp messages" -msgstr "" +msgstr "Pokazuj wiadomości o punktach doświadczenia umiejętności" -#: src/gui/setup_other.cpp:118 +#: src/gui/setup_other.cpp:126 msgid "Show players popups" -msgstr "" +msgstr "Pokazuj wyskakujące powiadomienia graczy" -#: src/gui/setup_other.cpp:121 +#: src/gui/setup_other.cpp:129 msgid "Afk message" -msgstr "" +msgstr "Wiadomość AFK" -#: src/gui/setup_other.cpp:124 +#: src/gui/setup_other.cpp:132 msgid "Show job" -msgstr "" +msgstr "Pokazuj poziom umiejętności" -#: src/gui/setup_other.cpp:127 +#: src/gui/setup_other.cpp:135 msgid "Enable attack filter" -msgstr "" +msgstr "Filtruj ataki" -#: src/gui/setup_other.cpp:130 +#: src/gui/setup_other.cpp:138 msgid "Enable advert protocol" -msgstr "" +msgstr "Włącz protokół reklamowy" -#: src/gui/setup_other.cpp:136 +#: src/gui/setup_other.cpp:144 msgid "Accept sell/buy requests" -msgstr "" +msgstr "Akceptuj prośby o handel" -#: src/gui/setup_other.cpp:139 +#: src/gui/setup_other.cpp:147 msgid "Enable shop mode" -msgstr "" +msgstr "Włącz tryb sklepu" -#: src/gui/setup_other.cpp:145 +#: src/gui/setup_other.cpp:153 msgid "Log NPC dialogue" -msgstr "" +msgstr "Loguj dialogi NPC" -#: src/gui/setup_other.cpp:149 -msgid "Other" -msgstr "" +#: src/gui/setup_other.cpp:157 +msgid "Bots support" +msgstr "Integracja z botami" -#: src/gui/setup_other.cpp:151 +#: src/gui/setup_other.cpp:159 +msgid "Enable auction bot support" +msgstr "Włącz integrację z AuctionBotem" + +#: src/gui/setup_other.cpp:162 +msgid "Enable guild bot support and disable native guild support" +msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii" + +#: src/gui/setup_other.cpp:168 msgid "Enable server side attack" -msgstr "" +msgstr "Włącz atak ze strony serwera" -#: src/gui/setup_other.cpp:154 +#: src/gui/setup_other.cpp:171 msgid "Enable bot checker" -msgstr "" +msgstr "Włącz wykrywacza botów" -#: src/gui/setup_other.cpp:157 -msgid "Enable buggy servers protection" -msgstr "" +#: src/gui/setup_other.cpp:174 +msgid "Enable buggy servers protection (do not disable)" +msgstr "Włącz ochronę przeciw zbugowanym serwerom" -#: src/gui/setup_other.cpp:160 +#: src/gui/setup_other.cpp:178 msgid "Enable debug log" -msgstr "" +msgstr "Włącz logowanie Debug" -#: src/gui/setup_other.cpp:163 +#: src/gui/setup_other.cpp:181 msgid "Low traffic mode" -msgstr "" +msgstr "Tryb niskiego transferu" -#: src/gui/setup_other.cpp:166 +#: src/gui/setup_other.cpp:184 msgid "Hide shield sprite" -msgstr "" +msgstr "Chowaj obrazek tarczy" -#: src/gui/setup_other.cpp:169 +#: src/gui/setup_other.cpp:187 msgid "Show background" -msgstr "" - -#: src/gui/setup_perfomance.cpp:48 -msgid "Perfomance" -msgstr "" +msgstr "Pokazuj tło" #: src/gui/setup_perfomance.cpp:55 msgid "Better perfomance (enable for better perfomance)" -msgstr "" +msgstr "Lepsza wydajność programu (włącz by poprawić wydajność)" #: src/gui/setup_perfomance.cpp:58 msgid "Auto adjust perfomance" -msgstr "" +msgstr "Automatycznie dopasuj ustawienia jakości" #: src/gui/setup_perfomance.cpp:61 -msgid "Show beings transparency" -msgstr "" - -#: src/gui/setup_perfomance.cpp:64 msgid "Hw acceleration" -msgstr "" +msgstr "Przyspieszenie Hw" -#: src/gui/setup_perfomance.cpp:67 +#: src/gui/setup_perfomance.cpp:64 msgid "Enable opacity cache (Software, can use many memory)" -msgstr "" +msgstr "Włącz cache przezroczystości (Software, może zużyć dużo pamięci)" -#: src/gui/setup_perfomance.cpp:70 +#: src/gui/setup_perfomance.cpp:67 msgid "Enable map reduce (Software)" -msgstr "" +msgstr "Włącz redukowanie map (Software)" -#: src/gui/setup_perfomance.cpp:73 +#: src/gui/setup_perfomance.cpp:70 msgid "Better quality (disable for better perfomance)" -msgstr "" +msgstr "Lepsza jakość (wyłącz dla lepszej wydajności)" -#: src/gui/setup_perfomance.cpp:76 +#: src/gui/setup_perfomance.cpp:73 msgid "Enable alpha channel fix (Software, can be very slow)" -msgstr "" +msgstr "Napraw kanał alfa (Software, może bardzo spowolniać)" + +#: src/gui/setup_perfomance.cpp:77 +msgid "Show beings transparency" +msgstr "Pokaż przezroczystość istot" #: src/gui/setup_perfomance.cpp:80 msgid "Enable reorder sprites." -msgstr "" +msgstr "Włącz reorganizację obrazków" #: src/gui/setup_perfomance.cpp:83 msgid "Small memory (enable for lower memory usage)" -msgstr "" +msgstr "Mała pamięć (włącz by zmniejszyć obciążenie pamięci)" #: src/gui/setup_perfomance.cpp:86 msgid "Disable advanced beings caching (Software)" -msgstr "" +msgstr "Wyłącz zaawansowany cache istot (Software)" #: src/gui/setup_perfomance.cpp:89 msgid "Disable beings caching (Software)" -msgstr "" +msgstr "Wyłącz cache istot (Software)" #: src/gui/setup_players.cpp:48 msgid "Players" @@ -2146,35 +2243,47 @@ msgstr "Gracze" #: src/gui/setup_players.cpp:54 msgid "Show gender" -msgstr "" +msgstr "Pokazuj płeć" #: src/gui/setup_players.cpp:57 msgid "Show level" -msgstr "" +msgstr "Pokazuj poziom" #: src/gui/setup_players.cpp:60 msgid "Show own name" -msgstr "" +msgstr "Pokazuj własne imię" #: src/gui/setup_players.cpp:63 -msgid "Target dead players" -msgstr "" +msgid "Enable extended mouse targeting" +msgstr "Włącz zaawansowane namierzanie myszką" #: src/gui/setup_players.cpp:66 +msgid "Target dead players" +msgstr "Namierzaj martwych graczy" + +#: src/gui/setup_players.cpp:69 msgid "Visible names" msgstr "Widoczne imiona" -#: src/gui/setup_players.cpp:69 +#: src/gui/setup_players.cpp:72 msgid "Secure trades" -msgstr "" +msgstr "Bezpieczny handel" -#: src/gui/setup_players.cpp:72 +#: src/gui/setup_players.cpp:75 msgid "Unsecure chars in names" -msgstr "" +msgstr "Niebezpieczne znaki w imionach" -#: src/gui/setup_players.cpp:75 +#: src/gui/setup_players.cpp:78 msgid "Show statuses" -msgstr "" +msgstr "Pokaż statusy" + +#: src/gui/setup_players.cpp:81 +msgid "Show ip addresses on screenshots" +msgstr "Pokaż adres IP na zrzutach ekranu" + +#: src/gui/setup_players.cpp:84 +msgid "Allow self heal with mouse click" +msgstr "Pozwól na leczenie siebie kliknięciem" #: src/gui/setup_relations.cpp:65 msgid "Relation" @@ -2190,7 +2299,7 @@ msgstr "Przyjaciel" #: src/gui/setup_relations.cpp:72 msgid "Disregarded" -msgstr "Nielubiany" +msgstr "Lekceważony" #: src/gui/setup_relations.cpp:73 msgid "Ignored" @@ -2198,104 +2307,177 @@ msgstr "Ignorowany" #: src/gui/setup_relations.cpp:74 msgid "Erased" -msgstr "" +msgstr "Skasowany" + +#: src/gui/setup_relations.cpp:75 +msgid "Blacklisted" +msgstr "Dodany/a do czarnej listy" -#: src/gui/setup_relations.cpp:239 +#: src/gui/setup_relations.cpp:76 +msgid "Enemy" +msgstr "Wróg" + +#: src/gui/setup_relations.cpp:240 msgid "Allow trading" msgstr "Zezwól na handel" -#: src/gui/setup_relations.cpp:241 +#: src/gui/setup_relations.cpp:242 msgid "Allow whispers" msgstr "Zezwól na szepty" -#: src/gui/setup_relations.cpp:244 +#: src/gui/setup_relations.cpp:245 msgid "Old" -msgstr "" +msgstr "Stary" -#: src/gui/setup_relations.cpp:246 +#: src/gui/setup_relations.cpp:247 msgid "Relations" -msgstr "" +msgstr "Relacje" -#: src/gui/setup_relations.cpp:271 +#: src/gui/setup_relations.cpp:272 msgid "When ignoring:" msgstr "Gdy ignorowany:" -#: src/gui/setup_theme.cpp:106 +#: src/gui/setup_theme.cpp:108 msgid "Tiny (10)" -msgstr "" +msgstr "Bardzo mała (10)" -#: src/gui/setup_theme.cpp:107 +#: src/gui/setup_theme.cpp:109 msgid "Small (11)" -msgstr "" +msgstr "Mała (11)" -#: src/gui/setup_theme.cpp:108 +#: src/gui/setup_theme.cpp:110 msgid "Medium (12)" -msgstr "" +msgstr "Średnia (12)" -#: src/gui/setup_theme.cpp:109 +#: src/gui/setup_theme.cpp:111 msgid "Large (13)" -msgstr "" +msgstr "Duża (13)" -#: src/gui/setup_theme.cpp:110 +#: src/gui/setup_theme.cpp:112 msgid "Big (14)" -msgstr "" +msgstr "Bardzo duża (14)" -#: src/gui/setup_theme.cpp:111 +#: src/gui/setup_theme.cpp:113 msgid "Huge (15)" -msgstr "" +msgstr "Ogromna (15)" + +#: src/gui/setup_theme.cpp:146 +msgid "Chinese (China)" +msgstr "Chinese (China)" + +#: src/gui/setup_theme.cpp:147 +msgid "Czech" +msgstr "Czech" + +#: src/gui/setup_theme.cpp:148 +msgid "English" +msgstr "English" + +#: src/gui/setup_theme.cpp:149 +msgid "Finnish" +msgstr "Finnish" + +#: src/gui/setup_theme.cpp:150 +msgid "French" +msgstr "French" + +#: src/gui/setup_theme.cpp:151 +msgid "German" +msgstr "German" + +#: src/gui/setup_theme.cpp:152 +msgid "Indonesian" +msgstr "Indonesian" + +#: src/gui/setup_theme.cpp:153 +#, fuzzy +msgid "Polish" +msgstr "English" + +#: src/gui/setup_theme.cpp:154 +msgid "Japanese" +msgstr "Japanese" + +#: src/gui/setup_theme.cpp:155 +msgid "Dutch (Belgium/Flemish)" +msgstr "Dutch (Belgium/Flemish)" -#: src/gui/setup_theme.cpp:141 +#: src/gui/setup_theme.cpp:156 +msgid "Portuguese" +msgstr "Portuguese" + +#: src/gui/setup_theme.cpp:157 +msgid "Portuguese (Brazilian)" +msgstr "Portuguese (Brazilian)" + +#: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "Russian" + +#: src/gui/setup_theme.cpp:159 +msgid "Spanish (Castilian)" +msgstr "Spanish (Castilian)" + +#: src/gui/setup_theme.cpp:191 msgid "Theme" -msgstr "" +msgstr "Skórka" -#: src/gui/setup_theme.cpp:143 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" -msgstr "" +msgstr "Skórka GUI" -#: src/gui/setup_theme.cpp:144 +#: src/gui/setup_theme.cpp:194 +msgid "Language" +msgstr "Język" + +#: src/gui/setup_theme.cpp:195 msgid "Main Font" -msgstr "" +msgstr "Główna czcionka" -#: src/gui/setup_theme.cpp:145 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" -msgstr "" +msgstr "Pogrubiona czcionka" -#: src/gui/setup_theme.cpp:146 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" -msgstr "" +msgstr "Czcionka efektów" -#: src/gui/setup_theme.cpp:147 +#: src/gui/setup_theme.cpp:198 msgid "Help font" -msgstr "" +msgstr "Czcionka pomocy" -#: src/gui/setup_theme.cpp:148 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" -msgstr "" +msgstr "Bezpieczna czcionka" + +#: src/gui/setup_theme.cpp:200 +msgid "Japanese font" +msgstr "Japońska czcionka" -#: src/gui/setup_theme.cpp:176 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Rozmiar czcionki" -#: src/gui/setup_theme.cpp:282 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" -msgstr "" +msgstr "Skórka zmieniona" -#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." -msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany." +msgstr "Uruchom ponownie program, aby mogły zajść zmiany." #: src/gui/setup_video.cpp:194 msgid "Software" -msgstr "" +msgstr "Software" #: src/gui/setup_video.cpp:195 msgid "Fast OpenGL" -msgstr "" +msgstr "Szybki OpenGL" #: src/gui/setup_video.cpp:196 msgid "Safe OpenGL" -msgstr "" +msgstr "Bezpieczny OpenGL" #: src/gui/setup_video.cpp:223 msgid "No text" @@ -2331,11 +2513,11 @@ msgstr "średnie" #: src/gui/setup_video.cpp:267 msgid "max" -msgstr "max" +msgstr "najlepsze" #: src/gui/setup_video.cpp:288 msgid "Full screen" -msgstr "Pełen ekran" +msgstr "Pełny ekran" #: src/gui/setup_video.cpp:289 msgid "Custom cursor" @@ -2361,16 +2543,12 @@ msgstr "jako cząsteczkę" #: src/gui/setup_video.cpp:302 msgid "FPS limit:" -msgstr "" +msgstr "Limit FPS:" #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341 -#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709 +#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710 msgid "Alt FPS limit: " -msgstr "" - -#: src/gui/setup_video.cpp:315 -msgid "Video" -msgstr "Obraz" +msgstr "Alternatywny limit FPS:" #: src/gui/setup_video.cpp:321 msgid "Overhead text" @@ -2386,27 +2564,30 @@ msgstr "Efekty otoczenia" #: src/gui/setup_video.cpp:324 msgid "Particle detail" -msgstr "" +msgstr "Detale cząsteczkowe" #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696 -#: src/gui/setup_video.cpp:707 +#: src/gui/setup_video.cpp:708 msgid "None" -msgstr "" +msgstr "Brak" #: src/gui/setup_video.cpp:484 msgid "" "Failed to switch to windowed mode and restoration of old mode also failed!" msgstr "" +"Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!" #: src/gui/setup_video.cpp:490 msgid "" "Failed to switch to fullscreen mode and restoration of old mode also failed!" msgstr "" +"Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego " +"stanu!" #: src/gui/setup_video.cpp:501 msgid "Switching to Full Screen" -msgstr "" +msgstr "Zmiana na tryb pełnoekranowy" #: src/gui/setup_video.cpp:502 msgid "Restart needed for changes to take effect." @@ -2414,7 +2595,7 @@ msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany." #: src/gui/setup_video.cpp:514 msgid "Changing to OpenGL" -msgstr "" +msgstr "Zmiana na OpenGL" #: src/gui/setup_video.cpp:515 msgid "Applying change to OpenGL requires restart." @@ -2422,865 +2603,508 @@ msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia." #: src/gui/setup_video.cpp:602 msgid "Custom resolution (example: 1024x768)" -msgstr "" +msgstr "Własna rozdzielczość (np. 1024x768)" #: src/gui/setup_video.cpp:603 msgid "Enter new resolution: " -msgstr "" +msgstr "Wpisz nową rozdzielczość:" #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623 msgid "Screen Resolution Changed" -msgstr "" +msgstr "Rozdzielczość zmieniona" #: src/gui/setup_video.cpp:621 msgid "Some windows may be moved to fit the lowered resolution." msgstr "" +"Niektóre okna mogą być przesunięte aby dopasować się do niższej " +"rozdzielczości." #: src/gui/setup_video.cpp:654 msgid "Particle Effect Settings Changed." -msgstr "" +msgstr "Ustawienia efektów cząsteczkowych zmienione." #: src/gui/setup_video.cpp:655 msgid "Changes will take effect on map change." msgstr "Efekty nastąpią po zmianie mapy." -#: src/gui/shopwindow.cpp:74 +#: src/gui/shopwindow.cpp:75 msgid "Personal Shop" -msgstr "" +msgstr "Własny sklep" -#: src/gui/shopwindow.cpp:116 +#: src/gui/shopwindow.cpp:118 msgid "Buy items" -msgstr "" +msgstr "Kupuj" -#: src/gui/shopwindow.cpp:117 +#: src/gui/shopwindow.cpp:119 msgid "Sell items" -msgstr "" +msgstr "Sprzedaj" -#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122 -#: src/gui/tradewindow.cpp:88 +#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124 +#: src/gui/tradewindow.cpp:89 msgid "Add" msgstr "Dodaj" -#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124 +#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126 msgid "Announce" -msgstr "" +msgstr "Ogłoś" -#: src/gui/shopwindow.cpp:125 +#: src/gui/shopwindow.cpp:127 msgid "Show links in announce" -msgstr "" +msgstr "Pokazuj linki w ogłoszeniach" + +#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149 +msgid "Auction" +msgstr "Aukcja" -#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106 +#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104 #: src/net/manaserv/tradehandler.cpp:127 msgid "Request for Trade" -msgstr "Prośba o Handel" +msgstr "Prośba o handel" -#: src/gui/shopwindow.cpp:724 +#: src/gui/shopwindow.cpp:749 #, c-format msgid "%s wants to %s %s do you accept?" -msgstr "" +msgstr "%s chce %s%s, akceptujesz?" -#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81 +#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81 msgid "Skills" msgstr "Zdolności" -#: src/gui/skilldialog.cpp:283 +#: src/gui/skilldialog.cpp:288 msgid "Up" msgstr "Góra" -#: src/gui/skilldialog.cpp:336 +#: src/gui/skilldialog.cpp:341 #, c-format msgid "Skill points available: %d" -msgstr "" +msgstr "Dostępne punkty umiejętności: %d" -#: src/gui/skilldialog.cpp:413 +#: src/gui/skilldialog.cpp:420 #, c-format msgid "Skill Set %d" -msgstr "" +msgstr "Zestaw umiejętności %d" -#: src/gui/skilldialog.cpp:425 +#: src/gui/skilldialog.cpp:432 #, c-format msgid "Skill %d" -msgstr "" +msgstr "Umiejętność %d" -#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545 +#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554 #, c-format msgid "Lvl: %d" -msgstr "" +msgstr "Poziom: %d" -#: src/gui/skilldialog.cpp:537 +#: src/gui/skilldialog.cpp:546 #, c-format msgid "Lvl: %d (%+d)" -msgstr "" +msgstr "Poziom: %d(%+d)" -#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52 +#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216 +#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52 msgid "Guild" msgstr "Gildia" -#: src/gui/socialwindow.cpp:146 +#: src/gui/socialwindow.cpp:147 #, c-format msgid "Invited user %s to guild %s." -msgstr "" +msgstr "Zaproszono gracza %s do gildii %s." -#: src/gui/socialwindow.cpp:160 +#: src/gui/socialwindow.cpp:161 #, c-format msgid "Guild %s quit requested." -msgstr "" +msgstr "Poproszono o wyjście z gildii %s." -#: src/gui/socialwindow.cpp:187 +#: src/gui/socialwindow.cpp:188 msgid "Member Invite to Guild" -msgstr "" +msgstr "Zaproszenie do gildii" -#: src/gui/socialwindow.cpp:188 +#: src/gui/socialwindow.cpp:189 #, c-format msgid "Who would you like to invite to guild %s?" -msgstr "" +msgstr "Kogo chcesz zaprosić do gildii %s?" -#: src/gui/socialwindow.cpp:197 +#: src/gui/socialwindow.cpp:198 msgid "Leave Guild?" -msgstr "" +msgstr "Opuścić gildię?" -#: src/gui/socialwindow.cpp:198 +#: src/gui/socialwindow.cpp:199 #, c-format msgid "Are you sure you want to leave guild %s?" -msgstr "" +msgstr "Na pewno opuścić gildię %s?" -#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50 +#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50 msgid "Party" msgstr "Grupa" -#: src/gui/socialwindow.cpp:243 +#: src/gui/socialwindow.cpp:347 #, c-format msgid "Invited user %s to party." -msgstr "" +msgstr "Gracz %s zaproszony do grupy." -#: src/gui/socialwindow.cpp:257 +#: src/gui/socialwindow.cpp:361 #, c-format msgid "Party %s quit requested." -msgstr "" +msgstr "Poproszono o wyjście z grupy %s." -#: src/gui/socialwindow.cpp:284 +#: src/gui/socialwindow.cpp:388 msgid "Member Invite to Party" -msgstr "" +msgstr "Zaproszenie do grupy" -#: src/gui/socialwindow.cpp:285 +#: src/gui/socialwindow.cpp:389 #, c-format msgid "Who would you like to invite to party %s?" -msgstr "" +msgstr "Kogo chcesz zaprosić do grupy %s?" -#: src/gui/socialwindow.cpp:294 +#: src/gui/socialwindow.cpp:398 msgid "Leave Party?" -msgstr "" +msgstr "Opuścić grupę?" -#: src/gui/socialwindow.cpp:295 +#: src/gui/socialwindow.cpp:399 #, c-format msgid "Are you sure you want to leave party %s?" -msgstr "" +msgstr "Na pewno opuścić grupę %s?" -#: src/gui/socialwindow.cpp:521 +#: src/gui/socialwindow.cpp:625 msgid "Nav" -msgstr "" +msgstr "Nawigacja" -#: src/gui/socialwindow.cpp:799 +#: src/gui/socialwindow.cpp:903 msgid "Atk" -msgstr "" +msgstr "Atk" -#: src/gui/socialwindow.cpp:840 +#: src/gui/socialwindow.cpp:944 msgid "Priority mobs" -msgstr "" +msgstr "Priorytetowe moby" -#: src/gui/socialwindow.cpp:872 +#: src/gui/socialwindow.cpp:976 msgid "Attack mobs" -msgstr "" +msgstr "Atakuj moby" -#: src/gui/socialwindow.cpp:907 +#: src/gui/socialwindow.cpp:1011 msgid "Ignore mobs" -msgstr "" +msgstr "Ignoruj moby" -#: src/gui/socialwindow.cpp:970 +#: src/gui/socialwindow.cpp:1074 msgid "Create Guild" -msgstr "Utwórz Gildię" +msgstr "Utwórz gildię" -#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387 +#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503 msgid "Create Party" -msgstr "" +msgstr "Utwórz grupę" -#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93 +#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93 msgid "Social" -msgstr "" +msgstr "Społeczność" -#: src/gui/socialwindow.cpp:1034 +#: src/gui/socialwindow.cpp:1140 msgid "Invite" -msgstr "" +msgstr "Zaproś" -#: src/gui/socialwindow.cpp:1176 +#: src/gui/socialwindow.cpp:1286 #, c-format msgid "Accepted party invite from %s." -msgstr "" +msgstr "Zaakceptowano zaproszenie do grupy od %s." -#: src/gui/socialwindow.cpp:1186 +#: src/gui/socialwindow.cpp:1296 #, c-format msgid "Rejected party invite from %s." -msgstr "" +msgstr "Odrzucono zaproszenie do grupy od %s." -#: src/gui/socialwindow.cpp:1203 +#: src/gui/socialwindow.cpp:1313 #, c-format msgid "Accepted guild invite from %s." -msgstr "" +msgstr "Akceptowano zaproszenie do gildii od %s." -#: src/gui/socialwindow.cpp:1213 +#: src/gui/socialwindow.cpp:1326 #, c-format msgid "Rejected guild invite from %s." -msgstr "" +msgstr "Odrzucono zaproszenie do gildii od %s." -#: src/gui/socialwindow.cpp:1257 +#: src/gui/socialwindow.cpp:1373 #, c-format msgid "Creating guild called %s." -msgstr "" +msgstr "Tworzenie gildii o nazwie %s." -#: src/gui/socialwindow.cpp:1280 +#: src/gui/socialwindow.cpp:1396 #, c-format msgid "Creating party called %s." -msgstr "" +msgstr "Tworzenie grupy o nazwie %s." -#: src/gui/socialwindow.cpp:1294 +#: src/gui/socialwindow.cpp:1410 msgid "Guild Name" -msgstr "" +msgstr "Nazwa gildii" -#: src/gui/socialwindow.cpp:1295 +#: src/gui/socialwindow.cpp:1411 msgid "Choose your guild's name." -msgstr "" +msgstr "Wybierz nazwę gildii." -#: src/gui/socialwindow.cpp:1309 +#: src/gui/socialwindow.cpp:1425 msgid "Received guild request, but one already exists." -msgstr "" +msgstr "Gildia o tej nazwie już istnieje." -#: src/gui/socialwindow.cpp:1315 +#: src/gui/socialwindow.cpp:1431 #, c-format msgid "%s has invited you to join the guild %s." -msgstr "" +msgstr "%s zaprosił/a Cię do gildii %s." -#: src/gui/socialwindow.cpp:1321 +#: src/gui/socialwindow.cpp:1437 msgid "Accept Guild Invite" -msgstr "" +msgstr "Akceptuj zaproszenie do gildii" -#: src/gui/socialwindow.cpp:1336 +#: src/gui/socialwindow.cpp:1452 msgid "Received party request, but one already exists." -msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje." +msgstr "Grupa o takiej nazwie już istnieje." -#: src/gui/socialwindow.cpp:1347 +#: src/gui/socialwindow.cpp:1463 msgid "You have been invited you to join a party." -msgstr "" +msgstr "Zostałeś/aś zaproszony/a do grupy." -#: src/gui/socialwindow.cpp:1351 +#: src/gui/socialwindow.cpp:1467 #, c-format msgid "You have been invited to join the %s party." -msgstr "" +msgstr "Zostałeś/aś zaproszony/a do grupy %s." -#: src/gui/socialwindow.cpp:1359 +#: src/gui/socialwindow.cpp:1475 #, c-format msgid "%s has invited you to join their party." -msgstr "%s zaprosił ciebie, byś dołączył do grupy." +msgstr "%s zaprosił/a Cię do grupy." -#: src/gui/socialwindow.cpp:1364 +#: src/gui/socialwindow.cpp:1480 #, c-format msgid "%s has invited you to join the %s party." -msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ." +msgstr "%s zaprosił/a Cię do grupy %s ." -#: src/gui/socialwindow.cpp:1373 +#: src/gui/socialwindow.cpp:1489 msgid "Accept Party Invite" msgstr "Zaakceptuj zaproszenie do grupy" -#: src/gui/socialwindow.cpp:1388 +#: src/gui/socialwindow.cpp:1504 msgid "Cannot create party. You are already in a party" -msgstr "" +msgstr "Nie można utworzyć grupy. Już należysz do grupy." -#: src/gui/socialwindow.cpp:1393 +#: src/gui/socialwindow.cpp:1509 msgid "Party Name" -msgstr "" +msgstr "Nazwa grupy" -#: src/gui/socialwindow.cpp:1394 +#: src/gui/socialwindow.cpp:1510 msgid "Choose your party's name." -msgstr "" +msgstr "Wybierz nazwę grupy." #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88 msgid "Specials" -msgstr "" +msgstr "Specjalne" -#: src/gui/statuspopup.cpp:197 -msgid "(D) default moves" -msgstr "" +#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274 +#: src/gui/statuswindow.cpp:337 +#, c-format +msgid "Level: %d" +msgstr "Poziom: %d" -#: src/gui/statuspopup.cpp:202 -msgid "(I) invert moves" -msgstr "" +#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260 +#: src/gui/statuswindow.cpp:304 +#, c-format +msgid "Money: %s" +msgstr "Pieniądze: %s" -#: src/gui/statuspopup.cpp:207 -msgid "(c) moves with some crazy moves" -msgstr "" +#: src/gui/statuswindow.cpp:151 +msgid "HP:" +msgstr "HP:" -#: src/gui/statuspopup.cpp:212 -msgid "(C) moves with crazy moves" -msgstr "" +#: src/gui/statuswindow.cpp:158 +msgid "Exp:" +msgstr "Exp:" -#: src/gui/statuspopup.cpp:217 -msgid "(d) double normal + crazy" -msgstr "" +#: src/gui/statuswindow.cpp:172 +msgid "MP:" +msgstr "MP:" -#: src/gui/statuspopup.cpp:222 -msgid "(?) move" -msgstr "" +#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387 +#, c-format +msgid "Job: %d" +msgstr "Praca: %d" -#: src/gui/statuspopup.cpp:240 -msgid "(a) custom crazy move" -msgstr "" +#: src/gui/statuswindow.cpp:205 +msgid "Job:" +msgstr "Praca:" -#: src/gui/statuspopup.cpp:244 -msgid "(?) crazy move" -msgstr "" +#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311 +#, c-format +msgid "Character points: %d" +msgstr "Punkty postaci: %d" -#: src/gui/statuspopup.cpp:254 -msgid "(0) default moves to target" -msgstr "" +#: src/gui/statuswindow.cpp:269 +#, c-format +msgid "Level: %d (GM %d)" +msgstr "Poziom: %d (GM %d)" -#: src/gui/statuspopup.cpp:259 -msgid "(1) moves to target in distance 1" -msgstr "" +#: src/gui/statuswindow.cpp:325 +#, c-format +msgid "Correction points: %d" +msgstr "Punkty korekcyjne: %d" -#: src/gui/statuspopup.cpp:264 -msgid "(2) moves to target in distance 2" -msgstr "" +#: src/gui/textcommandeditor.cpp:113 +msgid "No Target" +msgstr "Bez celu" -#: src/gui/statuspopup.cpp:269 -msgid "(3) moves to target in distance 3" -msgstr "" +#: src/gui/textcommandeditor.cpp:114 +msgid "Allow Target" +msgstr "Dozwól cel" -#: src/gui/statuspopup.cpp:274 -msgid "(5) moves to target in distance 5" -msgstr "" +#: src/gui/textcommandeditor.cpp:115 +msgid "Need Target" +msgstr "Wymaga celu" -#: src/gui/statuspopup.cpp:279 -msgid "(7) moves to target in distance 7" -msgstr "" +#: src/gui/textcommandeditor.cpp:120 +msgid "General Magic" +msgstr "Ogólna Magia" -#: src/gui/statuspopup.cpp:284 -msgid "(A) moves to target in attack range" -msgstr "" +#: src/gui/textcommandeditor.cpp:121 +msgid "Life Magic" +msgstr "Magia Życia" -#: src/gui/statuspopup.cpp:289 -msgid "(?) move to target" -msgstr "" +#: src/gui/textcommandeditor.cpp:122 +msgid "War Magic" +msgstr "Magia Wojny" -#: src/gui/statuspopup.cpp:297 -msgid "(D) default follow" -msgstr "" +#: src/gui/textcommandeditor.cpp:123 +msgid "Transmute Magic" +msgstr "Magia Transmutacji" -#: src/gui/statuspopup.cpp:301 -msgid "(R) relative follow" -msgstr "" +#: src/gui/textcommandeditor.cpp:124 +msgid "Nature Magic" +msgstr "Magia Natury" -#: src/gui/statuspopup.cpp:305 -msgid "(M) mirror follow" -msgstr "" +#: src/gui/textcommandeditor.cpp:125 +msgid "Astral Magic" +msgstr "Magia Astralna" -#: src/gui/statuspopup.cpp:309 -msgid "(P) pet follow" -msgstr "" +#: src/gui/textcommandeditor.cpp:168 +msgid "Command Editor" +msgstr "Edytor poleceń" -#: src/gui/statuspopup.cpp:313 -msgid "(?) unknown follow" -msgstr "" +#: src/gui/textcommandeditor.cpp:185 +msgid "magic" +msgstr "magia" -#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345 -msgid "(D) default attack" -msgstr "" +#: src/gui/textcommandeditor.cpp:189 +msgid "other" +msgstr "inne" -#: src/gui/statuspopup.cpp:327 -msgid "(s) switch attack without shield" -msgstr "" +#: src/gui/textcommandeditor.cpp:194 +msgid "Symbol:" +msgstr "Symbol:" -#: src/gui/statuspopup.cpp:332 -msgid "(S) switch attack with shield" -msgstr "" +#: src/gui/textcommandeditor.cpp:197 +msgid "Command:" +msgstr "Polecenie:" -#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361 -msgid "(?) attack" -msgstr "" +#: src/gui/textcommandeditor.cpp:200 +msgid "Comment:" +msgstr "Komentarz:" -#: src/gui/statuspopup.cpp:349 -msgid "(G) go and attack" -msgstr "" +#: src/gui/textcommandeditor.cpp:203 +msgid "Mana:" +msgstr "Mana:" -#: src/gui/statuspopup.cpp:353 -msgid "(A) go, attack, pickup" -msgstr "" +#: src/gui/textcommandeditor.cpp:209 +msgid "Target Type:" +msgstr "Rodzaj celu:" -#: src/gui/statuspopup.cpp:357 -msgid "(d) without auto attack" -msgstr "" +#: src/gui/textcommandeditor.cpp:215 +msgid "Icon:" +msgstr "Ikona:" -#: src/gui/statuspopup.cpp:375 -msgid "(S) small pick up 1x1 cells" -msgstr "" +#: src/gui/textcommandeditor.cpp:221 +msgid "Magic level:" +msgstr "Poziom magii:" -#: src/gui/statuspopup.cpp:379 -msgid "(D) default pick up 2x1 cells" -msgstr "" +#: src/gui/textcommandeditor.cpp:227 +msgid "Magic School:" +msgstr "Szkoła magii:" -#: src/gui/statuspopup.cpp:383 -msgid "(F) forward pick up 2x3 cells" -msgstr "" +#: src/gui/textcommandeditor.cpp:233 +msgid "School level:" +msgstr "Poziom szkoły:" -#: src/gui/statuspopup.cpp:387 -msgid "(3) pick up 3x3 cells" -msgstr "" +#: src/gui/textcommandeditor.cpp:238 +msgid "Save" +msgstr "Zachowaj" -#: src/gui/statuspopup.cpp:391 -msgid "(g) go and pick up in distance 4" -msgstr "" +#: src/gui/tradewindow.cpp:60 +msgid "Propose trade" +msgstr "Oferuj handel" -#: src/gui/statuspopup.cpp:395 -msgid "(G) go and pick up in distance 8" -msgstr "" +#: src/gui/tradewindow.cpp:61 +msgid "Confirmed. Waiting..." +msgstr "Potwierdzono. Oczekiwanie..." -#: src/gui/statuspopup.cpp:399 -msgid "(A) go and pick up in max distance" -msgstr "" +#: src/gui/tradewindow.cpp:62 +msgid "Agree trade" +msgstr "Akceptuj handel" -#: src/gui/statuspopup.cpp:403 -msgid "(?) pick up" -msgstr "" +#: src/gui/tradewindow.cpp:63 +msgid "Agreed. Waiting..." +msgstr "Zaakceptowano. Oczekiwanie..." -#: src/gui/statuspopup.cpp:412 -msgid "(N) normal map view" -msgstr "" +#: src/gui/tradewindow.cpp:66 +msgid "Trade: You" +msgstr "Handel: Ty" -#: src/gui/statuspopup.cpp:416 -msgid "(D) debug map view" -msgstr "" +#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167 +#, c-format +msgid "You get %s" +msgstr "Otrzymujesz %s" -#: src/gui/statuspopup.cpp:420 -msgid "(u) ultra map view" -msgstr "" +#: src/gui/tradewindow.cpp:112 +msgid "You give:" +msgstr "Dajesz:" -#: src/gui/statuspopup.cpp:424 -msgid "(U) ultra map view 2" -msgstr "" +#: src/gui/tradewindow.cpp:116 +msgid "Change" +msgstr "Zmień" -#: src/gui/statuspopup.cpp:428 -msgid "(e) empty map view" -msgstr "" +#: src/gui/tradewindow.cpp:375 +msgid "You don't have enough money." +msgstr "Nie masz wystarczającej ilości pieniędzy." -#: src/gui/statuspopup.cpp:432 -msgid "(b) black & white map view" +#: src/gui/tradewindow.cpp:454 +msgid "Failed adding item. You can not overlap one kind of item on the window." msgstr "" +"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam " +"rodzaj przedmiotu w okienku." -#: src/gui/statuspopup.cpp:436 -msgid "(?) map view" -msgstr "" +#: src/gui/unregisterdialog.cpp:54 +#, c-format +msgid "Name: %s" +msgstr "Imię: %s" -#: src/gui/statuspopup.cpp:444 -msgid "(f) use #flar for magic attack" -msgstr "" +#: src/gui/updaterwindow.cpp:138 +msgid "Updating..." +msgstr "Aktualizacja..." -#: src/gui/statuspopup.cpp:449 -msgid "(c) use #chiza for magic attack" -msgstr "" +#: src/gui/updaterwindow.cpp:159 +msgid "Connecting..." +msgstr "Łączenie..." -#: src/gui/statuspopup.cpp:454 -msgid "(I) use #ingrav for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:459 -msgid "(F) use #frillyar for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:464 -msgid "(U) use #upmarmu for magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:468 -msgid "(?) magic attack" -msgstr "" - -#: src/gui/statuspopup.cpp:477 -msgid "(D) default imitation" -msgstr "" - -#: src/gui/statuspopup.cpp:481 -msgid "(O) outfits imitation" -msgstr "" - -#: src/gui/statuspopup.cpp:485 -msgid "(?) imitation" -msgstr "" - -#: src/gui/statuspopup.cpp:494 -msgid "(O) on keyboard" -msgstr "" - -#: src/gui/statuspopup.cpp:497 -msgid "(A) away" -msgstr "" - -#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520 -msgid "(?) away" -msgstr "" - -#: src/gui/statuspopup.cpp:508 -msgid "(G) game camera mode" -msgstr "" - -#: src/gui/statuspopup.cpp:512 -msgid "(F) free camera mode" -msgstr "" - -#: src/gui/statuspopup.cpp:516 -msgid "(D) design camera mode" -msgstr "" - -#: src/gui/statuspopup.cpp:527 -msgid "Game modifiers are disabled" -msgstr "" - -#: src/gui/statuspopup.cpp:532 -msgid "Game modifiers are enabled" -msgstr "" - -#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259 -#: src/gui/statuswindow.cpp:322 -#, c-format -msgid "Level: %d" -msgstr "Poziom: %d" - -#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245 -#: src/gui/statuswindow.cpp:289 -#, c-format -msgid "Money: %s" -msgstr "Pieniądze: %s" - -#: src/gui/statuswindow.cpp:140 -msgid "HP:" -msgstr "HP:" - -#: src/gui/statuswindow.cpp:147 -msgid "Exp:" -msgstr "Exp:" - -#: src/gui/statuswindow.cpp:161 -msgid "MP:" -msgstr "MP:" - -#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372 -#, c-format -msgid "Job: %d" -msgstr "Praca: %d" - -#: src/gui/statuswindow.cpp:194 -msgid "Job:" -msgstr "Praca:" - -#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296 -#, c-format -msgid "Character points: %d" -msgstr "" - -#: src/gui/statuswindow.cpp:254 -#, c-format -msgid "Level: %d (GM %d)" -msgstr "" - -#: src/gui/statuswindow.cpp:310 -#, c-format -msgid "Correction points: %d" -msgstr "" - -#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698 -#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734 -#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809 -#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851 -msgid "(D)" -msgstr "" - -#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759 -msgid "(I)" -msgstr "" - -#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756 -msgid "(c)" -msgstr "" - -#: src/gui/statuswindow.cpp:642 -msgid "(C)" -msgstr "" - -#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743 -msgid "(d)" -msgstr "" - -#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662 -#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710 -#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746 -#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798 -#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838 -#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867 -msgid "(?)" -msgstr "" - -#: src/gui/statuswindow.cpp:659 -msgid "(a)" -msgstr "" - -#: src/gui/statuswindow.cpp:670 -msgid "(0)" -msgstr "" - -#: src/gui/statuswindow.cpp:673 -msgid "(1)" -msgstr "" - -#: src/gui/statuswindow.cpp:676 -msgid "(2)" -msgstr "" - -#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786 -msgid "(3)" -msgstr "" - -#: src/gui/statuswindow.cpp:682 -msgid "(5)" -msgstr "" - -#: src/gui/statuswindow.cpp:685 -msgid "(7)" -msgstr "" - -#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740 -#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864 -msgid "(A)" -msgstr "" - -#: src/gui/statuswindow.cpp:701 -msgid "(R)" -msgstr "" - -#: src/gui/statuswindow.cpp:704 -msgid "(M)" -msgstr "" - -#: src/gui/statuswindow.cpp:707 -msgid "(P)" -msgstr "" - -#: src/gui/statuswindow.cpp:721 -msgid "(s)" -msgstr "" - -#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777 -msgid "(S)" -msgstr "" - -#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792 -#: src/gui/statuswindow.cpp:845 -msgid "(G)" -msgstr "" - -#: src/gui/statuswindow.cpp:753 -msgid "(f)" -msgstr "" - -#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783 -#: src/gui/statuswindow.cpp:848 -msgid "(F)" -msgstr "" - -#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815 -msgid "(U)" -msgstr "" - -#: src/gui/statuswindow.cpp:789 -msgid "(g)" -msgstr "" - -#: src/gui/statuswindow.cpp:806 -msgid "(N)" -msgstr "" - -#: src/gui/statuswindow.cpp:812 -msgid "(u)" -msgstr "" - -#: src/gui/statuswindow.cpp:818 -msgid "(e)" -msgstr "" - -#: src/gui/statuswindow.cpp:821 -msgid "(b)" -msgstr "" - -#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861 -msgid "(O)" -msgstr "" - -#: src/gui/textcommandeditor.cpp:113 -msgid "No Target" -msgstr "" - -#: src/gui/textcommandeditor.cpp:114 -msgid "Allow Target" -msgstr "" - -#: src/gui/textcommandeditor.cpp:115 -msgid "Need Target" -msgstr "" - -#: src/gui/textcommandeditor.cpp:120 -msgid "General Magic" -msgstr "" - -#: src/gui/textcommandeditor.cpp:121 -msgid "Life Magic" -msgstr "" - -#: src/gui/textcommandeditor.cpp:122 -msgid "War Magic" -msgstr "" - -#: src/gui/textcommandeditor.cpp:123 -msgid "Transmute Magic" -msgstr "" - -#: src/gui/textcommandeditor.cpp:124 -msgid "Nature Magic" -msgstr "" - -#: src/gui/textcommandeditor.cpp:125 -msgid "Astral Magic" -msgstr "" - -#: src/gui/textcommandeditor.cpp:168 -msgid "Command Editor" -msgstr "" - -#: src/gui/textcommandeditor.cpp:185 -msgid "magic" -msgstr "" - -#: src/gui/textcommandeditor.cpp:189 -msgid "other" -msgstr "" - -#: src/gui/textcommandeditor.cpp:194 -msgid "Symbol:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:197 -msgid "Command:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:200 -msgid "Mana:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:206 -msgid "Target Type:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:212 -msgid "Icon:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:218 -msgid "Magic level:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:224 -msgid "Magic School:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:230 -msgid "School level:" -msgstr "" - -#: src/gui/textcommandeditor.cpp:235 -msgid "Save" -msgstr "" - -#: src/gui/tradewindow.cpp:60 -msgid "Propose trade" -msgstr "Oferuj handel" - -#: src/gui/tradewindow.cpp:61 -msgid "Confirmed. Waiting..." -msgstr "Potwierdzono. Oczekiwanie..." - -#: src/gui/tradewindow.cpp:62 -msgid "Agree trade" -msgstr "Akceptuj handel" - -#: src/gui/tradewindow.cpp:63 -msgid "Agreed. Waiting..." -msgstr "Zaakceptowano. Oczekiwanie..." - -#: src/gui/tradewindow.cpp:66 -msgid "Trade: You" -msgstr "Handel: Ty" - -#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166 -#, c-format -msgid "You get %s" -msgstr "" - -#: src/gui/tradewindow.cpp:111 -msgid "You give:" -msgstr "Dajesz:" - -#: src/gui/tradewindow.cpp:115 -msgid "Change" -msgstr "Zmień" - -#: src/gui/tradewindow.cpp:332 -msgid "" -"Failed adding item. You can not overlap one kind of item on the window." -msgstr "" -"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam " -"rodzaj przedmiotu w okienku." - -#: src/gui/tradewindow.cpp:377 -msgid "You don't have enough money." -msgstr "Nie masz wystarczającej ilości pieniędzy." - -#: src/gui/unregisterdialog.cpp:54 -#, c-format -msgid "Name: %s" -msgstr "Imię: %s" - -#: src/gui/updatewindow.cpp:136 -msgid "Updating..." -msgstr "Aktualizacja..." - -#: src/gui/updatewindow.cpp:155 -msgid "Connecting..." -msgstr "Łączenie..." - -#: src/gui/updatewindow.cpp:158 +#: src/gui/updaterwindow.cpp:162 msgid "Play" msgstr "Graj" -#: src/gui/updatewindow.cpp:556 +#: src/gui/updaterwindow.cpp:565 msgid "##1 The update process is incomplete." msgstr "##1 Proces aktualizacji jest niekompletny." #. TRANSLATORS: Continues "you try again later.". -#: src/gui/updatewindow.cpp:558 +#: src/gui/updaterwindow.cpp:567 msgid "##1 It is strongly recommended that" msgstr "##1 Jest mocno zalecane abyś" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/updatewindow.cpp:560 +#: src/gui/updaterwindow.cpp:569 msgid "##1 you try again later." -msgstr "" +msgstr "##1 Spróbuj ponownie później." -#: src/gui/updatewindow.cpp:686 +#: src/gui/updaterwindow.cpp:745 msgid "Completed" msgstr "Zakończono" @@ -3290,19 +3114,19 @@ msgstr "Byty" #: src/gui/userpalette.cpp:117 msgid "Friend Names" -msgstr "" +msgstr "Imiona przyjaciół" #: src/gui/userpalette.cpp:118 msgid "Disregarded Names" -msgstr "" +msgstr "Imiona lekceważonych" #: src/gui/userpalette.cpp:119 msgid "Ignored Names" -msgstr "" +msgstr "Imiona ignorowanych" #: src/gui/userpalette.cpp:120 msgid "Erased Names" -msgstr "" +msgstr "Imiona usuniętych" #: src/gui/userpalette.cpp:121 msgid "Other Players' Names" @@ -3322,23 +3146,23 @@ msgstr "NPC" #: src/gui/userpalette.cpp:126 msgid "Monster HP bar" -msgstr "" +msgstr "Pasek życia potwora" #: src/gui/userpalette.cpp:128 msgid "Monster HP bar (second color)" -msgstr "" +msgstr "Pasek życia potwora (drugi kolor)" #: src/gui/userpalette.cpp:129 msgid "Party Members" -msgstr "" +msgstr "Członkowie grupy" #: src/gui/userpalette.cpp:130 msgid "Guild Members" -msgstr "" +msgstr "Członkowie drużyny" #: src/gui/userpalette.cpp:131 msgid "Particle Effects" -msgstr "Efekty Cząsteczkowe" +msgstr "Efekty cząsteczkowe" #: src/gui/userpalette.cpp:132 msgid "Pickup Notification" @@ -3350,23 +3174,23 @@ msgstr "Powiadomienie o Exp" #: src/gui/userpalette.cpp:134 msgid "Player HP bar" -msgstr "" +msgstr "Pasek życia gracza" #: src/gui/userpalette.cpp:136 msgid "Player HP bar (second color)" -msgstr "" +msgstr "Pasek życia gracza (drugi kolor)" #: src/gui/userpalette.cpp:137 msgid "Player Hits Monster" -msgstr "" +msgstr "Inny gracz uderza potwora" #: src/gui/userpalette.cpp:138 msgid "Monster Hits Player" -msgstr "" +msgstr "Potwór uderza gracza" #: src/gui/userpalette.cpp:140 msgid "Other Player Hits Local Player" -msgstr "" +msgstr "Inny gracz uderza Ciebie" #: src/gui/userpalette.cpp:141 msgid "Critical Hit" @@ -3374,15 +3198,15 @@ msgstr "Uderzenie Krytyczne" #: src/gui/userpalette.cpp:143 msgid "Local Player Hits Monster" -msgstr "" +msgstr "Uderzasz potwora" #: src/gui/userpalette.cpp:145 msgid "Local Player Critical Hit" -msgstr "" +msgstr "Zadajesz cios krytyczny" #: src/gui/userpalette.cpp:147 msgid "Local Player Miss" -msgstr "" +msgstr "Pudłujesz" #: src/gui/userpalette.cpp:148 msgid "Misses" @@ -3390,71 +3214,71 @@ msgstr "Pudła" #: src/gui/userpalette.cpp:149 msgid "Portal Highlight" -msgstr "" +msgstr "Podświetlenie portalu" #: src/gui/userpalette.cpp:151 msgid "Default collision Highlight" -msgstr "" +msgstr "Podświetlenie nieprzechadzalnych terenów" #: src/gui/userpalette.cpp:153 msgid "Air collision Highlight" -msgstr "" +msgstr "Podświetlenie przeszkód powietrznych" #: src/gui/userpalette.cpp:155 msgid "Water collision Highlight" -msgstr "" +msgstr "Podświetlenie przeszkód wodnych" #: src/gui/userpalette.cpp:157 msgid "Walkable Highlight" -msgstr "" +msgstr "Podświetlenie miejsc, po których da się chodzić" #: src/gui/userpalette.cpp:159 msgid "Local Player Attack Range" -msgstr "" +msgstr "Zasięg Twojego ataku" #: src/gui/userpalette.cpp:161 msgid "Local Player Attack Range Border" -msgstr "" +msgstr "Obwódka zasięgu Twojego ataku" #: src/gui/userpalette.cpp:163 msgid "Monster Attack Range" -msgstr "" +msgstr "Zakres ataku potwora" #: src/gui/userpalette.cpp:165 msgid "Home Place" -msgstr "" +msgstr "Lokalizacja domowa" #: src/gui/userpalette.cpp:167 msgid "Home Place Border" -msgstr "" +msgstr "Obwódka lokalizacji domowej" #: src/gui/userpalette.cpp:169 msgid "Road Point" -msgstr "" +msgstr "Drogowskaz" -#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" -msgstr "" +msgstr "Kto jest online- aktualizacja" -#: src/gui/whoisonline.cpp:101 +#: src/gui/whoisonline.cpp:110 msgid "Update" -msgstr "" +msgstr "Aktualizacja" -#: src/gui/whoisonline.cpp:294 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " -msgstr "" +msgstr "Gracze online- " -#: src/gui/whoisonline.cpp:485 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" -msgstr "" +msgstr "Gracze online- błąd" -#: src/gui/whoisonline.cpp:516 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" -msgstr "" +msgstr "Gracze online- aktualizacja" #: src/gui/widgets/battletab.cpp:45 msgid "Battle" -msgstr "" +msgstr "Bitwa" #: src/gui/widgets/channeltab.cpp:52 msgid "/users > Lists the users in the current channel" @@ -3502,7 +3326,7 @@ msgstr "Komenda powoduje opuszczenie obecnego kanału." #: src/gui/widgets/channeltab.cpp:78 msgid "If you're the last person in the channel, it will be deleted." -msgstr "Jeżeli jesteś ostatnią osobą na kanale, zostanie on usunięty." +msgstr "Jeżeli jesteś ostatnią osobą w pokoju, zostanie on usunięty." #: src/gui/widgets/channeltab.cpp:83 msgid "Command: /op " @@ -3513,7 +3337,8 @@ msgid "This command makes a channel operator." msgstr "Ta komenda uczyni operatorem kanału." #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94 -#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85 +#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69 +#: src/net/ea/gui/partytab.cpp:85 msgid "If the has spaces in it, enclose it in double quotes (\")." msgstr "Jeżeli ma spację, należy ją zapisać w cudzysłowie (\")" @@ -3549,15 +3374,54 @@ msgstr "Ogłoszenie ogólne od %s:" #: src/gui/widgets/chattab.cpp:184 #, c-format msgid "%s whispers: %s" -msgstr "" +msgstr "%s szepcze: %s" + +#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67 +#: src/net/ea/gui/partytab.cpp:83 +msgid "Command: /invite " +msgstr "Polecenie: /invite " + +#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68 +msgid "This command invites to the guild you're in." +msgstr "To polecenie zaprasza do gildii, do której należysz." + +#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74 +#: src/net/ea/gui/partytab.cpp:90 +msgid "Command: /leave" +msgstr "Polecenie: /leave" + +#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75 +msgid "This command causes the player to leave the guild." +msgstr "To polecenie sprawia że gracz opuszcza gildię." + +#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135 +#: src/net/ea/gui/partytab.cpp:69 +msgid "/help > Display this help." +msgstr "/help > Pokaż tą pomoc." + +#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136 +msgid "/invite > Invite a player to your guild" +msgstr "/invite > Zaproś gracza do swojej gildii" + +#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137 +msgid "/leave > Leave the guild you are in" +msgstr "/leave > Opuść swoją gildię" + +#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138 +msgid "/kick > Kick some one from the guild you are in" +msgstr "/kick > Wyrzuć kogoś ze swojej gildii" + +#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394 +msgid "Edit" +msgstr "Edycja" #: src/gui/widgets/whispertab.cpp:107 msgid "/ignore > Ignore the other player" -msgstr "" +msgstr "/ignore > Ignoruj gracza" #: src/gui/widgets/whispertab.cpp:108 msgid "/unignore > Stop ignoring the other player" -msgstr "" +msgstr "/unignore- Przestań ignorować gracza" #: src/gui/widgets/whispertab.cpp:109 msgid "/close > Close the whisper tab" @@ -3573,48 +3437,47 @@ msgstr "Komenda zamyka obecną zakładkę szeptania" #: src/gui/widgets/whispertab.cpp:124 msgid "Command: /ignore" -msgstr "" +msgstr "Polecenie: /ignore" #: src/gui/widgets/whispertab.cpp:125 msgid "This command ignores the other player regardless of current relations." -msgstr "" +msgstr "To polecenie ignoruje gracza niezależnie od obecnych relacji." #: src/gui/widgets/whispertab.cpp:130 msgid "Command: /unignore " -msgstr "" +msgstr "Komenda: /unignore " #: src/gui/widgets/whispertab.cpp:131 -msgid "" -"This command stops ignoring the other player if they are being ignored." -msgstr "" +msgid "This command stops ignoring the other player if they are being ignored." +msgstr "To polecenie przerywa ignorowanie gracza, jeśli był ignorowany." #: src/gui/windowmenu.cpp:65 msgid "BC" -msgstr "" +msgstr "WB" #: src/gui/windowmenu.cpp:65 msgid "Bot checker" -msgstr "" +msgstr "Wykrywacz botów" #: src/gui/windowmenu.cpp:67 msgid "ONL" -msgstr "" +msgstr "ONL" #: src/gui/windowmenu.cpp:67 msgid "Who is online" -msgstr "" +msgstr "Gracze online" #: src/gui/windowmenu.cpp:69 msgid "KS" -msgstr "" +msgstr "SB" #: src/gui/windowmenu.cpp:71 msgid "Smilies" -msgstr "" +msgstr "Emotki" #: src/gui/windowmenu.cpp:73 msgid "STA" -msgstr "" +msgstr "STA" #: src/gui/windowmenu.cpp:73 msgid "Status" @@ -3622,618 +3485,921 @@ msgstr "Stan" #: src/gui/windowmenu.cpp:74 msgid "EQU" -msgstr "" +msgstr "EKW" #: src/gui/windowmenu.cpp:76 msgid "INV" -msgstr "" +msgstr "INW" #: src/gui/windowmenu.cpp:81 msgid "SKI" -msgstr "" +msgstr "SKI" #: src/gui/windowmenu.cpp:88 msgid "SPE" -msgstr "" +msgstr "SPE" #: src/gui/windowmenu.cpp:93 msgid "SOC" -msgstr "" +msgstr "SOC" #: src/gui/windowmenu.cpp:94 msgid "SH" -msgstr "" +msgstr "SK" #: src/gui/windowmenu.cpp:94 msgid "Shortcuts" -msgstr "" +msgstr "Skróty" #: src/gui/windowmenu.cpp:96 msgid "SP" -msgstr "" +msgstr "MG" #: src/gui/windowmenu.cpp:97 msgid "DR" -msgstr "" +msgstr "UP" #: src/gui/windowmenu.cpp:98 msgid "YK" -msgstr "" +msgstr "WŻ" #: src/gui/windowmenu.cpp:98 msgid "Did you know" -msgstr "" +msgstr "Czy wiesz, że..." #: src/gui/windowmenu.cpp:100 msgid "SET" -msgstr "" +msgstr "UST" #: src/gui/worldselectdialog.cpp:77 msgid "Select World" -msgstr "" +msgstr "Wybierz świat" #: src/gui/worldselectdialog.cpp:82 msgid "Change Login" -msgstr "" +msgstr "Przeloguj się" #: src/gui/worldselectdialog.cpp:83 msgid "Choose World" -msgstr "" +msgstr "Wybierz świat" -#: src/inventory.cpp:248 +#: src/inventory.cpp:251 msgid "Storage" -msgstr "" +msgstr "Magazyn" -#: src/inventory.cpp:250 +#: src/inventory.cpp:253 msgid "Cart" -msgstr "" +msgstr "Wózek" #: src/keyboardconfig.cpp:43 +msgid "Basic Keys" +msgstr "Podstawowe klawisze" + +#: src/keyboardconfig.cpp:44 msgid "Move Up" msgstr "Przesuń w górę" -#: src/keyboardconfig.cpp:44 +#: src/keyboardconfig.cpp:45 msgid "Move Down" msgstr "Przesuń w dół" -#: src/keyboardconfig.cpp:45 +#: src/keyboardconfig.cpp:46 msgid "Move Left" msgstr "Przesuń w lewo" -#: src/keyboardconfig.cpp:46 +#: src/keyboardconfig.cpp:47 msgid "Move Right" msgstr "Przesuń w prawo" -#: src/keyboardconfig.cpp:49 +#: src/keyboardconfig.cpp:50 msgid "Target & Attack" msgstr "Namierz i Atakuj" -#: src/keyboardconfig.cpp:51 +#: src/keyboardconfig.cpp:52 msgid "Move to Target" -msgstr "" +msgstr "Podejdź do celu" -#: src/keyboardconfig.cpp:53 +#: src/keyboardconfig.cpp:54 msgid "Change Move to Target type" -msgstr "" +msgstr "Zmień sposób podchodzenia do celu" -#: src/keyboardconfig.cpp:55 +#: src/keyboardconfig.cpp:56 msgid "Move to Home location" -msgstr "" +msgstr "Podejdź do lokacji domowej" -#: src/keyboardconfig.cpp:57 +#: src/keyboardconfig.cpp:58 msgid "Set home location" -msgstr "" +msgstr "Ustaw lokację domową" -#: src/keyboardconfig.cpp:59 +#: src/keyboardconfig.cpp:60 msgid "Move to navigation point" -msgstr "" - -#: src/keyboardconfig.cpp:61 -msgid "Smilie" -msgstr "Emotikonka" +msgstr "Podejdź do punktu nawigacyjnego" #: src/keyboardconfig.cpp:63 msgid "Stop Attack" msgstr "Zatrzymaj Atak" -#: src/keyboardconfig.cpp:64 -msgid "Target Closest" -msgstr "" +#: src/keyboardconfig.cpp:65 +msgid "Untarget" +msgstr "Przestań namierzać" #: src/keyboardconfig.cpp:66 +msgid "Target Closest" +msgstr "Celuj w najbliższe" + +#: src/keyboardconfig.cpp:68 msgid "Target NPC" msgstr "Namierz NPC" -#: src/keyboardconfig.cpp:67 +#: src/keyboardconfig.cpp:69 msgid "Target Player" msgstr "Namierz Gracza" -#: src/keyboardconfig.cpp:69 +#: src/keyboardconfig.cpp:71 msgid "Pickup" msgstr "Podnieś" -#: src/keyboardconfig.cpp:70 +#: src/keyboardconfig.cpp:72 msgid "Change Pickup Type" -msgstr "" +msgstr "Zmień sposób podnoszenia" -#: src/keyboardconfig.cpp:72 +#: src/keyboardconfig.cpp:74 msgid "Hide Windows" msgstr "Ukryj Okna" -#: src/keyboardconfig.cpp:74 +#: src/keyboardconfig.cpp:76 msgid "Sit" msgstr "Usiądź" -#: src/keyboardconfig.cpp:75 +#: src/keyboardconfig.cpp:77 msgid "Screenshot" msgstr "Zrzut ekranu" -#: src/keyboardconfig.cpp:76 +#: src/keyboardconfig.cpp:78 msgid "Enable/Disable Trading" msgstr "Włącz/Wysłącz Handlowanie" -#: src/keyboardconfig.cpp:78 +#: src/keyboardconfig.cpp:80 msgid "Change Map View Mode" -msgstr "" +msgstr "Zmień widok mapy" -#: src/keyboardconfig.cpp:80 -msgid "Item Shortcuts Key" -msgstr "" +#: src/keyboardconfig.cpp:82 +msgid "Select OK" +msgstr "Wybrano OK" + +#: src/keyboardconfig.cpp:85 +msgid "Shortcuts Keys" +msgstr "Klawisze skrótu" -#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84 -#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88 -#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92 -#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96 -#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100 -#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104 -#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108 -#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113 -#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117 -#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121 -#: src/keyboardconfig.cpp:360 +#: src/keyboardconfig.cpp:86 +msgid "Item Shortcuts Key" +msgstr "Klawisz skrótu przedmiotu" + +#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90 +#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94 +#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98 +#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102 +#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106 +#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110 +#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114 +#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119 +#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123 +#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127 +#: src/keyboardconfig.cpp:371 #, c-format msgid "Item Shortcut %d" -msgstr "Skrót Przedmiotu %d" +msgstr "Skrót przedmiotu %d" + +#: src/keyboardconfig.cpp:128 +msgid "Windows Keys" +msgstr "Klawisze okien" -#: src/keyboardconfig.cpp:122 +#: src/keyboardconfig.cpp:129 msgid "Help Window" msgstr "Okno Pomocy" -#: src/keyboardconfig.cpp:124 +#: src/keyboardconfig.cpp:131 msgid "Status Window" msgstr "Okno statusu" -#: src/keyboardconfig.cpp:126 +#: src/keyboardconfig.cpp:133 msgid "Inventory Window" msgstr "Okno Inwentarza" -#: src/keyboardconfig.cpp:128 +#: src/keyboardconfig.cpp:135 msgid "Equipment Window" msgstr "Okno Ekwipunku" -#: src/keyboardconfig.cpp:130 +#: src/keyboardconfig.cpp:137 msgid "Skill Window" msgstr "Okno Umiejętności" -#: src/keyboardconfig.cpp:132 +#: src/keyboardconfig.cpp:139 msgid "Minimap Window" msgstr "Okno Minimapy" -#: src/keyboardconfig.cpp:134 +#: src/keyboardconfig.cpp:141 msgid "Chat Window" msgstr "Okno Czatu" -#: src/keyboardconfig.cpp:136 +#: src/keyboardconfig.cpp:143 msgid "Item Shortcut Window" -msgstr "Okno Skrótów Przedmiotów" +msgstr "Okno Skrótów przedmiotów" -#: src/keyboardconfig.cpp:138 +#: src/keyboardconfig.cpp:145 msgid "Setup Window" msgstr "Okno Ustawień" -#: src/keyboardconfig.cpp:140 +#: src/keyboardconfig.cpp:147 msgid "Debug Window" msgstr "Okno diagnostyczne" -#: src/keyboardconfig.cpp:142 +#: src/keyboardconfig.cpp:149 msgid "Social Window" -msgstr "" +msgstr "Okno społeczne" -#: src/keyboardconfig.cpp:144 +#: src/keyboardconfig.cpp:151 msgid "Emote Shortcut Window" msgstr "Okno Skrótów Emotek" -#: src/keyboardconfig.cpp:146 +#: src/keyboardconfig.cpp:153 msgid "Outfits Window" -msgstr "" +msgstr "Okno strojów" -#: src/keyboardconfig.cpp:148 +#: src/keyboardconfig.cpp:155 msgid "Shop Window" -msgstr "" +msgstr "Okno sklepu" -#: src/keyboardconfig.cpp:150 +#: src/keyboardconfig.cpp:157 msgid "Quick drop Window" -msgstr "" +msgstr "Okno szybkiego upuszczania" -#: src/keyboardconfig.cpp:152 +#: src/keyboardconfig.cpp:159 msgid "Kill Stats Window" -msgstr "" +msgstr "Okno statystyk bitewnych" -#: src/keyboardconfig.cpp:154 +#: src/keyboardconfig.cpp:161 msgid "Commands Window" -msgstr "" +msgstr "Okno poleceń" -#: src/keyboardconfig.cpp:156 +#: src/keyboardconfig.cpp:163 msgid "Bot Checker Window" -msgstr "" +msgstr "Okno wykrywacza botów" -#: src/keyboardconfig.cpp:159 +#: src/keyboardconfig.cpp:166 msgid "Who Is Online Window" -msgstr "" +msgstr "Okno graczy online" -#: src/keyboardconfig.cpp:161 +#: src/keyboardconfig.cpp:168 msgid "Did you know Window" -msgstr "" +msgstr "Okno \"Czy wiesz że...\"" -#: src/keyboardconfig.cpp:164 +#: src/keyboardconfig.cpp:171 msgid "Previous Social Tab" -msgstr "" +msgstr "Poprzednia zakładka społeczna" -#: src/keyboardconfig.cpp:166 +#: src/keyboardconfig.cpp:173 msgid "Next Social Tab" -msgstr "" +msgstr "Następna zakładka społeczna" + +#: src/keyboardconfig.cpp:175 +msgid "Emotes Keys" +msgstr "Klawisze emotek" -#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170 -#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174 -#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178 -#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182 -#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186 -#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190 +#: src/keyboardconfig.cpp:176 +msgid "Smilie" +msgstr "Emotikonka" + +#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179 +#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183 +#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187 +#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191 #: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195 #: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199 -#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203 -#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207 -#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211 -#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215 -#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220 -#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226 -#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230 -#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234 -#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238 -#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242 -#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247 +#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204 +#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208 +#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212 +#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216 +#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220 +#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224 +#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229 +#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235 +#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239 +#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243 +#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247 #: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251 -#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255 -#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259 -#: src/keyboardconfig.cpp:355 +#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256 +#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260 +#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264 +#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268 +#: src/keyboardconfig.cpp:366 #, c-format msgid "Emote Shortcut %d" msgstr "Skrót Emotki %d" -#: src/keyboardconfig.cpp:261 +#: src/keyboardconfig.cpp:270 +msgid "Outfits Keys" +msgstr "Klawisze stroju" + +#: src/keyboardconfig.cpp:271 msgid "Wear Outfit" -msgstr "" +msgstr "Nałóż strój" -#: src/keyboardconfig.cpp:263 +#: src/keyboardconfig.cpp:273 msgid "Copy Outfit" -msgstr "" +msgstr "Kopiuj strój" -#: src/keyboardconfig.cpp:265 +#: src/keyboardconfig.cpp:275 msgid "Copy equipped to Outfit" -msgstr "" +msgstr "Skopiuj ekwipunek do stroju" -#: src/keyboardconfig.cpp:267 +#: src/keyboardconfig.cpp:277 +msgid "Chat Keys" +msgstr "Klawisze czatu" + +#: src/keyboardconfig.cpp:278 msgid "Toggle Chat" msgstr "Przełącznik Czatu" -#: src/keyboardconfig.cpp:269 +#: src/keyboardconfig.cpp:280 msgid "Scroll Chat Up" msgstr "Przewiń czat do góry" -#: src/keyboardconfig.cpp:271 +#: src/keyboardconfig.cpp:282 msgid "Scroll Chat Down" msgstr "Przewiń czat w doł" -#: src/keyboardconfig.cpp:273 +#: src/keyboardconfig.cpp:284 msgid "Previous Chat Tab" msgstr "Poprzednia zakładka czatu" -#: src/keyboardconfig.cpp:275 +#: src/keyboardconfig.cpp:286 msgid "Next Chat Tab" msgstr "Następna zakładka czatu" -#: src/keyboardconfig.cpp:278 +#: src/keyboardconfig.cpp:289 msgid "Close current Chat Tab" -msgstr "" +msgstr "Zamknij bieżącą zakładkę czatu" -#: src/keyboardconfig.cpp:280 +#: src/keyboardconfig.cpp:291 msgid "Previous chat line" +msgstr "Poprzedni wiersz czatu" + +#: src/keyboardconfig.cpp:293 +msgid "Next chat line" +msgstr "Następny wiersz czatu" + +#: src/keyboardconfig.cpp:295 +msgid "Chat Auto Complete" +msgstr "Dopełnianie w czacie" + +#: src/keyboardconfig.cpp:297 +msgid "Deactivate Chat Input" +msgstr "Wyłącz wpisywanie do czatu" + +#: src/keyboardconfig.cpp:299 +msgid "Other Keys" +msgstr "Inne" + +#: src/keyboardconfig.cpp:300 +msgid "Ignore input 1" +msgstr "Ignoruj wprowadzenie 1" + +#: src/keyboardconfig.cpp:302 +msgid "Ignore input 2" +msgstr "Ignoruj wprowadzenie 2" + +#: src/keyboardconfig.cpp:304 +msgid "Direct Up" +msgstr "Skieruj się w górę" + +#: src/keyboardconfig.cpp:305 +msgid "Direct Down" +msgstr "Skieruj się w dół" + +#: src/keyboardconfig.cpp:307 +msgid "Direct Left" +msgstr "Skieruj się w lewo" + +#: src/keyboardconfig.cpp:308 +msgid "Direct Right" +msgstr "Skieruj się w prawo" + +#: src/keyboardconfig.cpp:310 +msgid "Crazy moves" +msgstr "Szalone ruchy" + +#: src/keyboardconfig.cpp:312 +msgid "Change Crazy Move mode" +msgstr "Zmień tryb szalonych ruchów" + +#: src/keyboardconfig.cpp:314 +msgid "Quick Drop N Items from 0 slot" +msgstr "Szybkie upuszczenie N przedmiotów z pozycji 0" + +#: src/keyboardconfig.cpp:316 +msgid "Quick Drop N Items" +msgstr "Szybkie upuszczenie N przedmiotów" + +#: src/keyboardconfig.cpp:318 +msgid "Switch Quick Drop Counter" +msgstr "Zmień licznik szybkiego upuszczania" + +#: src/keyboardconfig.cpp:320 +msgid "Quick heal target or self" +msgstr "Szybkie leczenie celu lub siebie" + +#: src/keyboardconfig.cpp:322 +msgid "Use #itenplz spell" +msgstr "Użyj zaklęcia #itenplz" + +#: src/keyboardconfig.cpp:324 +msgid "Use magic attack" +msgstr "Użyj magicznego ataku" + +#: src/keyboardconfig.cpp:326 +msgid "Switch magic attack" +msgstr "Przełącz magiczny atak" + +#: src/keyboardconfig.cpp:329 +msgid "Switch pvp attack" +msgstr "Przełącz atak PvP" + +#: src/keyboardconfig.cpp:330 +msgid "Change move type" +msgstr "Zmień tryb poruszania się" + +#: src/keyboardconfig.cpp:332 +msgid "Change Attack Weapon Type" +msgstr "Zmień rodzaj broni" + +#: src/keyboardconfig.cpp:334 +msgid "Change Attack Type" +msgstr "Zmień rodzaj ataku" + +#: src/keyboardconfig.cpp:336 +msgid "Change Follow mode" +msgstr "Zmień rodzaj podążania" + +#: src/keyboardconfig.cpp:338 +msgid "Change Imitation mode" +msgstr "Zmień rodzaj imitacji" + +#: src/keyboardconfig.cpp:341 +msgid "Disable / Enable Game modifier keys" +msgstr "Włącz/ wyłącz klawisze modyfikatorów gry" + +#: src/keyboardconfig.cpp:342 +msgid "On / Off audio" +msgstr "Włącz/ wyłącz dźwięk" + +#: src/keyboardconfig.cpp:344 +msgid "Enable / Disable away mode" +msgstr "Włącz/ wyłącz tryb AFK" + +#: src/keyboardconfig.cpp:346 +msgid "Emulate right click from keyboard" +msgstr "Emuluj prawe kliknięcie klawiaturą" + +#: src/keyboardconfig.cpp:348 +msgid "Toggle camera mode" +msgstr "Przełącz tryb kamery" + +#: src/keyboardconfig.cpp:350 +msgid "Modifier key" +msgstr "Klawisz modyfikatora" + +#: src/keyboardconfig.cpp:429 +#, c-format +msgid "" +"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " +"strange behaviour." msgstr "" +"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić " +"się problemy." + +#: src/localplayer.cpp:384 +msgid "You were killed by " +msgstr "Zostałeś/aś zabity/a przez " + +#: src/localplayer.cpp:1434 +msgid "Tried to pick up nonexistent item." +msgstr "Próbowano podnieść nieistniejący przedmiot." + +#: src/localplayer.cpp:1436 +msgid "Item is too heavy." +msgstr "Przedmiot zbyt ciężki." + +#: src/localplayer.cpp:1438 +msgid "Item is too far away." +msgstr "Przedmiot za daleko" + +#: src/localplayer.cpp:1440 +msgid "Inventory is full." +msgstr "Inwentarz jest pełny." + +#: src/localplayer.cpp:1442 +msgid "Stack is too big." +msgstr "Za duży stos." + +#: src/localplayer.cpp:1445 +msgid "Item belongs to someone else." +msgstr "Przedmiot należy do kogoś innego." + +#: src/localplayer.cpp:1448 +msgid "Unknown problem picking up item." +msgstr "Nieznany problem podczas próby podniesienia przedmiotu." + +#. TRANSLATORS: %d is number, +#. [@@%d|%s@@] - here player can see link to item +#: src/localplayer.cpp:1472 +#, c-format +msgid "You picked up %d [@@%d|%s@@]." +msgid_plural "You picked up %d [@@%d|%s@@]." +msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]." +msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]." +msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]." + +#: src/localplayer.cpp:1887 +msgid "(D) default moves" +msgstr "(D) domyślne poruszanie się" + +#: src/localplayer.cpp:1888 +msgid "(I) invert moves" +msgstr "(I) odwrócone ruchy" + +#: src/localplayer.cpp:1889 +msgid "(c) moves with some crazy moves" +msgstr "(c) trochę szalonych ruchów" + +#: src/localplayer.cpp:1890 +msgid "(C) moves with crazy moves" +msgstr "(C) dużo szalonych ruchów" + +#: src/localplayer.cpp:1891 +msgid "(d) double normal + crazy" +msgstr "(d) podwójne normalne + szalone" + +#: src/localplayer.cpp:1892 +msgid "(?) unknown move" +msgstr "(?) nieznany sposób poruszania się" + +#: src/localplayer.cpp:1914 +#, c-format +msgid "(%d) crazy move number %d" +msgstr "(%d) szalone ruchy numer %d" + +#: src/localplayer.cpp:1919 +msgid "(a) custom crazy move" +msgstr "(a) własne szalone ruchy" + +#: src/localplayer.cpp:1923 +msgid "(?) crazy move" +msgstr "(?) szalone ruchy" + +#: src/localplayer.cpp:1937 +msgid "(0) default moves to target" +msgstr "(0) domyślne przybliżenie do celu" + +#: src/localplayer.cpp:1938 +msgid "(1) moves to target in distance 1" +msgstr "(1) podejdź do 1 pola od celu" + +#: src/localplayer.cpp:1939 +msgid "(2) moves to target in distance 2" +msgstr "(2) podejdź do 2 pól od celu" + +#: src/localplayer.cpp:1940 +msgid "(3) moves to target in distance 3" +msgstr "(3) podejdź do 3 pól od celu" + +#: src/localplayer.cpp:1941 +msgid "(5) moves to target in distance 5" +msgstr "(5) podejdź do 5 pól od celu" + +#: src/localplayer.cpp:1942 +msgid "(7) moves to target in distance 7" +msgstr "(7) podejdź do 7 pól od celu" + +#: src/localplayer.cpp:1943 +msgid "(A) moves to target in attack range" +msgstr "(A) podejdź do celu na zasięg ataku" + +#: src/localplayer.cpp:1944 +msgid "(a) archer attack range" +msgstr "(a) zasięg ataku łucznika" + +#: src/localplayer.cpp:1945 +msgid "(?) move to target" +msgstr "(?) pól do celu" + +#: src/localplayer.cpp:1964 +msgid "(D) default follow" +msgstr "(D) domyślne podążanie" + +#: src/localplayer.cpp:1965 +msgid "(R) relative follow" +msgstr "(R) relatywne podążanie" + +#: src/localplayer.cpp:1966 +msgid "(M) mirror follow" +msgstr "(M) lustrzane podążanie" + +#: src/localplayer.cpp:1967 +msgid "(P) pet follow" +msgstr "(P) niewolnicze podążanie" + +#: src/localplayer.cpp:1968 +msgid "(?) unknown follow" +msgstr "(?) nieznane podążanie" + +#: src/localplayer.cpp:1987 src/localplayer.cpp:1991 src/localplayer.cpp:2014 +msgid "(?) attack" +msgstr "(?) atak" + +#: src/localplayer.cpp:1988 src/localplayer.cpp:2010 +msgid "(D) default attack" +msgstr "(D) domyślny atak" + +#: src/localplayer.cpp:1989 +msgid "(s) switch attack without shield" +msgstr "(s) zdejmij tarczę do ataku" -#: src/keyboardconfig.cpp:282 -msgid "Next chat line" -msgstr "" +#: src/localplayer.cpp:1990 +msgid "(S) switch attack with shield" +msgstr "(S) załóż tarczę do ataku" -#: src/keyboardconfig.cpp:284 -msgid "Chat Auto Complete" -msgstr "" +#: src/localplayer.cpp:2011 +msgid "(G) go and attack" +msgstr "(G) idź, atakuj" -#: src/keyboardconfig.cpp:286 -msgid "Deactivate Chat Input" -msgstr "" +#: src/localplayer.cpp:2012 +msgid "(A) go, attack, pickup" +msgstr "(A) idź, atakuj, podnieś" -#: src/keyboardconfig.cpp:288 -msgid "Select OK" -msgstr "Wybrano OK" +#: src/localplayer.cpp:2013 +msgid "(d) without auto attack" +msgstr "(d) bez autoataku" -#: src/keyboardconfig.cpp:291 -msgid "Ignore input 1" -msgstr "Ignoruj wprowadzenie 1" +#: src/localplayer.cpp:2047 +msgid "(S) small pick up 1x1 cells" +msgstr "(S) podnoś w promieniu 1x1" -#: src/keyboardconfig.cpp:293 -msgid "Ignore input 2" -msgstr "Ignoruj wprowadzenie 2" +#: src/localplayer.cpp:2048 +msgid "(D) default pick up 2x1 cells" +msgstr "(D) podnoś w promieniu 2x1" -#: src/keyboardconfig.cpp:295 -msgid "Direct Up" -msgstr "" +#: src/localplayer.cpp:2049 +msgid "(F) forward pick up 2x3 cells" +msgstr "(F) podnoś w promieniu 2x3" -#: src/keyboardconfig.cpp:296 -msgid "Direct Down" -msgstr "" +#: src/localplayer.cpp:2050 +msgid "(3) pick up 3x3 cells" +msgstr "(3) podnoś w promieniu 3x3" -#: src/keyboardconfig.cpp:298 -msgid "Direct Left" -msgstr "" +#: src/localplayer.cpp:2051 +msgid "(g) go and pick up in distance 4" +msgstr "(g) podejdź i podnoś do 4 pól" -#: src/keyboardconfig.cpp:299 -msgid "Direct Right" -msgstr "" +#: src/localplayer.cpp:2052 +msgid "(G) go and pick up in distance 8" +msgstr "(G) podejdź i podnoś do 8 pól" -#: src/keyboardconfig.cpp:301 -msgid "Crazy moves" -msgstr "" +#: src/localplayer.cpp:2053 +msgid "(A) go and pick up in max distance" +msgstr "(A) podejdź i podnoś w zasięgu wzroku" -#: src/keyboardconfig.cpp:303 -msgid "Change Crazy Move mode" -msgstr "" +#: src/localplayer.cpp:2054 +msgid "(?) pick up" +msgstr "(?) podnoś" -#: src/keyboardconfig.cpp:305 -msgid "Quick Drop N Items from 0 slot" -msgstr "" +#: src/localplayer.cpp:2067 +msgid "(N) normal map view" +msgstr "(N) normalny widok mapy" -#: src/keyboardconfig.cpp:307 -msgid "Quick Drop N Items" -msgstr "" +#: src/localplayer.cpp:2068 +msgid "(D) debug map view" +msgstr "(D) widok debug" -#: src/keyboardconfig.cpp:309 -msgid "Switch Quick Drop Counter" -msgstr "" +#: src/localplayer.cpp:2069 +msgid "(u) ultra map view" +msgstr "(u) płaska mapa" -#: src/keyboardconfig.cpp:311 -msgid "Quick heal target or self" -msgstr "" +#: src/localplayer.cpp:2070 +msgid "(U) ultra map view 2" +msgstr "(U) płaska mapa 2" -#: src/keyboardconfig.cpp:313 -msgid "Use #itenplz spell" -msgstr "" +#: src/localplayer.cpp:2071 +msgid "(e) empty map view" +msgstr "(e) mapa bez tekstur" -#: src/keyboardconfig.cpp:315 -msgid "Use magic attack" -msgstr "" +#: src/localplayer.cpp:2072 +msgid "(b) black & white map view" +msgstr "(b) dwukolorowa mapa" -#: src/keyboardconfig.cpp:317 -msgid "Switch magic attack" -msgstr "" +#: src/localplayer.cpp:2091 +msgid "(f) use #flar for magic attack" +msgstr "(f) użyj #flar jako M.A." -#: src/keyboardconfig.cpp:319 -msgid "Change move type" -msgstr "" +#: src/localplayer.cpp:2092 +msgid "(c) use #chiza for magic attack" +msgstr "(c) użyj #chiza jako M.A." -#: src/keyboardconfig.cpp:321 -msgid "Change Attack Weapon Type" -msgstr "" +#: src/localplayer.cpp:2093 +msgid "(I) use #ingrav for magic attack" +msgstr "(I) użyj #ingrav jako M.A." -#: src/keyboardconfig.cpp:323 -msgid "Change Attack Type" -msgstr "" +#: src/localplayer.cpp:2094 +msgid "(F) use #frillyar for magic attack" +msgstr "(F) użyj #ingrav jako M.A." -#: src/keyboardconfig.cpp:325 -msgid "Change Follow mode" -msgstr "" +#: src/localplayer.cpp:2095 +msgid "(U) use #upmarmu for magic attack" +msgstr "(U) użyj #upmarmu jako M.A." -#: src/keyboardconfig.cpp:327 -msgid "Change Imitation mode" -msgstr "" +#: src/localplayer.cpp:2096 +msgid "(?) magic attack" +msgstr "(?) magiczny atak" -#: src/keyboardconfig.cpp:330 -msgid "Disable / Enable Game modifier keys" -msgstr "" +#: src/localplayer.cpp:2115 +msgid "(a) attack all players" +msgstr "(a) atakuj wszystkich graczy" -#: src/keyboardconfig.cpp:331 -msgid "On / Off audio" -msgstr "" +#: src/localplayer.cpp:2116 +msgid "(f) attack not friends" +msgstr "(f) nie atakuj przyjaciół" -#: src/keyboardconfig.cpp:333 -msgid "Enable / Disable away mode" -msgstr "" +#: src/localplayer.cpp:2117 +msgid "(b) attack bad relations" +msgstr "(b) atakuj nielubianych" -#: src/keyboardconfig.cpp:335 -msgid "Emulate right click from keyboard" -msgstr "" +#: src/localplayer.cpp:2118 +msgid "(d) dont attack players" +msgstr "(d) nie atakuj nikogo" -#: src/keyboardconfig.cpp:337 -msgid "Toggle camera mode" -msgstr "" +#: src/localplayer.cpp:2119 +msgid "(?) pvp attack" +msgstr "(?) atak PvP" -#: src/keyboardconfig.cpp:339 -msgid "Modifier key" -msgstr "" +#: src/localplayer.cpp:2138 +msgid "(D) default imitation" +msgstr "(D) domyślna imitacja" -#: src/keyboardconfig.cpp:411 -#, c-format -msgid "" -"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in " -"strange behaviour." -msgstr "" +#: src/localplayer.cpp:2139 +msgid "(O) outfits imitation" +msgstr "(O) Imituj strój" -#: src/localplayer.cpp:371 -msgid "You were killed by " -msgstr "" +#: src/localplayer.cpp:2140 +msgid "(?) imitation" +msgstr "(?) imitacja" -#: src/localplayer.cpp:1402 -msgid "Tried to pick up nonexistent item." -msgstr "" +#: src/localplayer.cpp:2168 +msgid "Away" +msgstr "AFK" -#: src/localplayer.cpp:1404 -msgid "Item is too heavy." -msgstr "" +#: src/localplayer.cpp:2187 +msgid "(O) on keyboard" +msgstr "(O) przy klawiaturze" -#: src/localplayer.cpp:1406 -msgid "Item is too far away." -msgstr "" +#: src/localplayer.cpp:2188 +msgid "(A) away" +msgstr "(A) AFK" -#: src/localplayer.cpp:1408 -msgid "Inventory is full." -msgstr "" +#: src/localplayer.cpp:2189 src/localplayer.cpp:2204 +msgid "(?) away" +msgstr "(?) stan" -#: src/localplayer.cpp:1410 -msgid "Stack is too big." -msgstr "" +#: src/localplayer.cpp:2202 +msgid "(G) game camera mode" +msgstr "(G) tryb kamery gry" -#: src/localplayer.cpp:1413 -msgid "Item belongs to someone else." -msgstr "" +#: src/localplayer.cpp:2203 +msgid "(F) free camera mode" +msgstr "(F) wolny tryb kamery" -#: src/localplayer.cpp:1416 -msgid "Unknown problem picking up item." -msgstr "" +#: src/localplayer.cpp:2228 +msgid "Game modifiers are enabled" +msgstr "Modyfikatory gry włączone." -#. TRANSLATORS: %d is number, -#. [@@%d|%s@@] - here player can see link to item -#: src/localplayer.cpp:1440 -#, c-format -msgid "You picked up %d [@@%d|%s@@]." -msgid_plural "You picked up %d [@@%d|%s@@]." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +#: src/localplayer.cpp:2229 +msgid "Game modifiers are disabled" +msgstr "Modyfikatory gry wyłączone." -#: src/localplayer.cpp:3174 -msgid "Away" -msgstr "" +#: src/localplayer.cpp:2230 +msgid "Game modifiers are unknown" +msgstr "Modyfikatory gry nieznane" -#: src/localplayer.cpp:3478 +#: src/localplayer.cpp:3746 msgid "Follow: " -msgstr "" +msgstr "Podążasz za: " -#: src/localplayer.cpp:3480 src/localplayer.cpp:3495 +#: src/localplayer.cpp:3748 src/localplayer.cpp:3763 msgid "Follow canceled" -msgstr "" +msgstr "Podążanie anulowane." -#: src/localplayer.cpp:3487 +#: src/localplayer.cpp:3755 msgid "Imitation: " -msgstr "" +msgstr "Imitujesz: " -#: src/localplayer.cpp:3489 src/localplayer.cpp:3497 +#: src/localplayer.cpp:3757 src/localplayer.cpp:3765 msgid "Imitation canceled" -msgstr "" +msgstr "Imitacja anulowana" -#: src/localplayer.cpp:3849 +#: src/localplayer.cpp:4113 msgid "You see " -msgstr "" +msgstr "Widzisz " #: src/main.cpp:47 -msgid "manaplus [options] [mana-file]" -msgstr "" +msgid "manaplus [options] [manaplus-file]" +msgstr "manaplus [opcje] [manaplus-file]" #: src/main.cpp:48 -msgid "[mana-file] : The mana file is an XML file (.mana)" -msgstr "" - -#: src/main.cpp:49 -msgid " used to set custom parameters" -msgstr "" +msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)" +msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)" #: src/main.cpp:50 -msgid " to the manaplus client." -msgstr "" +msgid " used to set custom parameters" +msgstr " używane do wprowadzania własnych parametrów" + +#: src/main.cpp:51 +msgid " to the manaplus client." +msgstr " do klienta manaplus." -#: src/main.cpp:52 +#: src/main.cpp:53 msgid "Options:" msgstr "Opcje:" -#: src/main.cpp:53 +#: src/main.cpp:54 msgid " -l --log-file : Log file to use" -msgstr "" +msgstr " -l --log-file : Używany plik logów" -#: src/main.cpp:54 +#: src/main.cpp:55 msgid " -L --chat-log-dir : Chat log dir to use" -msgstr "" +msgstr " -L --chat-log-dir : Używany katalog logów" -#: src/main.cpp:55 +#: src/main.cpp:56 msgid " -v --version : Display the version" -msgstr "" +msgstr " -v --version : Pokaż wersję" -#: src/main.cpp:56 +#: src/main.cpp:57 msgid " -h --help : Display this help" -msgstr "" +msgstr " -h --help : Pokaż tą pomoc" -#: src/main.cpp:57 +#: src/main.cpp:58 msgid " -C --config-dir : Configuration directory to use" -msgstr "" +msgstr " -C --config-dir : Katalog konfiguracyjny" -#: src/main.cpp:58 +#: src/main.cpp:59 msgid " -U --username : Login with this username" -msgstr "" +msgstr " -U --username : Zaloguj się tym loginem" -#: src/main.cpp:59 +#: src/main.cpp:60 msgid " -P --password : Login with this password" -msgstr "" +msgstr " -P --password : Zaloguj się tym hasłem" -#: src/main.cpp:60 +#: src/main.cpp:61 msgid " -c --character : Login with this character" -msgstr "" +msgstr " -c --character : Zaloguj się tą postacią" -#: src/main.cpp:61 +#: src/main.cpp:62 msgid " -s --server : Login server name or IP" -msgstr "" +msgstr " -s --server : Nazwa serwera lub IP" -#: src/main.cpp:62 +#: src/main.cpp:63 msgid " -p --port : Login server port" -msgstr "" +msgstr " -p --port : Port serwera" -#: src/main.cpp:63 +#: src/main.cpp:64 msgid " --update-host : Use this update host" -msgstr "" +msgstr " --update-host : Użyj tego serwera aktualizacji" -#: src/main.cpp:64 +#: src/main.cpp:65 msgid " -D --default : Choose default character server and character" -msgstr "" +msgstr " -D --default : Wybierz domyślny serwer i postać" -#: src/main.cpp:66 +#: src/main.cpp:67 msgid " -u --skip-update : Skip the update downloads" -msgstr "" +msgstr " -u --skip-update : Omiń aktualizację" -#: src/main.cpp:67 +#: src/main.cpp:68 msgid " -d --data : Directory to load game data from" -msgstr "" +msgstr " -d --data : Katalog z danymi gry" -#: src/main.cpp:69 +#: src/main.cpp:70 msgid " -L --localdata-dir : Directory to use as local data directory" -msgstr "" +msgstr " -L --localdata-dir : Katalog z lokalnymi danymi" -#: src/main.cpp:71 +#: src/main.cpp:72 msgid " --screenshot-dir : Directory to store screenshots" -msgstr "" +msgstr " --screenshot-dir : Katalog ze zrzutami ekranu" -#: src/main.cpp:72 +#: src/main.cpp:73 msgid " --safemode : Start game in safe mode" -msgstr "" +msgstr " --safemode : Rozpocznij grę w trybie bezpieczeństwa" -#: src/main.cpp:74 +#: src/main.cpp:75 msgid " --no-opengl : Disable OpenGL for this session" -msgstr "" +msgstr " --no-opengl : Wyłącz OpenGL w tej sesji" #: src/net/ea/buysellhandler.cpp:163 msgid "Nothing to sell." @@ -4247,143 +4413,127 @@ msgstr "Dziękuję za kupno." msgid "Unable to buy." msgstr "Nie można kupić." -#: src/net/ea/charserverhandler.cpp:63 +#: src/net/ea/charserverhandler.cpp:66 msgid "Strength:" -msgstr "" +msgstr "Siła:" -#: src/net/ea/charserverhandler.cpp:64 +#: src/net/ea/charserverhandler.cpp:67 msgid "Agility:" -msgstr "" +msgstr "Szybkość:" -#: src/net/ea/charserverhandler.cpp:65 +#: src/net/ea/charserverhandler.cpp:68 msgid "Vitality:" -msgstr "" +msgstr "Witalność:" -#: src/net/ea/charserverhandler.cpp:66 +#: src/net/ea/charserverhandler.cpp:69 msgid "Intelligence:" -msgstr "" +msgstr "Inteligencja:" -#: src/net/ea/charserverhandler.cpp:67 +#: src/net/ea/charserverhandler.cpp:70 msgid "Dexterity:" -msgstr "" +msgstr "Zręczność:" -#: src/net/ea/charserverhandler.cpp:68 +#: src/net/ea/charserverhandler.cpp:71 msgid "Luck:" -msgstr "" +msgstr "Szczęście:" -#: src/net/ea/charserverhandler.cpp:102 +#: src/net/ea/charserverhandler.cpp:115 msgid "Access denied. Most likely, there are too many players on this server." -msgstr "" +msgstr "Odmowa wstępu. Prawdopodobnie serwer jest przeciążony." -#: src/net/ea/charserverhandler.cpp:106 +#: src/net/ea/charserverhandler.cpp:119 msgid "Cannot use this ID." -msgstr "" +msgstr "Nie można użyć tego ID." -#: src/net/ea/charserverhandler.cpp:109 +#: src/net/ea/charserverhandler.cpp:122 msgid "Unknown char-server failure." -msgstr "" +msgstr "Nieznany błąd serwera postaci." -#: src/net/ea/charserverhandler.cpp:138 +#: src/net/ea/charserverhandler.cpp:151 msgid "Failed to create character. Most likely the name is already taken." -msgstr "" +msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte." -#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237 +#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235 msgid "Wrong name." -msgstr "" +msgstr "Nieprawidłowe imię." -#: src/net/ea/charserverhandler.cpp:145 +#: src/net/ea/charserverhandler.cpp:158 msgid "Incorrect stats." -msgstr "" +msgstr "Nieprawidłowe staty." -#: src/net/ea/charserverhandler.cpp:148 +#: src/net/ea/charserverhandler.cpp:161 msgid "Incorrect hair." -msgstr "" +msgstr "Nieprawidłowe włosy." -#: src/net/ea/charserverhandler.cpp:151 +#: src/net/ea/charserverhandler.cpp:164 msgid "Incorrect slot." -msgstr "" +msgstr "Nieprawidłowe miejsce inwentarza." -#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210 +#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210 msgid "Info" msgstr "Info" -#: src/net/ea/charserverhandler.cpp:166 +#: src/net/ea/charserverhandler.cpp:179 msgid "Character deleted." -msgstr "" +msgstr "Postać skasowana." -#: src/net/ea/charserverhandler.cpp:172 +#: src/net/ea/charserverhandler.cpp:185 msgid "Failed to delete character." -msgstr "" +msgstr "Nie udało się skasować postaci." -#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66 -#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77 -#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88 -#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101 +#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67 +#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78 +#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89 +#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102 msgid "Channels are not supported!" -msgstr "" +msgstr "Pokoje nie są obsługiwane!" -#: src/net/ea/chathandler.cpp:128 +#: src/net/ea/chathandler.cpp:129 #, c-format msgid "Whisper could not be sent, %s is offline." -msgstr "" +msgstr "Szept nie mógł zostać wysłany, %s jest offline." -#: src/net/ea/chathandler.cpp:136 +#: src/net/ea/chathandler.cpp:137 #, c-format msgid "Whisper could not be sent, ignored by %s." -msgstr "" +msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany/a przez %s." -#: src/net/ea/chathandler.cpp:348 +#: src/net/ea/chathandler.cpp:346 msgid "MVP player." -msgstr "" +msgstr "Gracz MVP." -#: src/net/ea/chathandler.cpp:352 +#: src/net/ea/chathandler.cpp:350 msgid "MVP player: " -msgstr "" - -#: src/net/ea/gamehandler.cpp:86 -#, c-format -msgid "Online users: %d" -msgstr "" - -#: src/net/ea/gamehandler.cpp:98 -msgid "Game" -msgstr "" - -#: src/net/ea/gamehandler.cpp:98 -msgid "Request to quit denied!" -msgstr "" - -#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83 -msgid "Command: /invite " -msgstr "" +msgstr "Gracz MVP: " -#: src/net/ea/gui/guildtab.cpp:68 -msgid "This command invites to the guild you're in." -msgstr "" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "Wszystkie szepty ignorowane." -#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90 -msgid "Command: /leave" -msgstr "" +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "Nie udało się ignorować wszystkich szeptów." -#: src/net/ea/gui/guildtab.cpp:75 -msgid "This command causes the player to leave the guild." -msgstr "" +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "Wszystkie szepty odignorowane." -#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69 -msgid "/help > Display this help." -msgstr "" +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "Nie udało się odignorować wszystkich szeptów." -#: src/net/ea/gui/guildtab.cpp:136 -msgid "/invite > Invite a player to your guild" -msgstr "" +#: src/net/ea/gamehandler.cpp:87 +#, c-format +msgid "Online users: %d" +msgstr "Gracze online: %d" -#: src/net/ea/gui/guildtab.cpp:137 -msgid "/leave > Leave the guild you are in" -msgstr "" +#: src/net/ea/gamehandler.cpp:99 +msgid "Game" +msgstr "Gra" -#: src/net/ea/gui/guildtab.cpp:138 -msgid "/kick > Kick some one from the guild you are in" -msgstr "" +#: src/net/ea/gamehandler.cpp:99 +msgid "Request to quit denied!" +msgstr "Żądanie wyjścia odrzucone!" #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85 msgid "Guild created." @@ -4391,351 +4541,363 @@ msgstr "Gildia została utworzona." #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93 msgid "You are already in guild." -msgstr "" +msgstr "Już jesteś w gildii." #: src/net/ea/guildhandler.cpp:98 msgid "Emperium check failed." -msgstr "" +msgstr "Na tym serwerze nie można utworzyć gildii." #: src/net/ea/guildhandler.cpp:103 msgid "Unknown server response." -msgstr "" +msgstr "Nieznana odpowiedź serwera." #: src/net/ea/guildhandler.cpp:180 #, c-format msgid "Guild name: %s" -msgstr "" +msgstr "Nazwa gildii: %s" #: src/net/ea/guildhandler.cpp:182 #, c-format msgid "Guild master: %s" -msgstr "" +msgstr "Przywódca gildii: %s" #: src/net/ea/guildhandler.cpp:184 #, c-format msgid "Guild level: %d" -msgstr "" +msgstr "Poziom gildii: %d" -#: src/net/ea/guildhandler.cpp:186 +#: src/net/ea/guildhandler.cpp:185 #, c-format msgid "Online members: %d" -msgstr "" +msgstr "Członkowie online: %d" -#: src/net/ea/guildhandler.cpp:188 +#: src/net/ea/guildhandler.cpp:187 #, c-format msgid "Max members: %d" -msgstr "" +msgstr "Maksymalna ilość członków: %d" -#: src/net/ea/guildhandler.cpp:190 +#: src/net/ea/guildhandler.cpp:189 #, c-format msgid "Average level: %d" -msgstr "" +msgstr "Przeciętny poziom: %d" -#: src/net/ea/guildhandler.cpp:192 +#: src/net/ea/guildhandler.cpp:191 #, c-format msgid "Guild exp: %d" -msgstr "" +msgstr "Punkty doświadczenie gildii: %d" -#: src/net/ea/guildhandler.cpp:194 +#: src/net/ea/guildhandler.cpp:192 #, c-format msgid "Guild next exp: %d" -msgstr "" +msgstr "Punkty doświadczenia do następnego poziomu gildii: %d" -#: src/net/ea/guildhandler.cpp:196 +#: src/net/ea/guildhandler.cpp:194 #, c-format msgid "Guild castle: %s" -msgstr "" +msgstr "Zamek gildii: %s" -#: src/net/ea/guildhandler.cpp:402 +#: src/net/ea/guildhandler.cpp:412 msgid "Could not inivte user to guild." -msgstr "" +msgstr "Nie można zaprosić gracza do gildii." -#: src/net/ea/guildhandler.cpp:406 +#: src/net/ea/guildhandler.cpp:416 msgid "User rejected guild invite." -msgstr "" +msgstr "Gracz odrzucił zaproszenie do gildii." -#: src/net/ea/guildhandler.cpp:410 +#: src/net/ea/guildhandler.cpp:420 msgid "User is now part of your guild." -msgstr "" +msgstr "Gracz należy teraz do Twojej gildii." -#: src/net/ea/guildhandler.cpp:414 +#: src/net/ea/guildhandler.cpp:424 msgid "Your guild is full." -msgstr "" +msgstr "Twoja gildia jest pełna." -#: src/net/ea/guildhandler.cpp:418 +#: src/net/ea/guildhandler.cpp:428 msgid "Unknown guild invite response." -msgstr "" - -#: src/net/ea/guildhandler.cpp:438 -msgid "You have left the guild." -msgstr "" +msgstr "Nieznana odpowiedź na zaproszenie do gildii." -#: src/net/ea/guildhandler.cpp:452 +#: src/net/ea/guildhandler.cpp:464 #, c-format msgid "%s has left your guild." -msgstr "" +msgstr "%s opuścił/a Twoją gildię." -#: src/net/ea/guildhandler.cpp:483 +#: src/net/ea/guildhandler.cpp:498 msgid "You was kicked from guild." -msgstr "" +msgstr "Zostałeś/aś wyrzucony/a z gildii." -#: src/net/ea/guildhandler.cpp:496 +#: src/net/ea/guildhandler.cpp:511 #, c-format msgid "%s has kicked from your guild." -msgstr "" +msgstr "%s wyrzucił/a Cię z gildii." #: src/net/ea/gui/partytab.cpp:70 msgid "/invite > Invite a player to your party" -msgstr "" +msgstr "/invite > Zaproś gracza do swojej grupy" #: src/net/ea/gui/partytab.cpp:71 msgid "/leave > Leave the party you are in" -msgstr "" +msgstr "/leave > Opuść swoją grupę" #: src/net/ea/gui/partytab.cpp:72 msgid "/kick > Kick some one from the party you are in" -msgstr "" +msgstr "/kick > Wyrzuć kogoś z grupy" #: src/net/ea/gui/partytab.cpp:73 msgid "/item > Show/change party item sharing options" -msgstr "" +msgstr "/item > Pokaż/zmień stan dzielenia się przedmiotami w grupie" #: src/net/ea/gui/partytab.cpp:74 msgid "/exp > Show/change party experience sharing options" msgstr "" +"/exp > Pokaż/zmień ustawienia grupy dotyczące dzielenia się punktami " +"doświadczenia" #: src/net/ea/gui/partytab.cpp:84 msgid "This command invites to party with you." -msgstr "" +msgstr "To polecenie zaprasza do Twojej drużyny." #: src/net/ea/gui/partytab.cpp:91 msgid "This command causes the player to leave the party." -msgstr "" +msgstr "To polecenie sprawia, że gracz opuszcza grupę." #: src/net/ea/gui/partytab.cpp:95 msgid "Command: /item " -msgstr "" +msgstr "Polecenie: /item " #: src/net/ea/gui/partytab.cpp:97 msgid "This command changes the party's item sharing policy." -msgstr "" +msgstr "To polecenie zmienia zasady dzielenia się przedmiotami w grupie." #: src/net/ea/gui/partytab.cpp:98 msgid "" " can be one of \"1\", \"yes\", \"true\" to enable item sharing, or " "\"0\", \"no\", \"false\" to disable item sharing." msgstr "" +" to może być \"1\", \"yes\", \"true\" aby włączyć dzielenie się, lub " +"\"0\", \"no\", \"false\" aby je wyłączyć." #: src/net/ea/gui/partytab.cpp:101 msgid "Command: /item" -msgstr "" +msgstr "Polecenie: /item" #: src/net/ea/gui/partytab.cpp:102 msgid "This command displays the party's current item sharing policy." msgstr "" +"To polecenie pokazuje aktualny stan zasad dzielenia się przedmiotami w " +"grupie." #: src/net/ea/gui/partytab.cpp:107 msgid "Command: /exp " -msgstr "" +msgstr "Polecenie: /exp " #: src/net/ea/gui/partytab.cpp:108 msgid "This command changes the party's experience sharing policy." msgstr "" +"To polecenie zmienia aktualny stan zasad dzielenia się punktami " +"doświadczenia w grupie." #: src/net/ea/gui/partytab.cpp:110 msgid "" " can be one of \"1\", \"yes\", \"true\" to enable experience " "sharing, or \"0\", \"no\", \"false\" to disable experience sharing." msgstr "" +" to może być \"1\", \"yes\", \"true\" żeby włączyć dzielenie się " +"punktami doświadczenia, \"0\", \"no\", \"false\" żeby je wyłączyć." #: src/net/ea/gui/partytab.cpp:113 msgid "Command: /exp" -msgstr "" +msgstr "Polecenie: /exp" #: src/net/ea/gui/partytab.cpp:114 msgid "This command displays the party's current experience sharing policy." msgstr "" +"To polecenie pokazuje aktualny stan zasad dzielenia się punktami " +"doświadczenia w grupie." -#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286 +#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285 msgid "Item sharing enabled." -msgstr "" +msgstr "Włączono dzielenie się przedmiotami." -#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296 +#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295 msgid "Item sharing disabled." -msgstr "" +msgstr "Wyłączono dzielenie się przedmiotami." -#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306 +#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305 msgid "Item sharing not possible." -msgstr "" +msgstr "Nie można włączyć dzielenia się przedmiotami." #: src/net/ea/gui/partytab.cpp:157 msgid "Item sharing unknown." -msgstr "" +msgstr "Stan dzielenia się przedmiotami nieznany." -#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248 +#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247 msgid "Experience sharing enabled." -msgstr "" +msgstr "Podział doświadczenia włączony." -#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258 +#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257 msgid "Experience sharing disabled." -msgstr "" +msgstr "Podział doświadczenia wyłączony." -#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268 +#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267 msgid "Experience sharing not possible." msgstr "" +"Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica " +"poziomów jest większa niż 10." #: src/net/ea/gui/partytab.cpp:196 msgid "Experience sharing unknown." -msgstr "" +msgstr "Nieznany stan podziału doświadczenia." -#: src/net/ea/inventoryhandler.cpp:407 +#: src/net/ea/inventoryhandler.cpp:404 msgid "Failed to use item." -msgstr "" +msgstr "Nie można użyć przedmiotu." -#: src/net/ea/inventoryhandler.cpp:580 +#: src/net/ea/inventoryhandler.cpp:572 msgid "Unable to equip." -msgstr "" +msgstr "Nie można założyć." #: src/net/ea/loginhandler.cpp:131 msgid "Account was not found. Please re-login." -msgstr "" +msgstr "Konto nie znalezione. Prosimy się przelogować." #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127 msgid "Old password incorrect." -msgstr "" +msgstr "Stare hasło nieprawidłowe." #: src/net/ea/loginhandler.cpp:137 msgid "New password too short." -msgstr "" +msgstr "Nowe hasło jest zbyt krótkie." -#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243 +#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328 msgid "Unknown error." -msgstr "" +msgstr "Nieznany błąd." -#: src/net/ea/loginhandler.cpp:205 +#: src/net/ea/loginhandler.cpp:203 msgid "Unregistered ID." -msgstr "" +msgstr "Niezarejestrowany ID." -#: src/net/ea/loginhandler.cpp:208 +#: src/net/ea/loginhandler.cpp:206 msgid "Wrong password." -msgstr "" +msgstr "Nieprawidłowe hasło." -#: src/net/ea/loginhandler.cpp:211 +#: src/net/ea/loginhandler.cpp:209 msgid "Account expired." -msgstr "" +msgstr "Ważność konta wygasła." -#: src/net/ea/loginhandler.cpp:214 +#: src/net/ea/loginhandler.cpp:212 msgid "Rejected from server." -msgstr "" +msgstr "Nie przyjęty przez serwer." -#: src/net/ea/loginhandler.cpp:217 +#: src/net/ea/loginhandler.cpp:215 msgid "" "You have been permanently banned from the game. Please contact the GM team." -msgstr "" +msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów." -#: src/net/ea/loginhandler.cpp:221 +#: src/net/ea/loginhandler.cpp:219 msgid "Client too old." -msgstr "" +msgstr "Klient jest zbyt nieaktualny." -#: src/net/ea/loginhandler.cpp:224 +#: src/net/ea/loginhandler.cpp:222 #, c-format msgid "" "You have been temporarily banned from the game until %s.\n" "Please contact the GM team via the forums." msgstr "" +"Dostałeś/aś tymczasowego bana do %s.\n" +"Prosimy o kontakt z drużyną GM-ów przez fora." -#: src/net/ea/loginhandler.cpp:231 +#: src/net/ea/loginhandler.cpp:229 msgid "Server overpopulated." -msgstr "" +msgstr "Serwer jest przeciążony." -#: src/net/ea/loginhandler.cpp:234 +#: src/net/ea/loginhandler.cpp:232 msgid "This user name is already taken." -msgstr "" +msgstr "Login jest już w użyciu." -#: src/net/ea/loginhandler.cpp:240 +#: src/net/ea/loginhandler.cpp:238 msgid "Username permanently erased." -msgstr "" +msgstr "Login pernamentnie usunięty." -#: src/net/ea/partyhandler.cpp:82 +#: src/net/ea/partyhandler.cpp:80 msgid "Could not create party." -msgstr "" +msgstr "Nie udało się utworzyć grupy." -#: src/net/ea/partyhandler.cpp:84 +#: src/net/ea/partyhandler.cpp:82 msgid "Party successfully created." -msgstr "" +msgstr "Grupa utworzona z powodzeniem." -#: src/net/ea/partyhandler.cpp:140 +#: src/net/ea/partyhandler.cpp:138 #, c-format msgid "%s has joined your party." -msgstr "" +msgstr "%s przyłączył/a się do Twojej drużyny." -#: src/net/ea/partyhandler.cpp:176 +#: src/net/ea/partyhandler.cpp:174 #, c-format msgid "%s is already a member of a party." -msgstr "" +msgstr "%s już należy do grupy." -#: src/net/ea/partyhandler.cpp:181 +#: src/net/ea/partyhandler.cpp:179 #, c-format msgid "%s refused your invitation." -msgstr "" +msgstr "%s odrzucił/a Twoje zaproszenie." -#: src/net/ea/partyhandler.cpp:186 +#: src/net/ea/partyhandler.cpp:184 #, c-format msgid "%s is now a member of your party." -msgstr "" +msgstr "%s został/a przyłączony/a do grupy." -#: src/net/ea/partyhandler.cpp:191 +#: src/net/ea/partyhandler.cpp:189 #, c-format msgid "%s can't join your party because party is full." -msgstr "" +msgstr "%s nie może się przyłączyć, ponieważ grupa jest już pełna." -#: src/net/ea/partyhandler.cpp:196 +#: src/net/ea/partyhandler.cpp:194 #, c-format msgid "QQQ Unknown invite response for %s." -msgstr "" +msgstr "QQQ Nieznana odpowiedź na zaproszenie od %s." -#: src/net/ea/partyhandler.cpp:356 +#: src/net/ea/partyhandler.cpp:358 msgid "You have left the party." -msgstr "" +msgstr "Opuściłeś/aś grupę." -#: src/net/ea/partyhandler.cpp:368 +#: src/net/ea/partyhandler.cpp:371 #, c-format msgid "%s has left your party." -msgstr "" +msgstr "%s opuścił/a Twoją grupę." -#: src/net/ea/partyhandler.cpp:444 +#: src/net/ea/partyhandler.cpp:448 #, c-format msgid "An unknown member tried to say: %s" -msgstr "" +msgstr "Nieznany członek grupy chciał powiedzieć: %s" -#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315 +#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315 msgid "You are dead." -msgstr "Jesteś martwy." +msgstr "Jesteś martwy/a." -#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316 +#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316 msgid "We regret to inform you that your character was killed in battle." -msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie." +msgstr "Z ubolewaniem powiadamiamy, iż Twoja postać poległa w bitwie." -#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318 +#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318 msgid "You are not that alive anymore." msgstr "Już nie jesteś taki żywy." -#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319 +#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319 msgid "The cold hands of the grim reaper are grabbing for your soul." -msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę." +msgstr "Skostniałe łapy ponurego żniwiarza sięgają po Twoją duszę." -#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320 +#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320 msgid "Game Over!" msgstr "Koniec gry!" -#: src/net/ea/playerhandler.cpp:101 +#: src/net/ea/playerhandler.cpp:102 msgid "Insert coin to continue." -msgstr "" +msgstr "Wrzuć żeton aby kontynuować." -#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321 +#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321 msgid "" "No, kids. Your character did not really die. It... err... went to a better " "place." @@ -4743,380 +4905,385 @@ msgstr "" "Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się " "do lepszego miejsca." -#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323 +#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323 msgid "" "Your plan of breaking your enemies weapon by bashing it with your throat " "failed." msgstr "" -"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem " -"zawiódł." +"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią gardłem zawiódł." -#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325 +#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325 msgid "I guess this did not run too well." msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze." -#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326 +#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326 msgid "Do you want your possessions identified?" -msgstr "Czy chesz zidentyfikować twoje rzeczy?" +msgstr "Czy chesz zidentyfikować swoje rzeczy?" -#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327 +#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327 msgid "Sadly, no trace of you was ever found..." -msgstr "Niestety, ślad po tobie zaginął..." +msgstr "Niestety, ślad po Tobie zaginął..." -#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329 +#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329 msgid "Annihilated." msgstr "Unicestwiony." -#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330 +#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330 msgid "Looks like you got your head handed to you." msgstr "Wygląda na to, że podano tobie twoją głowę." -#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332 +#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332 msgid "" "You screwed up again, dump your body down the tubes and get you another one." -msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe." +msgstr "Znowu nawaliłeś, wrzuć swoje ciało do ścieku i kup sobie nowe." -#: src/net/ea/playerhandler.cpp:119 +#: src/net/ea/playerhandler.cpp:120 msgid "You're not dead yet. You're just resting." -msgstr "" +msgstr "Jeszcze nie umarłeś. Tylko sobie odpoczywasz." -#: src/net/ea/playerhandler.cpp:120 +#: src/net/ea/playerhandler.cpp:121 msgid "You are no more." -msgstr "" +msgstr "Już Cię nie ma." -#: src/net/ea/playerhandler.cpp:121 +#: src/net/ea/playerhandler.cpp:122 msgid "You have ceased to be." -msgstr "" +msgstr "Twoja marna egzystencja może teraz odejść w zapomnienie." -#: src/net/ea/playerhandler.cpp:122 +#: src/net/ea/playerhandler.cpp:123 msgid "You've expired and gone to meet your maker." -msgstr "" +msgstr "Odeszłeś by spotkać się ze swym stwórcą." -#: src/net/ea/playerhandler.cpp:123 +#: src/net/ea/playerhandler.cpp:124 msgid "You're a stiff." -msgstr "" +msgstr "Jesteś sztywniak." -#: src/net/ea/playerhandler.cpp:124 +#: src/net/ea/playerhandler.cpp:125 msgid "Bereft of life, you rest in peace." -msgstr "" +msgstr "Pozbawiony życia, spoczywasz w pokoju." -#: src/net/ea/playerhandler.cpp:125 +#: src/net/ea/playerhandler.cpp:126 msgid "If you weren't so animated, you'd be pushing up the daisies." -msgstr "" +msgstr "Gdybyś nie był wirtualny, wąchałbyś kwiatki od spodu." -#: src/net/ea/playerhandler.cpp:126 +#: src/net/ea/playerhandler.cpp:127 msgid "Your metabolic processes are now history." -msgstr "" +msgstr "Twoje procesy metaboliczne są teraz historią." -#: src/net/ea/playerhandler.cpp:127 +#: src/net/ea/playerhandler.cpp:128 msgid "You're off the twig." -msgstr "" +msgstr "Wypadłeś z rozgrywki." -#: src/net/ea/playerhandler.cpp:128 +#: src/net/ea/playerhandler.cpp:129 msgid "You've kicked the bucket." -msgstr "" +msgstr "Kopnąłeś w kalendarz." -#: src/net/ea/playerhandler.cpp:129 +#: src/net/ea/playerhandler.cpp:130 msgid "" "You've shuffled off your mortal coil, run down the curtain and joined the " "bleedin' choir invisibile." msgstr "" +"Zrzuciłeś swą ziemską powłokę, wyniosłeś ducha poza doczesne wymiary i " +"przyłączyłeś się do chórów anielskich." -#: src/net/ea/playerhandler.cpp:131 +#: src/net/ea/playerhandler.cpp:132 msgid "You are an ex-player." -msgstr "" +msgstr "Jesteś eks-graczem." -#: src/net/ea/playerhandler.cpp:132 +#: src/net/ea/playerhandler.cpp:133 msgid "You're pining for the fjords." -msgstr "" +msgstr "Kopyrtnąłeś." -#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346 -#: src/net/ea/playerhandler.cpp:425 +#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345 +#: src/net/ea/playerhandler.cpp:427 msgid "Message" -msgstr "" +msgstr "Wiadomość" -#: src/net/ea/playerhandler.cpp:337 +#: src/net/ea/playerhandler.cpp:336 msgid "" -"You are carrying more than half your weight. You are unable to regain " -"health." +"You are carrying more than half your weight. You are unable to regain health." msgstr "" +"Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia." -#: src/net/ea/playerhandler.cpp:347 +#: src/net/ea/playerhandler.cpp:346 msgid "You are carrying less than half your weight. You can regain health." msgstr "" +"Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać " +"zdrowie." -#: src/net/ea/playerhandler.cpp:451 +#: src/net/ea/playerhandler.cpp:453 #, c-format msgid "You picked up %s." -msgstr "" +msgstr "Podniosłeś/aś %s." -#: src/net/ea/playerhandler.cpp:457 +#: src/net/ea/playerhandler.cpp:459 #, c-format msgid "You spent %s." -msgstr "" +msgstr "Wydałeś/aś %s." -#: src/net/ea/playerhandler.cpp:501 +#: src/net/ea/playerhandler.cpp:505 msgid "Cannot raise skill!" -msgstr "" +msgstr "Nie można podnieść poziomu umiejętności!" -#: src/net/ea/playerhandler.cpp:618 +#: src/net/ea/playerhandler.cpp:623 msgid "Equip arrows first." -msgstr "" +msgstr "Dodaj strzały do ekwipunku." -#: src/net/ea/specialhandler.cpp:149 +#: src/net/ea/specialhandler.cpp:143 msgid "Trade failed!" -msgstr "" +msgstr "Handel zakończony niepowodzeniem!" -#: src/net/ea/specialhandler.cpp:152 +#: src/net/ea/specialhandler.cpp:146 msgid "Emote failed!" -msgstr "" +msgstr "Emotka nieudana!" -#: src/net/ea/specialhandler.cpp:155 +#: src/net/ea/specialhandler.cpp:149 msgid "Sit failed!" -msgstr "" +msgstr "Nie można usiąść!" -#: src/net/ea/specialhandler.cpp:158 +#: src/net/ea/specialhandler.cpp:152 msgid "Chat creating failed!" -msgstr "" +msgstr "Nie można stworzyć czatu!" -#: src/net/ea/specialhandler.cpp:161 +#: src/net/ea/specialhandler.cpp:155 msgid "Could not join party!" -msgstr "" +msgstr "Nie udało się dołączyć do grupy!" -#: src/net/ea/specialhandler.cpp:164 +#: src/net/ea/specialhandler.cpp:158 msgid "Cannot shout!" -msgstr "" +msgstr "Nie można krzyczeć!" -#: src/net/ea/specialhandler.cpp:177 +#: src/net/ea/specialhandler.cpp:171 msgid "You have not yet reached a high enough lvl!" -msgstr "" +msgstr "Nie masz jeszcze wymaganego poziomu!" -#: src/net/ea/specialhandler.cpp:181 +#: src/net/ea/specialhandler.cpp:174 msgid "Insufficient HP!" -msgstr "" +msgstr "Zbyt niskie HP!" -#: src/net/ea/specialhandler.cpp:184 +#: src/net/ea/specialhandler.cpp:177 msgid "Insufficient SP!" -msgstr "" +msgstr "Zbyt niska mana!" -#: src/net/ea/specialhandler.cpp:187 +#: src/net/ea/specialhandler.cpp:180 msgid "You have no memos!" -msgstr "" +msgstr "Nie masz notek!" -#: src/net/ea/specialhandler.cpp:190 +#: src/net/ea/specialhandler.cpp:183 msgid "You cannot do that right now!" -msgstr "" +msgstr "Nie możesz tego teraz zrobić!" -#: src/net/ea/specialhandler.cpp:193 +#: src/net/ea/specialhandler.cpp:186 msgid "Seems you need more money... ;-)" -msgstr "" +msgstr "Chyba brak Ci kasy... ;-)" -#: src/net/ea/specialhandler.cpp:196 +#: src/net/ea/specialhandler.cpp:189 msgid "You cannot use this skill with that kind of weapon!" -msgstr "" +msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!" -#: src/net/ea/specialhandler.cpp:200 +#: src/net/ea/specialhandler.cpp:193 msgid "You need another red gem!" -msgstr "" +msgstr "Potrzebujesz innego czerwonego klejnotu!" -#: src/net/ea/specialhandler.cpp:203 +#: src/net/ea/specialhandler.cpp:196 msgid "You need another blue gem!" -msgstr "" +msgstr "Potrzebujesz innego niebieskiego klejnotu!" -#: src/net/ea/specialhandler.cpp:206 +#: src/net/ea/specialhandler.cpp:199 msgid "You're carrying to much to do this!" -msgstr "" +msgstr "Niesiesz za duży ciężar by to zrobić!" -#: src/net/ea/specialhandler.cpp:209 +#: src/net/ea/specialhandler.cpp:202 msgid "Huh? What's that?" -msgstr "" +msgstr "Eee? A to to co?" -#: src/net/ea/specialhandler.cpp:220 +#: src/net/ea/specialhandler.cpp:213 msgid "Warp failed..." -msgstr "" +msgstr "Nie udało się przeteleportować..." -#: src/net/ea/specialhandler.cpp:223 +#: src/net/ea/specialhandler.cpp:216 msgid "Could not steal anything..." -msgstr "" +msgstr "Nie udało się niczego ukraść..." -#: src/net/ea/specialhandler.cpp:226 +#: src/net/ea/specialhandler.cpp:219 msgid "Poison had no effect..." -msgstr "" +msgstr "Trucizna nie zadziałała..." -#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128 +#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128 #, c-format msgid "%s wants to trade with you, do you accept?" -msgstr "%s chce handlować z tobą, zgadzasz się?" +msgstr "%s chce handlować z Tobą, zgadzasz się?" -#: src/net/ea/tradehandler.cpp:130 +#: src/net/ea/tradehandler.cpp:135 msgid "Trading isn't possible. Trade partner is too far away." -msgstr "" +msgstr "Handel niemożliwy. Partner handlowy jest zbyt daleko." -#: src/net/ea/tradehandler.cpp:134 +#: src/net/ea/tradehandler.cpp:139 msgid "Trading isn't possible. Character doesn't exist." -msgstr "" +msgstr "Handel niemożliwy. Postać nie istnieje." -#: src/net/ea/tradehandler.cpp:138 +#: src/net/ea/tradehandler.cpp:143 msgid "Trade cancelled due to an unknown reason." -msgstr "" +msgstr "Handel anulowany z nieznanych powodów." -#: src/net/ea/tradehandler.cpp:146 +#: src/net/ea/tradehandler.cpp:149 #, c-format msgid "Trade: You and %s" -msgstr "" +msgstr "Handel: Ty i %s" -#: src/net/ea/tradehandler.cpp:156 +#: src/net/ea/tradehandler.cpp:159 #, c-format msgid "Trade with %s cancelled." -msgstr "" +msgstr "Handel z %s anulowany." -#: src/net/ea/tradehandler.cpp:169 +#: src/net/ea/tradehandler.cpp:172 msgid "Unhandled trade cancel packet." -msgstr "" +msgstr "Nieobsługiwany pakiet anulowania handlu." -#: src/net/ea/tradehandler.cpp:231 +#: src/net/ea/tradehandler.cpp:237 msgid "Failed adding item. Trade partner is over weighted." -msgstr "" +msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciążona." -#: src/net/ea/tradehandler.cpp:236 +#: src/net/ea/tradehandler.cpp:242 msgid "Failed adding item. Trade partner has no free slot." msgstr "" +"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w " +"inwentarzu." -#: src/net/ea/tradehandler.cpp:241 +#: src/net/ea/tradehandler.cpp:247 msgid "Failed adding item. You can't trade this item." -msgstr "" +msgstr "Nie można dodać przedmiotu. Tym przedmiotem nie można handlować." -#: src/net/ea/tradehandler.cpp:245 +#: src/net/ea/tradehandler.cpp:251 msgid "Failed adding item for unknown reason." -msgstr "" +msgstr "Nie można dodać przedmiotu z niewiadomych przyczyn." -#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Handel anulowany." -#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Handel zakończony." -#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259 +#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262 msgid "Strength" msgstr "Siła" #: src/net/manaserv/attributes.cpp:167 #, c-format msgid "Strength %+.1f" -msgstr "" +msgstr "Siła %+.1f" -#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260 +#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263 msgid "Agility" msgstr "Zwinność" #: src/net/manaserv/attributes.cpp:180 #, c-format msgid "Agility %+.1f" -msgstr "" +msgstr "Szybkość %+.1f" -#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263 +#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266 msgid "Dexterity" msgstr "Zręczność" #: src/net/manaserv/attributes.cpp:193 #, c-format msgid "Dexterity %+.1f" -msgstr "" +msgstr "Zręczność %+.1f" -#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261 +#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264 msgid "Vitality" msgstr "Witalność" #: src/net/manaserv/attributes.cpp:206 #, c-format msgid "Vitality %+.1f" -msgstr "" +msgstr "Witalność %+.1f" -#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262 +#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265 msgid "Intelligence" msgstr "Inteligencja" #: src/net/manaserv/attributes.cpp:219 #, c-format msgid "Intelligence %+.1f" -msgstr "" +msgstr "Inteligencja %+.1f" #: src/net/manaserv/attributes.cpp:225 msgid "Willpower" -msgstr "" +msgstr "Siła woli" #: src/net/manaserv/attributes.cpp:232 #, c-format msgid "Willpower %+.1f" -msgstr "" +msgstr "Siła woli %+.1f" #: src/net/manaserv/beinghandler.cpp:337 msgid "Press OK to respawn." -msgstr "" +msgstr "Naciśnij OK aby się zrespawnować." #: src/net/manaserv/beinghandler.cpp:338 msgid "You Died" -msgstr "" +msgstr "Padłeś." #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219 msgid "Not logged in." -msgstr "" +msgstr "Nie jesteś zalogowany/a." #: src/net/manaserv/charhandler.cpp:148 msgid "No empty slot." -msgstr "" +msgstr "Nie ma dostępnych miejsc." #: src/net/manaserv/charhandler.cpp:151 msgid "Invalid name." -msgstr "" +msgstr "Błędna nazwa." #: src/net/manaserv/charhandler.cpp:154 msgid "Character's name already exists." -msgstr "" +msgstr "Imię postaci już wykorzystane." #: src/net/manaserv/charhandler.cpp:157 msgid "Invalid hairstyle." -msgstr "" +msgstr "Błędna fryzura." #: src/net/manaserv/charhandler.cpp:160 msgid "Invalid hair color." -msgstr "" +msgstr "Błędny kolor włosów." #: src/net/manaserv/charhandler.cpp:163 msgid "Invalid gender." -msgstr "" +msgstr "Błędna płeć." #: src/net/manaserv/charhandler.cpp:166 msgid "Character's stats are too high." -msgstr "" +msgstr "Staty postaci są zbyt wysokie." #: src/net/manaserv/charhandler.cpp:169 msgid "Character's stats are too low." -msgstr "" +msgstr "Staty postaci są zbyt niskie." #: src/net/manaserv/charhandler.cpp:172 #, c-format msgid "At least one stat is out of the permitted range: (%u - %u)." -msgstr "" +msgstr "Przynajmniej jeden stat jest poza dozwolonym zakresem: (%u - %u)." #: src/net/manaserv/charhandler.cpp:178 msgid "Invalid slot number." -msgstr "" +msgstr "Błędny numer miejsca w inwentarzu." #: src/net/manaserv/charhandler.cpp:210 msgid "Player deleted." -msgstr "" +msgstr "Gracz skasowany." #: src/net/manaserv/charhandler.cpp:222 msgid "Selection out of range." -msgstr "" +msgstr "Zaznaczenie poza limitami." #: src/net/manaserv/charhandler.cpp:225 #, c-format msgid "Unknown error (%d)." -msgstr "" +msgstr "Nieznany błąd (%d)." #: src/net/manaserv/charhandler.cpp:261 msgid "No gameservers are available." @@ -5130,43 +5297,43 @@ msgstr "Temat: %s" #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269 msgid "Players in this channel:" -msgstr "" +msgstr "Gracze w tym pokoju:" #: src/net/manaserv/chathandler.cpp:208 msgid "Error joining channel." -msgstr "" +msgstr "Błąd w przyłączaniu się do pokoju." #: src/net/manaserv/chathandler.cpp:214 msgid "Listing channels." -msgstr "" +msgstr "Lista pokojów." #: src/net/manaserv/chathandler.cpp:226 msgid "End of channel list." -msgstr "" +msgstr "Koniec listy pokojów." #: src/net/manaserv/chathandler.cpp:299 #, c-format msgid "%s entered the channel." -msgstr "" +msgstr "%s wchodzi do pokoju." #: src/net/manaserv/chathandler.cpp:304 #, c-format msgid "%s left the channel." -msgstr "" +msgstr "%s opuścił/a pokój." #: src/net/manaserv/chathandler.cpp:320 #, c-format msgid "%s has set mode %s on user %s." -msgstr "" +msgstr "%s nadał/a tryb %s użytkownikowi %s." #: src/net/manaserv/chathandler.cpp:331 #, c-format msgid "%s has kicked %s." -msgstr "" +msgstr "%s wyrzucił/a %s." #: src/net/manaserv/chathandler.cpp:337 msgid "Unknown channel event." -msgstr "" +msgstr "Nieznane wydarzenie pokoju." #: src/net/manaserv/guildhandler.cpp:90 msgid "Error creating guild." @@ -5182,23 +5349,23 @@ msgstr "Członek został pomyślnie wypromowany." #: src/net/manaserv/guildhandler.cpp:212 msgid "Failed to promote member." -msgstr "Promocja Członka nie powiodła się." +msgstr "Promocja członka nie powiodła się." #: src/net/manaserv/loginhandler.cpp:93 msgid "Wrong magic_token." -msgstr "" +msgstr "Nieprawidłowy magic_token." #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281 msgid "Already logged in." -msgstr "" +msgstr "Już zalogowano." #: src/net/manaserv/loginhandler.cpp:99 msgid "Account banned." -msgstr "" +msgstr "Konto zbanowane." #: src/net/manaserv/loginhandler.cpp:124 msgid "New password incorrect." -msgstr "" +msgstr "Nowe hasło nieprawidłowe." #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163 msgid "Account not connected. Please login first." @@ -5206,52 +5373,54 @@ msgstr "Konto niepołączone. Proszę najpierw się zalogować." #: src/net/manaserv/loginhandler.cpp:156 msgid "New email address incorrect." -msgstr "" +msgstr "Nowy adres e-mail nieprawidłowy." #: src/net/manaserv/loginhandler.cpp:159 msgid "Old email address incorrect." -msgstr "" +msgstr "Stary adres e-mail nieprawidłowy." #: src/net/manaserv/loginhandler.cpp:167 msgid "The new email address already exists." -msgstr "" +msgstr "Nowy adres e-mail już zarejestrowany." #: src/net/manaserv/loginhandler.cpp:249 msgid "" "Client registration is not allowed. Please contact server administration." msgstr "" +"Rejestracja przez program zablokowana. Proszę skontaktować się z " +"administracją serwera." #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312 msgid "Client version is too old." -msgstr "" +msgstr "Wersja klienta jest zbyt stara." #: src/net/manaserv/loginhandler.cpp:278 msgid "Wrong username or password." -msgstr "" +msgstr "Nieprawidłowy login lub hasło." #: src/net/manaserv/loginhandler.cpp:284 msgid "Account banned" -msgstr "" +msgstr "Konto zbanowane." #: src/net/manaserv/loginhandler.cpp:287 msgid "Login attempt too soon after previous attempt." -msgstr "" +msgstr "Próba zalogowania zbyt wcześnie po poprzedniej próbie." #: src/net/manaserv/loginhandler.cpp:315 msgid "Wrong username, password or email address." -msgstr "" +msgstr "Niepoprawny login, hasło lub adres e-mail." #: src/net/manaserv/loginhandler.cpp:318 msgid "Username already exists." -msgstr "" +msgstr "Login już istnieje." #: src/net/manaserv/loginhandler.cpp:321 msgid "Email address already exists." -msgstr "" +msgstr "Adres e-mail już zarejestrowany." #: src/net/manaserv/loginhandler.cpp:324 msgid "You took too long with the captcha or your response was incorrect." -msgstr "" +msgstr "Captcha zabrała Ci zbyt wiele czasu, albo została źle rozwiązana." #: src/net/manaserv/partyhandler.cpp:90 msgid "Joined party." @@ -5265,7 +5434,7 @@ msgstr "%s dołączył do grupy." #: src/net/manaserv/partyhandler.cpp:126 #, c-format msgid "%s rejected your invite." -msgstr "" +msgstr "%s odrzucił/a Twoje zaproszenie." #: src/net/manaserv/tradehandler.cpp:107 msgid "Accepting incoming trade requests." @@ -5298,177 +5467,179 @@ msgstr "Nie można sprzedać." #: src/net/tmwa/buysellhandler.cpp:140 msgid "Unable to sell while trading." -msgstr "" +msgstr "Nie można sprzedawać podczas handlowania." #: src/net/tmwa/buysellhandler.cpp:143 msgid "Unable to sell unsellable item." -msgstr "" +msgstr "Nie można sprzedać- niesprzedawalny przedmiot" -#: src/net/tmwa/generalhandler.cpp:109 +#: src/net/tmwa/generalhandler.cpp:108 #, c-format msgid "Strength %+d" msgstr "Siła %+d" -#: src/net/tmwa/generalhandler.cpp:110 +#: src/net/tmwa/generalhandler.cpp:109 #, c-format msgid "Agility %+d" msgstr "Zwinność %+d" -#: src/net/tmwa/generalhandler.cpp:111 +#: src/net/tmwa/generalhandler.cpp:110 #, c-format msgid "Vitality %+d" msgstr "Witalność %+d" -#: src/net/tmwa/generalhandler.cpp:112 +#: src/net/tmwa/generalhandler.cpp:111 #, c-format msgid "Intelligence %+d" msgstr "Inteligencja %+d" -#: src/net/tmwa/generalhandler.cpp:113 +#: src/net/tmwa/generalhandler.cpp:112 #, c-format msgid "Dexterity %+d" msgstr "Zręczność %+d" -#: src/net/tmwa/generalhandler.cpp:114 +#: src/net/tmwa/generalhandler.cpp:113 #, c-format msgid "Luck %+d" msgstr "Szczęście %+d" -#: src/net/tmwa/generalhandler.cpp:140 +#: src/net/tmwa/generalhandler.cpp:139 msgid "Authentication failed." -msgstr "" +msgstr "Błąd uwierzytelniania." -#: src/net/tmwa/generalhandler.cpp:143 +#: src/net/tmwa/generalhandler.cpp:142 msgid "No servers available." -msgstr "" +msgstr "Brak dostępnych serwerów." #: src/net/tmwa/generalhandler.cpp:147 msgid "Someone else is trying to use this account." -msgstr "" +msgstr "Ktoś inny próbuje użyć konta." -#: src/net/tmwa/generalhandler.cpp:150 +#: src/net/tmwa/generalhandler.cpp:152 msgid "This account is already logged in." -msgstr "" +msgstr "To konto jest już zalogowane." -#: src/net/tmwa/generalhandler.cpp:153 +#: src/net/tmwa/generalhandler.cpp:156 msgid "Speed hack detected." -msgstr "" +msgstr "Wykryto speed hack." -#: src/net/tmwa/generalhandler.cpp:156 +#: src/net/tmwa/generalhandler.cpp:159 msgid "Duplicated login." -msgstr "" +msgstr "Zduplikowany login." -#: src/net/tmwa/generalhandler.cpp:159 +#: src/net/tmwa/generalhandler.cpp:162 msgid "Unknown connection error." -msgstr "" +msgstr "Nieznany błąd połączenia." -#: src/net/tmwa/generalhandler.cpp:232 +#: src/net/tmwa/generalhandler.cpp:235 msgid "Got disconnected from server!" msgstr "Rozłączono z serwerem!" -#: src/net/tmwa/generalhandler.cpp:264 +#: src/net/tmwa/generalhandler.cpp:267 msgid "Luck" msgstr "Szczęście" -#: src/net/tmwa/generalhandler.cpp:267 +#: src/net/tmwa/generalhandler.cpp:270 msgid "Defense" -msgstr "" +msgstr "Obrona" -#: src/net/tmwa/generalhandler.cpp:268 +#: src/net/tmwa/generalhandler.cpp:271 msgid "M.Attack" -msgstr "" +msgstr "Atak mag." -#: src/net/tmwa/generalhandler.cpp:269 +#: src/net/tmwa/generalhandler.cpp:272 msgid "M.Defense" -msgstr "" +msgstr "Obrona mag." -#: src/net/tmwa/generalhandler.cpp:271 +#: src/net/tmwa/generalhandler.cpp:274 #, no-c-format msgid "% Accuracy" -msgstr "" +msgstr "% celności" -#: src/net/tmwa/generalhandler.cpp:273 +#: src/net/tmwa/generalhandler.cpp:276 #, no-c-format msgid "% Evade" -msgstr "" +msgstr "% uników" -#: src/net/tmwa/generalhandler.cpp:275 +#: src/net/tmwa/generalhandler.cpp:278 #, no-c-format msgid "% Critical" -msgstr "" +msgstr "% ciosów krytycznych" -#: src/net/tmwa/generalhandler.cpp:276 +#: src/net/tmwa/generalhandler.cpp:279 msgid "Attack Delay" -msgstr "" +msgstr "Opóźnienie ataku" -#: src/net/tmwa/generalhandler.cpp:278 +#: src/net/tmwa/generalhandler.cpp:281 msgid "Walk Delay" -msgstr "" +msgstr "Opóźnienie poruszania się" -#: src/net/tmwa/generalhandler.cpp:280 +#: src/net/tmwa/generalhandler.cpp:283 msgid "Attack Range" -msgstr "" +msgstr "Zasięg ataku" -#: src/net/tmwa/network.cpp:152 +#: src/net/tmwa/generalhandler.cpp:285 +msgid "Damage per sec." +msgstr "Obrażenia na sek." + +#: src/net/tmwa/network.cpp:153 msgid "Empty address given to Network::connect()!" -msgstr "" +msgstr "Network::connect() otrzymał pusty adres!" -#: src/net/tmwa/network.cpp:356 +#: src/net/tmwa/network.cpp:357 msgid "Unable to resolve host \"" -msgstr "" +msgstr "Nie można było odnaleźć serwera." -#: src/net/tmwa/network.cpp:426 +#: src/net/tmwa/network.cpp:427 msgid "Connection to server terminated. " -msgstr "" +msgstr "Połączenie z serwerem przerwane." #: src/net/tmwa/partyhandler.cpp:171 #, c-format msgid "%s is not in your party!" msgstr "%s nie jest w twojej grupie!" -#: src/playerrelations.cpp:414 +#: src/playerrelations.cpp:461 msgid "Print '...'" -msgstr "" +msgstr "Pisz '...'" -#: src/playerrelations.cpp:434 +#: src/playerrelations.cpp:481 msgid "Blink name" -msgstr "" +msgstr "Mruganie nicka" -#: src/playerrelations.cpp:478 +#: src/playerrelations.cpp:525 msgid "Floating '...' bubble" -msgstr "" +msgstr "Bąbelek \"...\" nad głową" -#: src/playerrelations.cpp:481 +#: src/playerrelations.cpp:528 msgid "Floating bubble" -msgstr "" +msgstr "Bąbelek nad głową" -#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248 +#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246 #: src/resources/monsterdb.cpp:84 msgid "unnamed" msgstr "nienazwany" -#: src/resources/itemdb.cpp:65 +#: src/resources/itemdb.cpp:63 #, c-format msgid "Attack %+d" msgstr "Atak %+d" -#: src/resources/itemdb.cpp:66 +#: src/resources/itemdb.cpp:64 #, c-format msgid "Defense %+d" msgstr "Obrona %+d" -#: src/resources/itemdb.cpp:67 +#: src/resources/itemdb.cpp:65 #, c-format msgid "HP %+d" msgstr "HP %+d" -#: src/resources/itemdb.cpp:68 +#: src/resources/itemdb.cpp:66 #, c-format msgid "MP %+d" msgstr "MP %+d" -#: src/resources/itemdb.cpp:171 +#: src/resources/itemdb.cpp:169 msgid "Unknown item" msgstr "Nieznany przedmiot" - - diff --git a/po/pt.po b/po/pt.po index 91a041ad2..53fe4bd7f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/" @@ -732,7 +732,7 @@ msgstr "arco-íris 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2386,74 +2386,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Tema" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Tema" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Fonte" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Fonte negrito" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Fonte de particulas" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Fonte de ajuda" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "Fonte Segura" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "Font Jasponesa" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Tamanho da fonte" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Tema alterado" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Reincie o cliente para que as mudanças surtam efeito." @@ -3245,23 +3249,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4c7d2cbd6..b7803f16a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/" @@ -734,7 +734,7 @@ msgstr "arco-íris 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2388,74 +2388,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Tema" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Tema" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Fonte" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Fonte negrito" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Fonte de particulas" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Fonte de ajuda" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "Fonte segura" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "Font Japonesa" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Tamanho da fonte" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Tema alterado" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Reincie o cliente para que as mudanças surtam efeito." @@ -3247,23 +3251,23 @@ msgstr "Borda do Lugar Inicial" msgid "Road Point" msgstr "Ponto de estrada" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Atualizar" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Quem está online - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Quem está online - Erro" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" diff --git a/po/ru.po b/po/ru.po index b2c77759f..dc3c6b857 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-20 17:44+0000\n" "Last-Translator: akaras \n" "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/" @@ -740,7 +740,7 @@ msgstr "радуга 3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2401,74 +2401,79 @@ msgid "Indonesian" msgstr "Индонезийский" #: src/gui/setup_theme.cpp:153 +#, fuzzy +msgid "Polish" +msgstr "Английский" + +#: src/gui/setup_theme.cpp:154 msgid "Japanese" msgstr "Японский" -#: src/gui/setup_theme.cpp:154 +#: src/gui/setup_theme.cpp:155 msgid "Dutch (Belgium/Flemish)" msgstr "Голландский (Бельгийский / Фламандский)" -#: src/gui/setup_theme.cpp:155 +#: src/gui/setup_theme.cpp:156 msgid "Portuguese" msgstr "Португальский" -#: src/gui/setup_theme.cpp:156 +#: src/gui/setup_theme.cpp:157 msgid "Portuguese (Brazilian)" msgstr "Португальский (Бразильский)" -#: src/gui/setup_theme.cpp:157 +#: src/gui/setup_theme.cpp:158 msgid "Russian" msgstr "Русский" -#: src/gui/setup_theme.cpp:158 +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "Испанский (Кастильский)" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "Тема" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "Тема интерфейса" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "Язык" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "Основной шрифт" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "Жирный шрифт" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "Шрифт частиц" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "Шрифт помощи" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "Безопасный шрифт" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "Японский шрифт" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "Размер шрифта" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "Тема изменена" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "Перезегрузите игру дабы изменения вступили в силу." @@ -3263,23 +3268,23 @@ msgstr "Бордюр домашней позиции" msgid "Road Point" msgstr "Точка дороги" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "Кто онлайн - обновление" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "Обновить" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "Кто онлайн - " -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "Кто онлайн - ошибка" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "Кто онлайн - обновление" diff --git a/po/zh_CN.po b/po/zh_CN.po index 519462407..f06a31d1f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-11-26 02:20+0300\n" +"POT-Creation-Date: 2011-11-29 18:31+0300\n" "PO-Revision-Date: 2011-11-11 21:38+0000\n" "Last-Translator: akaras \n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/" @@ -724,7 +724,7 @@ msgstr "彩虹3" #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128 -#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211 +#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141 #: src/gui/textcommandeditor.cpp:160 msgid "???" @@ -2375,74 +2375,78 @@ msgid "Indonesian" msgstr "" #: src/gui/setup_theme.cpp:153 -msgid "Japanese" +msgid "Polish" msgstr "" #: src/gui/setup_theme.cpp:154 -msgid "Dutch (Belgium/Flemish)" +msgid "Japanese" msgstr "" #: src/gui/setup_theme.cpp:155 -msgid "Portuguese" +msgid "Dutch (Belgium/Flemish)" msgstr "" #: src/gui/setup_theme.cpp:156 -msgid "Portuguese (Brazilian)" +msgid "Portuguese" msgstr "" #: src/gui/setup_theme.cpp:157 -msgid "Russian" +msgid "Portuguese (Brazilian)" msgstr "" #: src/gui/setup_theme.cpp:158 +msgid "Russian" +msgstr "" + +#: src/gui/setup_theme.cpp:159 msgid "Spanish (Castilian)" msgstr "" -#: src/gui/setup_theme.cpp:190 +#: src/gui/setup_theme.cpp:191 msgid "Theme" msgstr "主题" -#: src/gui/setup_theme.cpp:192 +#: src/gui/setup_theme.cpp:193 msgid "Gui theme" msgstr "桂主题" -#: src/gui/setup_theme.cpp:193 +#: src/gui/setup_theme.cpp:194 msgid "Language" msgstr "" -#: src/gui/setup_theme.cpp:194 +#: src/gui/setup_theme.cpp:195 msgid "Main Font" msgstr "主要字体" -#: src/gui/setup_theme.cpp:195 +#: src/gui/setup_theme.cpp:196 msgid "Bold font" msgstr "加粗字体" -#: src/gui/setup_theme.cpp:196 +#: src/gui/setup_theme.cpp:197 msgid "Particle font" msgstr "粒子字体" -#: src/gui/setup_theme.cpp:197 +#: src/gui/setup_theme.cpp:198 msgid "Help font" msgstr "帮助字体" -#: src/gui/setup_theme.cpp:198 +#: src/gui/setup_theme.cpp:199 msgid "Secure font" msgstr "安全字体" -#: src/gui/setup_theme.cpp:199 +#: src/gui/setup_theme.cpp:200 msgid "Japanese font" msgstr "日文字体" -#: src/gui/setup_theme.cpp:236 +#: src/gui/setup_theme.cpp:237 msgid "Font size" msgstr "字体大小" -#: src/gui/setup_theme.cpp:377 +#: src/gui/setup_theme.cpp:378 msgid "Theme Changed" msgstr "主题更改" -#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619 +#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619 #: src/gui/setup_video.cpp:624 msgid "Restart your client for the change to take effect." msgstr "重启您的游戏客户端以使变更生效。" @@ -3229,23 +3233,23 @@ msgstr "家居广场边界" msgid "Road Point" msgstr "路点" -#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:494 +#: src/gui/whoisonline.cpp:87 src/gui/whoisonline.cpp:503 msgid "Who Is Online - Updating" msgstr "谁在线 - 更新" -#: src/gui/whoisonline.cpp:108 +#: src/gui/whoisonline.cpp:110 msgid "Update" msgstr "更新" -#: src/gui/whoisonline.cpp:307 +#: src/gui/whoisonline.cpp:309 msgid "Who Is Online - " msgstr "谁在线 -" -#: src/gui/whoisonline.cpp:508 +#: src/gui/whoisonline.cpp:517 msgid "Who Is Online - error" msgstr "谁在线 - 错误" -#: src/gui/whoisonline.cpp:540 +#: src/gui/whoisonline.cpp:549 msgid "Who Is Online - Update" msgstr "谁在线 - 更新" diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp index 3b1c1d932..67936f698 100644 --- a/src/gui/setup_theme.cpp +++ b/src/gui/setup_theme.cpp @@ -138,7 +138,7 @@ struct Language std::string value; }; -const int langs_count = 14; +const int langs_count = 15; const Language LANG_NAME[langs_count] = { @@ -150,6 +150,7 @@ const Language LANG_NAME[langs_count] = {N_("French"), "fr_FR"}, {N_("German"), "de_DE"}, {N_("Indonesian"), "id_ID"}, + {N_("Polish"), "pl_PL"}, {N_("Japanese"), "ja_JP.utf8"}, {N_("Dutch (Belgium/Flemish)"), "nl_BE"}, {N_("Portuguese"), "pt_PT"}, -- cgit v1.2.3-70-g09d2 From 7c6621108b54fd66fbb7aa87be067a34abcc3ced Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 30 Nov 2011 18:13:03 +0300 Subject: Add server side online players list support. --- src/gui/whoisonline.cpp | 211 +++++++++++++++++++++++++------------ src/gui/whoisonline.h | 17 ++- src/net/manaserv/playerhandler.cpp | 5 + src/net/manaserv/playerhandler.h | 2 + src/net/messagein.cpp | 25 +++++ src/net/messagein.h | 2 + src/net/playerhandler.h | 2 + src/net/tmwa/network.cpp | 2 +- src/net/tmwa/playerhandler.cpp | 41 +++++++ src/net/tmwa/playerhandler.h | 2 + src/net/tmwa/protocol.h | 2 + 11 files changed, 242 insertions(+), 69 deletions(-) (limited to 'src') diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index e0fa4ebcf..fde0f08da 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -41,6 +41,9 @@ #include "playerrelations.h" #include "main.h" +#include "net/net.h" +#include "net/playerhandler.h" + #include "gui/chatwindow.h" #include "utils/gettext.h" @@ -181,7 +184,113 @@ void WhoIsOnline::handleLink(const std::string& link, gcn::MouseEvent *event) } } -void WhoIsOnline::loadList() +void WhoIsOnline::updateWindow(std::vector &friends, + std::vector &neutral, + std::vector &disregard, + std::vector enemy, + int numOnline) +{ + //Set window caption + setCaption(_("Who Is Online - ") + toString(numOnline)); + + //List the online people + sort(friends.begin(), friends.end(), nameCompare); + sort(neutral.begin(), neutral.end(), nameCompare); + sort(disregard.begin(), disregard.end(), nameCompare); + bool addedFromSection(false); + for (int i = 0; i < static_cast(friends.size()); i++) + { + mBrowserBox->addRow(friends.at(i)); + addedFromSection = true; + } + if (addedFromSection == true) + { + mBrowserBox->addRow("---"); + addedFromSection = false; + } + for (int i = 0; i < static_cast(enemy.size()); i++) + { + mBrowserBox->addRow(enemy.at(i)); + addedFromSection = true; + } + if (addedFromSection == true) + { + mBrowserBox->addRow("---"); + addedFromSection = false; + } + for (int i = 0; i < static_cast(neutral.size()); i++) + { + mBrowserBox->addRow(neutral.at(i)); + addedFromSection = true; + } + if (addedFromSection == true && !disregard.empty()) + { + mBrowserBox->addRow("---"); + addedFromSection = false; + } + for (int i = 0; i < static_cast(disregard.size()); i++) + { + mBrowserBox->addRow(disregard.at(i)); + } + + if (mScrollArea->getVerticalMaxScroll() < + mScrollArea->getVerticalScrollAmount()) + { + mScrollArea->setVerticalScrollAmount( + mScrollArea->getVerticalMaxScroll()); + } +} + +void WhoIsOnline::loadList(std::vector &list) +{ + mBrowserBox->clearRows(); + int numOnline = list.size(); + std::vector friends; + std::vector neutral; + std::vector disregard; + std::vector enemy; + + mOnlinePlayers.clear(); + mShowLevel = config.getBoolValue("showlevel"); + + std::vector::const_iterator it = list.begin(); + std::vector::const_iterator it_end = list.end(); + for (; it != it_end; ++ it) + { + std::string nick = *it; + mOnlinePlayers.insert(nick); + + switch (player_relations.getRelation(nick)) + { + case PlayerRelation::NEUTRAL: + default: + neutral.push_back(prepareNick(nick, 0, "0")); + break; + + case PlayerRelation::FRIEND: + friends.push_back(prepareNick(nick, 0, "2")); + break; + + case PlayerRelation::DISREGARDED: + case PlayerRelation::BLACKLISTED: + disregard.push_back(prepareNick(nick, 0, "8")); + break; + + case PlayerRelation::ENEMY2: + enemy.push_back(prepareNick(nick, 0, "1")); + break; + + case PlayerRelation::IGNORED: + case PlayerRelation::ERASED: + //Ignore the ignored. + break; + } + } + + updateWindow(friends, neutral, disregard, enemy, numOnline); +} + +void WhoIsOnline::loadWebList() { if (!mMemoryBuffer) return; @@ -303,59 +412,11 @@ void WhoIsOnline::loadList() line = strtok(nullptr, "\n"); } - //Set window caption - setCaption(_("Who Is Online - ") + toString(numOnline)); - - //List the online people - sort(friends.begin(), friends.end(), nameCompare); - sort(neutral.begin(), neutral.end(), nameCompare); - sort(disregard.begin(), disregard.end(), nameCompare); - bool addedFromSection(false); - for (int i = 0; i < static_cast(friends.size()); i++) - { - mBrowserBox->addRow(friends.at(i)); - addedFromSection = true; - } - if (addedFromSection == true) - { - mBrowserBox->addRow("---"); - addedFromSection = false; - } - for (int i = 0; i < static_cast(enemy.size()); i++) - { - mBrowserBox->addRow(enemy.at(i)); - addedFromSection = true; - } - if (addedFromSection == true) - { - mBrowserBox->addRow("---"); - addedFromSection = false; - } - for (int i = 0; i < static_cast(neutral.size()); i++) - { - mBrowserBox->addRow(neutral.at(i)); - addedFromSection = true; - } - if (addedFromSection == true && !disregard.empty()) - { - mBrowserBox->addRow("---"); - addedFromSection = false; - } - for (int i = 0; i < static_cast(disregard.size()); i++) - { - mBrowserBox->addRow(disregard.at(i)); - } + updateWindow(friends, neutral, disregard, enemy, numOnline); // Free the memory buffer now that we don't need it anymore free(mMemoryBuffer); mMemoryBuffer = nullptr; - - if (mScrollArea->getVerticalMaxScroll() < - mScrollArea->getVerticalScrollAmount()) - { - mScrollArea->setVerticalScrollAmount( - mScrollArea->getVerticalMaxScroll()); - } } size_t WhoIsOnline::memoryWrite(void *ptr, size_t size, @@ -461,15 +522,22 @@ int WhoIsOnline::downloadThread(void *ptr) void WhoIsOnline::download() { - mDownloadComplete = true; - if (mThread && SDL_GetThreadID(mThread)) - SDL_WaitThread(mThread, nullptr); + if (serverVersion < 3) + { + mDownloadComplete = true; + if (mThread && SDL_GetThreadID(mThread)) + SDL_WaitThread(mThread, nullptr); - mDownloadComplete = false; - mThread = SDL_CreateThread(WhoIsOnline::downloadThread, this); + mDownloadComplete = false; + mThread = SDL_CreateThread(WhoIsOnline::downloadThread, this); - if (mThread == nullptr) - mDownloadStatus = UPDATE_ERROR; + if (mThread == nullptr) + mDownloadStatus = UPDATE_ERROR; + } + else + { + Net::getPlayerHandler()->requestOnlineList(); + } } void WhoIsOnline::logic() @@ -513,7 +581,7 @@ void WhoIsOnline::logic() case UPDATE_LIST: if (mDownloadComplete == true) { - loadList(); + loadWebList(); mDownloadStatus = UPDATE_COMPLETE; mUpdateButton->setEnabled(true); mUpdateTimer = 0; @@ -532,18 +600,27 @@ void WhoIsOnline::action(const gcn::ActionEvent &event) { if (event.getId() == "update") { - if (mDownloadStatus == UPDATE_COMPLETE) + if (serverVersion < 3) { - mUpdateTimer = cur_time - 20; - if (mUpdateButton) - mUpdateButton->setEnabled(false); - setCaption(_("Who Is Online - Update")); - if (mThread && SDL_GetThreadID(mThread)) + if (mDownloadStatus == UPDATE_COMPLETE) { - SDL_WaitThread(mThread, nullptr); - mThread = nullptr; + mUpdateTimer = cur_time - 20; + if (mUpdateButton) + mUpdateButton->setEnabled(false); + setCaption(_("Who Is Online - Update")); + if (mThread && SDL_GetThreadID(mThread)) + { + SDL_WaitThread(mThread, nullptr); + mThread = nullptr; + } + mDownloadComplete = true; } - mDownloadComplete = true; + } + else + { + mUpdateTimer = cur_time - 20; + Net::getPlayerHandler()->requestOnlineList(); + setCaption(_("Who Is Online - Update")); } } } diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h index 72063b183..112ad35ba 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/whoisonline.h @@ -65,7 +65,9 @@ class WhoIsOnline : public Window, /** * Loads and display online list from the memory buffer. */ - void loadList(); + void loadWebList(); + + void loadList(std::vector &list); void handleLink(const std::string& link, gcn::MouseEvent *event); @@ -83,6 +85,10 @@ class WhoIsOnline : public Window, void optionChanged(const std::string &name); + void updateList(std::vector &list); + + void readFromWeb(); + private: void download(); @@ -101,6 +107,13 @@ private: const std::string prepareNick(std::string nick, int level, std::string color) const; + + void updateWindow(std::vector &friends, + std::vector &neutral, + std::vector &disregard, + std::vector enemy, + int numOnline); + enum DownloadStatus { UPDATE_ERROR = 0, @@ -137,4 +150,6 @@ private: bool mUpdateOnlineList; }; +extern WhoIsOnline *whoIsOnline; + #endif diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index da8958044..925938161 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -443,4 +443,9 @@ Vector PlayerHandler::getDefaultWalkSpeed() const return ManaServ::BeingHandler::giveSpeedInPixelsPerTicks(6.0f); } +void PlayerHandler::requestOnlineList() +{ + +} + } // namespace ManaServ diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h index 21bbac516..c33eddc84 100644 --- a/src/net/manaserv/playerhandler.h +++ b/src/net/manaserv/playerhandler.h @@ -70,6 +70,8 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler int getJobLocation() const; int getAttackLocation() const; + void requestOnlineList(); + Vector getDefaultWalkSpeed() const; private: diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 0fbf7162b..19453b745 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -241,4 +241,29 @@ std::string MessageIn::readRawString(int length) return str; } +char *MessageIn::readBytes(int length) +{ + // Get string length + if (length < 0) + length = readInt16(); + + // Make sure the string isn't erroneous + if (length < 0 || mPos + length > mLength) + { + mPos = mLength + 1; + DEBUGLOG("readBytesString error"); + return nullptr; + } + + char *buf = new char[length + 2]; + + memcpy (buf, mData + mPos, length); + buf[length] = 0; + buf[length + 1] = 0; + mPos += length; + + PacketCounters::incInBytes(length); + return buf; +} + } diff --git a/src/net/messagein.h b/src/net/messagein.h index 6d7038d4a..ed143a213 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -95,6 +95,8 @@ class MessageIn virtual std::string readRawString(int length); + char *readBytes(int length); + virtual ~MessageIn() { } diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 47d666036..4f1ed8f00 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -71,6 +71,8 @@ class PlayerHandler virtual int getAttackLocation() const = 0; virtual Vector getDefaultWalkSpeed() const = 0; + + virtual void requestOnlineList() = 0; }; } // namespace Net diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 3181ec898..db006c5c0 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -83,7 +83,7 @@ short packet_lengths[] = -1, -1, 20, 10, 32, 9, 34, 14, 2, 6, 48, 56, -1, 4, 5, 10, // #0x0200 26, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index c34c661e8..20156d8cb 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -30,6 +30,8 @@ #include "net/tmwa/npchandler.h" #include "net/tmwa/inventoryhandler.h" +#include "gui/whoisonline.h" + #include "debug.h" extern Net::PlayerHandler *playerHandler; @@ -50,6 +52,7 @@ PlayerHandler::PlayerHandler() SMSG_PLAYER_STAT_UPDATE_5, SMSG_PLAYER_STAT_UPDATE_6, SMSG_PLAYER_ARROW_MESSAGE, + SMSG_ONLINE_LIST, 0 }; handledMessages = _messages; @@ -97,6 +100,9 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg) processPlayerArrowMessage(msg); break; + case SMSG_ONLINE_LIST: + processOnlineList(msg); + default: break; } @@ -201,4 +207,39 @@ void PlayerHandler::respawn() outMsg.writeInt8(0); } +void PlayerHandler::requestOnlineList() +{ + MessageOut outMsg(CMSG_ONLINE_LIST); +} + +void PlayerHandler::processOnlineList(Net::MessageIn &msg) +{ + if (!whoIsOnline) + return; + + int size = msg.readInt16() - 4; + std::vector arr; + + if (!size) + { + if (whoIsOnline) + whoIsOnline->loadList(arr); + return; + } + + const char *start = msg.readBytes(size); + const char *buf = start; + + while (buf - start + 1 < size && *(buf + 1)) + { + char status = *buf; // now unused + buf ++; + arr.push_back(buf); + buf += strlen(buf) + 1; + } + + if (whoIsOnline) + whoIsOnline->loadList(arr); +} + } // namespace TmwAthena diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index bf8e861ff..898bdae3d 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -51,6 +51,8 @@ class PlayerHandler : public MessageHandler, public Ea::PlayerHandler void setDirection(char direction); void setDestination(int x, int y, int direction = -1); void changeAction(Being::Action action); + void processOnlineList(Net::MessageIn &msg); + void requestOnlineList(); void respawn(); }; diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index caf3c8e53..37f036ca8 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -333,5 +333,7 @@ enum #define SMSG_PVP_SET 0x019a #define CMSG_IGNORE_ALL 0x00d0 #define SMSG_IGNORE_ALL_RESPONSE 0x00d2 +#define CMSG_ONLINE_LIST 0x0210 +#define SMSG_ONLINE_LIST 0x0211 #endif -- cgit v1.2.3-70-g09d2 From bf41736950d9e22be8b2b201dcd4833a50b26a99 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 30 Nov 2011 20:50:31 +0300 Subject: Add limits for online list packet. --- src/client.cpp | 9 +++++++-- src/client.h | 1 + src/gui/whoisonline.cpp | 11 +++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/client.cpp b/src/client.cpp index d8bb747fb..fefb5bc71 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2055,6 +2055,11 @@ void Client::initPacketLimiter() mPacketLimits[PACKET_STOPATTACK].cntLimit = 1; mPacketLimits[PACKET_STOPATTACK].cnt = 0; + mPacketLimits[PACKET_ONLINELIST].timeLimit = 1800; + mPacketLimits[PACKET_ONLINELIST].lastTime = 0; + mPacketLimits[PACKET_ONLINELIST].cntLimit = 1; + mPacketLimits[PACKET_ONLINELIST].cnt = 0; + if (!mServerConfigDir.empty()) { std::string packetLimitsName = @@ -2091,7 +2096,7 @@ void Client::initPacketLimiter() mPacketLimits[f].timeLimit = atoi(line); } inPacketFile.close(); - if (ver < 3) + if (ver < 4) writePacketLimits(packetLimitsName); } } @@ -2106,7 +2111,7 @@ void Client::writePacketLimits(std::string packetLimitsName) outPacketFile.close(); return; } - outPacketFile << "3" << std::endl; + outPacketFile << "4" << std::endl; for (int f = 0; f < PACKET_SIZE; f ++) { outPacketFile << toString(mPacketLimits[f].timeLimit) diff --git a/src/client.h b/src/client.h index b3fc0d676..3bcc5f597 100644 --- a/src/client.h +++ b/src/client.h @@ -131,6 +131,7 @@ enum PacketTypes PACKET_DIRECTION = 8, PACKET_ATTACK = 9, PACKET_STOPATTACK = 10, + PACKET_ONLINELIST = 11, PACKET_SIZE }; diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index fde0f08da..6004f706e 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -536,7 +536,8 @@ void WhoIsOnline::download() } else { - Net::getPlayerHandler()->requestOnlineList(); + if (Client::limitPackets(PACKET_ONLINELIST)) + Net::getPlayerHandler()->requestOnlineList(); } } @@ -618,9 +619,11 @@ void WhoIsOnline::action(const gcn::ActionEvent &event) } else { - mUpdateTimer = cur_time - 20; - Net::getPlayerHandler()->requestOnlineList(); - setCaption(_("Who Is Online - Update")); + if (Client::limitPackets(PACKET_ONLINELIST)) + { + mUpdateTimer = cur_time; + Net::getPlayerHandler()->requestOnlineList(); + } } } } -- cgit v1.2.3-70-g09d2 From 5acadea119fc2a89e944dc9431e298e5e9544770 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 2 Dec 2011 23:06:48 +0300 Subject: Fix some issues after automatic code checking. --- src/being.cpp | 3 +-- src/gui/botcheckerwindow.cpp | 4 ++-- src/gui/widgets/chattab.cpp | 3 +-- src/guichan/gui.cpp | 16 ++++++++-------- src/net/tmwa/playerhandler.cpp | 2 +- src/utils/base64.cpp | 3 ++- 6 files changed, 15 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/being.cpp b/src/being.cpp index 31f1eac59..185891509 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2527,10 +2527,9 @@ void Being::updatePercentHP() { if (!mMaxHP || !serverVersion) return; - unsigned num = 0; if (mHP) { - num = mHP * 100 / mMaxHP; + unsigned num = mHP * 100 / mMaxHP; if (num != mNumber) { mNumber = num; diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index bff9ad31a..2043b4fe3 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -193,14 +193,14 @@ public: attackBot = true; // attacking but not talking more than 2 minutes - if (talk > 2 * 60 && talk > 2 * 60) + if (talk > 2 * 60) { talkBot = true; str += toString((talk) / 60) + " "; } // attacking but not moving more than 2 minutes - if (move > 2 * 60 && move > 2 * 60) + if (move > 2 * 60) { moveBot = true; str += toString((move) / 60); diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 0a224605a..72af1b0b8 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -205,8 +205,7 @@ void ChatTab::chatLog(std::string line, Own own, // if configured, move magic messages log to debug chat tab if (localChatTab && this == localChatTab - && ((config.getBoolValue("showMagicInDebug") - && own == BY_PLAYER && tmp.text.length() > 1 + && ((config.getBoolValue("showMagicInDebug") && own == BY_PLAYER && tmp.text.length() > 1 && tmp.text.at(0) == '#' && tmp.text.at(1) != '#') || (config.getBoolValue("serverMsgInDebug") && (own == BY_SERVER diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp index 810a983c4..3f5581424 100644 --- a/src/guichan/gui.cpp +++ b/src/guichan/gui.cpp @@ -417,7 +417,7 @@ namespace gcn while (parent) { - parent = (Widget*)widget->getParent(); + parent = static_cast(widget->getParent()); // Check if the widget is present in the "widget with mouse" queue. bool widgetIsPresentInQueue = false; @@ -450,7 +450,7 @@ namespace gcn Widget* swap = widget; widget = parent; - parent = (Widget*)swap->getParent(); + parent = static_cast(swap->getParent()); } if (mFocusHandler->getDraggedWidget()) @@ -683,7 +683,7 @@ namespace gcn if (!Widget::widgetExists(widget)) break; - parent = (Widget*)widget->getParent(); + parent = static_cast(widget->getParent()); if (widget->isEnabled() || force) { @@ -742,7 +742,7 @@ namespace gcn Widget* swap = widget; widget = parent; - parent = (Widget*)swap->getParent(); + parent = static_cast(swap->getParent()); // If a non modal focused widget has been reach // and we have modal focus cancel the distribution. @@ -786,7 +786,7 @@ namespace gcn if (!Widget::widgetExists(widget)) break; - parent = (Widget*)widget->getParent(); + parent = static_cast(widget->getParent()); if (widget->isEnabled()) { @@ -815,7 +815,7 @@ namespace gcn Widget* swap = widget; widget = parent; - parent = (Widget*)swap->getParent(); + parent = static_cast(swap->getParent()); // If a non modal focused widget has been reach // and we have modal focus cancel the distribution. @@ -928,7 +928,7 @@ namespace gcn while (parent) { - parent = (Widget*)widget->getParent(); + parent = static_cast(widget->getParent()); // Check if the widget is present in the "widget with mouse" queue. bool widgetIsPresentInQueue = false; @@ -960,7 +960,7 @@ namespace gcn Widget* swap = widget; widget = parent; - parent = (Widget*)swap->getParent(); + parent = static_cast(swap->getParent()); } } } diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 20156d8cb..c678fe09d 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -232,7 +232,7 @@ void PlayerHandler::processOnlineList(Net::MessageIn &msg) while (buf - start + 1 < size && *(buf + 1)) { - char status = *buf; // now unused +// char status = *buf; // now unused buf ++; arr.push_back(buf); buf += strlen(buf) + 1; diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index 843a0b534..24a3a58e3 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -108,7 +108,8 @@ unsigned char *php3_base64_decode(const unsigned char *string, /* run through the whole string, converting as we go */ while ((ch = *current++) != '\0') { - if (ch == base64_pad) break; + if (ch == base64_pad) + break; /* When Base64 gets POSTed, all pluses are interpreted as spaces. This line changes them back. It's not exactly the Base64 spec, -- cgit v1.2.3-70-g09d2 From 284458d6c7644159eb14479e9f41127fd400ffdb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 3 Dec 2011 21:05:17 +0300 Subject: Allow copy any line from chat log to clipboard by context menu item "Copy to clipboard". --- src/gui/chatwindow.cpp | 17 +++++++++++++- src/gui/chatwindow.h | 2 ++ src/gui/popupmenu.cpp | 51 +++++++++++++++++++++++++++++++++++++++++- src/gui/popupmenu.h | 2 ++ src/gui/widgets/browserbox.cpp | 29 ++++++++++++++++++++++++ src/gui/widgets/browserbox.h | 3 +++ 6 files changed, 102 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 35b89b839..9ba54016e 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -55,6 +55,7 @@ #include "net/playerhandler.h" #include "net/net.h" +#include "utils/copynpaste.h" #include "utils/dtor.h" #include "utils/gettext.h" #include "utils/stringutils.h" @@ -1540,4 +1541,18 @@ void ChatWindow::parseHighlights() bool ChatWindow::findHighlight(std::string &str) { return findI(str, mHighlights) != std::string::npos; -} \ No newline at end of file +} + +void ChatWindow::copyToClipboard(int x, int y) +{ + ChatTab *tab = getFocused(); + if (!tab) + return; + + BrowserBox *text = tab->mTextOutput; + if (!text) + return; + + std::string str = text->getTextAtPos(x, y); + sendBuffer(str); +} diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index ad5229ffe..9d63ca402 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -258,6 +258,8 @@ class ChatWindow : public Window, bool findHighlight(std::string &str); + void copyToClipboard(int x, int y); + protected: friend class ChatTab; friend class WhisperTab; diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index b133f66fc..e49d5c451 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -95,7 +95,9 @@ PopupMenu::PopupMenu(): mDialog(nullptr), mButton(nullptr), mNick(""), - mType(Being::UNKNOWN) + mType(Being::UNKNOWN), + mX(0), + mY(0) { mBrowserBox = new BrowserBox; mBrowserBox->setPosition(4, 4); @@ -120,6 +122,8 @@ void PopupMenu::showPopup(int x, int y, Being *being) mNick = being->getName(); mType = being->getType(); mBrowserBox->clearRows(); + mX = x; + mY = y; const std::string &name = mNick; @@ -348,6 +352,8 @@ void PopupMenu::showPopup(int x, int y, Being *being) void PopupMenu::showPopup(int x, int y, std::vector &beings) { + mX = x; + mY = y; mBrowserBox->clearRows(); mBrowserBox->addRow("Players"); std::vector::const_iterator it, it_end; @@ -374,6 +380,8 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick) mNick = nick; mBeingId = 0; mType = Being::PLAYER; + mX = x; + mY = y; mBrowserBox->clearRows(); const std::string &name = mNick; @@ -508,6 +516,8 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem) return; mFloorItem = floorItem; + mX = x; + mY = y; const ItemInfo &info = floorItem->getInfo(); mBrowserBox->clearRows(); std::string name; @@ -534,6 +544,8 @@ void PopupMenu::showPopup(int x, int y, MapItem *mapItem) return; mMapItem = mapItem; + mX = x; + mY = y; mBrowserBox->clearRows(); @@ -554,6 +566,9 @@ void PopupMenu::showPopup(int x, int y, MapItem *mapItem) void PopupMenu::showOutfitsPopup(int x, int y) { + mX = x; + mY = y; + mBrowserBox->clearRows(); mBrowserBox->addRow(_("Outfits")); @@ -573,6 +588,9 @@ void PopupMenu::showSpellPopup(int x, int y, TextCommand *cmd) mBrowserBox->clearRows(); mSpell = cmd; + mX = x; + mY = y; + mBrowserBox->addRow(_("Spells")); mBrowserBox->addRow("load old spells", _("Load old spells")); mBrowserBox->addRow("edit spell", _("Edit spell")); @@ -589,6 +607,8 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) return; mTab = tab; + mX = x; + mY = y; mBrowserBox->clearRows(); @@ -617,6 +637,8 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab) mBrowserBox->addRow("leave party", _("Leave")); mBrowserBox->addRow("##3---"); } + mBrowserBox->addRow("chat clipboard", _("Copy to clipboard")); + mBrowserBox->addRow("##3---"); if (tab->getType() == ChatTab::TAB_WHISPER) { @@ -815,6 +837,8 @@ void PopupMenu::showChangePos(int x, int y) if (!player_node) return; + mX = x; + mY = y; const Guild *guild = player_node->getGuild(); if (guild) { @@ -838,6 +862,8 @@ void PopupMenu::showChangePos(int x, int y) mMapItem = nullptr; mNick = ""; mType = Being::UNKNOWN; + mX = 0; + mY = 0; setVisible(false); } } @@ -1404,6 +1430,11 @@ void PopupMenu::handleLink(const std::string &link, if (chatWindow) chatWindow->saveState(); } + else if (link == "chat clipboard" && mTab) + { + if (chatWindow) + chatWindow->copyToClipboard(mX, mY); + } else if (link == "remove attack" && being) { if (actorSpriteManager && being->getType() == Being::MONSTER) @@ -1690,6 +1721,8 @@ void PopupMenu::handleLink(const std::string &link, mMapItem = nullptr; mNick = ""; mType = Being::UNKNOWN; + mX = 0; + mY = 0; } void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, @@ -1700,6 +1733,8 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, mItem = item; mWindow = parent; + mX = x; + mY = y; mBrowserBox->clearRows(); int cnt = item->getQuantity(); @@ -1793,6 +1828,8 @@ void PopupMenu::showItemPopup(int x, int y, int itemId, unsigned char color) mItem = nullptr; mItemId = itemId; mItemColor = color; + mX = x; + mY = y; mBrowserBox->clearRows(); mBrowserBox->addRow("use", _("Use")); @@ -1809,6 +1846,8 @@ void PopupMenu::showItemPopup(int x, int y, int itemId, unsigned char color) void PopupMenu::showItemPopup(int x, int y, Item *item) { mItem = item; + mX = x; + mY = y; if (item) { mItemId = item->getId(); @@ -1864,6 +1903,8 @@ void PopupMenu::showItemPopup(int x, int y, Item *item) void PopupMenu::showDropPopup(int x, int y, Item *item) { mItem = item; + mX = x; + mY = y; mBrowserBox->clearRows(); if (item) @@ -1912,6 +1953,8 @@ void PopupMenu::showPopup(int x, int y, Button *button) return; mButton = button; + mX = x; + mY = y; mBrowserBox->clearRows(); std::vector names = windowMenu->getButtons(); @@ -1947,6 +1990,8 @@ void PopupMenu::showPopup(int x, int y, ProgressBar *b) return; mNick = b->text(); + mX = x; + mY = y; mBrowserBox->clearRows(); std::vector bars = miniStatusWindow->getBars(); @@ -1988,6 +2033,8 @@ void PopupMenu::showAttackMonsterPopup(int x, int y, std::string name, mNick = name; mType = Being::MONSTER; + mX = x; + mY = y; mBrowserBox->clearRows(); @@ -2041,6 +2088,8 @@ void PopupMenu::showUndressPopup(int x, int y, Being *being, Item *item) mItem = item; mItemId = item->getId(); mItemColor = item->getColor(); + mX = x; + mY = y; mBrowserBox->clearRows(); diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 4bbe2c46c..6dc9a953a 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -172,6 +172,8 @@ class PopupMenu : public Popup, public LinkHandler Button *mButton; std::string mNick; int mType; + int mX; + int mY; /** * Shared code for the various showPopup functions. diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 5ded29c55..4af38bf67 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -645,6 +645,35 @@ void BrowserBox::updateHeight() } } +std::string BrowserBox::getTextAtPos(const int x, const int y) +{ + int textX = 0; + int textY = 0; + + getAbsolutePosition(textX, textY); + if (x < textX || y < textY) + return ""; // mouse position ourside of correct widget (outside of tab) + + textX = x - textX; + textY = y - textY; + + std::string str = ""; + + for (LinePartIterator i = mLineParts.begin(); + i != mLineParts.end(); + ++i) + { + const LinePart &part = *i; + if (part.mY + 50 < mYStart) + continue; + if (part.mY > textY) + break; + str = part.mText; + } + + return str; +} + LinePart::~LinePart() { if (mImage) diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 06609b318..e26ae32e0 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -137,6 +137,7 @@ class BrowserBox : public gcn::Widget, * Handles mouse actions. */ void mousePressed(gcn::MouseEvent &event); + void mouseMoved(gcn::MouseEvent &event); /** @@ -198,6 +199,8 @@ class BrowserBox : public gcn::Widget, void setEnableImages(bool n) { mEnableImages = n; } + std::string getTextAtPos(const int x, const int y); + private: int calcHeight(); -- cgit v1.2.3-70-g09d2 From 940161d95ee7c9e9ef4c6941d3d464d4264a94ad Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 3 Dec 2011 21:10:26 +0300 Subject: Under X for copy to clipboard use destination clipboard with name "clipboard" before was "primary" clipboard (mouse clipboard). --- src/utils/copynpaste.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 3e37afd9d..784870e05 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -432,7 +432,7 @@ bool sendBuffer(std::string& text) } close(fd[0]); } - execl("/usr/bin/xsel", "xsel", "-i", (char *)nullptr); + execl("/usr/bin/xsel", "xsel", "-b", "-i", (char *)nullptr); exit(1); } -- cgit v1.2.3-70-g09d2 From 2d452dd8faf2529fda01913b0ab26f4a1f22ef3d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 5 Dec 2011 21:45:05 +0300 Subject: A bit improve speed in getting color from theme. --- src/gui/palette.cpp | 12 +++++------- src/gui/palette.h | 3 +++ src/gui/theme.cpp | 12 ++++++++++++ src/gui/widgets/browserbox.cpp | 5 +++-- 4 files changed, 23 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index f3046264f..348f97de8 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -65,15 +65,13 @@ Palette::~Palette() const gcn::Color& Palette::getColor(char c, bool &valid) { - for (Colors::const_iterator col = mColors.begin(), - colEnd = mColors.end(); col != colEnd; ++col) + CharColors::const_iterator it = mCharColors.find(c); + if (it != mCharColors.end()) { - if (col->ch == c) - { - valid = true; - return col->color; - } + valid = true; + return mColors[(*it).second].color; } + valid = false; return BLACK; } diff --git a/src/gui/palette.h b/src/gui/palette.h index 645260280..d46a3c57c 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -200,8 +201,10 @@ class Palette } }; typedef std::vector Colors; + typedef std::map CharColors; /** Vector containing the colors. */ Colors mColors; + CharColors mCharColors; std::vector mGradVector; }; diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 9aa6bb956..b3b28bffa 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -162,6 +162,18 @@ Theme::Theme(): mColors[SERVER].ch = 'S'; mColors[LOGGER].ch = 'L'; mColors[HYPERLINK].ch = '<'; + mCharColors['H'] = HIGHLIGHT; + mCharColors['C'] = CHAT; + mCharColors['G'] = GM; + mCharColors['Y'] = PLAYER; + mCharColors['W'] = WHISPER; + mCharColors['w'] = WHISPER_OFFLINE; + mCharColors['I'] = IS; + mCharColors['P'] = PARTY_CHAT_TAB; + mCharColors['U'] = GUILD_CHAT_TAB; + mCharColors['S'] = SERVER; + mCharColors['L'] = LOGGER; + mCharColors['<'] = HYPERLINK; } Theme::~Theme() diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 4af38bf67..7d30c10bf 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -79,6 +79,7 @@ BrowserBox::BrowserBox(unsigned int mode, bool opaque): mColors[PURPLE] = Theme::getThemeColor(Theme::PURPLE); mColors[GRAY] = Theme::getThemeColor(Theme::GRAY); mColors[BROWN] = Theme::getThemeColor(Theme::BROWN); + setForegroundColor(Theme::getThemeColor(Theme::TEXT)); } BrowserBox::~BrowserBox() @@ -406,8 +407,8 @@ int BrowserBox::calcHeight() char const *hyphen = "~"; int hyphenWidth = font->getWidth(hyphen); - gcn::Color selColor = Theme::getThemeColor(Theme::TEXT); - const gcn::Color textColor = Theme::getThemeColor(Theme::TEXT); + gcn::Color selColor = getForegroundColor(); + const gcn::Color textColor = getForegroundColor(); ResourceManager *resman = ResourceManager::getInstance(); mLineParts.clear(); -- cgit v1.2.3-70-g09d2 From 7a2d595785a61ec874ddc566e0d999495684c2aa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Dec 2011 01:30:04 +0300 Subject: Add gm commands to chat autocomplete list (only for gms) --- data/perserver/default/CMakeLists.txt | 1 + data/perserver/default/Makefile.am | 3 ++- data/perserver/default/gmcommands.txt | 32 ++++++++++++++++++++++++++++++++ packaging/windows/setup.nsi | 1 + src/gui/chatwindow.cpp | 30 +++++++++++++++++++++++++++++- src/gui/chatwindow.h | 3 +++ src/gui/didyouknowwindow.cpp | 6 +++--- src/gui/helpwindow.cpp | 6 +++--- src/localplayer.cpp | 4 ++++ src/resources/resourcemanager.cpp | 9 ++++----- src/resources/resourcemanager.h | 3 ++- 11 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 data/perserver/default/gmcommands.txt (limited to 'src') diff --git a/data/perserver/default/CMakeLists.txt b/data/perserver/default/CMakeLists.txt index 61bd98df1..f4e5c6cae 100644 --- a/data/perserver/default/CMakeLists.txt +++ b/data/perserver/default/CMakeLists.txt @@ -1,5 +1,6 @@ SET (FILES charcreation.xml + gmcommands.txt ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/perserver/default) diff --git a/data/perserver/default/Makefile.am b/data/perserver/default/Makefile.am index 7ab87da67..08e324ca3 100644 --- a/data/perserver/default/Makefile.am +++ b/data/perserver/default/Makefile.am @@ -1,7 +1,8 @@ defaultdir = $(pkgdatadir)/data/perserver/default default_DATA = \ - charcreation.xml + charcreation.xml \ + gmcommands.txt EXTRA_DIST = \ $(default_DATA) \ diff --git a/data/perserver/default/gmcommands.txt b/data/perserver/default/gmcommands.txt new file mode 100644 index 000000000..da271a12f --- /dev/null +++ b/data/perserver/default/gmcommands.txt @@ -0,0 +1,32 @@ +@spawn +@item +@hugo +@linus +@warp +@goto +@jump +@save +@storage +@gstorage +@hide +@visible +@invisible +@die +@kill +@alive +@blvl +@jlvl +@pvpon +@pvpoff +@killmonster +@kick +@broadcast +@localbroadcast +@hairstyle +@haircolor +@ignorelist +@killer +@killable +@summon +@skill-learn +@ipcheck diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index eb0e5ffe9..ebb2002a1 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -320,6 +320,7 @@ Section "Core files (required)" SecCore SetOutPath "$INSTDIR\data\icons\" File "${SRCDIR}\data\icons\manaplus.ico" SetOutPath "$INSTDIR\data\perserver\default\" + File "${SRCDIR}\data\perserver\default\*.txt" File "${SRCDIR}\data\perserver\default\*.xml" SetOutPath "$INSTDIR\docs" File "${SRCDIR}\docs\FAQ.txt" diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 9ba54016e..33c24e9c7 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -60,6 +60,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "resources/resourcemanager.h" + #include #include @@ -152,7 +154,8 @@ public: ChatWindow::ChatWindow(): Window(_("Chat"), false, nullptr, "chat.xml"), mTmpVisible(false), - mChatHistoryIndex(0) + mChatHistoryIndex(0), + mGMLoaded(false) { listen(CHANNEL_NOTICES); listen(Mana::CHANNEL_ATTRIBUTES); @@ -212,6 +215,8 @@ ChatWindow::ChatWindow(): mColorPicker->setVisible(config.getBoolValue("showChatColorsList")); fillCommands(); + if (player_node && player_node->isGM()) + loadGMCommands(); initTradeFilter(); loadCustomList(); parseHighlights(); @@ -302,6 +307,29 @@ void ChatWindow::fillCommands() mCommands.push_back("/pseudoaway "); } +void ChatWindow::loadGMCommands() +{ + if (mGMLoaded) + return; + + const char *fileName = "gmcommands.txt"; + ResourceManager *resman = ResourceManager::getInstance(); + std::vector list; + resman->loadTextFile(fileName, list); + std::vector::const_iterator it = list.begin(); + std::vector::const_iterator it_end = list.end(); + + while (it != it_end) + { + const std::string str = *it; + if (!str.empty()) + mCommands.push_back(str); + + ++ it; + } + mGMLoaded = true; +} + void ChatWindow::resetToDefaultSize() { Window::resetToDefaultSize(); diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 9d63ca402..3c1195e8f 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -243,6 +243,8 @@ class ChatWindow : public Window, void loadCustomList(); + void loadGMCommands(); + std::string doReplace(const std::string &msg); void adjustTabSize(); @@ -330,6 +332,7 @@ class ChatWindow : public Window, unsigned int mChatHistoryIndex; std::list mAwayLog; std::vector mHighlights; + bool mGMLoaded; }; extern ChatWindow *chatWindow; diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index 9a913a305..b5a7da634 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -138,16 +138,16 @@ void DidYouKnowWindow::loadFile(int num) { std::string name = helpPath + langs[0] + "/" + file + ".txt"; if (resman->exists(name)) - lines = resman->loadTextFile(name); + resman->loadTextFile(name, lines); if (lines.empty() && langs.size() > 1) { name = helpPath + langs[1] + "/" + file + ".txt"; - lines = resman->loadTextFile(name); + resman->loadTextFile(name, lines); } } if (lines.empty()) - lines = resman->loadTextFile(helpPath + file + ".txt"); + resman->loadTextFile(helpPath + file + ".txt", lines); for (unsigned int i = 0; i < lines.size(); ++i) mBrowserBox->addRow(lines[i]); diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index 49f309bca..b1175d709 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -114,16 +114,16 @@ void HelpWindow::loadFile(const std::string &file) { std::string name = helpPath + langs[0] + "/" + file + ".txt"; if (resman->exists(name)) - lines = resman->loadTextFile(name); + resman->loadTextFile(name, lines); if (lines.empty() && langs.size() > 1) { name = helpPath + langs[1] + "/" + file + ".txt"; - lines = resman->loadTextFile(name); + resman->loadTextFile(name, lines); } } if (lines.empty()) - lines = resman->loadTextFile(helpPath + file + ".txt"); + resman->loadTextFile(helpPath + file + ".txt", lines); for (unsigned int i = 0; i < lines.size(); ++i) mBrowserBox->addRow(lines[i]); diff --git a/src/localplayer.cpp b/src/localplayer.cpp index cbf75a5f9..c83082a44 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -397,7 +397,11 @@ void LocalPlayer::setGMLevel(int level) mGMLevel = level; if (level > 0) + { setGM(true); + if (chatWindow) + chatWindow->loadGMCommands(); + } } diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index a99ca622e..c7552b9b7 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -634,18 +634,17 @@ bool ResourceManager::copyFile(const std::string &src, const std::string &dst) return true; } -std::vector ResourceManager::loadTextFile( - const std::string &fileName) +bool ResourceManager::loadTextFile(const std::string &fileName, + std::vector &lines) { int contentsLength; char *fileContents = static_cast( loadFile(fileName, contentsLength)); - std::vector lines; if (!fileContents) { logger->log("Couldn't load text file: %s", fileName.c_str()); - return lines; + return false; } std::istringstream iss(std::string(fileContents, contentsLength)); @@ -655,7 +654,7 @@ std::vector ResourceManager::loadTextFile( lines.push_back(line); free(fileContents); - return lines; + return true; } std::vector ResourceManager::loadTextFileLocal( diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index f70fbece4..8cc851cca 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -217,7 +217,8 @@ class ResourceManager /** * Retrieves the contents of a text file (PhysFS). */ - std::vector loadTextFile(const std::string &fileName); + bool loadTextFile(const std::string &fileName, + std::vector &lines); /** * Retrieves the contents of a text file. -- cgit v1.2.3-70-g09d2 From c075c0daa245819d0a07fea6695f233fd329e397 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 8 Dec 2011 00:43:21 +0300 Subject: Add to combined menu also floor items. --- src/actorspritemanager.cpp | 26 ++++++++++++-------------- src/actorspritemanager.h | 2 +- src/gui/popupmenu.cpp | 40 +++++++++++++++++++++++++++++++++++----- src/gui/popupmenu.h | 4 +++- src/gui/viewport.cpp | 2 +- 5 files changed, 52 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 4403738f9..e0a59b349 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -406,13 +406,12 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y, } } -void ActorSpriteManager::findBeingsByPixel(std::vector &beings, +void ActorSpriteManager::findBeingsByPixel(std::vector &beings, int x, int y, bool allPlayers) const { if (!mMap) return; - bool targetDead = mTargetDeadPlayers; const int xtol = 16; const int uptol = 32; @@ -421,25 +420,24 @@ void ActorSpriteManager::findBeingsByPixel(std::vector &beings, if (!*it) continue; - if ((*it)->getType() == ActorSprite::FLOOR_ITEM - || (*it)->getType() == ActorSprite::PORTAL) - { + if ((*it)->getType() == ActorSprite::PORTAL) continue; - } - Being *being = static_cast(*it); + Being *being = dynamic_cast(*it); + ActorSprite *actor = *it; - if ((being->isAlive() - || (targetDead && being->getType() == Being::PLAYER)) + if ((being && (being->isAlive() + || (mTargetDeadPlayers && being->getType() == Being::PLAYER)) && (allPlayers || being != player_node)) + || actor->getType() == ActorSprite::FLOOR_ITEM) { - if ((being->getPixelX() - xtol <= x) && - (being->getPixelX() + xtol > x) && - (being->getPixelY() - uptol <= y) && - (being->getPixelY() > y)) + if ((actor->getPixelX() - xtol <= x) && + (actor->getPixelX() + xtol > x) && + (actor->getPixelY() - uptol <= y) && + (actor->getPixelY() > y)) { - beings.push_back(being); + beings.push_back(actor); } } } diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index f1f83634d..08a255621 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -94,7 +94,7 @@ class ActorSpriteManager: public ConfigListener /** * Returns a beings at the specific pixel. */ - void findBeingsByPixel(std::vector &beings, int x, int y, + void findBeingsByPixel(std::vector &beings, int x, int y, bool allPlayers) const; /** diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index e49d5c451..15afc7600 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -350,22 +350,36 @@ void PopupMenu::showPopup(int x, int y, Being *being) showPopup(x, y); } -void PopupMenu::showPopup(int x, int y, std::vector &beings) +void PopupMenu::showPopup(int x, int y, std::vector &beings) { mX = x; mY = y; mBrowserBox->clearRows(); - mBrowserBox->addRow("Players"); - std::vector::const_iterator it, it_end; + mBrowserBox->addRow(_("Players")); + std::vector::const_iterator it, it_end; for (it = beings.begin(), it_end = beings.end(); it != it_end; ++it) { - Being *being = *it; - if (!being->getName().empty()) + Being *being = dynamic_cast(*it); + ActorSprite *actor = *it; + if (being && !being->getName().empty()) { mBrowserBox->addRow(strprintf("@@player_%u|%s >@@", being->getId(), (being->getName() + being->getGenderSignWithSpace()).c_str())); } + else if(actor->getType() == ActorSprite::FLOOR_ITEM) + { + FloorItem *floorItem = static_cast(actor); + const ItemInfo &info = floorItem->getInfo(); + std::string name; + + if (serverVersion > 0) + name = info.getName(floorItem->getColor()); + else + name = info.getName(); + mBrowserBox->addRow(strprintf("@@flooritem_%u|%s >@@", + actor->getId(), name.c_str())); + } } mBrowserBox->addRow("##3---"); mBrowserBox->addRow("cancel", _("Cancel")); @@ -1685,6 +1699,22 @@ void PopupMenu::handleLink(const std::string &link, } } } + else if (!link.compare(0, 10, "flooritem_")) + { + if (actorSpriteManager) + { + int id = atoi(link.substr(10).c_str()); + if (id) + { + mFloorItem = actorSpriteManager->findItem(id); + if (mFloorItem) + { + showPopup(getX(), getY(), mFloorItem); + return; + } + } + } + } else if (!link.compare(0, 12, "hide button_")) { if (windowMenu) diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 6dc9a953a..2db565ab7 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -26,6 +26,8 @@ #include "gui/widgets/linkhandler.h" #include "gui/widgets/popup.h" +#include "actorsprite.h" + #include #include "localconsts.h" @@ -102,7 +104,7 @@ class PopupMenu : public Popup, public LinkHandler /** * Shows the beings related popup menu at the specified mouse coords. */ - void showPopup(int x, int y, std::vector &beings); + void showPopup(int x, int y, std::vector &beings); void showPlayerPopup(int x, int y, std::string nick); diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 3086a027f..b6c55f2c4 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -432,7 +432,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) { if (actorSpriteManager) { - std::vector beings; + std::vector beings; const int x = getMouseX() + static_cast(mPixelViewX); const int y = getMouseY() + static_cast(mPixelViewY); actorSpriteManager->findBeingsByPixel(beings, x, y, true); -- cgit v1.2.3-70-g09d2 From 4a4d6bd39b88933f5db4b632b28e1444062ad25a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 8 Dec 2011 21:50:36 +0300 Subject: Add variables for any chat text/commands. - target or nearest player nick. - target or nearest monster name. - comma separated list of visible players (except self). - all party members (except self). Example usage: type in chat: hello . --- src/commandhandler.cpp | 80 +++++++++++++++++++++++++++++++++++++++++++++ src/commandhandler.h | 2 ++ src/gui/chatwindow.cpp | 5 +++ src/gui/widgets/chattab.cpp | 3 ++ 4 files changed, 90 insertions(+) (limited to 'src') diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index d04fda150..862ac56b4 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -32,6 +32,7 @@ #include "localplayer.h" #include "logger.h" #include "main.h" +#include "party.h" #include "gui/chatwindow.h" #include "gui/helpwindow.h" @@ -1194,3 +1195,82 @@ void CommandHandler::handleDump(const std::string &args A_UNUSED, { } #endif + +void CommandHandler::replaceVars(std::string &str) +{ + if (!player_node || !actorSpriteManager) + return; + + if (str.find("") != std::string::npos) + { + Being *target = player_node->getTarget(); + if (!target || target->getType() != ActorSprite::PLAYER) + { + target = actorSpriteManager->findNearestLivingBeing( + player_node, 20, ActorSprite::PLAYER); + } + if (target) + replaceAll(str, "", target->getName()); + else + replaceAll(str, "", ""); + } + if (str.find("") != std::string::npos) + { + Being *target = player_node->getTarget(); + if (!target || target->getType() != ActorSprite::MONSTER) + { + target = actorSpriteManager->findNearestLivingBeing( + player_node, 20, ActorSprite::MONSTER); + } + if (target) + replaceAll(str, "", target->getName()); + else + replaceAll(str, "", ""); + } + if (str.find("") != std::string::npos) + { + std::vector names; + std::string newStr = ""; + actorSpriteManager->getPlayerNames(names, false); + std::vector::const_iterator it = names.begin(); + std::vector::const_iterator it_end = names.end(); + for (; it != it_end; ++ it) + { + if (*it != player_node->getName()) + newStr += *it + ","; + } + if (newStr[newStr.size() - 1] == ',') + newStr = newStr.substr(0, newStr.size() - 1); + if (!newStr.empty()) + replaceAll(str, "", newStr); + else + replaceAll(str, "", ""); + } + if (str.find("") != std::string::npos) + { + std::vector names; + std::string newStr = ""; + Party *party = nullptr; + if (player_node->isInParty() && (party = player_node->getParty())) + { + party->getNames(names); + std::vector::const_iterator it = names.begin(); + std::vector::const_iterator it_end = names.end(); + for (; it != it_end; ++ it) + { + if (*it != player_node->getName()) + newStr += *it + ","; + } + if (newStr[newStr.size() - 1] == ',') + newStr = newStr.substr(0, newStr.size() - 1); + if (!newStr.empty()) + replaceAll(str, "", newStr); + else + replaceAll(str, "", ""); + } + else + { + replaceAll(str, "", ""); + } + } +} diff --git a/src/commandhandler.h b/src/commandhandler.h index f8b44e04f..b97b191ff 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -59,6 +59,8 @@ class CommandHandler void handleCommands(const std::string &command, ChatTab *tab = localChatTab); + void replaceVars(std::string &str); + static char parseBoolean(const std::string &value); protected: diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 33c24e9c7..84d61cf65 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -24,6 +24,7 @@ #include "actorspritemanager.h" #include "client.h" +#include "commandhandler.h" #include "configuration.h" #include "guild.h" #include "keyboardconfig.h" @@ -305,6 +306,10 @@ void ChatWindow::fillCommands() mCommands.push_back("/serverunignoreall"); mCommands.push_back("/dumpg"); mCommands.push_back("/pseudoaway "); + mCommands.push_back(""); + mCommands.push_back(""); + mCommands.push_back(""); + mCommands.push_back(""); } void ChatWindow::loadGMCommands() diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 72af1b0b8..c2db20574 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -349,6 +349,9 @@ void ChatTab::chatInput(const std::string &message) start = msg.find('[', start + 1); } + if (commandHandler) + commandHandler->replaceVars(msg); + // Prepare ordinary message if (msg[0] != '/') handleInput(msg); -- cgit v1.2.3-70-g09d2 From b595695ec90d7e9207675f9b8c8ae2e978b03c5f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 8 Dec 2011 22:06:06 +0300 Subject: Fix monster hp bar in evol server. --- src/being.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/being.cpp b/src/being.cpp index 185891509..9e5ae3ad1 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2071,11 +2071,10 @@ void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage, int dx = static_cast(static_cast(width) / p); - if ((!damage && (this != player_node || hp == maxHP)) + if ((!damage && (this != player_node || hp == maxHP) && serverVersion < 1) || (!hp && maxHP == damage)) { graphics->setColor(userPalette->getColorWithAlpha(color1)); - graphics->fillRectangle(gcn::Rectangle( x, y, dx, height)); return; @@ -2083,19 +2082,16 @@ void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage, else if (width - dx <= 0) { graphics->setColor(userPalette->getColorWithAlpha(color2)); - graphics->fillRectangle(gcn::Rectangle( x, y, width, height)); return; } graphics->setColor(userPalette->getColorWithAlpha(color1)); - graphics->fillRectangle(gcn::Rectangle( x, y, dx, height)); graphics->setColor(userPalette->getColorWithAlpha(color2)); - graphics->fillRectangle(gcn::Rectangle( x + dx, y, width - dx, height)); } -- cgit v1.2.3-70-g09d2 From 50a25d4209c4412bbe6632baabeb931694d8ed25 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 8 Dec 2011 22:31:27 +0300 Subject: Add pasting into two clipboards under xserver. --- src/utils/copynpaste.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 784870e05..5105d38e5 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -407,7 +407,15 @@ bool retrieveBuffer(std::string& text, std::string::size_type& pos) return false; } +bool runxsel(std::string& text, const char *p1, const char *p2 = nullptr); + bool sendBuffer(std::string& text) +{ + runxsel(text, "-i"); + runxsel(text, "-b", "-i"); +} + +bool runxsel(std::string& text, const char *p1, const char *p2) { pid_t pid; int fd[2]; @@ -432,7 +440,11 @@ bool sendBuffer(std::string& text) } close(fd[0]); } - execl("/usr/bin/xsel", "xsel", "-b", "-i", (char *)nullptr); + if (p2) + execl("/usr/bin/xsel", "xsel", p1, p2, (char *)nullptr); + else + execl("/usr/bin/xsel", "xsel", p1, (char *)nullptr); + exit(1); } -- cgit v1.2.3-70-g09d2 From 39eef459c1134008086fdce273eac4767724ef68 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 10 Dec 2011 17:10:24 +0300 Subject: Change verstion to 1.1.12.11. --- ChangeLog | 16 ++++++++++++++++ README | 2 +- README.txt | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 6 files changed, 22 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 8e6665a82..02525e11d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2011-12-11 New release 1.1.12.11 +fix: draw damage part on hp bar. +fix: recursive directory creation on windows. +fix: text colors in wood theme. +add: polish translation (Derpella). +add: server side online list (evol only). +add: copy any line from chat to clipboard. +add: use two clipboard in xserver. +add: gm commands autocomplete for gms. +add: to combined menus floor items. +add: variables for replacment in chat messages. + - target or nearest player nick. + - target or nearest monster name. + - comma separated list of visible players (except self). + - all party members (except self). + 2011-11-27 New release 1.1.11.27 ManaPlus: fix: show enemy relation in online list. diff --git a/README b/README index 57d6cf834..3c0aaf967 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.11.27 Date: 2011-11-27 + Version: 1.1.12.11 Date: 2011-12-11 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 2950b8e2a..c5251f9e4 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.11.27 Date: 2011-11-27 + Version: 1.1.12.11 Date: 2011-12-11 Development team: - See AUTHORS file for a list diff --git a/build/packwin b/build/packwin index f81957f13..077104227 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.11.27" \ + -DPRODUCT_VERSION="1.1.12.11" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index a2f596cc6..bc6106248 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.11.27], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.12.11], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/main.h b/src/main.h index 6f7c0980a..8d6b531fd 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.1.11.27" -#define CHECK_VERSION "01.01.11.27" +#define SMALL_VERSION "1.1.12.11" +#define CHECK_VERSION "01.01.12.11" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2 From 03c15cd2ca4587d8bb275df738a9841081cb12f3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 10 Dec 2011 17:52:33 +0300 Subject: Fix talk to npc key delay. --- ChangeLog | 1 + src/game.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 02525e11d..561216655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ fix: draw damage part on hp bar. fix: recursive directory creation on windows. fix: text colors in wood theme. +fix: talk to npc key delay. add: polish translation (Derpella). add: server side online list (evol only). add: copy any line from chat to clipboard. diff --git a/src/game.cpp b/src/game.cpp index 683ba418b..2937d6bb7 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1507,8 +1507,7 @@ void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown) } // Talk to the nearest NPC if 't' pressed - if (event.type == SDL_KEYDOWN && - keyboard.getKeyIndex(event.key.keysym.sym) + if (wasDown && keyboard.getKeyIndex(event.key.keysym.sym) == KeyboardConfig::KEY_TALK && !keyboard.isKeyActive(keyboard.KEY_EMOTE)) { -- cgit v1.2.3-70-g09d2 From 2217f045be820bedaf18c5c196f20102edaace53 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 10 Dec 2011 18:13:52 +0300 Subject: Fix language switching in windows. --- src/client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/client.cpp b/src/client.cpp index fefb5bc71..d2b26f662 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -295,7 +295,7 @@ Client::Client(const Options &options): #if ENABLE_NLS std::string lang = config.getValue("lang", ""); #ifdef WIN32 - if (!lang.empty()) + if (lang.empty()) lang = std::string(_nl_locale_name_default()); putenv((char*)("LANG=" + lang).c_str()); -- cgit v1.2.3-70-g09d2 From 386650285cecf90a0b77ac3dd5e3548148ca9182 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 11 Dec 2011 03:15:43 +0300 Subject: Fix compilation warning. --- src/utils/copynpaste.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 5105d38e5..3e9e09a5c 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -413,6 +413,7 @@ bool sendBuffer(std::string& text) { runxsel(text, "-i"); runxsel(text, "-b", "-i"); + return true; } bool runxsel(std::string& text, const char *p1, const char *p2) -- cgit v1.2.3-70-g09d2 From c3c14c092bf1038d766dd969561a83515554d844 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 14 Dec 2011 02:58:34 +0300 Subject: Add last login time to char selection dialog. --- src/gui/charselectdialog.cpp | 2 ++ src/gui/charselectdialog.h | 1 + src/net/ea/loginhandler.cpp | 6 +++++- src/net/logindata.h | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 15d1e6e0e..401c9ae33 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -135,6 +135,7 @@ CharSelectDialog::CharSelectDialog(LoginData *data): setCloseButton(false); mAccountNameLabel = new Label(mLoginData->username); + mLastLoginLabel = new Label(mLoginData->lastLogin); mSwitchLoginButton = new Button(_("Switch Login"), "switch", this); mChangePasswordButton = new Button(_("Change Password"), "change_password", this); @@ -145,6 +146,7 @@ CharSelectDialog::CharSelectDialog(LoginData *data): placer = getPlacer(0, 0); placer(0, 0, mAccountNameLabel, 2); + placer(2, 0, mLastLoginLabel); placer(0, 1, mSwitchLoginButton); if (optionalActions & Net::LoginHandler::Unregister) diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 0dfe90733..9ebab0126 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -100,6 +100,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener, bool mLocked; gcn::Label *mAccountNameLabel; + gcn::Label *mLastLoginLabel; gcn::Button *mSwitchLoginButton; gcn::Button *mChangePasswordButton; diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index b11e60d4d..420236cfd 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -168,7 +168,11 @@ void LoginHandler::processLoginData(Net::MessageIn &msg) mToken.session_ID1 = msg.readInt32(); mToken.account_ID = msg.readInt32(); mToken.session_ID2 = msg.readInt32(); - msg.skip(30); // unknown + msg.skip(4); // old ip + loginData.lastLogin = msg.readString(24); + msg.skip(2); // unused bytes + +// msg.skip(30); // unknown // reserve bits for future usage mToken.sex = (msg.readInt8() & 1) ? GENDER_MALE : GENDER_FEMALE; diff --git a/src/net/logindata.h b/src/net/logindata.h index 647a04abf..6433d2759 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -59,6 +59,7 @@ class LoginData std::string password; std::string newPassword; std::string updateHost; + std::string lastLogin; int updateType; std::string email; @@ -82,6 +83,7 @@ class LoginData email.clear(); captchaResponse.clear(); gender = GENDER_UNSPECIFIED; + lastLogin.clear(); resetCharacterSlots(); } /** -- cgit v1.2.3-70-g09d2 From 6669764210df9526471d22101514e40cd118fee6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 14 Dec 2011 04:08:52 +0300 Subject: Fix increasing log file if client was disconnected from network. --- src/game.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/game.cpp b/src/game.cpp index 2937d6bb7..c7c50dd9c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -551,9 +551,9 @@ void Game::logic() if (Client::getState() != STATE_ERROR) { - errorMessage = _("The connection to the server was lost."); if (!disconnectedDialog) { + errorMessage = _("The connection to the server was lost."); disconnectedDialog = new OkDialog(_("Network Error"), errorMessage, false); disconnectedDialog->addActionListener(&errorListener); @@ -561,14 +561,19 @@ void Game::logic() } } - if (viewport) + if (viewport && !errorMessage.empty()) { Map *map = viewport->getCurrentMap(); if (map) + { + logger->log("state: %d", Client::getState()); map->saveExtraLayer(); + } } closeDialogs(); Client::setFramerate(config.getIntValue("fpslimit")); + if (Client::getState() != STATE_ERROR) + errorMessage = ""; } else { -- cgit v1.2.3-70-g09d2 From 3fbd84495797ad9be97753e541cb82799de2f1c9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 14 Dec 2011 04:12:40 +0300 Subject: Fix memory leak in reading evol online list. --- src/net/tmwa/playerhandler.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index c678fe09d..4534cca8b 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -240,6 +240,7 @@ void PlayerHandler::processOnlineList(Net::MessageIn &msg) if (whoIsOnline) whoIsOnline->loadList(arr); + delete [] start; } } // namespace TmwAthena -- cgit v1.2.3-70-g09d2 From e960fdb61ed728cd5e8f2f716ebe68ed44a593bb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 16 Dec 2011 01:43:23 +0300 Subject: Fix blocking some chars in inventory/storage input box. --- src/game.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/game.cpp b/src/game.cpp index c7c50dd9c..9245e213d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1092,6 +1092,7 @@ bool Game::handleSwitchKeys(SDL_Event &event, bool &used) gcn::Window *requestedWindow = nullptr; if (!NpcDialog::isAnyInputFocused() + && !InventoryWindow::isAnyInputFocused() && !keyboard.isKeyActive(keyboard.KEY_TARGET) && !keyboard.isKeyActive(keyboard.KEY_UNTARGET)) { -- cgit v1.2.3-70-g09d2 From ba997be747666c74c46c734cb636a8de84c582b3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 Dec 2011 16:42:27 +0300 Subject: Move target cursors to themes. Remove old unused target cursors. --- data/graphics/CMakeLists.txt | 9 --------- data/graphics/Makefile.am | 9 --------- data/graphics/gui/CMakeLists.txt | 12 ++++++------ data/graphics/gui/Makefile.am | 12 ++++++------ data/graphics/gui/target-cursor-blue-l.png | Bin 23803 -> 0 bytes data/graphics/gui/target-cursor-blue-m.png | Bin 18439 -> 0 bytes data/graphics/gui/target-cursor-blue-s.png | Bin 8353 -> 0 bytes data/graphics/gui/target-cursor-in-range-l.png | Bin 0 -> 23803 bytes data/graphics/gui/target-cursor-in-range-m.png | Bin 0 -> 18439 bytes data/graphics/gui/target-cursor-in-range-s.png | Bin 0 -> 8353 bytes data/graphics/gui/target-cursor-normal-l.png | Bin 0 -> 25586 bytes data/graphics/gui/target-cursor-normal-m.png | Bin 0 -> 17950 bytes data/graphics/gui/target-cursor-normal-s.png | Bin 0 -> 8361 bytes data/graphics/gui/target-cursor-red-l.png | Bin 25586 -> 0 bytes data/graphics/gui/target-cursor-red-m.png | Bin 17950 -> 0 bytes data/graphics/gui/target-cursor-red-s.png | Bin 8361 -> 0 bytes data/graphics/target-cursor-in-range-l.png | Bin 23803 -> 0 bytes data/graphics/target-cursor-in-range-m.png | Bin 18439 -> 0 bytes data/graphics/target-cursor-in-range-s.png | Bin 8353 -> 0 bytes data/graphics/target-cursor-normal-l.png | Bin 25586 -> 0 bytes data/graphics/target-cursor-normal-m.png | Bin 17950 -> 0 bytes data/graphics/target-cursor-normal-s.png | Bin 8361 -> 0 bytes packaging/windows/setup.nsi | 2 -- src/actorsprite.cpp | 6 +++--- 24 files changed, 15 insertions(+), 35 deletions(-) delete mode 100644 data/graphics/gui/target-cursor-blue-l.png delete mode 100644 data/graphics/gui/target-cursor-blue-m.png delete mode 100644 data/graphics/gui/target-cursor-blue-s.png create mode 100644 data/graphics/gui/target-cursor-in-range-l.png create mode 100644 data/graphics/gui/target-cursor-in-range-m.png create mode 100644 data/graphics/gui/target-cursor-in-range-s.png create mode 100644 data/graphics/gui/target-cursor-normal-l.png create mode 100644 data/graphics/gui/target-cursor-normal-m.png create mode 100644 data/graphics/gui/target-cursor-normal-s.png delete mode 100644 data/graphics/gui/target-cursor-red-l.png delete mode 100644 data/graphics/gui/target-cursor-red-m.png delete mode 100644 data/graphics/gui/target-cursor-red-s.png delete mode 100644 data/graphics/target-cursor-in-range-l.png delete mode 100644 data/graphics/target-cursor-in-range-m.png delete mode 100644 data/graphics/target-cursor-in-range-s.png delete mode 100644 data/graphics/target-cursor-normal-l.png delete mode 100644 data/graphics/target-cursor-normal-m.png delete mode 100644 data/graphics/target-cursor-normal-s.png (limited to 'src') diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt index a46ccfd0e..5a9b0f65b 100644 --- a/data/graphics/CMakeLists.txt +++ b/data/graphics/CMakeLists.txt @@ -1,12 +1,3 @@ ADD_SUBDIRECTORY(gui) ADD_SUBDIRECTORY(images) ADD_SUBDIRECTORY(sprites) - -SET (FILES - target-cursor-in-range-l.png - target-cursor-in-range-m.png - target-cursor-in-range-s.png - target-cursor-normal-l.png - target-cursor-normal-m.png - target-cursor-normal-s.png - ) diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am index d2f93f584..c0e91d050 100644 --- a/data/graphics/Makefile.am +++ b/data/graphics/Makefile.am @@ -1,16 +1,7 @@ graphicsdir = $(pkgdatadir)/data/graphics -graphics_DATA = \ - target-cursor-in-range-l.png \ - target-cursor-in-range-m.png \ - target-cursor-in-range-s.png \ - target-cursor-normal-l.png \ - target-cursor-normal-m.png \ - target-cursor-normal-s.png - EXTRA_DIST = \ - $(graphics_DATA) \ CMakeLists.txt SUBDIRS = gui images sprites diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 2c6e4b933..aba42b39c 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -33,12 +33,12 @@ SET (FILES tab.png tab_hilight.png tabselected.png - target-cursor-blue-l.png - target-cursor-blue-m.png - target-cursor-blue-s.png - target-cursor-red-l.png - target-cursor-red-m.png - target-cursor-red-s.png + target-cursor-in-range-l.png + target-cursor-in-range-m.png + target-cursor-in-range-s.png + target-cursor-normal-l.png + target-cursor-normal-m.png + target-cursor-normal-s.png unknown-item.png vscroll_down_default.png vscroll_down_highlight.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index 388d01663..7fb82f545 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -36,12 +36,12 @@ gui_DATA = \ tab.png \ tab_hilight.png \ tabselected.png \ - target-cursor-blue-l.png \ - target-cursor-blue-m.png \ - target-cursor-blue-s.png \ - target-cursor-red-l.png \ - target-cursor-red-m.png \ - target-cursor-red-s.png \ + target-cursor-in-range-l.png \ + target-cursor-in-range-m.png \ + target-cursor-in-range-s.png \ + target-cursor-normal-l.png \ + target-cursor-normal-m.png \ + target-cursor-normal-s.png \ unknown-item.png \ vscroll_down_default.png \ vscroll_down_highlight.png \ diff --git a/data/graphics/gui/target-cursor-blue-l.png b/data/graphics/gui/target-cursor-blue-l.png deleted file mode 100644 index 77cdf4b6d..000000000 Binary files a/data/graphics/gui/target-cursor-blue-l.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-blue-m.png b/data/graphics/gui/target-cursor-blue-m.png deleted file mode 100644 index c0107357a..000000000 Binary files a/data/graphics/gui/target-cursor-blue-m.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-blue-s.png b/data/graphics/gui/target-cursor-blue-s.png deleted file mode 100644 index 3e81c75de..000000000 Binary files a/data/graphics/gui/target-cursor-blue-s.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-in-range-l.png b/data/graphics/gui/target-cursor-in-range-l.png new file mode 100644 index 000000000..77cdf4b6d Binary files /dev/null and b/data/graphics/gui/target-cursor-in-range-l.png differ diff --git a/data/graphics/gui/target-cursor-in-range-m.png b/data/graphics/gui/target-cursor-in-range-m.png new file mode 100644 index 000000000..c0107357a Binary files /dev/null and b/data/graphics/gui/target-cursor-in-range-m.png differ diff --git a/data/graphics/gui/target-cursor-in-range-s.png b/data/graphics/gui/target-cursor-in-range-s.png new file mode 100644 index 000000000..3e81c75de Binary files /dev/null and b/data/graphics/gui/target-cursor-in-range-s.png differ diff --git a/data/graphics/gui/target-cursor-normal-l.png b/data/graphics/gui/target-cursor-normal-l.png new file mode 100644 index 000000000..76d2101b1 Binary files /dev/null and b/data/graphics/gui/target-cursor-normal-l.png differ diff --git a/data/graphics/gui/target-cursor-normal-m.png b/data/graphics/gui/target-cursor-normal-m.png new file mode 100644 index 000000000..e2ab79c29 Binary files /dev/null and b/data/graphics/gui/target-cursor-normal-m.png differ diff --git a/data/graphics/gui/target-cursor-normal-s.png b/data/graphics/gui/target-cursor-normal-s.png new file mode 100644 index 000000000..09195f440 Binary files /dev/null and b/data/graphics/gui/target-cursor-normal-s.png differ diff --git a/data/graphics/gui/target-cursor-red-l.png b/data/graphics/gui/target-cursor-red-l.png deleted file mode 100644 index 76d2101b1..000000000 Binary files a/data/graphics/gui/target-cursor-red-l.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-red-m.png b/data/graphics/gui/target-cursor-red-m.png deleted file mode 100644 index e2ab79c29..000000000 Binary files a/data/graphics/gui/target-cursor-red-m.png and /dev/null differ diff --git a/data/graphics/gui/target-cursor-red-s.png b/data/graphics/gui/target-cursor-red-s.png deleted file mode 100644 index 09195f440..000000000 Binary files a/data/graphics/gui/target-cursor-red-s.png and /dev/null differ diff --git a/data/graphics/target-cursor-in-range-l.png b/data/graphics/target-cursor-in-range-l.png deleted file mode 100644 index 77cdf4b6d..000000000 Binary files a/data/graphics/target-cursor-in-range-l.png and /dev/null differ diff --git a/data/graphics/target-cursor-in-range-m.png b/data/graphics/target-cursor-in-range-m.png deleted file mode 100644 index c0107357a..000000000 Binary files a/data/graphics/target-cursor-in-range-m.png and /dev/null differ diff --git a/data/graphics/target-cursor-in-range-s.png b/data/graphics/target-cursor-in-range-s.png deleted file mode 100644 index 3e81c75de..000000000 Binary files a/data/graphics/target-cursor-in-range-s.png and /dev/null differ diff --git a/data/graphics/target-cursor-normal-l.png b/data/graphics/target-cursor-normal-l.png deleted file mode 100644 index 76d2101b1..000000000 Binary files a/data/graphics/target-cursor-normal-l.png and /dev/null differ diff --git a/data/graphics/target-cursor-normal-m.png b/data/graphics/target-cursor-normal-m.png deleted file mode 100644 index e2ab79c29..000000000 Binary files a/data/graphics/target-cursor-normal-m.png and /dev/null differ diff --git a/data/graphics/target-cursor-normal-s.png b/data/graphics/target-cursor-normal-s.png deleted file mode 100644 index 09195f440..000000000 Binary files a/data/graphics/target-cursor-normal-s.png and /dev/null differ diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index ebb2002a1..9767cf685 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -268,8 +268,6 @@ Section "Core files (required)" SecCore File "${SRCDIR}\README.txt" SetOutPath "$INSTDIR\data\fonts" File "${SRCDIR}\data\fonts\*.ttf" - SetOutPath "$INSTDIR\data\graphics" - File "${SRCDIR}\data\graphics\*.png" SetOutPath "$INSTDIR\data\graphics\gui" File "${SRCDIR}\data\graphics\gui\*.png" File "${SRCDIR}\data\graphics\gui\*.xml" diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index 2a92cf506..a0fafbbf9 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -437,7 +437,7 @@ static const char *cursorSize(int size) void ActorSprite::initTargetCursor() { - static std::string targetCursorFile = "graphics/target-cursor-%s-%s.png"; + static std::string targetCursorFile = "target-cursor-%s-%s.png"; static int targetWidths[NUM_TC] = {44, 62, 82}; static int targetHeights[NUM_TC] = {35, 44, 60}; @@ -479,8 +479,8 @@ void ActorSprite::loadTargetCursor(const std::string &filename, if (size < TC_SMALL || size >= NUM_TC) return; - ResourceManager *resman = ResourceManager::getInstance(); - ImageSet *currentImageSet = resman->getImageSet(filename, width, height); + ImageSet *currentImageSet = Theme::getImageSetFromTheme( + filename, width, height); if (!currentImageSet) { -- cgit v1.2.3-70-g09d2 From 722404ad29f268ef8861c62b038c4e14652c7555 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 18 Dec 2011 17:19:28 +0300 Subject: Ad comments for "unused" data from server packets. Fix some guild and worlds packets. --- src/net/ea/gamehandler.cpp | 2 +- src/net/ea/guildhandler.cpp | 13 +++++++------ src/net/ea/loginhandler.cpp | 9 +++++---- src/net/ea/partyhandler.cpp | 4 ++-- src/net/ea/specialhandler.cpp | 4 ++-- src/net/tmwa/charserverhandler.cpp | 4 ++-- src/net/tmwa/loginhandler.cpp | 2 +- 7 files changed, 20 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index b74f2384d..a43c159e3 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -73,7 +73,7 @@ void GameHandler::processMapLogin(Net::MessageIn &msg) Uint16 x, y; msg.readInt32(); // server tick msg.readCoordinates(x, y, direction); - msg.skip(2); // unknown + msg.skip(2); // 0x0505 logger->log("Protocol: Player start position: (%d, %d)," " Direction: %d", x, y, direction); // Switch now or we'll have problems diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 907fa13db..49df76f97 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -168,7 +168,7 @@ void GuildHandler::processGuildBasicInfo(Net::MessageIn &msg) int avgLevel = msg.readInt32(); // Average level int exp = msg.readInt32(); // Exp int nextExp = msg.readInt32(); // Next exp - msg.skip(16); // unused + msg.skip(16); // 0 unused std::string name = msg.readString(24); // Name std::string master = msg.readString(24); // Master's name std::string castle = msg.readString(20); // Castles @@ -242,7 +242,7 @@ void GuildHandler::processGuildMemberList(Net::MessageIn &msg) int exp = msg.readInt32(); // Exp int online = msg.readInt32(); // Online int pos = msg.readInt32(); // Position - msg.skip(50); // unused + msg.skip(50); // 0 unused std::string name = msg.readString(24); // Name GuildMember *m = taGuild->addMember(id, charId, name); @@ -371,11 +371,11 @@ void GuildHandler::processGuildSkillInfo(Net::MessageIn &msg) { msg.readInt16(); // ID msg.readInt16(); // 'Info' (unknown atm) - msg.readInt16(); // unused + msg.readInt16(); // 0 unused msg.readInt16(); // Level msg.readInt16(); // SP msg.readInt16(); // 'Range' - msg.skip(24); // unused + msg.skip(24); // 0 unused msg.readInt8(); // Can be increased } } @@ -479,9 +479,10 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) { + msg.skip(2); // size (can be many explusions in list) std::string nick = msg.readString(24); // Name (of expulsed?) - msg.readString(40); // Message - msg.skip(24); // unused ("dummy") + msg.skip(24); // acc + msg.readString(44); // Message if (taGuild) taGuild->removeMember(nick); diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 420236cfd..a23c83b63 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -159,7 +159,7 @@ void LoginHandler::processUpdateHost(Net::MessageIn &msg) void LoginHandler::processLoginData(Net::MessageIn &msg) { // Skip the length word - msg.skip(2); + msg.skip(2); // size clearWorlds(); @@ -170,7 +170,7 @@ void LoginHandler::processLoginData(Net::MessageIn &msg) mToken.session_ID2 = msg.readInt32(); msg.skip(4); // old ip loginData.lastLogin = msg.readString(24); - msg.skip(2); // unused bytes + msg.skip(2); // 0 unused bytes // msg.skip(30); // unknown // reserve bits for future usage @@ -183,10 +183,11 @@ void LoginHandler::processLoginData(Net::MessageIn &msg) world->address = msg.readInt32(); world->port = msg.readInt16(); world->name = msg.readString(20); - world->online_users = msg.readInt32(); + world->online_users = msg.readInt16(); config.setValue("updatehost", mUpdateHost); world->updateHost = mUpdateHost; - msg.skip(2); // unknown + msg.skip(2); // maintenance + msg.skip(2); // new logger->log("Network: Server: %s (%s:%d)", world->name.c_str(), ipToString(world->address), world->port); diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 8373cb1c4..556e72c8d 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -320,7 +320,7 @@ void PartyHandler::processPartyMove(Net::MessageIn &msg) m = Ea::taParty->getMember(id); if (m) { - msg.skip(4); + msg.skip(4); // 0 m->setX(msg.readInt16()); // x m->setY(msg.readInt16()); // y m->setOnline(msg.readInt8()); // online (if 0) @@ -330,7 +330,7 @@ void PartyHandler::processPartyMove(Net::MessageIn &msg) } else { - msg.skip(4); + msg.skip(4); // 0 msg.readInt16(); // x msg.readInt16(); // y msg.readInt8(); // online (if 0) diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp index fe56db52a..4abcb004e 100644 --- a/src/net/ea/specialhandler.cpp +++ b/src/net/ea/specialhandler.cpp @@ -87,11 +87,11 @@ void SpecialHandler::processPlayerSkills(Net::MessageIn &msg) { int skillId = msg.readInt16(); msg.readInt16(); // target type - msg.skip(2); // unused + msg.skip(2); // skill pool flags int level = msg.readInt16(); msg.readInt16(); // sp msg.readInt16(); // range - msg.skip(24); // unused + msg.skip(24); // 0 unused int up = msg.readInt8(); PlayerInfo::setStatBase(skillId, level); diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 69f7165ec..d08e4a091 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -190,7 +190,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, msg.readInt32(); // option msg.readInt32(); // karma msg.readInt32(); // manner - msg.skip(2); // unknown + msg.readInt16(); // character points left character->data.mAttributes[HP] = msg.readInt16(); character->data.mAttributes[MAX_HP] = msg.readInt16(); @@ -347,7 +347,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) loginData.characterSlots = static_cast(slots); bool version = msg.readInt8() == 1 && serverVersion > 0; - msg.skip(17); // Unused + msg.skip(17); // 0 Unused delete_all(mCharacters); mCharacters.clear(); diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index bdc944d63..fba33297d 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -154,7 +154,7 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg) { unsigned int options = msg.readInt8(); mRegistrationEnabled = options; - msg.skip(2); + msg.skip(2); // 0 unused serverVersion = msg.readInt8(); } else -- cgit v1.2.3-70-g09d2 From e9a9f2592c9d8919550c46a15f0b43a6bc230422 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 21 Dec 2011 21:46:41 +0300 Subject: Dont load move type from config. --- src/localplayer.cpp | 12 +++++++----- src/localplayer.h | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index c83082a44..5935dd140 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -156,7 +156,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): mLastTargetX = 0; mLastTargetY = 0; - mInvertDirection = config.getIntValue("invertMoveDirection"); + mInvertDirection = 0; mCrazyMoveType = config.getIntValue("crazyMoveType"); mCrazyMoveState = 0; mAttackWeaponType = config.getIntValue("attackWeaponType"); @@ -1866,12 +1866,14 @@ void LocalPlayer::moveToHome() static const unsigned invertDirectionSize = 5; void LocalPlayer::changeMode(unsigned *var, unsigned limit, const char *conf, - std::string (LocalPlayer::*func)(), unsigned def) + std::string (LocalPlayer::*func)(), unsigned def, + bool save) { (*var) ++; if (*var >= limit) *var = def; - config.setValue(conf, *var); + if (save) + config.setValue(conf, *var); if (miniStatusWindow) miniStatusWindow->updateStatus(); const std::string str = (this->*func)(); @@ -1883,7 +1885,7 @@ void LocalPlayer::invertDirection() { mMoveState = 0; changeMode(&mInvertDirection, invertDirectionSize, "invertMoveDirection", - &LocalPlayer::getInvertDirectionString); + &LocalPlayer::getInvertDirectionString, 0, false); } static const char *invertDirectionStrings[] = @@ -4122,7 +4124,7 @@ void LocalPlayer::checkNewName(Being *being) void LocalPlayer::resetYellowBar() { - mInvertDirection = config.resetIntValue("invertMoveDirection"); + mInvertDirection = 0; mCrazyMoveType = config.resetIntValue("crazyMoveType"); mMoveToTargetType = config.resetIntValue("moveToTargetType"); mFollowMode = config.resetIntValue("followMode"); diff --git a/src/localplayer.h b/src/localplayer.h index 5b755e4f6..77e25e291 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -523,7 +523,8 @@ class LocalPlayer : public Being, public ActorSpriteListener, const char *getVarItem(const char **arr, unsigned index, unsigned sz); void changeMode(unsigned *var, unsigned limit, const char *conf, - std::string (LocalPlayer::*func)(), unsigned def = 0); + std::string (LocalPlayer::*func)(), unsigned def = 0, + bool save = true); void crazyMove1(); void crazyMove2(); -- cgit v1.2.3-70-g09d2 From 2ad5d25e30d7247d67a4784a6cb9e96245643960 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 22 Dec 2011 22:18:06 +0300 Subject: Fix create char dialog size and widgets positions. --- src/gui/charcreatedialog.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index d621caa96..42b54df05 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -124,24 +124,24 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot): mAttributesLeft = new Label( strprintf(_("Please distribute %d points"), 99)); - int w = 200; + int w = 280; int h = 330; setContentSize(w, h); - mPlayerBox->setDimension(gcn::Rectangle(80, 30, 110, 85)); + mPlayerBox->setDimension(gcn::Rectangle(145, 35, 110, 87)); mNameLabel->setPosition(5, 5); mNameField->setDimension( - gcn::Rectangle(45, 5, w - 45 - 7, mNameField->getHeight())); - mPrevHairColorButton->setPosition(90, 35); - mNextHairColorButton->setPosition(165, 35); + gcn::Rectangle(60, 5, w - 60 - 7, mNameField->getHeight())); + mPrevHairColorButton->setPosition(155, 35); + mNextHairColorButton->setPosition(230, 35); mHairColorLabel->setPosition(5, 40); - mPrevHairStyleButton->setPosition(90, 64); - mNextHairStyleButton->setPosition(165, 64); + mPrevHairStyleButton->setPosition(155, 64); + mNextHairStyleButton->setPosition(230, 64); mHairStyleLabel->setPosition(5, 70); if (serverVersion >= 2) { - mPrevRaceButton->setPosition(90, 93); - mNextRaceButton->setPosition(165, 93); + mPrevRaceButton->setPosition(155, 93); + mNextRaceButton->setPosition(230, 93); mRaceLabel->setPosition(5, 100); } @@ -365,17 +365,18 @@ void CharCreateDialog::setAttributes(const std::vector &labels, mAttributeLabel[i] = new Label(labels[i]); mAttributeLabel[i]->setWidth(70); mAttributeLabel[i]->setPosition(5, 140 + i*20); + mAttributeLabel[i]->adjustSize(); add(mAttributeLabel[i]); mAttributeSlider[i] = new Slider(min, max); - mAttributeSlider[i]->setDimension(gcn::Rectangle(75, 140 + i * 20, + mAttributeSlider[i]->setDimension(gcn::Rectangle(140, 140 + i * 20, 100, 10)); mAttributeSlider[i]->setActionEventId("statslider"); mAttributeSlider[i]->addActionListener(this); add(mAttributeSlider[i]); mAttributeValue[i] = new Label(toString(min)); - mAttributeValue[i]->setPosition(180, 140 + i*20); + mAttributeValue[i]->setPosition(245, 140 + i*20); add(mAttributeValue[i]); } -- cgit v1.2.3-70-g09d2 From a901facc32f489dbce6f9193f618d9d46a91f32c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 23 Dec 2011 00:27:06 +0300 Subject: Probably fix auto adjusting perfomance after going from sleep mode. --- src/client.cpp | 8 ++++++++ src/client.h | 2 ++ src/game.cpp | 30 ++++++++++++++++++------------ 3 files changed, 28 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/client.cpp b/src/client.cpp index d2b26f662..b5cbffd40 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2238,6 +2238,14 @@ void Client::setFramerate(int fpsLimit) SDL_setFramerate(&instance()->mFpsManager, fpsLimit); } +int Client::getFramerate() +{ + if (!instance()->mLimitFps) + return 0; + + return SDL_getFramerate(&instance()->mFpsManager); +} + void Client::closeDialogs() { Net::getNpcHandler()->clearDialogs(); diff --git a/src/client.h b/src/client.h index 3bcc5f597..fcb14a660 100644 --- a/src/client.h +++ b/src/client.h @@ -256,6 +256,8 @@ public: static void setFramerate(int fpsLimit); + static int getFramerate(); + static bool isTmw(); void optionChanged(const std::string &name); diff --git a/src/game.cpp b/src/game.cpp index 9245e213d..c40a7da59 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -572,6 +572,7 @@ void Game::logic() } closeDialogs(); Client::setFramerate(config.getIntValue("fpslimit")); + mNextAdjustTime = cur_time + adjustDelay; if (Client::getState() != STATE_ERROR) errorMessage = ""; } @@ -603,7 +604,10 @@ void Game::adjustPerfomance() return; } - int maxFps = config.getIntValue("fpslimit"); + int maxFps = Client::getFramerate(); + if (maxFps != config.getIntValue("fpslimit")) + return; + if (!maxFps) maxFps = 30; else if (maxFps < 10) @@ -1579,7 +1583,6 @@ void Game::handleActive(SDL_Event &event) player_node->setHalfAway(true); } } - Client::setFramerate(fpsLimit); } if (player_node) player_node->updateName(); @@ -1589,19 +1592,22 @@ void Game::handleActive(SDL_Event &event) if (event.active.state & SDL_APPMOUSEFOCUS) Client::setMouseFocused(event.active.gain); - if (player_node && player_node->getAway()) + if (!fpsLimit) { - if (Client::getInputFocused() || Client::getMouseFocused()) - fpsLimit = config.getIntValue("fpslimit"); + if (player_node && player_node->getAway()) + { + if (Client::getInputFocused() || Client::getMouseFocused()) + fpsLimit = config.getIntValue("fpslimit"); + else + fpsLimit = config.getIntValue("altfpslimit"); + } else - fpsLimit = config.getIntValue("altfpslimit"); - Client::setFramerate(fpsLimit); - } - else - { - fpsLimit = config.getIntValue("fpslimit"); - Client::setFramerate(fpsLimit); + { + fpsLimit = config.getIntValue("fpslimit"); + } } + Client::setFramerate(fpsLimit); + mNextAdjustTime = cur_time + adjustDelay; } /** -- cgit v1.2.3-70-g09d2 From 7cff9f7777dcfdaae8cc7b982740131d80ba75c1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 23 Dec 2011 01:46:27 +0300 Subject: Fix code style and some auto checked errors. --- src/commandhandler.cpp | 1 - src/gui/popupmenu.cpp | 2 +- src/gui/socialwindow.cpp | 4 ++-- src/net/download.cpp | 1 - src/resources/image.cpp | 4 ++-- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 862ac56b4..04ef1b3f4 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -406,7 +406,6 @@ void CommandHandler::handleParty(const std::string &args, ChatTab *tab) void CommandHandler::handleMe(const std::string &args, ChatTab *tab) { - const std::string str = strprintf("*%s*", args.c_str()); outString(tab, strprintf("*%s*", args.c_str()), args); } diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 15afc7600..283fcb99e 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -367,7 +367,7 @@ void PopupMenu::showPopup(int x, int y, std::vector &beings) being->getId(), (being->getName() + being->getGenderSignWithSpace()).c_str())); } - else if(actor->getType() == ActorSprite::FLOOR_ITEM) + else if (actor->getType() == ActorSprite::FLOOR_ITEM) { FloorItem *floorItem = static_cast(actor); const ItemInfo &info = floorItem->getInfo(); diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 2bc8aba9b..72dd2104d 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -848,11 +848,11 @@ public: std::vector *avatars = mBeings->getMembers(); - std::vector::iterator i = avatars->begin(); - if (!avatars) return; + std::vector::iterator i = avatars->begin(); + while (i != avatars->end()) { Avatar *ava = (*i); diff --git a/src/net/download.cpp b/src/net/download.cpp index 5141c022e..21881471b 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -180,7 +180,6 @@ int Download::downloadProgress(void *clientp, double dltotal, double dlnow, return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_CANCELLED, static_cast(dltotal), static_cast(dlnow)); - return -5; } return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_IDLE, diff --git a/src/resources/image.cpp b/src/resources/image.cpp index df07c16a2..4cdcdb001 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -473,10 +473,10 @@ Image* Image::SDLmerge(Image *image, int x, int y) static_cast(mBounds.h - y)); // for each pixel lines of a source image - for (offset_x = (x > 0 ? 0 : -x); offset_x < maxX; offset_x++) + for (offset_x = ((x > 0) ? 0 : -x); offset_x < maxX; offset_x++) { const int x1 = x0 + offset_x; - for (offset_y = (y > 0 ? 0 : -y); offset_y < maxY; offset_y++) + for (offset_y = ((y > 0) ? 0 : -y); offset_y < maxY; offset_y++) { // Computing offset on both images current_offset = (offset_y * getWidth()) + x1; -- cgit v1.2.3-70-g09d2 From 0ed89100d57c26d734790a104558244e67361073 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 24 Dec 2011 02:02:15 +0300 Subject: Fix compilation with external guichan. --- src/gui/whoisonline.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h index 112ad35ba..ade391d5a 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/whoisonline.h @@ -26,6 +26,7 @@ #include #include +#include #include "configlistener.h" -- cgit v1.2.3-70-g09d2 From 25d24557ed6410ce607fe3ee4560816625170c3d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 24 Dec 2011 15:03:39 +0300 Subject: Change version to 1.1.12.25 --- ChangeLog | 12 ++++++++++++ README | 2 +- README.txt | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 6 files changed, 18 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 561216655..302db3bb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-12-25 New release 1.1.12.25 +fix: increasing log file if client disconnected from network. +fix: memory leak in evol online list. +fix: enter some chars in inventory input box. +fix: some rare used packets. +fix: dont load move type from configuration file. +fix: create char dialog size. +fix: wrong auto adjusting perfomance after sleep mode. +add: last login time in char selection dialog. +add: update mplus font. +add: move target cursors to themes. + 2011-12-11 New release 1.1.12.11 fix: draw damage part on hp bar. fix: recursive directory creation on windows. diff --git a/README b/README index 3c0aaf967..2c043395e 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.12.11 Date: 2011-12-11 + Version: 1.1.12.25 Date: 2011-12-25 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index c5251f9e4..4982c709e 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.12.11 Date: 2011-12-11 + Version: 1.1.12.25 Date: 2011-12-25 Development team: - See AUTHORS file for a list diff --git a/build/packwin b/build/packwin index 077104227..873d7a123 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.12.11" \ + -DPRODUCT_VERSION="1.1.12.25" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index bc6106248..291c82258 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.12.11], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.12.25], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/main.h b/src/main.h index 8d6b531fd..c772bf6d7 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.1.12.11" -#define CHECK_VERSION "01.01.12.11" +#define SMALL_VERSION "1.1.12.25" +#define CHECK_VERSION "01.01.12.25" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2 From 3b8e75c9e1ed6f9647849f855cc069287c31c291 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 25 Dec 2011 15:23:14 +0300 Subject: Allow close npc dialog if server script working incorrectly. --- src/gui/npcdialog.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 66a30c8a7..1b0193c65 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -48,7 +48,7 @@ #include "debug.h" -#define CAPTION_WAITING _("Waiting for server") +#define CAPTION_WAITING _("Stop waiting") #define CAPTION_NEXT _("Next") #define CAPTION_CLOSE _("Close") #define CAPTION_SUBMIT _("Submit") @@ -222,7 +222,8 @@ void NpcDialog::action(const gcn::ActionEvent &event) nextDialog(); addText(_("> Next"), false); } - else if (mActionState == NPC_ACTION_CLOSE) + else if (mActionState == NPC_ACTION_CLOSE + || mActionState == NPC_ACTION_WAIT) { closeDialog(); } @@ -501,8 +502,6 @@ void NpcDialog::buildLayout() Layout &layout = getLayout(); layout.setRowHeight(0, Layout::AUTO_SET); - mButton->setEnabled(mActionState != NPC_ACTION_WAIT); - redraw(); mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll()); -- cgit v1.2.3-70-g09d2 From 1f3217e483d05d4af612e8192598d7a0c111f93c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 26 Dec 2011 01:11:56 +0300 Subject: Fix -s command line parameter. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index b49b38300..281687809 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -84,7 +84,7 @@ static void printVersion() static void parseOptions(int argc, char *argv[], Client::Options &options) { - const char *optstring = "hvud:U:P:Dc:p:l:L:C:"; + const char *optstring = "hvud:U:P:Dc:p:l:L:C:s:"; const struct option long_options[] = { -- cgit v1.2.3-70-g09d2 From cf542c3602eae931066d8b6e46d90109c8b2c13e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 26 Dec 2011 01:35:34 +0300 Subject: Restore GL_PACK_ALIGNMENT after creating screenshots in opengl modes. --- src/opengl1graphics.cpp | 4 ++++ src/openglgraphics.cpp | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src') diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index 1f1a0231d..e8c972522 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -474,6 +474,7 @@ SDL_Surface* OpenGL1Graphics::getScreenshot() { int h = mTarget->h; int w = mTarget->w; + GLint pack = 1; SDL_Surface *screenshot = SDL_CreateRGBSurface( SDL_SWSURFACE, @@ -484,6 +485,7 @@ SDL_Surface* OpenGL1Graphics::getScreenshot() SDL_LockSurface(screenshot); // Grap the pixel buffer and write it to the SDL surface + glGetIntegerv(GL_PACK_ALIGNMENT, &pack); glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, screenshot->pixels); @@ -505,6 +507,8 @@ SDL_Surface* OpenGL1Graphics::getScreenshot() free(buf); + glPixelStorei(GL_PACK_ALIGNMENT, pack); + if (SDL_MUSTLOCK(screenshot)) SDL_UnlockSurface(screenshot); diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index f5e9f8107..a8eb5d010 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -1020,6 +1020,7 @@ SDL_Surface* OpenGLGraphics::getScreenshot() { int h = mTarget->h; int w = mTarget->w; + GLint pack = 1; SDL_Surface *screenshot = SDL_CreateRGBSurface( SDL_SWSURFACE, @@ -1033,6 +1034,7 @@ SDL_Surface* OpenGLGraphics::getScreenshot() SDL_LockSurface(screenshot); // Grap the pixel buffer and write it to the SDL surface + glGetIntegerv(GL_PACK_ALIGNMENT, &pack); glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, screenshot->pixels); @@ -1054,6 +1056,8 @@ SDL_Surface* OpenGLGraphics::getScreenshot() free(buf); + glPixelStorei(GL_PACK_ALIGNMENT, pack); + if (SDL_MUSTLOCK(screenshot)) SDL_UnlockSurface(screenshot); -- cgit v1.2.3-70-g09d2 From c322175764a915968f136d86fb038e2ace057d45 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 26 Dec 2011 23:44:13 +0300 Subject: Add clear current outfit option to outfits context menu. Removed load old outfits option. --- src/gui/outfitwindow.cpp | 9 +++++++++ src/gui/outfitwindow.h | 2 ++ src/gui/popupmenu.cpp | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index c33c753bc..6e68fad17 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -985,3 +985,12 @@ void OutfitWindow::setItemSelected(Item *item) mItemColorSelected = 1; } } + +void OutfitWindow::clearCurrentOutfit() +{ + for (unsigned f = 0; f < OUTFIT_ITEM_COUNT; f++) + { + mItems[mCurrentOutfit][f] = -1; + mItemColors[mCurrentOutfit][f] = 1; + } +} diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h index 8dd5fd6a3..105f5a0db 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/outfitwindow.h @@ -108,6 +108,8 @@ class OutfitWindow : public Window, gcn::ActionListener std::string keyName(int number) A_PURE; + void clearCurrentOutfit(); + private: Button *mPreviousButton; Button *mNextButton; diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 283fcb99e..7860f3c04 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -586,7 +586,7 @@ void PopupMenu::showOutfitsPopup(int x, int y) mBrowserBox->clearRows(); mBrowserBox->addRow(_("Outfits")); - mBrowserBox->addRow("load old outfits", _("Load old outfits")); + mBrowserBox->addRow("clear outfit", _("Clear outfit")); mBrowserBox->addRow("##3---"); mBrowserBox->addRow("cancel", _("Cancel")); @@ -1331,11 +1331,6 @@ void PopupMenu::handleLink(const std::string &link, mDialog->setActionEventId("ok"); mDialog->addActionListener(&mRenameListener); } - else if (link == "load old outfits") - { - if (outfitWindow) - outfitWindow->load(true); - } else if (link == "load old spells") { if (spellManager) @@ -1673,6 +1668,11 @@ void PopupMenu::handleLink(const std::string &link, showChangePos(getX(), getY()); return; } + else if (link == "clear outfit") + { + if (outfitWindow) + outfitWindow->clearCurrentOutfit(); + } else if (!link.compare(0, 10, "guild-pos-")) { if (player_node) -- cgit v1.2.3-70-g09d2 From cf90c52427fcb50a0ca6d967dbbd6eb30c131481 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 29 Dec 2011 19:06:17 +0300 Subject: Move sha256 files to manaserv only files. --- src/CMakeLists.txt | 4 ++-- src/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d281151e2..7ec0c8a19 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -450,8 +450,6 @@ SET(SRCS utils/mathutils.h utils/paths.cpp utils/paths.h - utils/sha256.cpp - utils/sha256.h utils/stringutils.cpp utils/stringutils.h utils/mutex.h @@ -794,6 +792,8 @@ SET(SRCS_MANASERV enet/utility.h enet/win32.c enet/win32.h + utils/sha256.cpp + utils/sha256.h net/manaserv/attributes.cpp net/manaserv/attributes.h net/manaserv/adminhandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index fce320166..c1db3e92b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -457,8 +457,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mkdir.h \ utils/paths.cpp \ utils/paths.h \ - utils/sha256.cpp \ - utils/sha256.h \ utils/specialfolder.cpp \ utils/specialfolder.h \ utils/stringutils.cpp \ @@ -620,6 +618,8 @@ manaplus_SOURCES += enet/callbacks.c \ enet/unix.h \ enet/utility.h \ enet/win32.h \ + utils/sha256.cpp \ + utils/sha256.h \ net/manaserv/attributes.cpp \ net/manaserv/attributes.h \ net/manaserv/adminhandler.cpp \ -- cgit v1.2.3-70-g09d2 From fcb727089413f5f5712703ba979bfa5595e069c9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 30 Dec 2011 00:34:15 +0300 Subject: Fix crash with status effects cleaning with more than one reconnection to server. --- src/statuseffect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index f7bffc31f..08309829d 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -37,7 +37,7 @@ #define STATUS_EFFECTS_FILE "status-effects.xml" -void unloadMap(std::map map); +void unloadMap(std::map &map); bool StatusEffect::mLoaded = false; @@ -187,7 +187,7 @@ void StatusEffect::load() mLoaded = true; } -void unloadMap(std::map map) +void unloadMap(std::map &map) { std::map::iterator it; -- cgit v1.2.3-70-g09d2 From 34e1023596c61c4dfd6279cde1f97b318e04e3fd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 1 Jan 2012 22:55:57 +0300 Subject: Add process execute functions. --- manaplus.cbp | 2 + src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/utils/process.cpp | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/utils/process.h | 29 +++++++++ 5 files changed, 206 insertions(+) create mode 100644 src/utils/process.cpp create mode 100644 src/utils/process.h (limited to 'src') diff --git a/manaplus.cbp b/manaplus.cbp index c888239c3..87be5de7a 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -670,6 +670,8 @@ + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7ec0c8a19..b7005b144 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -450,6 +450,8 @@ SET(SRCS utils/mathutils.h utils/paths.cpp utils/paths.h + utils/process.cpp + utils/process.h utils/stringutils.cpp utils/stringutils.h utils/mutex.h diff --git a/src/Makefile.am b/src/Makefile.am index c1db3e92b..527893598 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -457,6 +457,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mkdir.h \ utils/paths.cpp \ utils/paths.h \ + utils/process.cpp \ + utils/process.h \ utils/specialfolder.cpp \ utils/specialfolder.h \ utils/stringutils.cpp \ diff --git a/src/utils/process.cpp b/src/utils/process.cpp new file mode 100644 index 000000000..94967f8cc --- /dev/null +++ b/src/utils/process.cpp @@ -0,0 +1,171 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "utils/process.h" + +#include +#include +#include + +#include + +#include "debug.h" + +#include "localconsts.h" + +const int timeOut = 10; + +#ifdef WIN32 + +#include + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + if (!waitTime) + waitTime = timeOut; + + STARTUPINFO siStartupInfo; + PROCESS_INFORMATION piProcessInfo; + memset(&siStartupInfo, 0, sizeof(siStartupInfo)); + memset(&piProcessInfo, 0, sizeof(piProcessInfo)); + siStartupInfo.cb = sizeof(siStartupInfo); + DWORD ret = -1; + std::string args(pathName + " " + arg1); + if (!arg2.empty()) + args += " " + arg2; + + if (CreateProcess(pathName.c_str(), (char*)args.c_str(), 0, 0, false, + CREATE_DEFAULT_ERROR_MODE, 0, 0, &siStartupInfo, + &piProcessInfo) != false) + { + if (!WaitForSingleObject(piProcessInfo.hProcess, timeOut * 1000)) + { + if (GetExitCodeProcess(piProcessInfo.hProcess, &ret)) + { + CloseHandle(piProcessInfo.hProcess); + CloseHandle(piProcessInfo.hThread); + return ret; + } + } + TerminateProcess(piProcessInfo.hProcess, -1); + } + + CloseHandle(piProcessInfo.hProcess); + CloseHandle(piProcessInfo.hThread); + return -1; +} + +#elif defined(__APPLE__) + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + return -1; +} + +#elif defined __linux__ || defined __linux + +#include +#include + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + pid_t mon_pid; + int status; + + if (!waitTime) + waitTime = timeOut; + + if ((mon_pid = fork()) == -1) + { // fork error + return -1; + } + else if (!mon_pid) + { // monitoring child + pid_t pid; + if ((pid = fork()) == -1) + { // fork error + return -1; + } + else if (!pid) + { // work child + if (arg2.empty()) + { + execl(pathName.c_str(), name.c_str(), + arg1.c_str(), (char *)nullptr); + } + else + { + execl(pathName.c_str(), name.c_str(), + arg1.c_str(), arg2.c_str(), (char *)nullptr); + } + exit(0); + } + + // monitoring process + pid_t sleep_pid; + if ((sleep_pid = fork()) == -1) + { // fork error + return -1; + } + else if (!sleep_pid) + { // sleep pid + sleep (timeOut); +// printf ("time out\n"); + exit(-1); + } + + // monitoring process + pid_t exited_pid = wait(&status); + int ret = -1; + if (exited_pid == pid) + { + kill(sleep_pid, SIGKILL); + if (WIFEXITED(status)) + ret = WEXITSTATUS(status); + } + else + { + kill(pid, SIGKILL); + ret = -1; + } + wait(nullptr); + exit(ret); + } + + // monitoring parent + waitpid(mon_pid, &status, 0); + if (WIFEXITED(status)) + return WEXITSTATUS(status); + + return -1; +} + +#else + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime) +{ + return -1; +} + +#endif diff --git a/src/utils/process.h b/src/utils/process.h new file mode 100644 index 000000000..27a73ba20 --- /dev/null +++ b/src/utils/process.h @@ -0,0 +1,29 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_PROCESS_H +#define UTILS_PROCESS_H + +#include + +int execFile(std::string pathName, std::string name, + std::string arg1, std::string arg2, int waitTime = 0); + +#endif // UTILS_PROCESS_H -- cgit v1.2.3-70-g09d2 From a7aa62d82574128cba8fd3c10d29e2bbcfca305d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 4 Jan 2012 20:46:33 +0300 Subject: Allow play gui sound with incorrect paths configured. --- src/sound.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/sound.cpp b/src/sound.cpp index a573458ef..7448624dd 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -349,9 +349,13 @@ void Sound::playGuiSfx(const std::string &path) if (!mInstalled || path.empty() || !mPlayGui) return; + std::string tmpPath; + if (!path.compare(0, 4, "sfx/")) + tmpPath = path; + else + tmpPath = paths.getValue("sfx", "sfx/") + path; ResourceManager *resman = ResourceManager::getInstance(); - SoundEffect *sample = resman->getSoundEffect( - paths.getStringValue("sfx") + path); + SoundEffect *sample = resman->getSoundEffect(tmpPath); if (sample) { logger->log("Sound::playGuiSfx() Playing: %s", path.c_str()); -- cgit v1.2.3-70-g09d2 From 11b1348fd4b52a35851a03a9c50bd962e385a6a9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 4 Jan 2012 20:53:28 +0300 Subject: Add ability for testing drivers and graphics. --- manaplus.cbp | 4 + src/CMakeLists.txt | 4 + src/Makefile.am | 4 + src/client.cpp | 105 +++++++++++++++-- src/client.h | 25 +++- src/main.cpp | 24 +++- src/test/testlauncher.cpp | 170 +++++++++++++++++++++++++++ src/test/testlauncher.h | 54 +++++++++ src/test/testmain.cpp | 287 ++++++++++++++++++++++++++++++++++++++++++++++ src/test/testmain.h | 64 +++++++++++ 10 files changed, 726 insertions(+), 15 deletions(-) create mode 100644 src/test/testlauncher.cpp create mode 100644 src/test/testlauncher.h create mode 100644 src/test/testmain.cpp create mode 100644 src/test/testmain.h (limited to 'src') diff --git a/manaplus.cbp b/manaplus.cbp index 87be5de7a..e44f3718d 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -680,6 +680,10 @@ + + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b7005b144..18379fdf0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -459,6 +459,10 @@ SET(SRCS utils/mkdir.h utils/xml.cpp utils/xml.h + test/testlauncher.cpp + test/testlauncher.h + test/testmain.cpp + test/testmain.h actor.cpp actor.h actorsprite.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 527893598..ead1224d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -466,6 +466,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mutex.h \ utils/xml.cpp \ utils/xml.h \ + test/testlauncher.cpp \ + test/testlauncher.h \ + test/testmain.cpp \ + test/testmain.h \ actor.cpp \ actor.h \ actorsprite.cpp \ diff --git a/src/client.cpp b/src/client.cpp index b5cbffd40..4b0319954 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -101,6 +101,9 @@ #include "utils/paths.h" #include "utils/stringutils.h" +#include "test/testlauncher.h" +#include "test/testmain.h" + #ifdef __APPLE__ #include #endif @@ -269,7 +272,25 @@ Client::Client(const Options &options): mGuiAlpha(1.0f) { mInstance = this; +} + +void Client::testsInit() +{ + printf ("testInit\n"); + if (!mOptions.test.empty()) + { + gameInit(); + } + else + { + logger = new Logger; + initLocalDataDir(); + initConfigDir(); + } +} +void Client::gameInit() +{ logger = new Logger; // Load branding information @@ -644,7 +665,31 @@ Client::Client(const Options &options): Client::~Client() { - logger->log1("Quitting1"); + if (!mOptions.testMode) + gameClear(); + else + testsClear(); +} + +void Client::testsClear() +{ + if (!mOptions.test.empty()) + { + gameClear(); + } + else + { + BeingInfo::clear(); + + delete logger; + logger = nullptr; + } +} + +void Client::gameClear() +{ + if (logger) + logger->log1("Quitting1"); config.removeListener("fpslimit", this); config.removeListener("guialpha", this); @@ -681,39 +726,46 @@ Client::~Client() player_relations.store(); - logger->log1("Quitting2"); + if (logger) + logger->log1("Quitting2"); delete gui; gui = nullptr; - logger->log1("Quitting3"); + if (logger) + logger->log1("Quitting3"); delete mainGraphics; mainGraphics = nullptr; - logger->log1("Quitting4"); + if (logger) + logger->log1("Quitting4"); // Shutdown libxml xmlCleanupParser(); - logger->log1("Quitting5"); + if (logger) + logger->log1("Quitting5"); BeingInfo::clear(); // Shutdown sound sound.close(); - logger->log1("Quitting6"); + if (logger) + logger->log1("Quitting6"); ActorSprite::unload(); ResourceManager::deleteInstance(); - logger->log1("Quitting8"); + if (logger) + logger->log1("Quitting8"); SDL_FreeSurface(mIcon); - logger->log1("Quitting9"); + if (logger) + logger->log1("Quitting9"); delete userPalette; userPalette = nullptr; @@ -721,7 +773,8 @@ Client::~Client() delete joystick; joystick = nullptr; - logger->log1("Quitting10"); + if (logger) + logger->log1("Quitting10"); config.write(); serverConfig.write(); @@ -729,7 +782,8 @@ Client::~Client() config.clear(); serverConfig.clear(); - logger->log1("Quitting11"); + if (logger) + logger->log1("Quitting11"); delete chatLogger; chatLogger = nullptr; @@ -740,7 +794,22 @@ Client::~Client() mInstance = nullptr; } -int Client::exec() +int Client::testsExec() +{ + if (mOptions.test.empty()) + { + TestMain test; + return test.exec(); + } + else + { + TestLauncher launcher(mOptions.test); + return launcher.exec(); + } + return 0; +} + +int Client::gameExec() { int lastTickTime = tick_time; @@ -1480,6 +1549,12 @@ void Client::initRootDir() * Windows and other systems we use the current working directory. */ void Client::initHomeDir() +{ + initLocalDataDir(); + initConfigDir(); +} + +void Client::initLocalDataDir() { mLocalDataDir = mOptions.localDataDir; @@ -1509,7 +1584,10 @@ void Client::initHomeDir() logger->error(strprintf(_("%s doesn't exist and can't be created! " "Exiting."), mLocalDataDir.c_str())); } +} +void Client::initConfigDir() +{ mConfigDir = mOptions.configDir; if (mConfigDir.empty()) @@ -1623,7 +1701,10 @@ void Client::initConfiguration() // bool oldConfig = false; // int emptySize = config.getSize(); - configPath = mConfigDir + "/config.xml"; + if (mOptions.test.empty()) + configPath = mConfigDir + "/config.xml"; + else + configPath = mConfigDir + "/test.xml"; configFile = fopen(configPath.c_str(), "r"); diff --git a/src/client.h b/src/client.h index fcb14a660..22eb406eb 100644 --- a/src/client.h +++ b/src/client.h @@ -163,6 +163,7 @@ public: chooseDefault(false), noOpenGL(false), safeMode(false), + testMode(false), serverPort(0) {} @@ -184,6 +185,8 @@ public: std::string localDataDir; std::string screenshotDir; bool safeMode; + bool testMode; + std::string test; std::string serverName; short serverPort; @@ -198,7 +201,13 @@ public: static Client *instance() { return mInstance; } - int exec(); + void gameInit(); + + void testsInit(); + + int gameExec(); + + int testsExec(); static void setState(State state) { instance()->mState = state; } @@ -280,19 +289,33 @@ public: private: void initRootDir(); + void initHomeDir(); + void initConfiguration(); + + void initLocalDataDir(); + + void initConfigDir(); + void initUpdatesDir(); + void initScreenshotDir(); + void initServerConfig(std::string serverName); bool copyFile(std::string &configPath, std::string &oldConfigPath); + bool createConfig(std::string &configPath); void accountLogin(LoginData *data); void storeSafeParameters(); + void gameClear(); + + void testsClear(); + static Client *mInstance; Options mOptions; diff --git a/src/main.cpp b/src/main.cpp index 281687809..31d88082f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,6 +71,7 @@ static void printHelp() " directory") << endl << _(" --screenshot-dir : Directory to store screenshots") << endl << _(" --safemode : Start game in safe mode") << endl + << _(" -T --tests : Start testing drivers and auto configuring") << endl #ifdef USE_OPENGL << _(" --no-opengl : Disable OpenGL for this session") << endl #endif @@ -84,7 +85,7 @@ static void printVersion() static void parseOptions(int argc, char *argv[], Client::Options &options) { - const char *optstring = "hvud:U:P:Dc:p:l:L:C:s:"; + const char *optstring = "hvud:U:P:Dc:p:l:L:C:s:t:T"; const struct option long_options[] = { @@ -107,6 +108,8 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) { "chat-log-dir", required_argument, 0, 'L' }, { "screenshot-dir", required_argument, 0, 'i' }, { "safemode", no_argument, 0, 'm' }, + { "tests", no_argument, 0, 'T' }, + { "test", required_argument, 0, 't' }, { nullptr, 0, 0, 0 } }; @@ -174,6 +177,14 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) case 'm': options.safeMode = true; break; + case 'T': + options.testMode = true; + options.test = ""; + break; + case 't': + options.testMode = true; + options.test = std::string(optarg); + break; default: break; } @@ -247,5 +258,14 @@ int main(int argc, char *argv[]) SetCurrentDirectory(PHYSFS_getBaseDir()); #endif Client client(options); - return client.exec(); + if (!options.testMode) + { + client.gameInit(); + return client.gameExec(); + } + else + { + client.testsInit(); + return client.testsExec(); + } } diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp new file mode 100644 index 000000000..5c532a42c --- /dev/null +++ b/src/test/testlauncher.cpp @@ -0,0 +1,170 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "test/testlauncher.h" + +#include "client.h" +#include "configuration.h" +#include "graphics.h" +#include "localconsts.h" +#include "logger.h" +#include "sound.h" + +#include "gui/theme.h" + +#include "utils/gettext.h" +#include "utils/mkdir.h" +#include "utils/stringutils.h" + +#include "resources/image.h" +#include "resources/wallpaper.h" + +#ifdef WIN32 +#include +#define sleep(seconds) Sleep((seconds) * 1000) +#endif + +//#include + +#include "debug.h" + +TestLauncher::TestLauncher(std::string test) : + mTest(test) +{ + file.open((Client::getLocalDataDirectory() + + std::string("/test.log")).c_str(), std::ios::out); +} + +TestLauncher::~TestLauncher() +{ + file.close(); +} + +int TestLauncher::exec() +{ + if (mTest == "1" || mTest == "2" || mTest == "3") + return testBackend(); + else if (mTest == "4") + return testSound(); + else if (mTest == "5" || mTest == "6" || mTest == "7") + return testRescale(); + else if (mTest == "8" || mTest == "9" || mTest == "10") + return testFps(); + + return -1; +} + +int TestLauncher::testBackend() +{ + Image *img = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif"); + if (!img) + return 1; + int cnt = 100; + + for (int f = 0; f < cnt; f ++) + { + mainGraphics->drawImage(img, cnt * 7, cnt * 5); + mainGraphics->updateScreen(); + } + + sleep(1); + return 0; +} + +int TestLauncher::testSound() +{ + sound.playGuiSfx("system/newmessage.ogg"); + sleep(1); + sound.playSfx("system/newmessage.ogg", 0, 0); + sound.playMusic("sfx/system/newmessage.ogg"); + sleep(3); + sound.stopMusic(); + return 0; +} + +int TestLauncher::testRescale() +{ + Wallpaper::loadWallpapers(); + const std::string wallpaperName = Wallpaper::getWallpaper(800, 600); + Image *img = Theme::getImageFromTheme(wallpaperName); + if (!img) + return 1; + + sleep(1); + return 0; +} + +int TestLauncher::testFps() +{ + timeval start; + timeval end; + + Wallpaper::loadWallpapers(); + const std::string wallpaperName = Wallpaper::getWallpaper(800, 600); + Image *img[4]; + + img[0] = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif"); + img[1] = Theme::getImageFromTheme("graphics/sprites/arrow_down.gif"); + img[2] = Theme::getImageFromTheme("graphics/sprites/arrow_left.gif"); + img[3] = Theme::getImageFromTheme("graphics/sprites/arrow_right.gif"); + int idx = 0; + + int cnt = 500; + + gettimeofday(&start, NULL); + for (int k = 0; k < cnt; k ++) + { + for (int x = 0; x < 800; x += 20) + { + for (int y = 0; y < 600; y += 25) + { + mainGraphics->drawImage(img[idx], x, y); + idx ++; + if (idx > 3) + idx = 0; + } + } + mainGraphics->updateScreen(); + } + + gettimeofday(&end, NULL); + int tFps = calcFps(&start, &end, cnt); + file << mTest << std::endl; + file << tFps << std::endl; + + sleep(1); + return 0; +} + +int TestLauncher::calcFps(timeval *start, timeval *end, int calls) +{ + long mtime; + long seconds; + long useconds; + + seconds = end->tv_sec - start->tv_sec; + useconds = end->tv_usec - start->tv_usec; + + mtime = (seconds * 1000 + useconds / 1000.0) + 0.5; + if (mtime == 0) + return 100000; + + return static_cast(calls) * 1000 / mtime; +} diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h new file mode 100644 index 000000000..19a057722 --- /dev/null +++ b/src/test/testlauncher.h @@ -0,0 +1,54 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef TEST_TESTLAUNCHER_H +#define TEST_TESTLAUNCHER_H + +#include "logger.h" + +#include +#include + +class TestLauncher +{ + public: + TestLauncher(std::string test); + + ~TestLauncher(); + + int exec(); + + int calcFps(timeval *start, timeval *end, int calls); + + int testBackend(); + + int testSound(); + + int testRescale(); + + int testFps(); + + private: + std::string mTest; + + std::ofstream file; +}; + +#endif // TEST_TESTLAUNCHER_H diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp new file mode 100644 index 000000000..db82592b3 --- /dev/null +++ b/src/test/testmain.cpp @@ -0,0 +1,287 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "test/testmain.h" + +#include "utils/gettext.h" + +#include "client.h" +#include "configuration.h" +#include "localconsts.h" + +#include "utils/gettext.h" +#include "utils/mkdir.h" +#include "utils/stringutils.h" +#include "utils/process.h" + +#include + +#include "debug.h" + +#ifdef WIN32 + const std::string fileName = "manaplus.exe"; +#else + const std::string fileName = "manaplus"; +#endif + +TestMain::TestMain() +{ + log = new Logger; +// log->setLogFile(Client::getLocalDataDirectory() +// + std::string("/test.log")); + log->setLogFile(Client::getLocalDataDirectory() + + std::string("/manaplustest.log")); +} + +void TestMain::initConfig() +{ + config.init(Client::getConfigDirectory() + "/test.xml"); +// config.setDefaultValues(getConfigDefaults()); + + config.setValue("hwaccel", false); + config.setValue("screen", false); + config.setValue("sound", false); + config.setValue("guialpha", 0.8f); + config.setValue("remember", true); + config.setValue("sfxVolume", 50); + config.setValue("musicVolume", 60); + config.setValue("fpslimit", 0); + config.setValue("customcursor", true); + config.setValue("useScreenshotDirectorySuffix", true); + config.setValue("ChatLogLength", 128); + config.setValue("screenwidth", 800); + config.setValue("screenheight", 600); +} + +int TestMain::exec() +{ + initConfig(); + int softwareTest = invokeSoftwareRenderTest("1"); + int fastOpenGLTest = invokeFastOpenGLRenderTest("2"); + int safeOpenGLTest = invokeSafeOpenGLRenderTest("3"); + int soundTest = invokeTest4(); + int rescaleTest[3]; + int softFpsTest = -1; + int fastOpenGLFpsTest = -1; + int safeOpenGLFpsTest = -1; + int softFps = 0; + int fastOpenGLFps = 0; + int safeOpenGLFps = 0; + + int openGLMode = 0; + int maxFps = 0; + rescaleTest[0] = -1; + rescaleTest[1] = -1; + rescaleTest[2] = -1; + std::string info; + + info += strprintf("%d.%d,%d,%d.", soundTest, softwareTest, + fastOpenGLTest, safeOpenGLTest); + + if (!softwareTest) + { + softFpsTest = invokeSoftwareRenderTest("8"); + info += strprintf ("%d", softFpsTest); + if (!softFpsTest) + { + softFps = readValue(8); + info += strprintf (",%d", softFps); + if (!softFps) + { + softwareTest = -1; + softFpsTest = -1; + } + else + { + rescaleTest[0] = invokeSoftwareRenderTest("5"); + info += strprintf (",%d", rescaleTest[0]); + } + } + else + { + softwareTest = -1; + } + } + info += "."; + if (!fastOpenGLTest) + { + fastOpenGLFpsTest = invokeFastOpenGLRenderTest("9"); + info += strprintf ("%d", fastOpenGLFpsTest); + if (!fastOpenGLFpsTest) + { + fastOpenGLFps = readValue(9); + info += strprintf (",%d", fastOpenGLFps); + if (!fastOpenGLFps) + { + fastOpenGLTest = -1; + fastOpenGLFpsTest = -1; + } + else + { + rescaleTest[1] = invokeFastOpenGLRenderTest("6"); + info += strprintf (",%d", rescaleTest[1]); + } + } + else + { + fastOpenGLTest = -1; + } + } + info += "."; + if (!safeOpenGLTest) + { + safeOpenGLFpsTest = invokeSafeOpenGLRenderTest("10"); + info += strprintf ("%d", safeOpenGLFpsTest); + if (!safeOpenGLFpsTest) + { + safeOpenGLFps = readValue(10); + info += strprintf (",%d", safeOpenGLFps); + if (!safeOpenGLFps) + { + safeOpenGLTest = -1; + safeOpenGLFpsTest = -1; + } + else + { + rescaleTest[2] = invokeSafeOpenGLRenderTest("7"); + info += strprintf (",%d", rescaleTest[2]); + } + } + else + { + safeOpenGLTest = -1; + } + } + info += "."; + + maxFps = softFps; + if (maxFps < fastOpenGLFps) + { + openGLMode = 1; + maxFps = fastOpenGLFps; + } + if (maxFps < safeOpenGLFps) + { + openGLMode = 2; + maxFps = safeOpenGLFps; + } + + writeConfig(openGLMode, rescaleTest[openGLMode], soundTest, info); + return 0; +} + +void TestMain::writeConfig(int openGLMode, int rescale, + int sound, std::string info) +{ + config.init(Client::getConfigDirectory() + "/config.xml"); + + // searched values + config.setValue("opengl", openGLMode); + config.setValue("showBackground", !rescale); + config.setValue("sound", !sound); + + // better perfomance + config.setValue("hwaccel", true); + config.setValue("fpslimit", 60); + config.setValue("altfpslimit", 2); + config.setValue("safemode", false); + config.setValue("enableMapReduce", true); + + // stats + config.setValue("testInfo", info); + + config.write(); +} + +int TestMain::readValue(int ver, int def) +{ + std::string tmp; + int var; + file.open((Client::getLocalDataDirectory() + + std::string("/test.log")).c_str(), std::ios::in); + if (!getline(file, tmp)) + { + file.close(); + return def; + } + var = atoi(tmp.c_str()); + if (ver != var || !getline(file, tmp)) + { + file.close(); + return def; + } + def = atoi(tmp.c_str()); + file.close(); + log->log("value for %d = %d", ver, def); + return def; +} + +int TestMain::invokeTest(std::string test) +{ + config.setValue("opengl", 0); + + config.write(); + int ret = execFile(fileName, fileName, "-t", test); + return ret; +} + +int TestMain::invokeTest4() +{ + config.setValue("sound", true); + int ret = invokeTest("4"); + + log->log("4: %d", ret); + return ret; +} + +int TestMain::invokeSoftwareRenderTest(std::string test) +{ + config.setValue("opengl", 0); + config.write(); + int ret = execFile(fileName, fileName, "-t", test, 30); + log->log("%s: %d", test.c_str(), ret); + return ret; +} + +int TestMain::invokeFastOpenGLRenderTest(std::string test) +{ +#if defined USE_OPENGL + config.setValue("opengl", 1); +#else + return -1; +#endif + config.write(); + int ret = execFile(fileName, fileName, "-t", test, 30); + log->log("%s: %d", test.c_str(), ret); + return ret; +} + +int TestMain::invokeSafeOpenGLRenderTest(std::string test) +{ +#if defined USE_OPENGL + config.setValue("opengl", 2); +#else + return -1; +#endif + config.write(); + int ret = execFile(fileName, fileName, "-t", test, 30); + log->log("%s: %d", test.c_str(), ret); + return ret; +} diff --git a/src/test/testmain.h b/src/test/testmain.h new file mode 100644 index 000000000..de1229454 --- /dev/null +++ b/src/test/testmain.h @@ -0,0 +1,64 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef TEST_TESTMAIN_H +#define TEST_TESTMAIN_H + +#include "logger.h" + +#include + +class TestMain +{ + public: + TestMain(); + + int exec(); + + private: + void initConfig(); + + int readValue(int ver, int def = 0); + + int invokeTest(std::string test); + + int invokeTest3(); + + int invokeTest4(); + + int invokeTest7(); + + int invokeSoftwareRenderTest(std::string test); + + int invokeFastOpenGLRenderTest(std::string test); + + int invokeSafeOpenGLRenderTest(std::string test); + + void testsMain(); + + void writeConfig(int openGLMode, int rescale, + int sound, std::string info); + + Logger *log; + + std::ifstream file; +}; + +#endif // TEST_TESTMAIN_H -- cgit v1.2.3-70-g09d2 From cbd616c89bd2650c931dc52a22b2309310efa196 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 4 Jan 2012 22:01:44 +0300 Subject: Add chat command /dumpt for dumping last testing values. --- src/commandhandler.cpp | 9 +++++++++ src/commandhandler.h | 2 ++ src/gui/chatwindow.cpp | 1 + 3 files changed, 12 insertions(+) (limited to 'src') diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 04ef1b3f4..cd8169651 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -202,6 +202,8 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab) handleServerUnIgnoreAll(args, tab); else if (type == "dumpg") handleDumpGraphics(args, tab); + else if (type == "dumpt") + handleDumpTests(args, tab); else if (tab->handleCommand(type, args)) ; else if (type == "hack") @@ -1125,6 +1127,13 @@ void CommandHandler::handleDumpGraphics(const std::string &args A_UNUSED, outString(tab, str, str); } +void CommandHandler::handleDumpTests(const std::string &args A_UNUSED, + ChatTab *tab) +{ + std::string str = config.getStringValue("testInfo"); + outString(tab, str, str); +} + #ifdef DEBUG_DUMP_LEAKS void showRes(std::string str, ResourceManager::Resources *res); diff --git a/src/commandhandler.h b/src/commandhandler.h index b97b191ff..af54278ac 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -299,6 +299,8 @@ class CommandHandler void handleDumpGraphics(const std::string &args, ChatTab *tab); + void handleDumpTests(const std::string &args, ChatTab *tab); + void outString(ChatTab *tab, const std::string &str, const std::string &def); diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 84d61cf65..4fd48b4c3 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -305,6 +305,7 @@ void ChatWindow::fillCommands() mCommands.push_back("/serverignoreall"); mCommands.push_back("/serverunignoreall"); mCommands.push_back("/dumpg"); + mCommands.push_back("/dumpt"); mCommands.push_back("/pseudoaway "); mCommands.push_back(""); mCommands.push_back(""); -- cgit v1.2.3-70-g09d2 From 1373361d6ca934aac0b3b7a09f7f8a4882820fc2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 4 Jan 2012 22:02:37 +0300 Subject: Add default empty value for testInfo config variable. --- src/defaults.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/defaults.cpp b/src/defaults.cpp index f18e0f432..1e58dd5a0 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -224,6 +224,7 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "lang", ""); AddDEF(configData, "selectedJoystick", 0); AddDEF(configData, "useInactiveJoystick", false); + AddDEF(configData, "testInfo", ""); return configData; } -- cgit v1.2.3-70-g09d2 From 77d5f27e2a8162a05ad37cba16cb054c3ad0d210 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 4 Jan 2012 23:49:29 +0300 Subject: Add additional checks for unsecure chars: for double space, for last dot in nick. --- src/playerrelations.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 1bf63aa81..81338de74 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -574,14 +574,24 @@ bool PlayerRelationsManager::checkName(const std::string &name) const const int size = name.size(); std::string check = config.getStringValue("unsecureChars"); - if (name.substr(0, 1) == " " || name.substr(size - 1, 1) == " ") + std::string lastChar = name.substr(size - 1, 1); + if (name.substr(0, 1) == " " || lastChar == " " || lastChar == "." + || name.find(" ") != std::string::npos) + { return false; + } else if (check.empty()) + { return true; + } else if (name.find_first_of(check) != std::string::npos) + { return false; + } else + { return true; + } } PlayerRelationsManager player_relations; -- cgit v1.2.3-70-g09d2 From 7cf5cb58865bc5f3951a6f4e40cf892ede96fc5a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 5 Jan 2012 18:35:21 +0300 Subject: Update copyrights year. --- src/actor.cpp | 2 +- src/actor.h | 2 +- src/actorsprite.cpp | 2 +- src/actorsprite.h | 2 +- src/actorspritelistener.h | 2 +- src/actorspritemanager.cpp | 2 +- src/actorspritemanager.h | 2 +- src/animatedsprite.cpp | 2 +- src/animatedsprite.h | 2 +- src/animationparticle.cpp | 2 +- src/animationparticle.h | 2 +- src/auctionmanager.cpp | 2 +- src/auctionmanager.h | 2 +- src/avatar.h | 2 +- src/being.cpp | 2 +- src/being.h | 2 +- src/channel.cpp | 2 +- src/channel.h | 2 +- src/channelmanager.cpp | 2 +- src/channelmanager.h | 2 +- src/chatlogger.cpp | 2 +- src/chatlogger.h | 2 +- src/client.cpp | 2 +- src/client.h | 2 +- src/commandhandler.cpp | 2 +- src/commandhandler.h | 2 +- src/compoundsprite.cpp | 2 +- src/compoundsprite.h | 2 +- src/configlistener.h | 2 +- src/configuration.cpp | 2 +- src/configuration.h | 2 +- src/debug.h | 2 +- src/defaults.cpp | 2 +- src/defaults.h | 2 +- src/equipment.h | 2 +- src/event.cpp | 2 +- src/event.h | 2 +- src/flooritem.cpp | 2 +- src/flooritem.h | 2 +- src/game.cpp | 2 +- src/game.h | 2 +- src/graphics.cpp | 2 +- src/graphics.h | 2 +- src/graphicsvertexes.cpp | 2 +- src/graphicsvertexes.h | 2 +- src/gui/beingpopup.cpp | 2 +- src/gui/beingpopup.h | 2 +- src/gui/buydialog.cpp | 2 +- src/gui/buydialog.h | 2 +- src/gui/buyselldialog.cpp | 2 +- src/gui/buyselldialog.h | 2 +- src/gui/changeemaildialog.cpp | 2 +- src/gui/changeemaildialog.h | 2 +- src/gui/changepassworddialog.cpp | 2 +- src/gui/changepassworddialog.h | 2 +- src/gui/charcreatedialog.cpp | 2 +- src/gui/charcreatedialog.h | 2 +- src/gui/charselectdialog.cpp | 2 +- src/gui/charselectdialog.h | 2 +- src/gui/chatwindow.cpp | 2 +- src/gui/chatwindow.h | 2 +- src/gui/confirmdialog.cpp | 2 +- src/gui/confirmdialog.h | 2 +- src/gui/connectiondialog.cpp | 2 +- src/gui/connectiondialog.h | 2 +- src/gui/debugwindow.cpp | 2 +- src/gui/debugwindow.h | 2 +- src/gui/didyouknowwindow.cpp | 2 +- src/gui/didyouknowwindow.h | 2 +- src/gui/emotepopup.cpp | 2 +- src/gui/emotepopup.h | 2 +- src/gui/equipmentwindow.cpp | 2 +- src/gui/equipmentwindow.h | 2 +- src/gui/focushandler.cpp | 2 +- src/gui/focushandler.h | 2 +- src/gui/gui.cpp | 2 +- src/gui/gui.h | 2 +- src/gui/helpwindow.cpp | 2 +- src/gui/helpwindow.h | 2 +- src/gui/inventorywindow.cpp | 2 +- src/gui/inventorywindow.h | 2 +- src/gui/itemamountwindow.cpp | 2 +- src/gui/itemamountwindow.h | 2 +- src/gui/itempopup.cpp | 2 +- src/gui/itempopup.h | 2 +- src/gui/logindialog.cpp | 2 +- src/gui/logindialog.h | 2 +- src/gui/minimap.cpp | 2 +- src/gui/minimap.h | 2 +- src/gui/ministatuswindow.cpp | 2 +- src/gui/ministatuswindow.h | 2 +- src/gui/npcdialog.cpp | 2 +- src/gui/npcdialog.h | 2 +- src/gui/npcpostdialog.cpp | 2 +- src/gui/npcpostdialog.h | 2 +- src/gui/okdialog.cpp | 2 +- src/gui/okdialog.h | 2 +- src/gui/outfitwindow.cpp | 2 +- src/gui/outfitwindow.h | 2 +- src/gui/palette.cpp | 2 +- src/gui/palette.h | 2 +- src/gui/popupmenu.cpp | 2 +- src/gui/popupmenu.h | 2 +- src/gui/quitdialog.cpp | 2 +- src/gui/quitdialog.h | 2 +- src/gui/register.cpp | 2 +- src/gui/register.h | 2 +- src/gui/sdlfont.cpp | 2 +- src/gui/sdlfont.h | 2 +- src/gui/sdlinput.cpp | 2 +- src/gui/selldialog.cpp | 2 +- src/gui/selldialog.h | 2 +- src/gui/serverdialog.cpp | 2 +- src/gui/serverdialog.h | 2 +- src/gui/setup.cpp | 2 +- src/gui/setup.h | 2 +- src/gui/setup_audio.cpp | 2 +- src/gui/setup_audio.h | 2 +- src/gui/setup_chat.cpp | 2 +- src/gui/setup_chat.h | 2 +- src/gui/setup_colors.cpp | 2 +- src/gui/setup_colors.h | 2 +- src/gui/setup_joystick.cpp | 2 +- src/gui/setup_joystick.h | 2 +- src/gui/setup_keyboard.cpp | 2 +- src/gui/setup_other.cpp | 2 +- src/gui/setup_other.h | 2 +- src/gui/setup_perfomance.cpp | 2 +- src/gui/setup_perfomance.h | 2 +- src/gui/setup_players.cpp | 2 +- src/gui/setup_players.h | 2 +- src/gui/setup_relations.cpp | 2 +- src/gui/setup_relations.h | 2 +- src/gui/setup_video.cpp | 2 +- src/gui/setup_video.h | 2 +- src/gui/shopwindow.cpp | 2 +- src/gui/shopwindow.h | 2 +- src/gui/shortcutwindow.cpp | 2 +- src/gui/shortcutwindow.h | 2 +- src/gui/skilldialog.cpp | 2 +- src/gui/skilldialog.h | 2 +- src/gui/socialwindow.cpp | 2 +- src/gui/socialwindow.h | 2 +- src/gui/specialswindow.cpp | 2 +- src/gui/specialswindow.h | 2 +- src/gui/speechbubble.cpp | 2 +- src/gui/speechbubble.h | 2 +- src/gui/statuswindow.cpp | 2 +- src/gui/statuswindow.h | 2 +- src/gui/textdialog.cpp | 2 +- src/gui/textdialog.h | 2 +- src/gui/textpopup.cpp | 2 +- src/gui/textpopup.h | 2 +- src/gui/theme.cpp | 2 +- src/gui/theme.h | 2 +- src/gui/tradewindow.cpp | 2 +- src/gui/tradewindow.h | 2 +- src/gui/unregisterdialog.cpp | 2 +- src/gui/unregisterdialog.h | 2 +- src/gui/updaterwindow.cpp | 2 +- src/gui/updaterwindow.h | 2 +- src/gui/userpalette.cpp | 2 +- src/gui/userpalette.h | 2 +- src/gui/viewport.cpp | 2 +- src/gui/viewport.h | 2 +- src/gui/widgets/avatarlistbox.cpp | 2 +- src/gui/widgets/avatarlistbox.h | 2 +- src/gui/widgets/battletab.cpp | 2 +- src/gui/widgets/battletab.h | 2 +- src/gui/widgets/browserbox.cpp | 2 +- src/gui/widgets/browserbox.h | 2 +- src/gui/widgets/button.cpp | 2 +- src/gui/widgets/button.h | 2 +- src/gui/widgets/channeltab.cpp | 2 +- src/gui/widgets/channeltab.h | 2 +- src/gui/widgets/chattab.cpp | 2 +- src/gui/widgets/chattab.h | 2 +- src/gui/widgets/checkbox.cpp | 2 +- src/gui/widgets/checkbox.h | 2 +- src/gui/widgets/container.cpp | 2 +- src/gui/widgets/container.h | 2 +- src/gui/widgets/dropdown.cpp | 2 +- src/gui/widgets/dropdown.h | 2 +- src/gui/widgets/flowcontainer.cpp | 2 +- src/gui/widgets/flowcontainer.h | 2 +- src/gui/widgets/guildchattab.cpp | 2 +- src/gui/widgets/guildchattab.h | 2 +- src/gui/widgets/guitable.cpp | 2 +- src/gui/widgets/guitable.h | 2 +- src/gui/widgets/horizontcontainer.cpp | 2 +- src/gui/widgets/horizontcontainer.h | 2 +- src/gui/widgets/icon.cpp | 2 +- src/gui/widgets/icon.h | 2 +- src/gui/widgets/inttextfield.cpp | 2 +- src/gui/widgets/inttextfield.h | 2 +- src/gui/widgets/inventoryfilter.cpp | 2 +- src/gui/widgets/inventoryfilter.h | 2 +- src/gui/widgets/itemcontainer.cpp | 2 +- src/gui/widgets/itemcontainer.h | 2 +- src/gui/widgets/itemlinkhandler.cpp | 2 +- src/gui/widgets/itemlinkhandler.h | 2 +- src/gui/widgets/itemshortcutcontainer.cpp | 2 +- src/gui/widgets/itemshortcutcontainer.h | 2 +- src/gui/widgets/layout.cpp | 2 +- src/gui/widgets/layout.h | 2 +- src/gui/widgets/layouthelper.cpp | 2 +- src/gui/widgets/layouthelper.h | 2 +- src/gui/widgets/linkhandler.h | 2 +- src/gui/widgets/listbox.cpp | 2 +- src/gui/widgets/listbox.h | 2 +- src/gui/widgets/mouseevent.h | 2 +- src/gui/widgets/passwordfield.cpp | 2 +- src/gui/widgets/passwordfield.h | 2 +- src/gui/widgets/playerbox.cpp | 2 +- src/gui/widgets/playerbox.h | 2 +- src/gui/widgets/popup.cpp | 2 +- src/gui/widgets/popup.h | 2 +- src/gui/widgets/progressbar.cpp | 2 +- src/gui/widgets/progressbar.h | 2 +- src/gui/widgets/progressindicator.cpp | 2 +- src/gui/widgets/progressindicator.h | 2 +- src/gui/widgets/radiobutton.cpp | 2 +- src/gui/widgets/radiobutton.h | 2 +- src/gui/widgets/resizegrip.cpp | 2 +- src/gui/widgets/resizegrip.h | 2 +- src/gui/widgets/scrollarea.cpp | 2 +- src/gui/widgets/scrollarea.h | 2 +- src/gui/widgets/setupitem.cpp | 2 +- src/gui/widgets/setupitem.h | 2 +- src/gui/widgets/setuptab.cpp | 2 +- src/gui/widgets/setuptab.h | 2 +- src/gui/widgets/setuptabscroll.cpp | 2 +- src/gui/widgets/setuptabscroll.h | 2 +- src/gui/widgets/shopitems.cpp | 2 +- src/gui/widgets/shopitems.h | 2 +- src/gui/widgets/shoplistbox.cpp | 2 +- src/gui/widgets/shoplistbox.h | 2 +- src/gui/widgets/shortcutcontainer.cpp | 2 +- src/gui/widgets/shortcutcontainer.h | 2 +- src/gui/widgets/slider.cpp | 2 +- src/gui/widgets/slider.h | 2 +- src/gui/widgets/tab.cpp | 2 +- src/gui/widgets/tab.h | 2 +- src/gui/widgets/tabbedarea.cpp | 2 +- src/gui/widgets/tabbedarea.h | 2 +- src/gui/widgets/tablemodel.cpp | 2 +- src/gui/widgets/tablemodel.h | 2 +- src/gui/widgets/textbox.cpp | 2 +- src/gui/widgets/textbox.h | 2 +- src/gui/widgets/textfield.cpp | 2 +- src/gui/widgets/textfield.h | 2 +- src/gui/widgets/textpreview.cpp | 2 +- src/gui/widgets/textpreview.h | 2 +- src/gui/widgets/tradetab.cpp | 2 +- src/gui/widgets/tradetab.h | 2 +- src/gui/widgets/vertcontainer.cpp | 2 +- src/gui/widgets/vertcontainer.h | 2 +- src/gui/widgets/whispertab.cpp | 2 +- src/gui/widgets/whispertab.h | 2 +- src/gui/widgets/window.cpp | 2 +- src/gui/widgets/window.h | 2 +- src/gui/widgets/windowcontainer.cpp | 2 +- src/gui/widgets/windowcontainer.h | 2 +- src/gui/windowmenu.cpp | 2 +- src/gui/windowmenu.h | 2 +- src/gui/worldselectdialog.cpp | 2 +- src/gui/worldselectdialog.h | 2 +- src/guichanfwd.h | 2 +- src/guild.cpp | 2 +- src/guild.h | 2 +- src/guildmanager.cpp | 2 +- src/guildmanager.h | 2 +- src/imageparticle.cpp | 2 +- src/imageparticle.h | 2 +- src/imagesprite.cpp | 2 +- src/imagesprite.h | 2 +- src/inventory.cpp | 2 +- src/inventory.h | 2 +- src/item.cpp | 2 +- src/item.h | 2 +- src/itemshortcut.cpp | 2 +- src/itemshortcut.h | 2 +- src/joystick.cpp | 2 +- src/joystick.h | 2 +- src/listener.cpp | 2 +- src/listener.h | 2 +- src/localconsts.h | 2 +- src/localplayer.cpp | 2 +- src/localplayer.h | 2 +- src/logger.cpp | 2 +- src/logger.h | 2 +- src/main.cpp | 2 +- src/main.h | 2 +- src/map.cpp | 2 +- src/map.h | 2 +- src/net/adminhandler.h | 2 +- src/net/buysellhandler.h | 2 +- src/net/charhandler.cpp | 2 +- src/net/charhandler.h | 2 +- src/net/chathandler.h | 2 +- src/net/download.cpp | 2 +- src/net/download.h | 2 +- src/net/ea/adminhandler.cpp | 2 +- src/net/ea/adminhandler.h | 2 +- src/net/ea/beinghandler.cpp | 2 +- src/net/ea/beinghandler.h | 2 +- src/net/ea/buysellhandler.cpp | 2 +- src/net/ea/buysellhandler.h | 2 +- src/net/ea/charserverhandler.cpp | 2 +- src/net/ea/charserverhandler.h | 2 +- src/net/ea/chathandler.cpp | 2 +- src/net/ea/chathandler.h | 2 +- src/net/ea/eaprotocol.h | 2 +- src/net/ea/gamehandler.cpp | 2 +- src/net/ea/gamehandler.h | 2 +- src/net/ea/gui/guildtab.cpp | 2 +- src/net/ea/gui/guildtab.h | 2 +- src/net/ea/gui/partytab.cpp | 2 +- src/net/ea/gui/partytab.h | 2 +- src/net/ea/guildhandler.cpp | 2 +- src/net/ea/guildhandler.h | 2 +- src/net/ea/inventoryhandler.cpp | 2 +- src/net/ea/inventoryhandler.h | 2 +- src/net/ea/itemhandler.cpp | 2 +- src/net/ea/itemhandler.h | 2 +- src/net/ea/loginhandler.cpp | 2 +- src/net/ea/loginhandler.h | 2 +- src/net/ea/npchandler.cpp | 2 +- src/net/ea/npchandler.h | 2 +- src/net/ea/playerhandler.cpp | 2 +- src/net/ea/playerhandler.h | 2 +- src/net/ea/specialhandler.cpp | 2 +- src/net/ea/specialhandler.h | 2 +- src/net/ea/token.h | 2 +- src/net/ea/tradehandler.cpp | 2 +- src/net/ea/tradehandler.h | 2 +- src/net/gamehandler.h | 2 +- src/net/generalhandler.h | 2 +- src/net/guildhandler.h | 2 +- src/net/inventoryhandler.h | 2 +- src/net/logindata.h | 2 +- src/net/loginhandler.h | 2 +- src/net/manaserv/adminhandler.cpp | 2 +- src/net/manaserv/adminhandler.h | 2 +- src/net/manaserv/attributes.cpp | 2 +- src/net/manaserv/attributes.h | 2 +- src/net/manaserv/beinghandler.cpp | 2 +- src/net/manaserv/beinghandler.h | 2 +- src/net/manaserv/buysellhandler.cpp | 2 +- src/net/manaserv/buysellhandler.h | 2 +- src/net/manaserv/charhandler.cpp | 2 +- src/net/manaserv/charhandler.h | 2 +- src/net/manaserv/chathandler.cpp | 2 +- src/net/manaserv/chathandler.h | 2 +- src/net/manaserv/connection.cpp | 2 +- src/net/manaserv/connection.h | 2 +- src/net/manaserv/defines.h | 2 +- src/net/manaserv/effecthandler.cpp | 2 +- src/net/manaserv/effecthandler.h | 2 +- src/net/manaserv/gamehandler.cpp | 2 +- src/net/manaserv/gamehandler.h | 2 +- src/net/manaserv/generalhandler.cpp | 2 +- src/net/manaserv/generalhandler.h | 2 +- src/net/manaserv/guildhandler.cpp | 2 +- src/net/manaserv/guildhandler.h | 2 +- src/net/manaserv/internal.cpp | 2 +- src/net/manaserv/internal.h | 2 +- src/net/manaserv/inventoryhandler.cpp | 2 +- src/net/manaserv/inventoryhandler.h | 2 +- src/net/manaserv/itemhandler.cpp | 2 +- src/net/manaserv/itemhandler.h | 2 +- src/net/manaserv/loginhandler.cpp | 2 +- src/net/manaserv/loginhandler.h | 2 +- src/net/manaserv/messagehandler.cpp | 2 +- src/net/manaserv/messagehandler.h | 2 +- src/net/manaserv/messagein.cpp | 2 +- src/net/manaserv/messagein.h | 2 +- src/net/manaserv/messageout.cpp | 2 +- src/net/manaserv/messageout.h | 2 +- src/net/manaserv/network.cpp | 2 +- src/net/manaserv/network.h | 2 +- src/net/manaserv/npchandler.cpp | 2 +- src/net/manaserv/npchandler.h | 2 +- src/net/manaserv/partyhandler.cpp | 2 +- src/net/manaserv/partyhandler.h | 2 +- src/net/manaserv/playerhandler.cpp | 2 +- src/net/manaserv/playerhandler.h | 2 +- src/net/manaserv/protocol.h | 2 +- src/net/manaserv/specialhandler.cpp | 2 +- src/net/manaserv/specialhandler.h | 2 +- src/net/manaserv/tradehandler.cpp | 2 +- src/net/manaserv/tradehandler.h | 2 +- src/net/messagehandler.h | 2 +- src/net/messagein.cpp | 2 +- src/net/messagein.h | 2 +- src/net/messageout.cpp | 2 +- src/net/messageout.h | 2 +- src/net/net.cpp | 2 +- src/net/net.h | 2 +- src/net/npchandler.h | 2 +- src/net/packetcounters.cpp | 2 +- src/net/packetcounters.h | 2 +- src/net/partyhandler.h | 2 +- src/net/playerhandler.h | 2 +- src/net/serverinfo.h | 2 +- src/net/specialhandler.h | 2 +- src/net/tmwa/adminhandler.cpp | 2 +- src/net/tmwa/adminhandler.h | 2 +- src/net/tmwa/beinghandler.cpp | 2 +- src/net/tmwa/beinghandler.h | 2 +- src/net/tmwa/buysellhandler.cpp | 2 +- src/net/tmwa/buysellhandler.h | 2 +- src/net/tmwa/charserverhandler.cpp | 2 +- src/net/tmwa/charserverhandler.h | 2 +- src/net/tmwa/chathandler.cpp | 2 +- src/net/tmwa/chathandler.h | 2 +- src/net/tmwa/gamehandler.cpp | 2 +- src/net/tmwa/gamehandler.h | 2 +- src/net/tmwa/generalhandler.cpp | 2 +- src/net/tmwa/generalhandler.h | 2 +- src/net/tmwa/gui/guildtab.cpp | 2 +- src/net/tmwa/gui/guildtab.h | 2 +- src/net/tmwa/gui/partytab.cpp | 2 +- src/net/tmwa/gui/partytab.h | 2 +- src/net/tmwa/guildhandler.cpp | 2 +- src/net/tmwa/guildhandler.h | 2 +- src/net/tmwa/inventoryhandler.cpp | 2 +- src/net/tmwa/inventoryhandler.h | 2 +- src/net/tmwa/itemhandler.cpp | 2 +- src/net/tmwa/itemhandler.h | 2 +- src/net/tmwa/loginhandler.cpp | 2 +- src/net/tmwa/loginhandler.h | 2 +- src/net/tmwa/messagehandler.cpp | 2 +- src/net/tmwa/messagehandler.h | 2 +- src/net/tmwa/messagein.cpp | 2 +- src/net/tmwa/messagein.h | 2 +- src/net/tmwa/messageout.cpp | 2 +- src/net/tmwa/messageout.h | 2 +- src/net/tmwa/network.cpp | 2 +- src/net/tmwa/network.h | 2 +- src/net/tmwa/npchandler.cpp | 2 +- src/net/tmwa/npchandler.h | 2 +- src/net/tmwa/playerhandler.cpp | 2 +- src/net/tmwa/playerhandler.h | 2 +- src/net/tmwa/protocol.h | 2 +- src/net/tmwa/specialhandler.cpp | 2 +- src/net/tmwa/specialhandler.h | 2 +- src/net/tmwa/tradehandler.cpp | 2 +- src/net/tmwa/tradehandler.h | 2 +- src/net/tradehandler.h | 2 +- src/net/worldinfo.h | 2 +- src/opengl1graphics.cpp | 2 +- src/opengl1graphics.h | 2 +- src/openglgraphics.cpp | 2 +- src/openglgraphics.h | 2 +- src/particle.cpp | 2 +- src/particle.h | 2 +- src/particlecontainer.cpp | 2 +- src/particlecontainer.h | 2 +- src/particleemitter.cpp | 2 +- src/particleemitter.h | 2 +- src/particleemitterprop.h | 2 +- src/party.cpp | 2 +- src/party.h | 2 +- src/playerinfo.cpp | 2 +- src/playerinfo.h | 2 +- src/playerrelations.cpp | 2 +- src/playerrelations.h | 2 +- src/position.cpp | 2 +- src/position.h | 2 +- src/properties.h | 2 +- src/resources/action.cpp | 2 +- src/resources/action.h | 2 +- src/resources/ambientlayer.cpp | 2 +- src/resources/ambientlayer.h | 2 +- src/resources/animation.cpp | 2 +- src/resources/animation.h | 2 +- src/resources/beinginfo.cpp | 2 +- src/resources/beinginfo.h | 2 +- src/resources/chardb.cpp | 2 +- src/resources/chardb.h | 2 +- src/resources/colordb.cpp | 2 +- src/resources/colordb.h | 2 +- src/resources/dye.cpp | 2 +- src/resources/dye.h | 2 +- src/resources/image.cpp | 2 +- src/resources/image.h | 2 +- src/resources/imageloader.cpp | 2 +- src/resources/imageloader.h | 2 +- src/resources/imageset.cpp | 2 +- src/resources/imageset.h | 2 +- src/resources/imagewriter.cpp | 2 +- src/resources/imagewriter.h | 2 +- src/resources/itemdb.cpp | 2 +- src/resources/itemdb.h | 2 +- src/resources/iteminfo.cpp | 2 +- src/resources/iteminfo.h | 2 +- src/resources/mapdb.cpp | 2 +- src/resources/mapdb.h | 2 +- src/resources/mapreader.cpp | 2 +- src/resources/mapreader.h | 2 +- src/resources/monsterdb.cpp | 2 +- src/resources/monsterdb.h | 2 +- src/resources/music.cpp | 2 +- src/resources/music.h | 2 +- src/resources/npcdb.cpp | 2 +- src/resources/npcdb.h | 2 +- src/resources/resource.cpp | 2 +- src/resources/resource.h | 2 +- src/resources/resourcemanager.cpp | 2 +- src/resources/resourcemanager.h | 2 +- src/resources/soundeffect.cpp | 2 +- src/resources/soundeffect.h | 2 +- src/resources/specialdb.cpp | 2 +- src/resources/specialdb.h | 2 +- src/resources/spritedef.cpp | 2 +- src/resources/spritedef.h | 2 +- src/resources/wallpaper.cpp | 2 +- src/resources/wallpaper.h | 2 +- src/rotationalparticle.cpp | 2 +- src/rotationalparticle.h | 2 +- src/shopitem.cpp | 2 +- src/shopitem.h | 2 +- src/simpleanimation.cpp | 2 +- src/simpleanimation.h | 2 +- src/sound.cpp | 2 +- src/sound.h | 2 +- src/sprite.h | 2 +- src/statuseffect.cpp | 2 +- src/statuseffect.h | 2 +- src/test/testlauncher.cpp | 2 +- src/test/testlauncher.h | 2 +- src/test/testmain.cpp | 2 +- src/test/testmain.h | 2 +- src/text.cpp | 2 +- src/text.h | 2 +- src/textparticle.cpp | 2 +- src/textparticle.h | 2 +- src/textrenderer.h | 2 +- src/tileset.h | 2 +- src/units.cpp | 2 +- src/units.h | 2 +- src/utils/dtor.h | 2 +- src/utils/gettext.h | 2 +- src/utils/mathutils.h | 2 +- src/utils/mkdir.cpp | 2 +- src/utils/mkdir.h | 2 +- src/utils/mutex.h | 2 +- src/utils/paths.cpp | 2 +- src/utils/paths.h | 2 +- src/utils/process.cpp | 2 +- src/utils/process.h | 2 +- src/utils/sha256.cpp | 2 +- src/utils/sha256.h | 2 +- src/utils/specialfolder.cpp | 2 +- src/utils/specialfolder.h | 2 +- src/utils/stringutils.cpp | 2 +- src/utils/stringutils.h | 2 +- src/utils/xml.cpp | 2 +- src/utils/xml.h | 2 +- src/variabledata.h | 2 +- src/vector.cpp | 2 +- src/vector.h | 2 +- 563 files changed, 563 insertions(+), 563 deletions(-) (limited to 'src') diff --git a/src/actor.cpp b/src/actor.cpp index 150f6042b..6a11c6e91 100644 --- a/src/actor.cpp +++ b/src/actor.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actor.h b/src/actor.h index 9afaff93d..51cba0c60 100644 --- a/src/actor.h +++ b/src/actor.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index a0fafbbf9..c7ee1fa77 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorsprite.h b/src/actorsprite.h index e130269bf..29df6954c 100644 --- a/src/actorsprite.h +++ b/src/actorsprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorspritelistener.h b/src/actorspritelistener.h index 88082af20..314825fc7 100644 --- a/src/actorspritelistener.h +++ b/src/actorspritelistener.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index e0a59b349..fa6d49d38 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index 08a255621..90c667a73 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 5277ddf33..f4f3451cb 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 16bcdf2da..4a41eac52 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp index ef2e0a680..3d08554fa 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/animationparticle.h b/src/animationparticle.h index 984d3dc14..45110501a 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/auctionmanager.cpp b/src/auctionmanager.cpp index 900d47e29..9e4752e9b 100644 --- a/src/auctionmanager.cpp +++ b/src/auctionmanager.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/auctionmanager.h b/src/auctionmanager.h index bdc0497ae..35b233abf 100644 --- a/src/auctionmanager.h +++ b/src/auctionmanager.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/avatar.h b/src/avatar.h index 6c79dd96a..5ff0a8f75 100644 --- a/src/avatar.h +++ b/src/avatar.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/being.cpp b/src/being.cpp index 9e5ae3ad1..6041b7123 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/being.h b/src/being.h index f1cae8df7..6052644c9 100644 --- a/src/being.h +++ b/src/being.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channel.cpp b/src/channel.cpp index 19859f4ef..dd52fe75d 100644 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channel.h b/src/channel.h index 078ea3a5e..559002296 100644 --- a/src/channel.h +++ b/src/channel.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp index 4ae1ebe2a..83229b454 100644 --- a/src/channelmanager.cpp +++ b/src/channelmanager.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/channelmanager.h b/src/channelmanager.h index e90408032..6798bdfa8 100644 --- a/src/channelmanager.h +++ b/src/channelmanager.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp index 0299a6fe3..8017575c4 100644 --- a/src/chatlogger.cpp +++ b/src/chatlogger.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/chatlogger.h b/src/chatlogger.h index 23d5d4a86..91805a8bc 100644 --- a/src/chatlogger.h +++ b/src/chatlogger.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009-2010 Andrei Karas * * This file is part of The ManaPlus Client. diff --git a/src/client.cpp b/src/client.cpp index 4b0319954..5d5ce3535 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/client.h b/src/client.h index 22eb406eb..27e6249bd 100644 --- a/src/client.h +++ b/src/client.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index cd8169651..6f2c2867d 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/commandhandler.h b/src/commandhandler.h index af54278ac..d9f11059b 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index 912c51404..e76a55dcf 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/compoundsprite.h b/src/compoundsprite.h index f29bece7f..1c04e44d2 100644 --- a/src/compoundsprite.h +++ b/src/compoundsprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/configlistener.h b/src/configlistener.h index bf94b1df5..e4bbbee53 100644 --- a/src/configlistener.h +++ b/src/configlistener.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/configuration.cpp b/src/configuration.cpp index b8b742f53..bed7c0878 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/configuration.h b/src/configuration.h index 1f03b7387..ae8908bfd 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/debug.h b/src/debug.h index 00a0ec3d0..4b3934922 100644 --- a/src/debug.h +++ b/src/debug.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/defaults.cpp b/src/defaults.cpp index 1e58dd5a0..414714ebe 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/defaults.h b/src/defaults.h index 8a6ec7f60..1d979e928 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/equipment.h b/src/equipment.h index 2b6dae3ce..6e4d04c21 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/event.cpp b/src/event.cpp index 9d27a081a..4f77967bc 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/event.h b/src/event.h index 9ff02f3d0..61bf31e14 100644 --- a/src/event.h +++ b/src/event.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/flooritem.cpp b/src/flooritem.cpp index cf1ee16dc..6e4926f2e 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/flooritem.h b/src/flooritem.h index fb929268a..7e7da33a0 100644 --- a/src/flooritem.h +++ b/src/flooritem.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/game.cpp b/src/game.cpp index c40a7da59..81e93034f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/game.h b/src/game.h index 4e5337d29..c6d942fe1 100644 --- a/src/game.h +++ b/src/game.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphics.cpp b/src/graphics.cpp index 47b0cae3d..bbd398aa5 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphics.h b/src/graphics.h index 2502c0418..4c47e690d 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphicsvertexes.cpp b/src/graphicsvertexes.cpp index 0e28c2b76..4a299620d 100644 --- a/src/graphicsvertexes.cpp +++ b/src/graphicsvertexes.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h index 13b7bf0c8..046bf90ce 100644 --- a/src/graphicsvertexes.h +++ b/src/graphicsvertexes.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index 759d4c245..eff4652ce 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/beingpopup.h b/src/gui/beingpopup.h index 2aeb6c20c..a029f739a 100644 --- a/src/gui/beingpopup.h +++ b/src/gui/beingpopup.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp index f5e556848..c41f22de7 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/buydialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h index 6bc10a103..57f66c922 100644 --- a/src/gui/buydialog.h +++ b/src/gui/buydialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp index 2a614ed74..5aa421bad 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/buyselldialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h index 2c7e5c101..d8e4444d8 100644 --- a/src/gui/buyselldialog.h +++ b/src/gui/buyselldialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index 3c412b424..518ed3da1 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index fccb5cb1c..acbd6b55a 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index a7ebaebca..8082b8d58 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index fca8b4946..525384a09 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index 42b54df05..a1233fdcc 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index c7010d6b1..e369f1777 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 401c9ae33..638691bab 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 9ebab0126..1e32fb311 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 4fd48b4c3..5c1286923 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 3c1195e8f..82e3d31f2 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp index 298855563..cf9d541ad 100644 --- a/src/gui/confirmdialog.cpp +++ b/src/gui/confirmdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h index 2b5febed0..421be7f96 100644 --- a/src/gui/confirmdialog.h +++ b/src/gui/confirmdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp index da98ea5ac..ba1330881 100644 --- a/src/gui/connectiondialog.cpp +++ b/src/gui/connectiondialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h index 7c0b59faf..76d8a952b 100644 --- a/src/gui/connectiondialog.h +++ b/src/gui/connectiondialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 56a63c72d..d13545bea 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h index b955209a5..ff86eaf74 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/debugwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index b5a7da634..db0878360 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h index d9734e8fe..f3fb61c70 100644 --- a/src/gui/didyouknowwindow.h +++ b/src/gui/didyouknowwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp index a8c92ed47..a286f78e8 100644 --- a/src/gui/emotepopup.cpp +++ b/src/gui/emotepopup.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/emotepopup.h b/src/gui/emotepopup.h index a80562fea..453c4e669 100644 --- a/src/gui/emotepopup.h +++ b/src/gui/emotepopup.h @@ -3,7 +3,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index cb3ace0c7..483e2da94 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 0a3c2da20..b06333b2f 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp index 40fa2f4ed..0e98c3473 100644 --- a/src/gui/focushandler.cpp +++ b/src/gui/focushandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 9d814bb69..064f04697 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index b3154fb25..bd855a598 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/gui.h b/src/gui/gui.h index 578202b17..cadcc89ac 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index b1175d709..a099c7a7a 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h index 178ae1e16..a6d83e91d 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/helpwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 8ffebebff..f1ea1ff6e 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index aa78705b8..5f2c9cb0a 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp index a80434ac0..9e2a97681 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/itemamountwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h index bacd4cfd0..076101c0f 100644 --- a/src/gui/itemamountwindow.h +++ b/src/gui/itemamountwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 2e87cd544..9a9e5f50d 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 66d7e91a2..89f6355fe 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index 86b3dc28b..719b86cb8 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h index 0696bc680..08799b1c2 100644 --- a/src/gui/logindialog.h +++ b/src/gui/logindialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index d890a462f..74da37341 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/minimap.h b/src/gui/minimap.h index 86996f51c..8b7da5849 100644 --- a/src/gui/minimap.h +++ b/src/gui/minimap.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index 665d2b61b..3ab946fa8 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index 6fb8f7652..ca18e1b92 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 1b0193c65..55baf9362 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index 7e9ea7e10..e76897499 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index ada48e832..6bcb62baf 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h index bc329096b..b00f7bda0 100644 --- a/src/gui/npcpostdialog.h +++ b/src/gui/npcpostdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp index 5a6ee4846..4a3bdf731 100644 --- a/src/gui/okdialog.cpp +++ b/src/gui/okdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h index 2f32d0d65..5705be568 100644 --- a/src/gui/okdialog.h +++ b/src/gui/okdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index 6e68fad17..74e8dbe46 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h index 105f5a0db..b2b46c7e7 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/outfitwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index 348f97de8..fe14cd2d4 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/palette.h b/src/gui/palette.h index d46a3c57c..36d87e305 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 7860f3c04..f31d01cfa 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 2db565ab7..17a985a4f 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index 450cfd86e..dff5a570c 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index 5456be26b..dd881d283 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 29030aa72..2122e0d6b 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/register.h b/src/gui/register.h index b0137f141..ecda27d28 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 001a8671a..0e69db026 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2009 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index e0aac7785..6fcad34d4 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 7c5ddb055..e8660f861 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -8,7 +8,7 @@ * * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessn and Per Larsson * Copyright (C) 2007-2010 The Mana World Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * Js_./ * Per Larsson a.k.a finalman _RqZ{a<^_aa diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp index e1a77f6c9..0e1b16de7 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/selldialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index a775cf0e0..877b74cd8 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 3fd298159..65421abd3 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h index 39c6f94f7..d2fe0d25b 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/serverdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index d305824d5..f76f738c6 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup.h b/src/gui/setup.h index b499da4ee..3a6f66297 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp index 1737e9004..bc058faf9 100644 --- a/src/gui/setup_audio.cpp +++ b/src/gui/setup_audio.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index 53aa017b6..88869d730 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp index 1b8209c8f..7e81acaa9 100644 --- a/src/gui/setup_chat.cpp +++ b/src/gui/setup_chat.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h index 402235d99..238021cca 100644 --- a/src/gui/setup_chat.h +++ b/src/gui/setup_chat.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 6f1a4afce..d5885143c 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -1,7 +1,7 @@ /* * Configurable text colors * Copyright (C) 2008 Douglas Boffey - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h index b6d5209e2..cbcca6dfa 100644 --- a/src/gui/setup_colors.h +++ b/src/gui/setup_colors.h @@ -1,7 +1,7 @@ /* * Configurable text colors * Copyright (C) 2008 Douglas Boffey - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 7899247e3..290607be4 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index 5bd72cdad..d93d7e821 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index fa7a63b8c..bdd7c2083 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2007 Joshua Langley * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp index bd445cfa0..d6f5e9972 100644 --- a/src/gui/setup_other.cpp +++ b/src/gui/setup_other.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h index a13bf4ba3..4144a02ab 100644 --- a/src/gui/setup_other.h +++ b/src/gui/setup_other.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp index dd634d1f3..95703fa4c 100644 --- a/src/gui/setup_perfomance.cpp +++ b/src/gui/setup_perfomance.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h index f355c9691..097c1e28c 100644 --- a/src/gui/setup_perfomance.h +++ b/src/gui/setup_perfomance.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index a6bf5b81c..f0bf4c0ea 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index c9ce7b3b3..ebfc78db6 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 8ac61f90c..9ddef9e1a 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index 2c23d4dba..76ea26875 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 794fd3324..259388fd0 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 509deb2fd..0c82ab272 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp index a50a485ec..b6b87edb7 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/shopwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index e1fd8a2a0..53ed7690c 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index eff28def7..fed2deba8 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index 8627a5dce..ceb82ef7b 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 072a9cb85..833a2bbe7 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 63f7d1790..dcb40927a 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 72dd2104d..f5e293e5d 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index dec8a6c26..d99982c06 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp index 6abff3796..4dd53cee1 100644 --- a/src/gui/specialswindow.cpp +++ b/src/gui/specialswindow.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h index 4350a656b..a7eeeb5d5 100644 --- a/src/gui/specialswindow.h +++ b/src/gui/specialswindow.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp index 7356cc633..877715137 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 170f619e8..5342bd49e 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 5ac14d132..b3e3f38f3 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index d3a619bcb..87107694f 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp index a32b13aa4..b30c9eb82 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/textdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h index aed26c1e9..f5395a17d 100644 --- a/src/gui/textdialog.h +++ b/src/gui/textdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index 15b2618da..8cdbfa430 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h index 9ac041389..6f418152c 100644 --- a/src/gui/textpopup.h +++ b/src/gui/textpopup.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index b3b28bffa..ecc491191 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/theme.h b/src/gui/theme.h index 92b2c8878..3be6882a3 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -4,7 +4,7 @@ * Copyright (C) 2009 Aethyra Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index 506bf65c9..43393fc09 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h index 16b3d9d6f..b055c90ce 100644 --- a/src/gui/tradewindow.h +++ b/src/gui/tradewindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index c43f28400..ca21263f1 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h index e68741e22..a89b3231b 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/unregisterdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index ac51cc76f..089aa1ea1 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h index e9a45241f..f8ee4e29c 100644 --- a/src/gui/updaterwindow.h +++ b/src/gui/updaterwindow.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 62fd03c70..a3299fb7b 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h index 3bf9c782a..cb0593fa7 100644 --- a/src/gui/userpalette.h +++ b/src/gui/userpalette.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index b6c55f2c4..aedfbe219 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 938988198..b25f51242 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 8264f0fb9..1bf897301 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index afb4abdf5..526db6ef5 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index c5500e801..5ac13c78e 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h index 03c63da2c..8d85e739e 100644 --- a/src/gui/widgets/battletab.h +++ b/src/gui/widgets/battletab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 7d30c10bf..250520d28 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index e26ae32e0..ab3049c0b 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 85e4eca17..2867e3d39 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 1b62179b3..aed46bb55 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp index 87d87f7d1..f362cc28c 100644 --- a/src/gui/widgets/channeltab.cpp +++ b/src/gui/widgets/channeltab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h index 5d3b78094..4b56d2e05 100644 --- a/src/gui/widgets/channeltab.h +++ b/src/gui/widgets/channeltab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index c2db20574..aea367482 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 962c0b363..ddf10bf5e 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index dcedc8951..0689c5395 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index af38065f5..0c8e48553 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp index 558257507..80028a62f 100644 --- a/src/gui/widgets/container.cpp +++ b/src/gui/widgets/container.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index c011b8925..d927f5379 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 2a17320de..91c983f26 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 3559b634a..e9b61aa43 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp index 7d3ddc0b4..acda5ad88 100644 --- a/src/gui/widgets/flowcontainer.cpp +++ b/src/gui/widgets/flowcontainer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index d1f276b3c..677dd3661 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp index 0353ac23f..a95fca3cf 100644 --- a/src/gui/widgets/guildchattab.cpp +++ b/src/gui/widgets/guildchattab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h index 4f5ee3a8e..bebdaa1f3 100644 --- a/src/gui/widgets/guildchattab.h +++ b/src/gui/widgets/guildchattab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 78ce14e56..d620cbb8d 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 17f517644..d5810fcbf 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp index dbb02498a..c128ea550 100644 --- a/src/gui/widgets/horizontcontainer.cpp +++ b/src/gui/widgets/horizontcontainer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index 2a3f77d2b..7439672dc 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index b8cc2ac3a..b35eb1d95 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index 4b0d12342..6f05da3f7 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index 89544e108..8a075000b 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h index b36b088a6..7284c9d03 100644 --- a/src/gui/widgets/inttextfield.h +++ b/src/gui/widgets/inttextfield.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp index 795f0d31e..216c2bea0 100644 --- a/src/gui/widgets/inventoryfilter.cpp +++ b/src/gui/widgets/inventoryfilter.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h index c3762189e..c4f2b6242 100644 --- a/src/gui/widgets/inventoryfilter.h +++ b/src/gui/widgets/inventoryfilter.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 57c64093b..669d05a66 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 2c465fdee..ae6e4a35d 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 549aa1616..61d929f0b 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h index bc3bdc51c..9f66da991 100644 --- a/src/gui/widgets/itemlinkhandler.h +++ b/src/gui/widgets/itemlinkhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 3682ec448..130d641fe 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 587723279..59e52b5ae 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index f0359062e..453e62a50 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 754d13a0b..02fed43b5 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp index 54c41635f..2b79609b9 100644 --- a/src/gui/widgets/layouthelper.cpp +++ b/src/gui/widgets/layouthelper.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index a01051595..b0f4d435d 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h index f8f195f2d..366899ffc 100644 --- a/src/gui/widgets/linkhandler.h +++ b/src/gui/widgets/linkhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 53299ca46..28fe9daa1 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 8ac0bbc3b..e4b6dd54e 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h index 9484be0a5..e41ed46b8 100644 --- a/src/gui/widgets/mouseevent.h +++ b/src/gui/widgets/mouseevent.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp index 34639b063..6f339ddd7 100644 --- a/src/gui/widgets/passwordfield.cpp +++ b/src/gui/widgets/passwordfield.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h index 5ba08094d..eca95e6ad 100644 --- a/src/gui/widgets/passwordfield.h +++ b/src/gui/widgets/passwordfield.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index fb72176bd..5e2412d3b 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 2bf010618..a066c104e 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 78557d481..e206a3246 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 64e4b52ac..8ff21149a 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * Copyright (C) 2009 Aethyra Development Team * * This file is part of The ManaPlus Client. diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index f9b6da153..8b2beb8d5 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index 36ed96bd2..163310245 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index e885aa0ec..ae94f0a0f 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h index e5fcaefda..6d55fd3ce 100644 --- a/src/gui/widgets/progressindicator.h +++ b/src/gui/widgets/progressindicator.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index 7d344b09d..94152a716 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index d1c347acb..7692d478a 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index c8822eea9..4a6adadb6 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index 873d74058..ce4eb0770 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 0ec4a2027..021bd3d15 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 105791080..86902b5c9 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 8081f5d7b..92ff625c2 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 5b8a9df87..eb2680ede 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp index e98e9c3ac..b3863c134 100644 --- a/src/gui/widgets/setuptab.cpp +++ b/src/gui/widgets/setuptab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h index ddc0c8958..e47af8995 100644 --- a/src/gui/widgets/setuptab.h +++ b/src/gui/widgets/setuptab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp index 4fb092070..ab8f61a40 100644 --- a/src/gui/widgets/setuptabscroll.cpp +++ b/src/gui/widgets/setuptabscroll.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h index 2b0c6f65e..4ad1f464b 100644 --- a/src/gui/widgets/setuptabscroll.h +++ b/src/gui/widgets/setuptabscroll.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp index d3aac5c56..5f13e5f71 100644 --- a/src/gui/widgets/shopitems.cpp +++ b/src/gui/widgets/shopitems.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h index 29d24cb64..c013f1810 100644 --- a/src/gui/widgets/shopitems.h +++ b/src/gui/widgets/shopitems.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index b649a81ef..71e373d70 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index c5acbbefc..9b416d3a3 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 36f88da08..6c8397bbb 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 8587950c6..72f8b9cac 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 3822d40c9..ed667e194 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index 9ac45d0a0..8eed984b1 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 8e4b1fe6f..c09fb423d 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index ba51e6c74..40b46ede5 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index fb9279343..e7dda5067 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index d71109dd3..8e349a4b4 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp index f54b4281a..5216fb89c 100644 --- a/src/gui/widgets/tablemodel.cpp +++ b/src/gui/widgets/tablemodel.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h index 810b2f4ac..40a350163 100644 --- a/src/gui/widgets/tablemodel.h +++ b/src/gui/widgets/tablemodel.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index f31c8d129..a4bc3bc09 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 27525fc85..6d2467b38 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index b4584947a..03fdb5378 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index e530cfef2..bc1123f19 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 9be2d5b3f..f3ea962bc 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h index a3f623177..81e27fd06 100644 --- a/src/gui/widgets/textpreview.h +++ b/src/gui/widgets/textpreview.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index deec2aea6..5c893de1f 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h index f061778f3..06add3ee0 100644 --- a/src/gui/widgets/tradetab.h +++ b/src/gui/widgets/tradetab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index 5e79b7c19..36daf7676 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 08546aa47..6e1305a06 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 33859d8be..625c8a392 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h index 8678c932c..72d407ac2 100644 --- a/src/gui/widgets/whispertab.h +++ b/src/gui/widgets/whispertab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 273695a1a..3858b0d81 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 6249626d3..65dbf196b 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp index 34a6b68c7..43aaea8a4 100644 --- a/src/gui/widgets/windowcontainer.cpp +++ b/src/gui/widgets/windowcontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h index b27ba927f..00ef04c19 100644 --- a/src/gui/widgets/windowcontainer.h +++ b/src/gui/widgets/windowcontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 3f41be466..e954340f8 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index 3f02ea851..8abc5e87a 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp index ae5345031..917605281 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/worldselectdialog.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h index 61bcc4b51..1a469757f 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/worldselectdialog.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guichanfwd.h b/src/guichanfwd.h index be5708863..b3808d8ba 100644 --- a/src/guichanfwd.h +++ b/src/guichanfwd.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guild.cpp b/src/guild.cpp index 0e629e2be..e569bed65 100644 --- a/src/guild.cpp +++ b/src/guild.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guild.h b/src/guild.h index 915dda5e7..e95677ec6 100644 --- a/src/guild.h +++ b/src/guild.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index 16edb369a..9dc9d7b73 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/guildmanager.h b/src/guildmanager.h index 5cd5e19cc..368b2456c 100644 --- a/src/guildmanager.h +++ b/src/guildmanager.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp index 8634702ce..5e0b93d7a 100644 --- a/src/imageparticle.cpp +++ b/src/imageparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imageparticle.h b/src/imageparticle.h index 73005a526..16b4b8cb7 100644 --- a/src/imageparticle.h +++ b/src/imageparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imagesprite.cpp b/src/imagesprite.cpp index 6ccaeb5fc..f969717f2 100644 --- a/src/imagesprite.cpp +++ b/src/imagesprite.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/imagesprite.h b/src/imagesprite.h index 9dad0f743..7537faef3 100644 --- a/src/imagesprite.h +++ b/src/imagesprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/inventory.cpp b/src/inventory.cpp index 4521613ba..47a32bce1 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/inventory.h b/src/inventory.h index f94568739..d210c65e2 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/item.cpp b/src/item.cpp index d4b41b6cb..cc7d666b5 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/item.h b/src/item.h index 29700f27a..ad051846d 100644 --- a/src/item.h +++ b/src/item.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 625e8d90a..f267dd755 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/itemshortcut.h b/src/itemshortcut.h index b735e899c..55c6d1165 100644 --- a/src/itemshortcut.h +++ b/src/itemshortcut.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/joystick.cpp b/src/joystick.cpp index 29e16dff4..035232e41 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/joystick.h b/src/joystick.h index be23599c9..87d1e81a9 100644 --- a/src/joystick.h +++ b/src/joystick.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/listener.cpp b/src/listener.cpp index cf7c209d6..ea125013f 100644 --- a/src/listener.cpp +++ b/src/listener.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/listener.h b/src/listener.h index cccc026c6..dc968672a 100644 --- a/src/listener.h +++ b/src/listener.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/localconsts.h b/src/localconsts.h index e135a4108..4a8bb062a 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 5935dd140..3d2d3a165 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/localplayer.h b/src/localplayer.h index 77e25e291..ed181e3d0 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/logger.cpp b/src/logger.cpp index c2eb1cc46..a2df9a911 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/logger.h b/src/logger.h index 4ce89f759..db618b275 100644 --- a/src/logger.h +++ b/src/logger.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/main.cpp b/src/main.cpp index 31d88082f..5507cce7e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/main.h b/src/main.h index c772bf6d7..5b4eb5c63 100644 --- a/src/main.h +++ b/src/main.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/map.cpp b/src/map.cpp index e706f120b..63b815af2 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/map.h b/src/map.h index 79dd01c41..0f2f2bf47 100644 --- a/src/map.h +++ b/src/map.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h index 6899f85f4..f6d8606ce 100644 --- a/src/net/adminhandler.h +++ b/src/net/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h index c41e918e1..8a49a68cd 100644 --- a/src/net/buysellhandler.h +++ b/src/net/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/charhandler.cpp b/src/net/charhandler.cpp index f3a02fc3b..016b72cbf 100644 --- a/src/net/charhandler.cpp +++ b/src/net/charhandler.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/charhandler.h b/src/net/charhandler.h index 848354e96..f8b3f4f98 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/chathandler.h b/src/net/chathandler.h index fc6c10376..f8a9e4ccf 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/download.cpp b/src/net/download.cpp index 21881471b..22af389f3 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/download.h b/src/net/download.h index 8339dee30..b31350eff 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index bdd43b3f8..556629458 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index 5d1b7aa14..70c458514 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 1c2983137..84bd03bb1 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index f47385a61..b4fd5f93f 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 28584d97f..73d4090b7 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index 196626b0d..14d39ea02 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 63e267584..b05ed6b51 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index bacde67b6..bec8d2011 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 35e8597f0..e31f68596 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index d39e6788a..baa9a01b5 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h index d34cba0ca..62b61a956 100644 --- a/src/net/ea/eaprotocol.h +++ b/src/net/ea/eaprotocol.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index a43c159e3..61ad8bfdb 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 511efe357..248175617 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 9836f5fa9..87fc34d94 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index 2aad4a564..81d971161 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index 23eab361c..cf62af459 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 3a544d8db..029d71ac7 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 49df76f97..dfbe53a6e 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index 5b090ec41..5b7442a40 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index d2a1fb4f0..4c4fb760c 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 6db6b18ed..c2e076751 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index 38d6f7be9..e08fe2cd1 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index dabf61b5d..1d0747c61 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index a23c83b63..bbf19fb34 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 62ace31c8..555de6385 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index e8e1014d4..18b0ca39a 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 3e68c2321..be0465375 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 02af3dbb4..6a841415f 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index ceb4aba0b..d0402ecfc 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp index 4abcb004e..7b2ef601a 100644 --- a/src/net/ea/specialhandler.cpp +++ b/src/net/ea/specialhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/specialhandler.h b/src/net/ea/specialhandler.h index 47b412f3e..c2b05399e 100644 --- a/src/net/ea/specialhandler.h +++ b/src/net/ea/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/token.h b/src/net/ea/token.h index 40a7058ff..86871647f 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 5aaa09f91..0ba3925a8 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index 6d623f60d..07e9cc23b 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h index 14203fb20..fd051234f 100644 --- a/src/net/gamehandler.h +++ b/src/net/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h index 1a15e6929..9864ba654 100644 --- a/src/net/generalhandler.h +++ b/src/net/generalhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h index 4070abad5..b8af633de 100644 --- a/src/net/guildhandler.h +++ b/src/net/guildhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 360f141fa..ec2f3db47 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/logindata.h b/src/net/logindata.h index 6433d2759..e5d3fc97a 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 5607ca1e2..1366e30dd 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp index a7bcf6355..609c9e4f1 100644 --- a/src/net/manaserv/adminhandler.cpp +++ b/src/net/manaserv/adminhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h index 5a71db35e..a4157b3b0 100644 --- a/src/net/manaserv/adminhandler.h +++ b/src/net/manaserv/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp index 25c75f9d8..be22e2822 100644 --- a/src/net/manaserv/attributes.cpp +++ b/src/net/manaserv/attributes.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/attributes.h b/src/net/manaserv/attributes.h index 35eeaef88..ba5931b8c 100644 --- a/src/net/manaserv/attributes.h +++ b/src/net/manaserv/attributes.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp index d14cdcadf..cef4f497a 100644 --- a/src/net/manaserv/beinghandler.cpp +++ b/src/net/manaserv/beinghandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h index 59797f8f5..70d61545c 100644 --- a/src/net/manaserv/beinghandler.h +++ b/src/net/manaserv/beinghandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp index 7cc0e70f2..25db86cf0 100644 --- a/src/net/manaserv/buysellhandler.cpp +++ b/src/net/manaserv/buysellhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h index e1a9c91e5..3c983ac08 100644 --- a/src/net/manaserv/buysellhandler.h +++ b/src/net/manaserv/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp index 42db6e621..300af5a2b 100644 --- a/src/net/manaserv/charhandler.cpp +++ b/src/net/manaserv/charhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/charhandler.h b/src/net/manaserv/charhandler.h index ea44ae23e..134b8447b 100644 --- a/src/net/manaserv/charhandler.h +++ b/src/net/manaserv/charhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index 1757b565d..f0a23127c 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h index e93c2dd87..029d5fe83 100644 --- a/src/net/manaserv/chathandler.h +++ b/src/net/manaserv/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/connection.cpp b/src/net/manaserv/connection.cpp index 33d6f28cf..2467eb198 100644 --- a/src/net/manaserv/connection.cpp +++ b/src/net/manaserv/connection.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/connection.h b/src/net/manaserv/connection.h index 933822a85..4263ae21f 100644 --- a/src/net/manaserv/connection.h +++ b/src/net/manaserv/connection.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/defines.h b/src/net/manaserv/defines.h index e2fe27839..aaf29bff2 100644 --- a/src/net/manaserv/defines.h +++ b/src/net/manaserv/defines.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp index 92cf66302..59fb1e4f5 100644 --- a/src/net/manaserv/effecthandler.cpp +++ b/src/net/manaserv/effecthandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/effecthandler.h b/src/net/manaserv/effecthandler.h index 774411041..ceb48fd22 100644 --- a/src/net/manaserv/effecthandler.h +++ b/src/net/manaserv/effecthandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp index 21bd526d8..4a03dff0f 100644 --- a/src/net/manaserv/gamehandler.cpp +++ b/src/net/manaserv/gamehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h index 323b2566a..443533bba 100644 --- a/src/net/manaserv/gamehandler.h +++ b/src/net/manaserv/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index 2eea6cdf6..584faa368 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h index c6614707f..fcb28c846 100644 --- a/src/net/manaserv/generalhandler.h +++ b/src/net/manaserv/generalhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp index 306a15be4..dfd2ed3cf 100644 --- a/src/net/manaserv/guildhandler.cpp +++ b/src/net/manaserv/guildhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h index 6a8db27c8..893a7157b 100644 --- a/src/net/manaserv/guildhandler.h +++ b/src/net/manaserv/guildhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/internal.cpp b/src/net/manaserv/internal.cpp index 6d2c99712..37148b101 100644 --- a/src/net/manaserv/internal.cpp +++ b/src/net/manaserv/internal.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/internal.h b/src/net/manaserv/internal.h index 14a728727..9c0529a79 100644 --- a/src/net/manaserv/internal.h +++ b/src/net/manaserv/internal.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp index ce837b5e1..47f149eca 100644 --- a/src/net/manaserv/inventoryhandler.cpp +++ b/src/net/manaserv/inventoryhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h index ba4535d79..8471b1caf 100644 --- a/src/net/manaserv/inventoryhandler.h +++ b/src/net/manaserv/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp index 89826a33f..021d57cf3 100644 --- a/src/net/manaserv/itemhandler.cpp +++ b/src/net/manaserv/itemhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/itemhandler.h b/src/net/manaserv/itemhandler.h index 0fdd8c333..cfdc30083 100644 --- a/src/net/manaserv/itemhandler.h +++ b/src/net/manaserv/itemhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp index bf823562f..f1cb8e352 100644 --- a/src/net/manaserv/loginhandler.cpp +++ b/src/net/manaserv/loginhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h index 0e8f2a4e6..72c43aec0 100644 --- a/src/net/manaserv/loginhandler.h +++ b/src/net/manaserv/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagehandler.cpp b/src/net/manaserv/messagehandler.cpp index 2e9603f19..769f2a3b6 100644 --- a/src/net/manaserv/messagehandler.cpp +++ b/src/net/manaserv/messagehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagehandler.h b/src/net/manaserv/messagehandler.h index c1011cef7..c09d59439 100644 --- a/src/net/manaserv/messagehandler.h +++ b/src/net/manaserv/messagehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagein.cpp b/src/net/manaserv/messagein.cpp index 92bfa7d2c..bc97155a9 100644 --- a/src/net/manaserv/messagein.cpp +++ b/src/net/manaserv/messagein.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messagein.h b/src/net/manaserv/messagein.h index 6b0464a44..f22cdabca 100644 --- a/src/net/manaserv/messagein.h +++ b/src/net/manaserv/messagein.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messageout.cpp b/src/net/manaserv/messageout.cpp index c80ba6593..0bb1c0f77 100644 --- a/src/net/manaserv/messageout.cpp +++ b/src/net/manaserv/messageout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/messageout.h b/src/net/manaserv/messageout.h index 772b108f3..dc583ab3d 100644 --- a/src/net/manaserv/messageout.h +++ b/src/net/manaserv/messageout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp index 44478fb4c..84e71eaf3 100644 --- a/src/net/manaserv/network.cpp +++ b/src/net/manaserv/network.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/network.h b/src/net/manaserv/network.h index 63ba7b11a..506d44b4f 100644 --- a/src/net/manaserv/network.h +++ b/src/net/manaserv/network.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp index 8ff2c5d21..24a58ebd8 100644 --- a/src/net/manaserv/npchandler.cpp +++ b/src/net/manaserv/npchandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h index f91858614..d71cd4d18 100644 --- a/src/net/manaserv/npchandler.h +++ b/src/net/manaserv/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp index 660657f44..60dcaaaff 100644 --- a/src/net/manaserv/partyhandler.cpp +++ b/src/net/manaserv/partyhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h index 087936d72..5497d5e34 100644 --- a/src/net/manaserv/partyhandler.h +++ b/src/net/manaserv/partyhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index 925938161..5ebf840bc 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h index c33eddc84..0255406a8 100644 --- a/src/net/manaserv/playerhandler.h +++ b/src/net/manaserv/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/protocol.h b/src/net/manaserv/protocol.h index 7f5e03871..58103ffb1 100644 --- a/src/net/manaserv/protocol.h +++ b/src/net/manaserv/protocol.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp index 85fe7271f..13c6f7613 100644 --- a/src/net/manaserv/specialhandler.cpp +++ b/src/net/manaserv/specialhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/specialhandler.h b/src/net/manaserv/specialhandler.h index ccbe59fd9..f6a20e4ac 100644 --- a/src/net/manaserv/specialhandler.h +++ b/src/net/manaserv/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp index 383da9fe6..e827c2cec 100644 --- a/src/net/manaserv/tradehandler.cpp +++ b/src/net/manaserv/tradehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h index 2ca542f78..39d691982 100644 --- a/src/net/manaserv/tradehandler.h +++ b/src/net/manaserv/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index 64483c8cd..9867ffd65 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 19453b745..4fb61dc6a 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messagein.h b/src/net/messagein.h index ed143a213..8dd43a1a0 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index b1e0c2295..9ec45c7cc 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/messageout.h b/src/net/messageout.h index a169bfe2d..6ac6f81e2 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/net.cpp b/src/net/net.cpp index 933f7686b..713b6aa7e 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/net.h b/src/net/net.h index a6adef44e..ce320591f 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/npchandler.h b/src/net/npchandler.h index 40b97deef..2e32e5986 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/packetcounters.cpp b/src/net/packetcounters.cpp index 8cd2e4627..dc504768e 100644 --- a/src/net/packetcounters.cpp +++ b/src/net/packetcounters.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h index 35d5d64bc..936217c95 100644 --- a/src/net/packetcounters.h +++ b/src/net/packetcounters.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index 14f06060d..dd92f78d1 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 4f1ed8f00..f62acc0c9 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index eb07f766e..fb6a99a33 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/specialhandler.h b/src/net/specialhandler.h index 64b11fdda..7ed3673cf 100644 --- a/src/net/specialhandler.h +++ b/src/net/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 5d5034938..65f4d6f2c 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index d81e2421a..4063a7fba 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 02267e20e..627db1402 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 5e741aaa8..a45e33d36 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 552aa1d51..b6473400a 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index 65067f7e0..e4d07511f 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index d08e4a091..717df1284 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index f1256e409..915c6dba5 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 5af248e5c..368421285 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 9a88b7478..8652d297d 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index adaaa067b..5acf9ae6c 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index ddb381058..d48fabdcc 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 293986bde..ea44ec206 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index e0f29fd1d..b250ddfd4 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 05a93bff8..af90f5c6b 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h index 21c56c4ed..351dadfd6 100644 --- a/src/net/tmwa/gui/guildtab.h +++ b/src/net/tmwa/gui/guildtab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 373fcca31..d0738e79c 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h index d865995f7..0bdc11372 100644 --- a/src/net/tmwa/gui/partytab.h +++ b/src/net/tmwa/gui/partytab.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 7ea97eb49..5e2ac528f 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index d8d291bdd..e1d2d7c29 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 14a15e59f..7fa26f5ed 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index d924e8713..d2ecc4b6d 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp index ee33cd230..ce03044c7 100644 --- a/src/net/tmwa/itemhandler.cpp +++ b/src/net/tmwa/itemhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h index 3e948547e..0f2459fbf 100644 --- a/src/net/tmwa/itemhandler.h +++ b/src/net/tmwa/itemhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index fba33297d..3b53bbf7c 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index c13c882a7..e2b8beec7 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagehandler.cpp b/src/net/tmwa/messagehandler.cpp index 830b3bc4f..d4b3c03a4 100644 --- a/src/net/tmwa/messagehandler.cpp +++ b/src/net/tmwa/messagehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index fef9e2004..7607e5c80 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp index 5a9d39211..b8bba342f 100644 --- a/src/net/tmwa/messagein.cpp +++ b/src/net/tmwa/messagein.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index bf8debf54..29b17d8ba 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index d5d9d82f9..790611381 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index d97851d4a..5d1e911b6 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index db006c5c0..addc737ee 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 757358c25..17a4f7370 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 6b6ffcbb6..574f34d55 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 548346205..967829ddc 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 4534cca8b..d5f0641eb 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index 898bdae3d..0fa524d51 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 37f036ca8..0f124cc20 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index c75d954dc..9fa7b6dfa 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/specialhandler.h b/src/net/tmwa/specialhandler.h index 50bf31c0b..f17ef4c44 100644 --- a/src/net/tmwa/specialhandler.h +++ b/src/net/tmwa/specialhandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 2280079ea..1a44e4956 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index 3a4c8c1fc..b5a06ef6a 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index 57219e675..06a431ec6 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h index b02e9fa21..26733a0da 100644 --- a/src/net/worldinfo.h +++ b/src/net/worldinfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index e8c972522..672962f7b 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h index 11df607f8..87458d8b9 100644 --- a/src/opengl1graphics.h +++ b/src/opengl1graphics.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index a8eb5d010..dc7e37e17 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/openglgraphics.h b/src/openglgraphics.h index d12810203..1047223ad 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particle.cpp b/src/particle.cpp index e71791ce8..bc92a21b5 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particle.h b/src/particle.h index ad448a054..a79181498 100644 --- a/src/particle.h +++ b/src/particle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index 40ab68865..e39f4dd86 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particlecontainer.h b/src/particlecontainer.h index 2219bd67c..a8af163fd 100644 --- a/src/particlecontainer.h +++ b/src/particlecontainer.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 1add452a0..f1c81e9ab 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particleemitter.h b/src/particleemitter.h index 49826d0f6..09e17767a 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h index 76c855e4f..cadfa0f3a 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/party.cpp b/src/party.cpp index b462c94a7..1a693ddd6 100644 --- a/src/party.cpp +++ b/src/party.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/party.h b/src/party.h index 73c45214a..1f616319d 100644 --- a/src/party.h +++ b/src/party.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp index 93e704302..0b9d16de2 100644 --- a/src/playerinfo.cpp +++ b/src/playerinfo.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/playerinfo.h b/src/playerinfo.h index b90e47ce9..cff145d2d 100644 --- a/src/playerinfo.h +++ b/src/playerinfo.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 81338de74..28596ac8b 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/playerrelations.h b/src/playerrelations.h index 5eb1b3c64..20ba55fce 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/position.cpp b/src/position.cpp index 8e9baf272..7bd6cfe50 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/position.h b/src/position.h index 973a774f0..2e10aebe2 100644 --- a/src/position.h +++ b/src/position.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/properties.h b/src/properties.h index 19354b9ab..406477c73 100644 --- a/src/properties.h +++ b/src/properties.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/action.cpp b/src/resources/action.cpp index f940bffcb..e1f88ecb7 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/action.h b/src/resources/action.h index 9ab6f98d5..603135875 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp index 2ad25dcd0..b5640904c 100644 --- a/src/resources/ambientlayer.cpp +++ b/src/resources/ambientlayer.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h index c90ef7c79..54a764841 100644 --- a/src/resources/ambientlayer.h +++ b/src/resources/ambientlayer.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 1f3336a8b..1c1da6ca5 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/animation.h b/src/resources/animation.h index 19b17eb54..f52234abb 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 0b2aaa8fa..0fa815181 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index b93c11ba6..0f62ba5ea 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp index d944f280e..c6de2e189 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/chardb.cpp @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/chardb.h b/src/resources/chardb.h index 769dedb56..8be2c34c4 100644 --- a/src/resources/chardb.h +++ b/src/resources/chardb.h @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 3b8c9d573..41393541f 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/colordb.h b/src/resources/colordb.h index f4cc88a59..36907095e 100644 --- a/src/resources/colordb.h +++ b/src/resources/colordb.h @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 29b1c864e..6800c5170 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/dye.h b/src/resources/dye.h index 85192041a..94bee3b58 100644 --- a/src/resources/dye.h +++ b/src/resources/dye.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 4cdcdb001..d94967631 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/image.h b/src/resources/image.h index 333dc63f9..a9f5722cd 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp index a8563c679..decf17189 100644 --- a/src/resources/imageloader.cpp +++ b/src/resources/imageloader.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h index 5c3d29c74..1dcd046ca 100644 --- a/src/resources/imageloader.h +++ b/src/resources/imageloader.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp index 09b57be28..9e3513e91 100644 --- a/src/resources/imageset.cpp +++ b/src/resources/imageset.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imageset.h b/src/resources/imageset.h index fd320295a..69ebebdc0 100644 --- a/src/resources/imageset.h +++ b/src/resources/imageset.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp index a3a35cfd1..9501c98a5 100644 --- a/src/resources/imagewriter.cpp +++ b/src/resources/imagewriter.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index ae94730f2..ca8150694 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 2911fa06f..e7cc0f931 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index 71f0a490e..e56840c16 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index dfcff3f76..f163fc590 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 1fe8f3bad..8c5e2dd8f 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp index e7288e039..e61ee45b0 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/mapdb.cpp @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/mapdb.h b/src/resources/mapdb.h index 2ba084297..d249a5cc6 100644 --- a/src/resources/mapdb.h +++ b/src/resources/mapdb.h @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 68d39f0ae..5ebfe5fe3 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index c15a83b6f..301b7d7ce 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index dbf9d3e9a..b994ea57f 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index 1a9d0e64f..3ddc68c08 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/music.cpp b/src/resources/music.cpp index 099d030b0..6e752ab60 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/music.h b/src/resources/music.h index a4b5b4973..428c02572 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index d04a2518f..71834e2bc 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index 1d8a72aa6..9b686691a 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index 552af06ec..e9449f0c9 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/resource.h b/src/resources/resource.h index 7196fa916..b8e06aaa7 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index c7552b9b7..06818705c 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 8cc851cca..f0146b8b4 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index a8da8dd80..eaa323bd6 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index fdd4bd275..91ca3bb59 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp index 51ba4bc74..e771c3738 100644 --- a/src/resources/specialdb.cpp +++ b/src/resources/specialdb.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h index 8a9e6bb23..f6ef73862 100644 --- a/src/resources/specialdb.h +++ b/src/resources/specialdb.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 32d18b6b8..1122cb2e9 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 3aa6369dd..9e756bdf7 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index c8cd5ad60..7ebc5a11a 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/resources/wallpaper.h b/src/resources/wallpaper.h index 55f5eec93..7123cfd96 100644 --- a/src/resources/wallpaper.h +++ b/src/resources/wallpaper.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp index c7c0d10bf..f9c493eb1 100644 --- a/src/rotationalparticle.cpp +++ b/src/rotationalparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h index d5b91bc63..19e71e62c 100644 --- a/src/rotationalparticle.h +++ b/src/rotationalparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/shopitem.cpp b/src/shopitem.cpp index db84d30df..083c2836f 100644 --- a/src/shopitem.cpp +++ b/src/shopitem.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/shopitem.h b/src/shopitem.h index 188698438..61d23a4ab 100644 --- a/src/shopitem.h +++ b/src/shopitem.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index 31f0c7af0..5de9813fd 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/simpleanimation.h b/src/simpleanimation.h index 44aab9a25..eda8d1fc0 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/sound.cpp b/src/sound.cpp index 7448624dd..123a66567 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/sound.h b/src/sound.h index 16fff161b..6ac361cac 100644 --- a/src/sound.h +++ b/src/sound.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/sprite.h b/src/sprite.h index 64721b740..ffee97d49 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 08309829d..5a33df561 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/statuseffect.h b/src/statuseffect.h index 8af1607a5..326a0d3c1 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 5c532a42c..e06174127 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h index 19a057722..b1031a9c1 100644 --- a/src/test/testlauncher.h +++ b/src/test/testlauncher.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index db82592b3..687006d4a 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testmain.h b/src/test/testmain.h index de1229454..8e5ce162f 100644 --- a/src/test/testmain.h +++ b/src/test/testmain.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/text.cpp b/src/text.cpp index bb480811f..4d54dd431 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/text.h b/src/text.h index 2b0eaa97b..e28e70ac7 100644 --- a/src/text.h +++ b/src/text.h @@ -3,7 +3,7 @@ * Copyright (C) 2008 Douglas Boffey * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/textparticle.cpp b/src/textparticle.cpp index 02cc97459..d8c0b7a8e 100644 --- a/src/textparticle.cpp +++ b/src/textparticle.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/textparticle.h b/src/textparticle.h index b37f25732..c85aff476 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/textrenderer.h b/src/textrenderer.h index 8fe2c5954..9309c5415 100644 --- a/src/textrenderer.h +++ b/src/textrenderer.h @@ -2,7 +2,7 @@ * Text Renderer * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/tileset.h b/src/tileset.h index 0867e5716..c21d6948a 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/units.cpp b/src/units.cpp index edf9c749a..82d3920f7 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -2,7 +2,7 @@ * Support for custom units * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/units.h b/src/units.h index 7705a9bd4..ba1f720e3 100644 --- a/src/units.h +++ b/src/units.h @@ -2,7 +2,7 @@ * Support for custom units * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/dtor.h b/src/utils/dtor.h index fbe903ced..54fa11549 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/gettext.h b/src/utils/gettext.h index 696f0d4bf..8bb41a4cb 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h index 40a9e5d79..9f6818146 100644 --- a/src/utils/mathutils.h +++ b/src/utils/mathutils.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp index dc2ab63ef..582c9c7dc 100644 --- a/src/utils/mkdir.cpp +++ b/src/utils/mkdir.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h index deff75475..8c5ab4ca2 100644 --- a/src/utils/mkdir.h +++ b/src/utils/mkdir.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 03dac2e7a..a97a8d3f8 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index 3cc35cb55..2ef5bb6ae 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/paths.h b/src/utils/paths.h index 1723bf6c4..804900587 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/process.cpp b/src/utils/process.cpp index 94967f8cc..a54fbbde3 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/process.h b/src/utils/process.h index 27a73ba20..12421729f 100644 --- a/src/utils/process.h +++ b/src/utils/process.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp index 523c021a4..ac9c78b2a 100644 --- a/src/utils/sha256.cpp +++ b/src/utils/sha256.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file has been slighly modified as part of The ManaPlus Client. * diff --git a/src/utils/sha256.h b/src/utils/sha256.h index aa2468d56..54bb92f3c 100644 --- a/src/utils/sha256.h +++ b/src/utils/sha256.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp index fae0fbf47..9690a9fb7 100644 --- a/src/utils/specialfolder.cpp +++ b/src/utils/specialfolder.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h index 571817370..8eb00a637 100644 --- a/src/utils/specialfolder.h +++ b/src/utils/specialfolder.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 39f14a646..642ba0df2 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 273fa0c8c..0913c7348 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 10436067f..87833d176 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/utils/xml.h b/src/utils/xml.h index 7bcec2c83..e35a2a06f 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/variabledata.h b/src/variabledata.h index 73eca2198..e5516bd9f 100644 --- a/src/variabledata.h +++ b/src/variabledata.h @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/vector.cpp b/src/vector.cpp index c234dea4c..e134a777a 100644 --- a/src/vector.cpp +++ b/src/vector.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/vector.h b/src/vector.h index 0f10bae96..744b235c0 100644 --- a/src/vector.h +++ b/src/vector.h @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2007-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * -- cgit v1.2.3-70-g09d2 From bfa7b90207d3671c6e98129be9ce82b1fbe5b419 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 5 Jan 2012 19:48:40 +0300 Subject: Fix test result if impossible start test. --- src/utils/process.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/utils/process.cpp b/src/utils/process.cpp index a54fbbde3..45fdd51c6 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -26,10 +26,10 @@ #include -#include "debug.h" - #include "localconsts.h" +#include "debug.h" + const int timeOut = 10; #ifdef WIN32 @@ -118,7 +118,7 @@ int execFile(std::string pathName, std::string name, execl(pathName.c_str(), name.c_str(), arg1.c_str(), arg2.c_str(), (char *)nullptr); } - exit(0); + exit(-1); } // monitoring process -- cgit v1.2.3-70-g09d2 From 78ee4491892b8fae778b913a0b8db52b9876dabe Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 5 Jan 2012 23:24:57 +0300 Subject: Fix code style. --- src/main.cpp | 3 ++- src/test/testlauncher.cpp | 2 +- src/test/testmain.cpp | 9 +++------ 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index 5507cce7e..f704d68c7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,7 +71,8 @@ static void printHelp() " directory") << endl << _(" --screenshot-dir : Directory to store screenshots") << endl << _(" --safemode : Start game in safe mode") << endl - << _(" -T --tests : Start testing drivers and auto configuring") << endl + << _(" -T --tests : Start testing drivers and " + "auto configuring") << endl #ifdef USE_OPENGL << _(" --no-opengl : Disable OpenGL for this session") << endl #endif diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index e06174127..6f2f7a612 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -103,7 +103,7 @@ int TestLauncher::testRescale() { Wallpaper::loadWallpapers(); const std::string wallpaperName = Wallpaper::getWallpaper(800, 600); - Image *img = Theme::getImageFromTheme(wallpaperName); + volatile Image *img = Theme::getImageFromTheme(wallpaperName); if (!img) return 1; diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 687006d4a..712133d41 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -78,9 +78,6 @@ int TestMain::exec() int safeOpenGLTest = invokeSafeOpenGLRenderTest("3"); int soundTest = invokeTest4(); int rescaleTest[3]; - int softFpsTest = -1; - int fastOpenGLFpsTest = -1; - int safeOpenGLFpsTest = -1; int softFps = 0; int fastOpenGLFps = 0; int safeOpenGLFps = 0; @@ -97,7 +94,7 @@ int TestMain::exec() if (!softwareTest) { - softFpsTest = invokeSoftwareRenderTest("8"); + int softFpsTest = invokeSoftwareRenderTest("8"); info += strprintf ("%d", softFpsTest); if (!softFpsTest) { @@ -122,7 +119,7 @@ int TestMain::exec() info += "."; if (!fastOpenGLTest) { - fastOpenGLFpsTest = invokeFastOpenGLRenderTest("9"); + int fastOpenGLFpsTest = invokeFastOpenGLRenderTest("9"); info += strprintf ("%d", fastOpenGLFpsTest); if (!fastOpenGLFpsTest) { @@ -147,7 +144,7 @@ int TestMain::exec() info += "."; if (!safeOpenGLTest) { - safeOpenGLFpsTest = invokeSafeOpenGLRenderTest("10"); + int safeOpenGLFpsTest = invokeSafeOpenGLRenderTest("10"); info += strprintf ("%d", safeOpenGLFpsTest); if (!safeOpenGLFpsTest) { -- cgit v1.2.3-70-g09d2 From 0150901f5d6a7e0a3c7294560fbd8ac7925f419e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 6 Jan 2012 01:32:18 +0300 Subject: Fix crash in chat autocomplete if no current chat tab. --- src/gui/chatwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 5c1286923..0c094f7a8 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -1180,7 +1180,8 @@ void ChatWindow::autoComplete() ChatTab *cTab = static_cast(mChatTabs->getSelectedTab()); std::vector nameList; - cTab->getAutoCompleteList(nameList); + if (cTab) + cTab->getAutoCompleteList(nameList); newName = autoComplete(nameList, name); if (newName == "" && actorSpriteManager) -- cgit v1.2.3-70-g09d2 From 948ae2c65d97bc1ebe79faea8c76a1708e65380b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 6 Jan 2012 02:47:38 +0300 Subject: Fix a bit code style. --- src/localplayer.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 3d2d3a165..01e864a6b 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -1437,13 +1437,17 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, int amount, case PICKUP_BAD_ITEM: msg = N_("Tried to pick up nonexistent item."); break; - case PICKUP_TOO_HEAVY: msg = N_("Item is too heavy."); + case PICKUP_TOO_HEAVY: + msg = N_("Item is too heavy."); break; - case PICKUP_TOO_FAR: msg = N_("Item is too far away."); + case PICKUP_TOO_FAR: + msg = N_("Item is too far away."); break; - case PICKUP_INV_FULL: msg = N_("Inventory is full."); + case PICKUP_INV_FULL: + msg = N_("Inventory is full."); break; - case PICKUP_STACK_FULL: msg = N_("Stack is too big."); + case PICKUP_STACK_FULL: + msg = N_("Stack is too big."); break; case PICKUP_DROP_STEAL: msg = N_("Item belongs to someone else."); -- cgit v1.2.3-70-g09d2 From 3acedd2fadd68550798a5eec0550a855dbc05d85 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 6 Jan 2012 15:09:21 +0300 Subject: Allow use replacement item with any id. Example: --- src/being.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/being.cpp b/src/being.cpp index 6041b7123..af3b14419 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2183,6 +2183,12 @@ void Being::recalcSpritesOrder() { std::map::const_iterator repIt = itemReplacer.find(mSpriteIDs[remSprite]); + if (repIt == itemReplacer.end()) + { + repIt = itemReplacer.find(0); + if (repIt->second == 0) + repIt = itemReplacer.end(); + } if (repIt != itemReplacer.end()) { mSpriteHide[remSprite] = repIt->second; -- cgit v1.2.3-70-g09d2 From 229b55863347dc346f3ad816e38b84b456ee527c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 02:21:59 +0300 Subject: Use absolute path for launching tests. --- src/main.cpp | 4 ++++ src/test/testmain.cpp | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index f704d68c7..1988e5962 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,8 @@ #include "debug.h" +char *selfName = nullptr; + static void printHelp() { using std::endl; @@ -228,6 +230,8 @@ int main(int argc, char *argv[]) LoadLibrary("exchndl.dll"); #endif + selfName = argv[0]; + // Parse command line options Client::Options options; parseOptions(argc, argv, options); diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 712133d41..287eeb706 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -35,14 +35,17 @@ #include "debug.h" +std::string fileName = ""; +extern char *selfName; + +TestMain::TestMain() +{ #ifdef WIN32 - const std::string fileName = "manaplus.exe"; + fileName = "manaplus.exe"; #else - const std::string fileName = "manaplus"; + fileName = selfName; #endif -TestMain::TestMain() -{ log = new Logger; // log->setLogFile(Client::getLocalDataDirectory() // + std::string("/test.log")); -- cgit v1.2.3-70-g09d2 From 4d125dff59df1e10a24022973b0d725e6203cc99 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 04:34:03 +0300 Subject: Possible fix for tests from shortcut. --- src/test/testmain.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 287eeb706..a35cd01db 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -46,6 +46,9 @@ TestMain::TestMain() fileName = selfName; #endif +#if defined __linux__ || defined __linux + chdir(getFileDir(fileName).c_str()); +#endif log = new Logger; // log->setLogFile(Client::getLocalDataDirectory() // + std::string("/test.log")); -- cgit v1.2.3-70-g09d2 From e84eb6767a9038962e68351fdc2387dc78b31ddb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 15:39:05 +0300 Subject: Revert "Possible fix for tests from shortcut." This reverts commit 4d125dff59df1e10a24022973b0d725e6203cc99. --- src/test/testmain.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index a35cd01db..287eeb706 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -46,9 +46,6 @@ TestMain::TestMain() fileName = selfName; #endif -#if defined __linux__ || defined __linux - chdir(getFileDir(fileName).c_str()); -#endif log = new Logger; // log->setLogFile(Client::getLocalDataDirectory() // + std::string("/test.log")); -- cgit v1.2.3-70-g09d2 From 74bc4670af005224449a561b4b5be58163d10a29 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 17:02:14 +0300 Subject: Allow use bold text also if browser box line was splitted. --- src/gui/widgets/browserbox.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 250520d28..5856a91b1 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -451,6 +451,7 @@ int BrowserBox::calcHeight() } gcn::Color prevColor = selColor; + bold = false; // TODO: Check if we must take texture size limits into account here // TODO: Check if some of the O(n) calls can be removed @@ -466,8 +467,6 @@ int BrowserBox::calcHeight() wrapped = false; } - bold = false; - // "Tokenize" the string at control sequences if (mUseLinksAndUserColors) end = row.find("##", start + 1); -- cgit v1.2.3-70-g09d2 From 78ef5eee69ace485763ce44267d8d475abf4adc2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 17:26:09 +0300 Subject: Remove "> Next" from npc dialogs. --- src/gui/npcdialog.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 55baf9362..265748b6f 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -220,7 +220,6 @@ void NpcDialog::action(const gcn::ActionEvent &event) return; nextDialog(); - addText(_("> Next"), false); } else if (mActionState == NPC_ACTION_CLOSE || mActionState == NPC_ACTION_WAIT) -- cgit v1.2.3-70-g09d2 From 7048f43f0683b62985e265df09657efd60025e58 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 20:03:24 +0300 Subject: Fix tab for debug messages. --- src/commandhandler.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- src/commandhandler.h | 3 +++ 2 files changed, 51 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 6f2c2867d..0f8df546c 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -1124,14 +1124,60 @@ void CommandHandler::handleDumpGraphics(const std::string &args A_UNUSED, str += config.getBoolValue("particleeffects") ? "1" : "0"; str += strprintf(",%d-%d", fps, config.getIntValue("fpslimit")); - outString(tab, str, str); + outStringNormal(tab, str, str); } void CommandHandler::handleDumpTests(const std::string &args A_UNUSED, ChatTab *tab) { std::string str = config.getStringValue("testInfo"); - outString(tab, str, str); + outStringNormal(tab, str, str); +} + +void CommandHandler::outStringNormal(ChatTab *tab, const std::string &str, + const std::string &def) +{ + if (!player_node) + return; + + if (!tab) + { + Net::getChatHandler()->talk(str); + return; + } + + switch (tab->getType()) + { + case ChatTab::TAB_PARTY: + { + Net::getPartyHandler()->chat(str); + break; + } + case ChatTab::TAB_GUILD: + { + if (!player_node) + return; + const Guild *guild = player_node->getGuild(); + if (guild) + { + if (guild->getServerGuild()) + Net::getGuildHandler()->chat(guild->getId(), str); + else if (guildManager) + guildManager->chat(str); + } + break; + } + case ChatTab::TAB_WHISPER: + { + WhisperTab *whisper = static_cast(tab); + tab->chatLog(player_node->getName(), str); + Net::getChatHandler()->privateMessage(whisper->getNick(), str); + break; + } + default: + Net::getChatHandler()->talk(def); + break; + } } #ifdef DEBUG_DUMP_LEAKS diff --git a/src/commandhandler.h b/src/commandhandler.h index d9f11059b..16e5e94ce 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -304,6 +304,9 @@ class CommandHandler void outString(ChatTab *tab, const std::string &str, const std::string &def); + void outStringNormal(ChatTab *tab, const std::string &str, + const std::string &def); + void handleCacheInfo(const std::string &args, ChatTab *tab); bool parse2Int(const std::string &args, int *x, int *y); -- cgit v1.2.3-70-g09d2 From 068d43927d58c76eab0731ad1ce1bc839e687de0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 20:51:59 +0300 Subject: Change version to 1.2.1.8. --- ChangeLog | 17 +++++++++++++++++ README | 2 +- README.txt | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 6 files changed, 23 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 302db3bb9..52e08dde2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2012-01-08 New release 1.2.1.8 +fix: -s command line parameter. +fix: restore GL_PACK_ALIGNMENT after creating screenshots in opengl modes +fix: rare crash with reconnecting to different servers. +fix: color for /me messages in wood theme. +fix: crash in char autocomplete if no active tab in chat window. +fix: bold chat/npc text correction. +add: allow close npc dialog if script stopped with error. +add: clear outfit option in outfits context menu. +add: ability to test graphics and sound perfomance and stability. +Shortcut ManaPlus (test). Need close all other ManaPlus instances. +add: chat command /dumpt to dump last test values. +add: addiitional checks for unsecure chars combinations in players nicks. +add: allow use item replacment with empty from value. +This mean replace from any value. +add: remove "> Next" message from npc dialogs. + 2011-12-25 New release 1.1.12.25 fix: increasing log file if client disconnected from network. fix: memory leak in evol online list. diff --git a/README b/README index 2c043395e..b0f0394a1 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.12.25 Date: 2011-12-25 + Version: 1.2.1.8 Date: 2012-01-08 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 4982c709e..2f9700820 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.12.25 Date: 2011-12-25 + Version: 1.2.1.8 Date: 2012-01-08 Development team: - See AUTHORS file for a list diff --git a/build/packwin b/build/packwin index 873d7a123..7d09414c7 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.12.25" \ + -DPRODUCT_VERSION="1.2.1.8" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index 291c82258..16b222908 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.12.25], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.1.8], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/main.h b/src/main.h index 5b4eb5c63..924d316b2 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.1.12.25" -#define CHECK_VERSION "01.01.12.25" +#define SMALL_VERSION "1.2.1.8" +#define CHECK_VERSION "01.02.01.08" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2 From 72d496fb243f622c9a582d593b0d51ec057acd37 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 8 Jan 2012 20:41:48 +0300 Subject: Validate update host. --- src/client.cpp | 4 ++++ src/gui/logindialog.cpp | 12 ++++++++++-- src/main.cpp | 7 ++++++- src/net/ea/loginhandler.cpp | 5 +++++ src/net/manaserv/loginhandler.cpp | 9 +++++++++ src/utils/stringutils.cpp | 10 ++++++++++ src/utils/stringutils.h | 2 ++ 7 files changed, 46 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/client.cpp b/src/client.cpp index 5d5ce3535..88fe8c443 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1689,6 +1689,8 @@ void Client::initConfiguration() config.setValue("musicVolume", 60); config.setValue("fpslimit", 60); std::string defaultUpdateHost = branding.getValue("defaultUpdateHost", ""); + if (!checkPath(defaultUpdateHost)) + defaultUpdateHost = ""; config.setValue("updatehost", defaultUpdateHost); config.setValue("customcursor", true); config.setValue("useScreenshotDirectorySuffix", true); @@ -1741,6 +1743,8 @@ void Client::initUpdatesDir() // If updatesHost is currently empty, fill it from config file if (mUpdateHost.empty()) mUpdateHost = config.getStringValue("updatehost"); + if (!checkPath(mUpdateHost)) + return; // Don't go out of range int he next check if (mUpdateHost.length() < 2) diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp index 719b86cb8..b1c80b102 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/logindialog.cpp @@ -184,8 +184,16 @@ void LoginDialog::action(const gcn::ActionEvent &event) serverConfig.setValue("customUpdateHost", mUpdateHostText->getText()); - mLoginData->updateHost = mUpdateHostText->getText(); - *mUpdateHost = mUpdateHostText->getText(); + if (checkPath(mUpdateHostText->getText())) + { + mLoginData->updateHost = mUpdateHostText->getText(); + *mUpdateHost = mUpdateHostText->getText(); + } + else + { + mLoginData->updateHost = ""; + *mUpdateHost = ""; + } } mLoginData->updateType = updateType; serverConfig.setValue("updateType", updateType); diff --git a/src/main.cpp b/src/main.cpp index 1988e5962..71794487c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,6 +33,8 @@ #include #include +#include "utils/stringutils.h" + #ifdef __MINGW32__ #include #endif @@ -140,7 +142,10 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) options.printHelp = true; break; case 'H': - options.updateHost = optarg; + if (checkPath(optarg)) + options.updateHost = optarg; + else + options.updateHost = ""; break; case 'c': options.character = optarg; diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index bbf19fb34..291a92906 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -150,6 +150,11 @@ void LoginHandler::processUpdateHost(Net::MessageIn &msg) len = msg.readInt16() - 4; mUpdateHost = msg.readString(len); + if (!checkPath(mUpdateHost)) + { + mUpdateHost = ""; + logger->log1("Warning: incorrect update server name"); + } loginData.updateHost = mUpdateHost; logger->log("Received update host \"%s\" from login server.", diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp index f1cb8e352..8b8ac831f 100644 --- a/src/net/manaserv/loginhandler.cpp +++ b/src/net/manaserv/loginhandler.cpp @@ -341,9 +341,18 @@ void LoginHandler::readServerInfo(Net::MessageIn &msg) // Set the update host when included in the message const std::string updateHost = msg.readString(); if (!updateHost.empty()) + { + if (!checkPath(updateHost)) + { + logger->log1("Warning: incorrect update server name"); + updateHost = ""; + } mLoginData->updateHost = updateHost; + } else + { logger->log1("Warning: server does not have an update host set!"); + } // Read the client data folder for dynamic data loading. // This is only used by the QT client. diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 642ba0df2..b855e3b04 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -612,3 +612,13 @@ std::string &removeProtocol(std::string &url) url = url.substr(i + 3); return url; } + +bool checkPath(std::string path) +{ + if (path.empty()) + return true; + return path.find("../") == std::string::npos + && path.find("..\\") == std::string::npos + && path.find("/..") == std::string::npos + && path.find("\\..") == std::string::npos; +} diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 0913c7348..c6eb08a6c 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -206,4 +206,6 @@ bool findCutFirst(std::string &str1, std::string str2); std::string &removeProtocol(std::string &url); +bool checkPath(std::string path); + #endif // UTILS_STRINGUTILS_H -- cgit v1.2.3-70-g09d2 From 08dc59e8bff25736d15d11313e0296f60e248e0a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 8 Jan 2012 21:37:28 +0300 Subject: Add check for update files path. --- src/gui/updaterwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 089aa1ea1..4e641b5ca 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -91,7 +91,8 @@ std::vector loadXMLFile(const std::string &fileName) else file.required = false; - files.push_back(file); + if (checkPath(file.name)) + files.push_back(file); } return files; @@ -118,7 +119,7 @@ std::vector loadTxtFile(const std::string &fileName) thisFile.required = true; thisFile.desc = ""; - if (!thisFile.name.empty()) + if (!thisFile.name.empty() && checkPath(thisFile.name)) files.push_back(thisFile); } } -- cgit v1.2.3-70-g09d2 From bad730dd0de24b2b17b91922c0c7f2b31b7b4d9b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Jan 2012 18:43:15 +0300 Subject: Move libxml2 includes to xml.h --- src/animationparticle.h | 2 +- src/configuration.cpp | 3 --- src/configuration.h | 3 ++- src/main.cpp | 22 ++-------------------- src/resources/action.h | 2 +- src/resources/animation.h | 2 +- src/resources/chardb.cpp | 4 ---- src/resources/chardb.h | 2 +- src/resources/colordb.cpp | 2 -- src/resources/itemdb.cpp | 4 +--- src/resources/mapdb.cpp | 2 -- src/resources/mapreader.cpp | 1 - src/resources/mapreader.h | 2 +- src/resources/spritedef.cpp | 2 -- src/resources/spritedef.h | 2 +- src/rotationalparticle.h | 2 +- src/utils/xml.cpp | 16 ++++++++++++++++ src/utils/xml.h | 4 ++++ 18 files changed, 32 insertions(+), 45 deletions(-) (limited to 'src') diff --git a/src/animationparticle.h b/src/animationparticle.h index 45110501a..27e7d0b22 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -25,7 +25,7 @@ #include "imageparticle.h" -#include +#include "utils/xml.h" class Animation; class Map; diff --git a/src/configuration.cpp b/src/configuration.cpp index bed7c0878..40c3ab8c3 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -27,9 +27,6 @@ #include "utils/paths.h" #include "utils/stringutils.h" -#include "utils/xml.h" - -#include #include diff --git a/src/configuration.h b/src/configuration.h index ae8908bfd..7e4c65a40 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -24,9 +24,10 @@ #define CONFIGURATION_H #include "utils/stringutils.h" +#include "utils/xml.h" + #include "defaults.h" -#include #include #include diff --git a/src/main.cpp b/src/main.cpp index 71794487c..9bffcfa2a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,13 +27,12 @@ #include "client.h" #include "logger.h" -#include - #include #include #include #include "utils/stringutils.h" +#include "utils/xml.h" #ifdef __MINGW32__ #include @@ -210,23 +209,6 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) extern "C" char const *_nl_locale_name_default(void); #endif -static void xmlNullLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) -{ - // Does nothing, that's the whole point of it -} - -// Initialize libxml2 and check for potential ABI mismatches between -// compiled version and the shared library actually used. -static void initXML() -{ - xmlInitParser(); - LIBXML_TEST_VERSION; - - // Suppress libxml2 error messages - xmlSetGenericErrorFunc(nullptr, xmlNullLogger); -} - - int main(int argc, char *argv[]) { #if defined(__MINGW32__) @@ -262,7 +244,7 @@ int main(int argc, char *argv[]) atexit((void(*)()) PHYSFS_deinit); - initXML(); + XML::initXML(); #ifdef WIN32 SetCurrentDirectory(PHYSFS_getBaseDir()); diff --git a/src/resources/action.h b/src/resources/action.h index 603135875..1e3965363 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -23,7 +23,7 @@ #ifndef ACTION_H #define ACTION_H -#include +#include "utils/xml.h" #include diff --git a/src/resources/animation.h b/src/resources/animation.h index f52234abb..33bfd76e9 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -23,7 +23,7 @@ #ifndef ANIMATION_H #define ANIMATION_H -#include +#include "utils/xml.h" #include #include diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp index c6de2e189..30408c239 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/chardb.cpp @@ -24,10 +24,6 @@ #include "client.h" #include "logger.h" -#include "utils/xml.h" - -#include - #include "debug.h" namespace diff --git a/src/resources/chardb.h b/src/resources/chardb.h index 8be2c34c4..c668c1a73 100644 --- a/src/resources/chardb.h +++ b/src/resources/chardb.h @@ -25,7 +25,7 @@ #include #include -#include +#include "utils/xml.h" /** * Char information database. diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 41393541f..2a79f0554 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -26,8 +26,6 @@ #include "utils/xml.h" -#include - #include "debug.h" namespace diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index e7cc0f931..2c381286a 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -23,6 +23,7 @@ #include "resources/itemdb.h" #include "client.h" +#include "configuration.h" #include "logger.h" #include "resources/iteminfo.h" @@ -32,9 +33,6 @@ #include "utils/gettext.h" #include "utils/stringutils.h" #include "utils/xml.h" -#include "configuration.h" - -#include #include "debug.h" diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp index e61ee45b0..1da3dd908 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/mapdb.cpp @@ -27,8 +27,6 @@ #include "utils/xml.h" -#include - #include "debug.h" namespace diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 5ebfe5fe3..8c8bf2f9d 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -35,7 +35,6 @@ #include "utils/base64.h" #include "utils/gettext.h" #include "utils/stringutils.h" -#include "utils/xml.h" #include #include diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 301b7d7ce..8fc11e70f 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -23,7 +23,7 @@ #ifndef MAPREADER_H #define MAPREADER_H -#include +#include "utils/xml.h" #include diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 1122cb2e9..40bdb64c8 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -33,8 +33,6 @@ #include "configuration.h" -#include "utils/xml.h" - #include "debug.h" SpriteReference *SpriteReference::Empty = nullptr; diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 9e756bdf7..3f656be0d 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -25,7 +25,7 @@ #include "resources/resource.h" -#include +#include "utils/xml.h" #include #include diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h index 19e71e62c..96b7a29ff 100644 --- a/src/rotationalparticle.h +++ b/src/rotationalparticle.h @@ -25,7 +25,7 @@ #include "imageparticle.h" -#include +#include "utils/xml.h" class Animation; class Map; diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 87833d176..5a9558cc2 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -32,6 +32,11 @@ #include "debug.h" +static void xmlNullLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) +{ + // Does nothing, that's the whole point of it +} + namespace XML { Document::Document(const std::string &filename, bool useResman): @@ -165,4 +170,15 @@ namespace XML return nullptr; } + // Initialize libxml2 and check for potential ABI mismatches between + // compiled version and the shared library actually used. + void initXML() + { + xmlInitParser(); + LIBXML_TEST_VERSION; + + // Suppress libxml2 error messages + xmlSetGenericErrorFunc(nullptr, xmlNullLogger); + } + } // namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index e35a2a06f..2b97b45f5 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -23,6 +23,8 @@ #ifndef XML_H #define XML_H +#include +#include #include #include @@ -94,6 +96,8 @@ namespace XML * Finds the first child node with the given name */ xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name); + + void initXML(); } #define for_each_xml_child_node(var, parent) \ -- cgit v1.2.3-70-g09d2 From 793a119a7a36f9680dad108e75075c8c4bd4a0d0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Jan 2012 18:58:54 +0300 Subject: Replace all xmlNodePtr to XmlNodePtr. --- src/actorsprite.cpp | 4 ++-- src/animationparticle.cpp | 2 +- src/animationparticle.h | 2 +- src/configuration.cpp | 4 ++-- src/configuration.h | 2 +- src/effectmanager.cpp | 2 +- src/gui/equipmentwindow.cpp | 8 ++++---- src/gui/equipmentwindow.h | 6 +++--- src/gui/serverdialog.cpp | 2 +- src/gui/skilldialog.cpp | 2 +- src/gui/theme.cpp | 4 ++-- src/gui/updaterwindow.cpp | 2 +- src/net/manaserv/attributes.cpp | 2 +- src/particle.cpp | 4 ++-- src/particleemitter.cpp | 4 ++-- src/particleemitter.h | 4 ++-- src/resources/chardb.cpp | 4 ++-- src/resources/chardb.h | 2 +- src/resources/colordb.cpp | 4 ++-- src/resources/emotedb.cpp | 2 +- src/resources/itemdb.cpp | 22 +++++++++++----------- src/resources/mapdb.cpp | 2 +- src/resources/mapreader.cpp | 14 +++++++------- src/resources/mapreader.h | 8 ++++---- src/resources/monsterdb.cpp | 2 +- src/resources/npcdb.cpp | 2 +- src/resources/specialdb.cpp | 2 +- src/resources/spritedef.cpp | 14 +++++++------- src/resources/spritedef.h | 10 +++++----- src/rotationalparticle.cpp | 2 +- src/rotationalparticle.h | 2 +- src/simpleanimation.cpp | 6 +++--- src/simpleanimation.h | 4 ++-- src/statuseffect.cpp | 2 +- src/units.cpp | 2 +- src/utils/xml.cpp | 12 ++++++------ src/utils/xml.h | 24 +++++++++++++----------- 37 files changed, 99 insertions(+), 97 deletions(-) (limited to 'src') diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index c7ee1fa77..fd2de295a 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -164,7 +164,7 @@ static EffectDescription *default_effect = nullptr; static std::map effects; static bool effects_initialized = false; -static EffectDescription *getEffectDescription(xmlNodePtr node, int *id) +static EffectDescription *getEffectDescription(XmlNodePtr node, int *id) { EffectDescription *ed = new EffectDescription; @@ -180,7 +180,7 @@ static EffectDescription *getEffectDescription(int effectId) if (!effects_initialized) { XML::Document doc(EFFECTS_FILE); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) { diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp index 3d08554fa..c1bf251af 100644 --- a/src/animationparticle.cpp +++ b/src/animationparticle.cpp @@ -33,7 +33,7 @@ AnimationParticle::AnimationParticle(Map *map, Animation *animation): { } -AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode, +AnimationParticle::AnimationParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes): ImageParticle(map, nullptr), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) diff --git a/src/animationparticle.h b/src/animationparticle.h index 27e7d0b22..933f2d164 100644 --- a/src/animationparticle.h +++ b/src/animationparticle.h @@ -36,7 +36,7 @@ class AnimationParticle : public ImageParticle public: AnimationParticle(Map *map, Animation *animation); - AnimationParticle(Map *map, xmlNodePtr animationNode, + AnimationParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); ~AnimationParticle(); diff --git a/src/configuration.cpp b/src/configuration.cpp index 40c3ab8c3..957fa1798 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -426,7 +426,7 @@ bool Configuration::resetBoolValue(const std::string &key) return defaultValue; } -void ConfigurationObject::initFromXML(xmlNodePtr parent_node) +void ConfigurationObject::initFromXML(XmlNodePtr parent_node) { clear(); @@ -489,7 +489,7 @@ void Configuration::init(const std::string &filename, bool useResManager) return; } - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "configuration")) { diff --git a/src/configuration.h b/src/configuration.h index 7e4c65a40..55e588964 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -193,7 +193,7 @@ class ConfigurationObject } protected: - virtual void initFromXML(xmlNodePtr node); + virtual void initFromXML(XmlNodePtr node); virtual void writeToXML(xmlTextWriterPtr writer); void deleteList(const std::string &name); diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index 55bf692cd..b00687631 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -32,7 +32,7 @@ EffectManager::EffectManager() { XML::Document doc("effects.xml"); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) { diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 483e2da94..4bfc477a0 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -355,7 +355,7 @@ void EquipmentWindow::resetBeing(Being *being) void EquipmentWindow::fillBoxes() { XML::Document *doc = new XML::Document("equipmentwindow.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); if (!root) { delete doc; @@ -381,13 +381,13 @@ void EquipmentWindow::fillBoxes() delete doc; } -void EquipmentWindow::loadWindow(xmlNodePtr windowNode) +void EquipmentWindow::loadWindow(XmlNodePtr windowNode) { setDefaultSize(XML::getProperty(windowNode, "width", 180), XML::getProperty(windowNode, "height", 345), ImageRect::CENTER); } -void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode) +void EquipmentWindow::loadPlayerBox(XmlNodePtr playerBoxNode) { mPlayerBox->setDimension(gcn::Rectangle( XML::getProperty(playerBoxNode, "x", 50), @@ -396,7 +396,7 @@ void EquipmentWindow::loadPlayerBox(xmlNodePtr playerBoxNode) XML::getProperty(playerBoxNode, "height", 168))); } -void EquipmentWindow::loadSlot(xmlNodePtr slotNode, ImageSet *imageset) +void EquipmentWindow::loadSlot(XmlNodePtr slotNode, ImageSet *imageset) { int slot = parseSlotName(XML::getProperty(slotNode, "name", "")); if (slot < 0) diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index b06333b2f..c8cf095f8 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -108,11 +108,11 @@ class EquipmentWindow : public Window, public gcn::ActionListener void addBox(int idx, int x, int y, int imageIndex); - void loadWindow(xmlNodePtr windowNode); + void loadWindow(XmlNodePtr windowNode); - void loadPlayerBox(xmlNodePtr playerBoxNode); + void loadPlayerBox(XmlNodePtr playerBoxNode); - void loadSlot(xmlNodePtr slotNode, ImageSet *imageset); + void loadSlot(XmlNodePtr slotNode, ImageSet *imageset); int parseSlotName(std::string name); diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 65421abd3..a4a477527 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -628,7 +628,7 @@ void ServerDialog::downloadServerList() void ServerDialog::loadServers(bool addNew) { XML::Document doc(mDir + "/serverlist.xml", false); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "serverlist")) { diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 833a2bbe7..72f5a8ca1 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -362,7 +362,7 @@ void SkillDialog::loadSkills(const std::string &file) return; XML::Document doc(file); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); int setCount = 0; std::string setName; diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index ecc491191..2d3b0beea 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -315,7 +315,7 @@ Skin *Theme::readSkin(const std::string &filename) // filename = resman->mapPathToSkin(filename0); XML::Document doc(resolveThemePath(filename)); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset")) return nullptr; @@ -818,7 +818,7 @@ void Theme::loadColors(std::string file) file += "/colors.xml"; XML::Document doc(resolveThemePath(file)); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) { diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 4e641b5ca..5e8e51464 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -67,7 +67,7 @@ std::vector loadXMLFile(const std::string &fileName) { std::vector files; XML::Document doc(fileName, false); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "updates")) { diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp index be22e2822..01bd23273 100644 --- a/src/net/manaserv/attributes.cpp +++ b/src/net/manaserv/attributes.cpp @@ -238,7 +238,7 @@ namespace Attributes logger->log("Initializing attributes database..."); XML::Document doc(DEFAULT_ATTRIBUTESDB_FILE); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "attributes")) { diff --git a/src/particle.cpp b/src/particle.cpp index bc92a21b5..aae780b7a 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -291,7 +291,7 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, dyePalettes = particleEffectFile.substr(pos + 1); XML::Document doc(particleEffectFile.substr(0, pos)); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "effect")) { @@ -309,7 +309,7 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, continue; // Determine the exact particle type - xmlNodePtr node; + XmlNodePtr node; // Animation if ((node = XML::findFirstChildByName(effectChildNode, "animation"))) diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index f1c81e9ab..40f06d671 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -39,7 +39,7 @@ #define SIN45 0.707106781f #define DEG_RAD_FACTOR 0.017453293f -ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, +ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, Map *map, int rotation, const std::string& dyePalettes): mOutputPauseLeft(0), @@ -466,7 +466,7 @@ ParticleEmitter::~ParticleEmitter() template ParticleEmitterProp -ParticleEmitter::readParticleEmitterProp(xmlNodePtr propertyNode, T def) +ParticleEmitter::readParticleEmitterProp(XmlNodePtr propertyNode, T def) { ParticleEmitterProp retval; diff --git a/src/particleemitter.h b/src/particleemitter.h index 09e17767a..faa54dd12 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -43,7 +43,7 @@ class Particle; class ParticleEmitter { public: - ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map, + ParticleEmitter(XmlNodePtr emitterNode, Particle *target, Map *map, int rotation = 0, const std::string& dyePalettes = std::string()); @@ -82,7 +82,7 @@ class ParticleEmitter private: template ParticleEmitterProp - readParticleEmitterProp(xmlNodePtr propertyNode, T def); + readParticleEmitterProp(XmlNodePtr propertyNode, T def); /** * initial position of particles: diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp index 30408c239..4be2e2b04 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/chardb.cpp @@ -44,7 +44,7 @@ void CharDB::load() unload(); XML::Document *doc = new XML::Document("charcreation.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "chars")) { @@ -76,7 +76,7 @@ void CharDB::load() mLoaded = true; } -void CharDB::loadMinMax(xmlNodePtr node, unsigned *min, unsigned *max) +void CharDB::loadMinMax(XmlNodePtr node, unsigned *min, unsigned *max) { *min = XML::getProperty(node, "min", 1); *max = XML::getProperty(node, "max", 10); diff --git a/src/resources/chardb.h b/src/resources/chardb.h index c668c1a73..60ff31084 100644 --- a/src/resources/chardb.h +++ b/src/resources/chardb.h @@ -42,7 +42,7 @@ namespace CharDB */ void unload(); - void loadMinMax(xmlNodePtr node, unsigned *min, unsigned *max); + void loadMinMax(XmlNodePtr node, unsigned *min, unsigned *max); unsigned getMinHairColor(); diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index 2a79f0554..cdbfbeba8 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -49,7 +49,7 @@ void ColorDB::load() void ColorDB::loadHair() { XML::Document *doc = new XML::Document("hair.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); bool hairXml = true; if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) @@ -97,7 +97,7 @@ void ColorDB::loadHair() void ColorDB::loadColorLists() { XML::Document *doc = new XML::Document("itemcolors.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); if (!root) { delete doc; diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index c456c49e4..163d8b879 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -52,7 +52,7 @@ void EmoteDB::load() logger->log1("Initializing emote database..."); XML::Document doc("emotes.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes")) { diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 2c381286a..fcc20613d 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -47,11 +47,11 @@ namespace } // Forward declarations -static void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node); -static void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node); -static void loadFloorSprite(SpriteDisplay *display, xmlNodePtr node); -static void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode); -static void loadOrderSprite(ItemInfo *itemInfo, xmlNodePtr node, +static void loadSpriteRef(ItemInfo *itemInfo, XmlNodePtr node); +static void loadSoundRef(ItemInfo *itemInfo, XmlNodePtr node); +static void loadFloorSprite(SpriteDisplay *display, XmlNodePtr node); +static void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode); +static void loadOrderSprite(ItemInfo *itemInfo, XmlNodePtr node, bool drawAfter); static int parseSpriteName(std::string name); static int parseDirectionName(std::string name); @@ -172,7 +172,7 @@ void ItemDB::load() mUnknown->addTag(mTags["All"]); XML::Document doc("items.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items")) { @@ -593,7 +593,7 @@ int parseDirectionName(std::string name) return id; } -void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node) +void loadSpriteRef(ItemInfo *itemInfo, XmlNodePtr node) { std::string gender = XML::getProperty(node, "gender", "unisex"); std::string filename = reinterpret_cast( @@ -605,7 +605,7 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node) itemInfo->setSprite(filename, GENDER_FEMALE); } -void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node) +void loadSoundRef(ItemInfo *itemInfo, XmlNodePtr node) { std::string event = XML::getProperty(node, "event", ""); std::string filename = reinterpret_cast( @@ -626,7 +626,7 @@ void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node) } } -void loadFloorSprite(SpriteDisplay *display, xmlNodePtr floorNode) +void loadFloorSprite(SpriteDisplay *display, XmlNodePtr floorNode) { for_each_xml_child_node(spriteNode, floorNode) { @@ -648,7 +648,7 @@ void loadFloorSprite(SpriteDisplay *display, xmlNodePtr floorNode) } } -void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) +void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode) { std::string removeSprite = XML::getProperty(replaceNode, "sprite", ""); int direction = parseDirectionName(XML::getProperty( @@ -766,7 +766,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) } } -void loadOrderSprite(ItemInfo *itemInfo, xmlNodePtr node, bool drawAfter) +void loadOrderSprite(ItemInfo *itemInfo, XmlNodePtr node, bool drawAfter) { int sprite = parseSpriteName(XML::getProperty(node, "name", "")); int priority = XML::getProperty(node, "priority", 0); diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp index 1da3dd908..aa10aff85 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/mapdb.cpp @@ -43,7 +43,7 @@ void MapDB::load() XML::Document *doc = new XML::Document( paths.getStringValue("maps") + "remap.xml"); - xmlNodePtr root = doc->rootNode(); + XmlNodePtr root = doc->rootNode(); if (!root) { delete doc; diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 8c8bf2f9d..aa7bce59d 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -222,7 +222,7 @@ Map *MapReader::readMap(const std::string &filename, XML::Document doc(reinterpret_cast(inflated), inflatedSize); free(inflated); - xmlNodePtr node = doc.rootNode(); + XmlNodePtr node = doc.rootNode(); // Parse the inflated map data if (node) @@ -247,7 +247,7 @@ Map *MapReader::readMap(const std::string &filename, return map; } -Map *MapReader::readMap(xmlNodePtr node, const std::string &path) +Map *MapReader::readMap(XmlNodePtr node, const std::string &path) { if (!node) return nullptr; @@ -379,7 +379,7 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path) return map; } -void MapReader::readProperties(xmlNodePtr node, Properties *props) +void MapReader::readProperties(XmlNodePtr node, Properties *props) { if (!node || !props) return; @@ -442,7 +442,7 @@ inline static void setTile(Map *map, MapLayer *layer, int x, int y, int gid) } } -void MapReader::readLayer(xmlNodePtr node, Map *map) +void MapReader::readLayer(XmlNodePtr node, Map *map) { // Layers are not necessarily the same size as the map const int w = XML::getProperty(node, "width", map->getWidth()); @@ -491,7 +491,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } // Read base64 encoded map file - xmlNodePtr dataChild = childNode->xmlChildrenNode; + XmlNodePtr dataChild = childNode->xmlChildrenNode; if (!dataChild) continue; @@ -576,7 +576,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } else if (encoding == "csv") { - xmlNodePtr dataChild = childNode->xmlChildrenNode; + XmlNodePtr dataChild = childNode->xmlChildrenNode; if (!dataChild) continue; @@ -646,7 +646,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) } -Tileset *MapReader::readTileset(xmlNodePtr node, const std::string &path, +Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path, Map *map) { if (!map) diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 8fc11e70f..c9c742ecd 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -47,7 +47,7 @@ class MapReader * Read an XML map from a parsed XML tree. The path is used to find the * location of referenced tileset images. */ - static Map *readMap(xmlNodePtr node, const std::string &path); + static Map *readMap(XmlNodePtr node, const std::string &path); private: /** @@ -57,17 +57,17 @@ class MapReader * @param props The Properties instance to which the properties will * be assigned. */ - static void readProperties(xmlNodePtr node, Properties* props); + static void readProperties(XmlNodePtr node, Properties* props); /** * Reads a map layer and adds it to the given map. */ - static void readLayer(xmlNodePtr node, Map *map); + static void readLayer(XmlNodePtr node, Map *map); /** * Reads a tile set. */ - static Tileset *readTileset(xmlNodePtr node, const std::string &path, + static Tileset *readTileset(XmlNodePtr node, const std::string &path, Map *map); }; diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index b994ea57f..e6901fa2f 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -52,7 +52,7 @@ void MonsterDB::load() logger->log1("Initializing monster database..."); XML::Document doc("monsters.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters")) { diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index 71834e2bc..b823620f0 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -46,7 +46,7 @@ void NPCDB::load() logger->log1("Initializing NPC database..."); XML::Document doc("npcs.xml"); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs")) { diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp index e771c3738..eb4a81c9a 100644 --- a/src/resources/specialdb.cpp +++ b/src/resources/specialdb.cpp @@ -55,7 +55,7 @@ void SpecialDB::load() logger->log("Initializing special database..."); XML::Document doc("specials.xml"); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "specials")) { diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 40bdb64c8..7ff74ac18 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -81,7 +81,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant) palettes = animationFile.substr(pos + 1); XML::Document doc(animationFile.substr(0, pos)); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) { @@ -134,7 +134,7 @@ void SpriteDef::substituteActions() substituteAction(SpriteAction::SPAWN, SpriteAction::STAND); } -void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant, +void SpriteDef::loadSprite(XmlNodePtr spriteNode, int variant, const std::string &palettes) { // Get the variant @@ -158,7 +158,7 @@ void SpriteDef::loadSprite(xmlNodePtr spriteNode, int variant, } } -void SpriteDef::loadImageSet(xmlNodePtr node, const std::string &palettes) +void SpriteDef::loadImageSet(XmlNodePtr node, const std::string &palettes) { const std::string name = XML::getProperty(node, "name", ""); @@ -186,7 +186,7 @@ void SpriteDef::loadImageSet(xmlNodePtr node, const std::string &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", ""); @@ -228,7 +228,7 @@ void SpriteDef::loadAction(xmlNodePtr node, int variant_offset) } } -void SpriteDef::loadAnimation(xmlNodePtr animationNode, +void SpriteDef::loadAnimation(XmlNodePtr animationNode, Action *action, ImageSet *imageSet, int variant_offset) { @@ -346,7 +346,7 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode, } // for frameNode } -void SpriteDef::includeSprite(xmlNodePtr includeNode) +void SpriteDef::includeSprite(XmlNodePtr includeNode) { std::string filename = XML::getProperty(includeNode, "file", ""); @@ -363,7 +363,7 @@ void SpriteDef::includeSprite(xmlNodePtr includeNode) mProcessedFiles.insert(filename); XML::Document doc(filename); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) { diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 3f656be0d..0490bdcb3 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -145,30 +145,30 @@ class SpriteDef : public Resource /** * Loads a sprite element. */ - void loadSprite(xmlNodePtr spriteNode, int variant, + void loadSprite(XmlNodePtr spriteNode, int variant, const std::string &palettes = ""); /** * Loads an imageset element. */ - void loadImageSet(xmlNodePtr node, const std::string &palettes); + void loadImageSet(XmlNodePtr node, const std::string &palettes); /** * 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, + 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. diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp index f9c493eb1..e1a7fd035 100644 --- a/src/rotationalparticle.cpp +++ b/src/rotationalparticle.cpp @@ -34,7 +34,7 @@ RotationalParticle::RotationalParticle(Map *map, Animation *animation): { } -RotationalParticle::RotationalParticle(Map *map, xmlNodePtr animationNode, +RotationalParticle::RotationalParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes): ImageParticle(map, 0), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h index 96b7a29ff..251e3769c 100644 --- a/src/rotationalparticle.h +++ b/src/rotationalparticle.h @@ -36,7 +36,7 @@ class RotationalParticle : public ImageParticle public: RotationalParticle(Map *map, Animation *animation); - RotationalParticle(Map *map, xmlNodePtr animationNode, + RotationalParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); ~RotationalParticle(); diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index 5de9813fd..f0002b47e 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -44,7 +44,7 @@ SimpleAnimation::SimpleAnimation(Animation *animation): { } -SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode, +SimpleAnimation::SimpleAnimation(XmlNodePtr animationNode, const std::string& dyePalettes): mAnimation(new Animation), mAnimationTime(0), @@ -136,7 +136,7 @@ Image *SimpleAnimation::getCurrentImage() const return nullptr; } -void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode, +void SimpleAnimation::initializeAnimation(XmlNodePtr animationNode, const std::string& dyePalettes) { mInitialized = false; @@ -161,7 +161,7 @@ void SimpleAnimation::initializeAnimation(xmlNodePtr animationNode, return; // Get animation frames - for (xmlNodePtr frameNode = animationNode->xmlChildrenNode; + for (XmlNodePtr frameNode = animationNode->xmlChildrenNode; frameNode; frameNode = frameNode->next) { int delay = XML::getProperty(frameNode, "delay", 0); diff --git a/src/simpleanimation.h b/src/simpleanimation.h index eda8d1fc0..de1203662 100644 --- a/src/simpleanimation.h +++ b/src/simpleanimation.h @@ -47,7 +47,7 @@ class SimpleAnimation /** * Creates a simple animation that creates its animation from XML Data. */ - SimpleAnimation(xmlNodePtr animationNode, + SimpleAnimation(XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); ~SimpleAnimation(); @@ -68,7 +68,7 @@ class SimpleAnimation Image *getCurrentImage() const; private: - void initializeAnimation(xmlNodePtr animationNode, const std::string& + void initializeAnimation(XmlNodePtr animationNode, const std::string& dyePalettes = std::string()); /** The hosted animation. */ diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 5a33df561..3de30e3cf 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -130,7 +130,7 @@ void StatusEffect::load() unload(); XML::Document doc(STATUS_EFFECTS_FILE); - xmlNodePtr rootNode = doc.rootNode(); + XmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "status-effects")) { diff --git a/src/units.cpp b/src/units.cpp index 82d3920f7..c031558cf 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -100,7 +100,7 @@ void Units::loadUnits() } XML::Document doc("units.xml"); - xmlNodePtr root = doc.rootNode(); + XmlNodePtr root = doc.rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "units")) { diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 5a9558cc2..d1df63510 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -101,12 +101,12 @@ namespace XML xmlFreeDoc(mDoc); } - xmlNodePtr Document::rootNode() + XmlNodePtr Document::rootNode() { return mDoc ? xmlDocGetRootElement(mDoc) : nullptr; } - int getProperty(xmlNodePtr node, const char* name, int def) + int getProperty(XmlNodePtr node, const char* name, int def) { int &ret = def; @@ -120,7 +120,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; @@ -134,7 +134,7 @@ namespace XML return ret; } - std::string getProperty(xmlNodePtr node, const char *name, + std::string getProperty(XmlNodePtr node, const char *name, const std::string &def) { xmlChar *prop = xmlGetProp(node, BAD_CAST name); @@ -148,7 +148,7 @@ namespace XML return def; } - bool getBoolProperty(xmlNodePtr node, const char* name, bool def) + bool getBoolProperty(XmlNodePtr node, const char* name, bool def) { xmlChar *prop = xmlGetProp(node, BAD_CAST name); @@ -159,7 +159,7 @@ namespace XML return def; } - xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name) + XmlNodePtr findFirstChildByName(XmlNodePtr parent, const char *name) { for_each_xml_child_node(child, parent) { diff --git a/src/utils/xml.h b/src/utils/xml.h index 2b97b45f5..849bc2060 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -29,6 +29,8 @@ #include +#define XmlNodePtr xmlNodePtr + /** * XML helper functions. */ @@ -65,42 +67,42 @@ namespace XML * Returns the root node of the document (or NULL if there was a * load error). */ - xmlNodePtr rootNode(); + XmlNodePtr rootNode(); private: xmlDocPtr mDoc; }; /** - * Gets an floating point property from an xmlNodePtr. + * 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 an integer property from an xmlNodePtr. + * 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 a string property from an xmlNodePtr. + * Gets a string property from an XmlNodePtr. */ - std::string getProperty(xmlNodePtr node, const char *name, + std::string getProperty(XmlNodePtr node, const char *name, const std::string &def); /** - * Gets a boolean property from an xmlNodePtr. + * Gets a boolean property from an XmlNodePtr. */ - bool getBoolProperty(xmlNodePtr node, const char *name, bool def); + bool getBoolProperty(XmlNodePtr node, const char *name, bool def); /** * Finds the first child node with the given name */ - xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name); + XmlNodePtr findFirstChildByName(XmlNodePtr parent, const char *name); void initXML(); } #define for_each_xml_child_node(var, parent) \ - for (xmlNodePtr var = parent->xmlChildrenNode; var; var = var->next) + for (XmlNodePtr var = parent->xmlChildrenNode; var; var = var->next) #endif // XML_H -- cgit v1.2.3-70-g09d2 From a057817a0983b3a3190f6773101f788f2c6278ba Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Jan 2012 19:02:55 +0300 Subject: Move clieanup for libxml2 to xml.cpp --- src/client.cpp | 3 +-- src/utils/xml.cpp | 6 ++++++ src/utils/xml.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/client.cpp b/src/client.cpp index 88fe8c443..0f82a4514 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -741,8 +741,7 @@ void Client::gameClear() if (logger) logger->log1("Quitting4"); - // Shutdown libxml - xmlCleanupParser(); + XML::cleanupXML(); if (logger) logger->log1("Quitting5"); diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index d1df63510..9d6858d9d 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -181,4 +181,10 @@ namespace XML xmlSetGenericErrorFunc(nullptr, xmlNullLogger); } + // Shutdown libxml + void cleanupXML() + { + xmlCleanupParser(); + } + } // namespace XML diff --git a/src/utils/xml.h b/src/utils/xml.h index 849bc2060..fac90c63d 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -100,6 +100,8 @@ namespace XML XmlNodePtr findFirstChildByName(XmlNodePtr parent, const char *name); void initXML(); + + void cleanupXML(); } #define for_each_xml_child_node(var, parent) \ -- cgit v1.2.3-70-g09d2 From 5edddb1313ed0dc275e6ae70b8a1780ded3a590d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Jan 2012 21:06:33 +0300 Subject: Replace xmlStrEqual to xmlNameEqual. --- src/actorsprite.cpp | 6 +++--- src/configuration.cpp | 8 ++++---- src/effectmanager.cpp | 4 ++-- src/gui/equipmentwindow.cpp | 6 +++--- src/gui/serverdialog.cpp | 8 ++++---- src/gui/skilldialog.cpp | 6 +++--- src/gui/theme.cpp | 14 +++++++------- src/gui/updaterwindow.cpp | 4 ++-- src/net/manaserv/attributes.cpp | 8 ++++---- src/particle.cpp | 8 ++++---- src/particleemitter.cpp | 22 +++++++++++----------- src/resources/chardb.cpp | 8 ++++---- src/resources/colordb.cpp | 10 +++++----- src/resources/emotedb.cpp | 16 ++++++++-------- src/resources/itemdb.cpp | 28 ++++++++++++++-------------- src/resources/mapdb.cpp | 2 +- src/resources/mapreader.cpp | 26 +++++++++++++------------- src/resources/monsterdb.cpp | 12 ++++++------ src/resources/npcdb.cpp | 8 ++++---- src/resources/specialdb.cpp | 6 +++--- src/resources/spritedef.cpp | 24 ++++++++++++------------ src/simpleanimation.cpp | 6 +++--- src/statuseffect.cpp | 8 +++++--- src/units.cpp | 6 +++--- src/utils/xml.cpp | 2 +- src/utils/xml.h | 2 ++ 26 files changed, 131 insertions(+), 127 deletions(-) (limited to 'src') diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index fd2de295a..c1c139bb9 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -182,7 +182,7 @@ static EffectDescription *getEffectDescription(int effectId) XML::Document doc(EFFECTS_FILE); XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) + if (!root || !xmlNameEqual(root, "being-effects")) { logger->log1("Error loading being effects file: " EFFECTS_FILE); @@ -193,13 +193,13 @@ static EffectDescription *getEffectDescription(int effectId) { int id; - if (xmlStrEqual(node->name, BAD_CAST "effect")) + if (xmlNameEqual(node, "effect")) { EffectDescription *EffectDescription = getEffectDescription(node, &id); effects[id] = EffectDescription; } - else if (xmlStrEqual(node->name, BAD_CAST "default")) + else if (xmlNameEqual(node, "default")) { EffectDescription *effectDescription = getEffectDescription(node, &id); diff --git a/src/configuration.cpp b/src/configuration.cpp index 957fa1798..b3d5d77d0 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -432,7 +432,7 @@ void ConfigurationObject::initFromXML(XmlNodePtr parent_node) for_each_xml_child_node(node, parent_node) { - if (xmlStrEqual(node->name, BAD_CAST "list")) + if (xmlNameEqual(node, "list")) { // list option handling @@ -440,7 +440,7 @@ void ConfigurationObject::initFromXML(XmlNodePtr parent_node) for_each_xml_child_node(subnode, node) { - if (xmlStrEqual(subnode->name, BAD_CAST name.c_str()) + if (xmlNameEqual(subnode, name.c_str()) && subnode->type == XML_ELEMENT_NODE) { ConfigurationObject *cobj = new ConfigurationObject; @@ -452,7 +452,7 @@ void ConfigurationObject::initFromXML(XmlNodePtr parent_node) } } - else if (xmlStrEqual(node->name, BAD_CAST "option")) + else if (xmlNameEqual(node, "option")) { // single option handling @@ -491,7 +491,7 @@ void Configuration::init(const std::string &filename, bool useResManager) XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "configuration")) + if (!rootNode || !xmlNameEqual(rootNode, "configuration")) { logger->log("Warning: No configuration file (%s)", filename.c_str()); return; diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp index b00687631..de12ecaa5 100644 --- a/src/effectmanager.cpp +++ b/src/effectmanager.cpp @@ -34,7 +34,7 @@ EffectManager::EffectManager() XML::Document doc("effects.xml"); XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "being-effects")) + if (!root || !xmlNameEqual(root, "being-effects")) { logger->log1("Error loading being effects file: effects.xml"); return; @@ -46,7 +46,7 @@ EffectManager::EffectManager() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "effect")) + if (xmlNameEqual(node, "effect")) { EffectDescription ed; ed.id = XML::getProperty(node, "id", -1); diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 4bfc477a0..0dadca2dc 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -371,11 +371,11 @@ void EquipmentWindow::fillBoxes() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "window")) + if (xmlNameEqual(node, "window")) loadWindow(node); - else if (xmlStrEqual(node->name, BAD_CAST "playerbox")) + else if (xmlNameEqual(node, "playerbox")) loadPlayerBox(node); - else if (xmlStrEqual(node->name, BAD_CAST "slot")) + else if (xmlNameEqual(node, "slot")) loadSlot(node, mImageSet); } delete doc; diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index a4a477527..85b3bbf4e 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -630,7 +630,7 @@ void ServerDialog::loadServers(bool addNew) XML::Document doc(mDir + "/serverlist.xml", false); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "serverlist")) + if (!rootNode || !xmlNameEqual(rootNode, "serverlist")) { logger->log1("Error loading server list!"); return; @@ -646,7 +646,7 @@ void ServerDialog::loadServers(bool addNew) for_each_xml_child_node(serverNode, rootNode) { - if (!xmlStrEqual(serverNode->name, BAD_CAST "server")) + if (!xmlNameEqual(serverNode, "server")) continue; ServerInfo server; @@ -681,7 +681,7 @@ void ServerDialog::loadServers(bool addNew) for_each_xml_child_node(subNode, serverNode) { - if (xmlStrEqual(subNode->name, BAD_CAST "connection")) + if (xmlNameEqual(subNode, "connection")) { server.hostname = XML::getProperty(subNode, "hostname", ""); server.port = static_cast( @@ -693,7 +693,7 @@ void ServerDialog::loadServers(bool addNew) server.port = defaultPortForServerType(server.type); } } - else if (xmlStrEqual(subNode->name, BAD_CAST "description")) + else if (xmlNameEqual(subNode, "description")) { server.description = reinterpret_cast( subNode->xmlChildrenNode->content); diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 72f5a8ca1..4ee674325 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -370,7 +370,7 @@ void SkillDialog::loadSkills(const std::string &file) SkillListBox *listbox; SkillTab *tab; - if (!root || !xmlStrEqual(root->name, BAD_CAST "skills")) + if (!root || !xmlNameEqual(root, "skills")) { logger->log("Error loading skills file: %s", file.c_str()); @@ -413,7 +413,7 @@ void SkillDialog::loadSkills(const std::string &file) for_each_xml_child_node(set, root) { - if (xmlStrEqual(set->name, BAD_CAST "set")) + if (xmlNameEqual(set, "set")) { setCount++; setName = XML::getProperty(set, "name", @@ -425,7 +425,7 @@ void SkillDialog::loadSkills(const std::string &file) for_each_xml_child_node(node, set) { - if (xmlStrEqual(node->name, BAD_CAST "skill")) + if (xmlNameEqual(node, "skill")) { int id = atoi(XML::getProperty(node, "id", "-1").c_str()); std::string name = XML::getProperty(node, "name", diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 2d3b0beea..85fd215ac 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -317,7 +317,7 @@ Skin *Theme::readSkin(const std::string &filename) XML::Document doc(resolveThemePath(filename)); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset")) + if (!rootNode || !xmlNameEqual(rootNode, "skinset")) return nullptr; const std::string skinSetImage = XML::getProperty(rootNode, "image", ""); @@ -339,7 +339,7 @@ Skin *Theme::readSkin(const std::string &filename) // iterate 's for_each_xml_child_node(widgetNode, rootNode) { - if (!xmlStrEqual(widgetNode->name, BAD_CAST "widget")) + if (!xmlNameEqual(widgetNode, "widget")) continue; const std::string widgetType = @@ -348,7 +348,7 @@ Skin *Theme::readSkin(const std::string &filename) { for_each_xml_child_node(partNode, widgetNode) { - if (xmlStrEqual(partNode->name, BAD_CAST "part")) + if (xmlNameEqual(partNode, "part")) { const std::string partType = XML::getProperty(partNode, "type", "unknown"); @@ -477,7 +477,7 @@ Skin *Theme::readSkin(const std::string &filename) "'%s'", partType.c_str()); } } - else if (xmlStrEqual(partNode->name, BAD_CAST "option")) + else if (xmlNameEqual(partNode, "option")) { const std::string name = XML::getProperty( partNode, "name", ""); @@ -820,7 +820,7 @@ void Theme::loadColors(std::string file) XML::Document doc(resolveThemePath(file)); XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log("Error loading colors file: %s", file.c_str()); return; @@ -835,7 +835,7 @@ void Theme::loadColors(std::string file) for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "color")) + if (xmlNameEqual(node, "color")) { type = readColorType(XML::getProperty(node, "id", "")); if (type < 0) // invalid or no type given @@ -850,7 +850,7 @@ void Theme::loadColors(std::string file) mColors[type].set(type, color, grad, 10); } - else if (xmlStrEqual(node->name, BAD_CAST "progressbar")) + else if (xmlNameEqual(node, "progressbar")) { type = readProgressType(XML::getProperty(node, "id", "")); if (type < 0) // invalid or no type given diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index 5e8e51464..39dde65c3 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -69,7 +69,7 @@ std::vector loadXMLFile(const std::string &fileName) XML::Document doc(fileName, false); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "updates")) + if (!rootNode || !xmlNameEqual(rootNode, "updates")) { logger->log("Error loading update file: %s", fileName.c_str()); return files; @@ -78,7 +78,7 @@ std::vector loadXMLFile(const std::string &fileName) for_each_xml_child_node(fileNode, rootNode) { // Ignore all tags except for the "update" tags - if (!xmlStrEqual(fileNode->name, BAD_CAST "update")) + if (!xmlNameEqual(fileNode, "update")) continue; updateFile file; diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp index 01bd23273..662032e29 100644 --- a/src/net/manaserv/attributes.cpp +++ b/src/net/manaserv/attributes.cpp @@ -240,7 +240,7 @@ namespace Attributes XML::Document doc(DEFAULT_ATTRIBUTESDB_FILE); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "attributes")) + if (!rootNode || !xmlNameEqual(rootNode, "attributes")) { logger->log("Attributes: Error while loading " DEFAULT_ATTRIBUTESDB_FILE ". Using Built-ins."); @@ -251,7 +251,7 @@ namespace Attributes for_each_xml_child_node(node, rootNode) { - if (xmlStrEqual(node->name, BAD_CAST "attribute")) + if (xmlNameEqual(node, "attribute")) { int id = XML::getProperty(node, "id", 0); @@ -290,7 +290,7 @@ namespace Attributes unsigned int count = 0; for_each_xml_child_node(effectNode, node) { - if (!xmlStrEqual(effectNode->name, BAD_CAST "modifier")) + if (!xmlNameEqual(effectNode, "modifier")) continue; ++count; std::string tag = XML::getProperty(effectNode, "tag", ""); @@ -334,7 +334,7 @@ namespace Attributes logger->log("Found %d tags for attribute %d.", count, id); }// End attribute - else if (xmlStrEqual(node->name, BAD_CAST "points")) + else if (xmlNameEqual(node, "points")) { creationPoints = XML::getProperty( node, "start", DEFAULT_POINTS); diff --git a/src/particle.cpp b/src/particle.cpp index aae780b7a..a0acb4f73 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -293,7 +293,7 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, XML::Document doc(particleEffectFile.substr(0, pos)); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "effect")) + if (!rootNode || !xmlNameEqual(rootNode, "effect")) { logger->log("Error loading particle: %s", particleEffectFile.c_str()); return nullptr; @@ -305,7 +305,7 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, for_each_xml_child_node(effectChildNode, rootNode) { // We're only interested in particles - if (!xmlStrEqual(effectChildNode->name, BAD_CAST "particle")) + if (!xmlNameEqual(effectChildNode, "particle")) continue; // Determine the exact particle type @@ -361,14 +361,14 @@ Particle *Particle::addEffect(const std::string &particleEffectFile, // Look for additional emitters for this particle for_each_xml_child_node(emitterNode, effectChildNode) { - if (xmlStrEqual(emitterNode->name, BAD_CAST "emitter")) + if (xmlNameEqual(emitterNode, "emitter")) { ParticleEmitter *newEmitter; newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap, rotation, dyePalettes); newParticle->addEmitter(newEmitter); } - else if (xmlStrEqual(emitterNode->name, BAD_CAST "deatheffect")) + else if (xmlNameEqual(emitterNode, "deatheffect")) { std::string deathEffect = reinterpret_cast( emitterNode->xmlChildrenNode->content); diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 40f06d671..62f6767c6 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -71,7 +71,7 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, for_each_xml_child_node(propertyNode, emitterNode) { - if (xmlStrEqual(propertyNode->name, BAD_CAST "property")) + if (xmlNameEqual(propertyNode, "property")) { std::string name = XML::getProperty(propertyNode, "name", ""); @@ -197,13 +197,13 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, name.c_str()); } } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "emitter")) + else if (xmlNameEqual(propertyNode, "emitter")) { ParticleEmitter newEmitter(propertyNode, mParticleTarget, map, rotation, dyePalettes); mParticleChildEmitters.push_back(newEmitter); } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "rotation")) + else if (xmlNameEqual(propertyNode, "rotation")) { ImageSet *imageset = ResourceManager::getInstance()->getImageSet( XML::getProperty(propertyNode, "imageset", ""), @@ -229,7 +229,7 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, offsetY -= imageset->getHeight() - 32; offsetX -= imageset->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { int index = XML::getProperty(frameNode, "index", -1); @@ -250,7 +250,7 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, mParticleRotation.addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { int start = XML::getProperty(frameNode, "start", -1); int end = XML::getProperty(frameNode, "end", -1); @@ -276,13 +276,13 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, start++; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { mParticleRotation.addTerminator(rand); } } // for frameNode } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "animation")) + else if (xmlNameEqual(propertyNode, "animation")) { ImageSet *imageset = ResourceManager::getInstance()->getImageSet( XML::getProperty(propertyNode, "imageset", ""), @@ -307,7 +307,7 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, offsetY -= imageset->getHeight() - 32; offsetX -= imageset->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { int index = XML::getProperty(frameNode, "index", -1); @@ -328,7 +328,7 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, mParticleAnimation.addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { int start = XML::getProperty(frameNode, "start", -1); int end = XML::getProperty(frameNode, "end", -1); @@ -354,13 +354,13 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, start++; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { mParticleAnimation.addTerminator(rand); } } // for frameNode } - else if (xmlStrEqual(propertyNode->name, BAD_CAST "deatheffect")) + else if (xmlNameEqual(propertyNode, "deatheffect")) { mDeathEffect = reinterpret_cast( propertyNode->xmlChildrenNode->content); diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp index 4be2e2b04..f38f13224 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/chardb.cpp @@ -46,7 +46,7 @@ void CharDB::load() XML::Document *doc = new XML::Document("charcreation.xml"); XmlNodePtr root = doc->rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "chars")) + if (!root || !xmlNameEqual(root, "chars")) { logger->log1("CharDB: Failed to parse charcreation.xml."); @@ -56,15 +56,15 @@ void CharDB::load() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "haircolor")) + if (xmlNameEqual(node, "haircolor")) { loadMinMax(node, &mMinHairColor, &mMaxHairColor); } - else if (xmlStrEqual(node->name, BAD_CAST "hairstyle")) + else if (xmlNameEqual(node, "hairstyle")) { loadMinMax(node, &mMinHairStyle, &mMaxHairStyle); } - else if (xmlStrEqual(node->name, BAD_CAST "stat")) + else if (xmlNameEqual(node, "stat")) { loadMinMax(node, &mMinStat, &mMaxStat); mSumStat = XML::getProperty(node, "sum", 0); diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index cdbfbeba8..1ffe507b2 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -52,7 +52,7 @@ void ColorDB::loadHair() XmlNodePtr root = doc->rootNode(); bool hairXml = true; - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log1("Trying to fall back on colors.xml"); @@ -62,7 +62,7 @@ void ColorDB::loadHair() doc = new XML::Document("colors.xml"); root = doc->rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) + if (!root || !xmlNameEqual(root, "colors")) { logger->log1("ColorDB: Failed to find any color files."); mHairColors[0] = mFail; @@ -76,7 +76,7 @@ void ColorDB::loadHair() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "color")) + if (xmlNameEqual(node, "color")) { int id = XML::getProperty(node, "id", 0); @@ -106,7 +106,7 @@ void ColorDB::loadColorLists() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "list")) + if (xmlNameEqual(node, "list")) { std::string name = XML::getProperty(node, "name", ""); if (name.empty()) @@ -120,7 +120,7 @@ void ColorDB::loadColorLists() for_each_xml_child_node(colorNode, node) { - if (xmlStrEqual(colorNode->name, BAD_CAST "color")) + if (xmlNameEqual(colorNode, "color")) { ItemColor c(XML::getProperty(colorNode, "id", -1), XML::getProperty(colorNode, "name", ""), diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp index 163d8b879..c6126a57b 100644 --- a/src/resources/emotedb.cpp +++ b/src/resources/emotedb.cpp @@ -54,7 +54,7 @@ void EmoteDB::load() XML::Document doc("emotes.xml"); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes")) + if (!rootNode || !xmlNameEqual(rootNode, "emotes")) { logger->log1("Emote Database: Error while loading emotes.xml!"); return; @@ -63,7 +63,7 @@ void EmoteDB::load() //iterate s for_each_xml_child_node(emoteNode, rootNode) { - if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote")) + if (!xmlNameEqual(emoteNode, "emote")) continue; int id = XML::getProperty(emoteNode, "id", -1); @@ -81,7 +81,7 @@ void EmoteDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { EmoteSprite *currentSprite = new EmoteSprite; std::string file = paths.getStringValue("sprites") @@ -92,7 +92,7 @@ void EmoteDB::load() currentSprite->name = XML::getProperty(spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast( spriteNode->xmlChildrenNode->content); @@ -108,7 +108,7 @@ void EmoteDB::load() XML::Document doc2("graphics/sprites/manaplus_emotes.xml"); rootNode = doc2.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "emotes")) + if (!rootNode || !xmlNameEqual(rootNode, "emotes")) { logger->log1("Emote Database: Error while loading" " manaplus_emotes.xml!"); @@ -118,7 +118,7 @@ void EmoteDB::load() //iterate s for_each_xml_child_node(emoteNode, rootNode) { - if (!xmlStrEqual(emoteNode->name, BAD_CAST "emote")) + if (!xmlNameEqual(emoteNode, "emote")) continue; int id = XML::getProperty(emoteNode, "id", -1); @@ -136,7 +136,7 @@ void EmoteDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { EmoteSprite *currentSprite = new EmoteSprite; std::string file = paths.getStringValue("sprites") @@ -147,7 +147,7 @@ void EmoteDB::load() currentSprite->name = XML::getProperty(spriteNode, "name", ""); currentInfo->sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast( spriteNode->xmlChildrenNode->content); diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index fcc20613d..5fa68a88f 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -174,7 +174,7 @@ void ItemDB::load() XML::Document doc("items.xml"); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items")) + if (!rootNode || !xmlNameEqual(rootNode, "items")) { logger->log("ItemDB: Error while loading items.xml!"); mLoaded = true; @@ -183,7 +183,7 @@ void ItemDB::load() for_each_xml_child_node(node, rootNode) { - if (!xmlStrEqual(node->name, BAD_CAST "item")) + if (!xmlNameEqual(node, "item")) continue; int id = XML::getProperty(node, "id", 0); @@ -324,7 +324,7 @@ void ItemDB::load() for_each_xml_child_node(itemChild, node) { - if (xmlStrEqual(itemChild->name, BAD_CAST "sprite")) + if (xmlNameEqual(itemChild, "sprite")) { std::string attackParticle = XML::getProperty( itemChild, "particle-effect", ""); @@ -332,23 +332,23 @@ void ItemDB::load() loadSpriteRef(itemInfo, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "sound")) + else if (xmlNameEqual(itemChild, "sound")) { loadSoundRef(itemInfo, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "floor")) + else if (xmlNameEqual(itemChild, "floor")) { loadFloorSprite(&display, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "replace")) + else if (xmlNameEqual(itemChild, "replace")) { loadReplaceSprite(itemInfo, itemChild); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "drawAfter")) + else if (xmlNameEqual(itemChild, "drawAfter")) { loadOrderSprite(itemInfo, itemChild, true); } - else if (xmlStrEqual(itemChild->name, BAD_CAST "drawBefore")) + else if (xmlNameEqual(itemChild, "drawBefore")) { loadOrderSprite(itemInfo, itemChild, false); } @@ -630,7 +630,7 @@ void loadFloorSprite(SpriteDisplay *display, XmlNodePtr floorNode) { for_each_xml_child_node(spriteNode, floorNode) { - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { SpriteReference *currentSprite = new SpriteReference; currentSprite->sprite = reinterpret_cast( @@ -639,7 +639,7 @@ void loadFloorSprite(SpriteDisplay *display, XmlNodePtr floorNode) = XML::getProperty(spriteNode, "variant", 0); display->sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast( spriteNode->xmlChildrenNode->content); @@ -669,7 +669,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode) continue; for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); @@ -691,7 +691,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode) for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); @@ -724,7 +724,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode) for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); @@ -754,7 +754,7 @@ void loadReplaceSprite(ItemInfo *itemInfo, XmlNodePtr replaceNode) return; for_each_xml_child_node(itemNode, replaceNode) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + if (xmlNameEqual(itemNode, "item")) { int from = XML::getProperty(itemNode, "from", 0); int to = XML::getProperty(itemNode, "to", 1); diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp index aa10aff85..b186ad658 100644 --- a/src/resources/mapdb.cpp +++ b/src/resources/mapdb.cpp @@ -52,7 +52,7 @@ void MapDB::load() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "map")) + if (xmlNameEqual(node, "map")) { std::string name = XML::getProperty(node, "name", ""); if (name.empty()) diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index aa7bce59d..8d71779f2 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -227,7 +227,7 @@ Map *MapReader::readMap(const std::string &filename, // Parse the inflated map data if (node) { - if (!xmlStrEqual(node->name, BAD_CAST "map")) + if (!xmlNameEqual(node, "map")) logger->log("Error: Not a map file (%s)!", realFilename.c_str()); else map = readMap(node, realFilename); @@ -276,23 +276,23 @@ Map *MapReader::readMap(XmlNodePtr node, const std::string &path) for_each_xml_child_node(childNode, node) { - if (xmlStrEqual(childNode->name, BAD_CAST "tileset")) + if (xmlNameEqual(childNode, "tileset")) { Tileset *tileset = readTileset(childNode, pathDir, map); if (tileset) map->addTileset(tileset); } - else if (xmlStrEqual(childNode->name, BAD_CAST "layer")) + else if (xmlNameEqual(childNode, "layer")) { readLayer(childNode, map); } - else if (xmlStrEqual(childNode->name, BAD_CAST "properties")) + else if (xmlNameEqual(childNode, "properties")) { readProperties(childNode, map); map->setVersion(atoi(map->getProperty( "manaplus version").c_str())); } - else if (xmlStrEqual(childNode->name, BAD_CAST "objectgroup")) + else if (xmlNameEqual(childNode, "objectgroup")) { // The object group offset is applied to each object individually const int tileOffsetX = XML::getProperty(childNode, "x", 0); @@ -302,7 +302,7 @@ Map *MapReader::readMap(XmlNodePtr node, const std::string &path) for_each_xml_child_node(objectNode, childNode) { - if (xmlStrEqual(objectNode->name, BAD_CAST "object")) + if (xmlNameEqual(objectNode, "object")) { std::string objType = XML::getProperty( objectNode, "type", ""); @@ -386,7 +386,7 @@ void MapReader::readProperties(XmlNodePtr node, Properties *props) for_each_xml_child_node(childNode, node) { - if (!xmlStrEqual(childNode->name, BAD_CAST "property")) + if (!xmlNameEqual(childNode, "property")) continue; // Example: @@ -472,7 +472,7 @@ void MapReader::readLayer(XmlNodePtr node, Map *map) // Load the tile data for_each_xml_child_node(childNode, node) { - if (!xmlStrEqual(childNode->name, BAD_CAST "data")) + if (!xmlNameEqual(childNode, "data")) continue; const std::string encoding = @@ -619,7 +619,7 @@ void MapReader::readLayer(XmlNodePtr node, Map *map) // Read plain XML map file for_each_xml_child_node(childNode2, childNode) { - if (!xmlStrEqual(childNode2->name, BAD_CAST "tile")) + if (!xmlNameEqual(childNode2, "tile")) continue; const int gid = XML::getProperty(childNode2, "gid", -1); @@ -678,7 +678,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path, for_each_xml_child_node(childNode, node) { - if (xmlStrEqual(childNode->name, BAD_CAST "image")) + if (xmlNameEqual(childNode, "image")) { const std::string source = XML::getProperty( childNode, "source", ""); @@ -703,11 +703,11 @@ Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path, } } } - else if (xmlStrEqual(childNode->name, BAD_CAST "tile")) + else if (xmlNameEqual(childNode, "tile")) { for_each_xml_child_node(tileNode, childNode) { - if (!xmlStrEqual(tileNode->name, BAD_CAST "properties")) + if (!xmlNameEqual(tileNode, "properties")) continue; int tileGID = firstGid + XML::getProperty(childNode, "id", 0); @@ -716,7 +716,7 @@ Tileset *MapReader::readTileset(XmlNodePtr node, const std::string &path, std::map tileProperties; for_each_xml_child_node(propertyNode, tileNode) { - if (!xmlStrEqual(propertyNode->name, BAD_CAST "property")) + if (!xmlNameEqual(propertyNode, "property")) continue; std::string name = XML::getProperty( propertyNode, "name", ""); diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index e6901fa2f..9d295db35 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -54,7 +54,7 @@ void MonsterDB::load() XML::Document doc("monsters.xml"); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters")) + if (!rootNode || !xmlNameEqual(rootNode, "monsters")) { logger->log("Monster Database: Error while loading monster.xml!"); mLoaded = true; @@ -71,7 +71,7 @@ void MonsterDB::load() //iterate s for_each_xml_child_node(monsterNode, rootNode) { - if (!xmlStrEqual(monsterNode->name, BAD_CAST "monster")) + if (!xmlNameEqual(monsterNode, "monster")) continue; BeingInfo *currentInfo = new BeingInfo; @@ -119,7 +119,7 @@ void MonsterDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { SpriteReference *currentSprite = new SpriteReference; currentSprite->sprite = reinterpret_cast( @@ -129,7 +129,7 @@ void MonsterDB::load() spriteNode, "variant", 0); display.sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "sound")) + else if (xmlNameEqual(spriteNode, "sound")) { std::string event = XML::getProperty(spriteNode, "event", ""); const char *filename; @@ -172,7 +172,7 @@ void MonsterDB::load() currentInfo->getName().c_str()); } } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "attack")) + else if (xmlNameEqual(spriteNode, "attack")) { const int id = XML::getProperty(spriteNode, "id", 0); const std::string particleEffect = XML::getProperty( @@ -185,7 +185,7 @@ void MonsterDB::load() currentInfo->addAttack(id, spriteAction, particleEffect, missileParticle); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { display.particles.push_back(reinterpret_cast( spriteNode->xmlChildrenNode->content)); diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index b823620f0..832fa26d6 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -48,7 +48,7 @@ void NPCDB::load() XML::Document doc("npcs.xml"); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs")) + if (!rootNode || !xmlNameEqual(rootNode, "npcs")) { logger->log("NPC Database: Error while loading npcs.xml!"); mLoaded = true; @@ -58,7 +58,7 @@ void NPCDB::load() //iterate s for_each_xml_child_node(npcNode, rootNode) { - if (!xmlStrEqual(npcNode->name, BAD_CAST "npc")) + if (!xmlNameEqual(npcNode, "npc")) continue; int id = XML::getProperty(npcNode, "id", 0); @@ -84,7 +84,7 @@ void NPCDB::load() if (!spriteNode->xmlChildrenNode) continue; - if (xmlStrEqual(spriteNode->name, BAD_CAST "sprite")) + if (xmlNameEqual(spriteNode, "sprite")) { SpriteReference *currentSprite = new SpriteReference; currentSprite->sprite = reinterpret_cast( @@ -93,7 +93,7 @@ void NPCDB::load() XML::getProperty(spriteNode, "variant", 0); display.sprites.push_back(currentSprite); } - else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) + else if (xmlNameEqual(spriteNode, "particlefx")) { std::string particlefx = reinterpret_cast( spriteNode->xmlChildrenNode->content); diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp index eb4a81c9a..b1a3a9c4d 100644 --- a/src/resources/specialdb.cpp +++ b/src/resources/specialdb.cpp @@ -57,7 +57,7 @@ void SpecialDB::load() XML::Document doc("specials.xml"); XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "specials")) + if (!root || !xmlNameEqual(root, "specials")) { logger->log("Error loading specials file specials.xml"); return; @@ -67,13 +67,13 @@ void SpecialDB::load() for_each_xml_child_node(set, root) { - if (xmlStrEqual(set->name, BAD_CAST "set")) + if (xmlNameEqual(set, "set")) { setName = XML::getProperty(set, "name", "Actions"); for_each_xml_child_node(special, set) { - if (xmlStrEqual(special->name, BAD_CAST "special")) + if (xmlNameEqual(special, "special")) { SpecialInfo *info = new SpecialInfo(); int id = XML::getProperty(special, "id", 0); diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index 7ff74ac18..0d9b95f6f 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -83,7 +83,7 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant) XML::Document doc(animationFile.substr(0, pos)); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) + if (!rootNode || !xmlNameEqual(rootNode, "sprite")) { logger->log("Error, failed to parse %s", animationFile.c_str()); @@ -149,11 +149,11 @@ void SpriteDef::loadSprite(XmlNodePtr spriteNode, int variant, for_each_xml_child_node(node, spriteNode) { - if (xmlStrEqual(node->name, BAD_CAST "imageset")) + if (xmlNameEqual(node, "imageset")) loadImageSet(node, palettes); - else if (xmlStrEqual(node->name, BAD_CAST "action")) + else if (xmlNameEqual(node, "action")) loadAction(node, variant_offset); - else if (xmlStrEqual(node->name, BAD_CAST "include")) + else if (xmlNameEqual(node, "include")) includeSprite(node); } } @@ -223,7 +223,7 @@ void SpriteDef::loadAction(XmlNodePtr node, int variant_offset) // Load animations for_each_xml_child_node(animationNode, node) { - if (xmlStrEqual(animationNode->name, BAD_CAST "animation")) + if (xmlNameEqual(animationNode, "animation")) loadAnimation(animationNode, action, imageSet, variant_offset); } } @@ -262,7 +262,7 @@ void SpriteDef::loadAnimation(XmlNodePtr animationNode, offsetY -= imageSet->getHeight() - 32; offsetX -= imageSet->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { const int index = XML::getProperty(frameNode, "index", -1); @@ -282,7 +282,7 @@ void SpriteDef::loadAnimation(XmlNodePtr animationNode, animation->addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { const int start = XML::getProperty(frameNode, "start", -1); const int end = XML::getProperty(frameNode, "end", -1); @@ -322,22 +322,22 @@ void SpriteDef::loadAnimation(XmlNodePtr animationNode, repeat --; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { animation->addTerminator(rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "jump")) + else if (xmlNameEqual(frameNode, "jump")) { animation->addJump(XML::getProperty( frameNode, "action", ""), rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "label")) + else if (xmlNameEqual(frameNode, "label")) { std::string name = XML::getProperty(frameNode, "name", ""); if (!name.empty()) animation->addLabel(name); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "goto")) + else if (xmlNameEqual(frameNode, "goto")) { std::string name = XML::getProperty(frameNode, "label", ""); if (!name.empty()) @@ -365,7 +365,7 @@ void SpriteDef::includeSprite(XmlNodePtr includeNode) XML::Document doc(filename); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "sprite")) + if (!rootNode || !xmlNameEqual(rootNode, "sprite")) { logger->log("Error, no sprite root node in %s", filename.c_str()); return; diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index f0002b47e..2b7cc328d 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -171,7 +171,7 @@ void SimpleAnimation::initializeAnimation(XmlNodePtr animationNode, offsetY -= imageset->getHeight() - 32; offsetX -= imageset->getWidth() / 2 - 16; - if (xmlStrEqual(frameNode->name, BAD_CAST "frame")) + if (xmlNameEqual(frameNode, "frame")) { int index = XML::getProperty(frameNode, "index", -1); @@ -192,7 +192,7 @@ void SimpleAnimation::initializeAnimation(XmlNodePtr animationNode, if (mAnimation) mAnimation->addFrame(img, delay, offsetX, offsetY, rand); } - else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence")) + else if (xmlNameEqual(frameNode, "sequence")) { int start = XML::getProperty(frameNode, "start", -1); int end = XML::getProperty(frameNode, "end", -1); @@ -218,7 +218,7 @@ void SimpleAnimation::initializeAnimation(XmlNodePtr animationNode, start++; } } - else if (xmlStrEqual(frameNode->name, BAD_CAST "end")) + else if (xmlNameEqual(frameNode, "end")) { if (mAnimation) mAnimation->addTerminator(rand); diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 3de30e3cf..a7e06a2f4 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -132,7 +132,7 @@ void StatusEffect::load() XML::Document doc(STATUS_EFFECTS_FILE); XmlNodePtr rootNode = doc.rootNode(); - if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "status-effects")) + if (!rootNode || !xmlNameEqual(rootNode, "status-effects")) { logger->log1("Error loading status effects file: " STATUS_EFFECTS_FILE); @@ -145,7 +145,7 @@ void StatusEffect::load() int index = atoi(XML::getProperty(node, "id", "-1").c_str()); - if (xmlStrEqual(node->name, BAD_CAST "status-effect")) + if (xmlNameEqual(node, "status-effect")) { the_map = &statusEffects; int block_index = atoi(XML::getProperty( @@ -155,8 +155,10 @@ void StatusEffect::load() blockEffectIndexMap[block_index] = index; } - else if (xmlStrEqual(node->name, BAD_CAST "stun-effect")) + else if (xmlNameEqual(node, "stun-effect")) + { the_map = &stunEffects; + } if (the_map) { diff --git a/src/units.cpp b/src/units.cpp index c031558cf..804512dbd 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -102,7 +102,7 @@ void Units::loadUnits() XML::Document doc("units.xml"); XmlNodePtr root = doc.rootNode(); - if (!root || !xmlStrEqual(root->name, BAD_CAST "units")) + if (!root || !xmlNameEqual(root, "units")) { logger->log1("Error loading unit definition file: units.xml"); return; @@ -110,7 +110,7 @@ void Units::loadUnits() for_each_xml_child_node(node, root) { - if (xmlStrEqual(node->name, BAD_CAST "unit")) + if (xmlNameEqual(node, "unit")) { struct UnitDescription ud; int level = 1; @@ -127,7 +127,7 @@ void Units::loadUnits() for_each_xml_child_node(uLevel, node) { - if (xmlStrEqual(uLevel->name, BAD_CAST "level")) + if (xmlNameEqual(uLevel, "level")) { struct UnitLevel ul; ul.symbol = XML::getProperty(uLevel, "symbol", diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 9d6858d9d..420915d8f 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -163,7 +163,7 @@ namespace XML { for_each_xml_child_node(child, parent) { - if (xmlStrEqual(child->name, BAD_CAST name)) + if (xmlNameEqual(child, name)) return child; } diff --git a/src/utils/xml.h b/src/utils/xml.h index fac90c63d..821ee2de4 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -31,6 +31,8 @@ #define XmlNodePtr xmlNodePtr +#define xmlNameEqual(node, str) xmlStrEqual((node)->name, BAD_CAST (str)) + /** * XML helper functions. */ -- cgit v1.2.3-70-g09d2 From bb4b31241a30c16eba2506fff89b4057e4a7c6ee Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Jan 2012 21:42:15 +0300 Subject: Replace xmlTextWriterPtr to XmlTextWriterPtr --- src/configuration.cpp | 4 ++-- src/configuration.h | 2 +- src/utils/xml.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/configuration.cpp b/src/configuration.cpp index b3d5d77d0..39e0c75d4 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -500,7 +500,7 @@ void Configuration::init(const std::string &filename, bool useResManager) initFromXML(rootNode); } -void ConfigurationObject::writeToXML(xmlTextWriterPtr writer) +void ConfigurationObject::writeToXML(XmlTextWriterPtr writer) { for (Options::const_iterator i = mOptions.begin(), i_end = mOptions.end(); i != i_end; ++i) @@ -551,7 +551,7 @@ void Configuration::write() fclose(testFile); } - xmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0); + XmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0); if (!writer) { diff --git a/src/configuration.h b/src/configuration.h index 55e588964..2a84588f6 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -194,7 +194,7 @@ class ConfigurationObject protected: virtual void initFromXML(XmlNodePtr node); - virtual void writeToXML(xmlTextWriterPtr writer); + virtual void writeToXML(XmlTextWriterPtr writer); void deleteList(const std::string &name); diff --git a/src/utils/xml.h b/src/utils/xml.h index 821ee2de4..f623fa618 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -30,8 +30,8 @@ #include #define XmlNodePtr xmlNodePtr - #define xmlNameEqual(node, str) xmlStrEqual((node)->name, BAD_CAST (str)) +#define XmlTextWriterPtr xmlTextWriterPtr /** * XML helper functions. -- cgit v1.2.3-70-g09d2 From 05c3c78e18253d2a9faaebea16ee4ff0474db446 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 11 Jan 2012 00:03:05 +0300 Subject: Fix compliation under gcc 4.7 snapshot. --- src/gui/chatwindow.cpp | 6 +++--- src/gui/setup.cpp | 4 ++-- src/gui/socialwindow.cpp | 4 ++-- src/gui/widgets/tabbedarea.cpp | 10 +++++++--- src/gui/widgets/tabbedarea.h | 8 +++----- 5 files changed, 17 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 0c094f7a8..a775510b0 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -420,11 +420,11 @@ void ChatWindow::prevTab() int tab = mChatTabs->getSelectedTabIndex(); - if (tab == 0) + if (tab <= 0) tab = mChatTabs->getNumberOfTabs(); tab--; - mChatTabs->setSelectedTab(tab); + mChatTabs->setSelectedTabByPos(tab); } void ChatWindow::nextTab() @@ -438,7 +438,7 @@ void ChatWindow::nextTab() if (tab == mChatTabs->getNumberOfTabs()) tab = 0; - mChatTabs->setSelectedTab(tab); + mChatTabs->setSelectedTabByPos(tab); } void ChatWindow::closeTab() diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index f76f738c6..bac474950 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -201,7 +201,7 @@ void Setup::doCancel() void Setup::activateTab(const std::string &name) { std::string tmp = gettext(name.c_str()); - mPanel->setSelectedTab(tmp); + mPanel->setSelectedTabByName(tmp); /* for (std::list::const_iterator it = mTabs.begin(); it != mTabs.end(); ++it) @@ -212,7 +212,7 @@ void Setup::activateTab(const std::string &name) logger->log("check tab: " + tab->getName()); if (tab->getName() == tmp) { - mPanel->setSelectedTab(name); + mPanel->setSelectedTabByName(name); return; } } diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index f5e293e5d..2d8ecc54f 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -1610,7 +1610,7 @@ void SocialWindow::nextTab() if (tab == mTabs->getNumberOfTabs()) tab = 0; - mTabs->setSelectedTab(tab); + mTabs->setSelectedTabByPos(tab); } void SocialWindow::prevTab() @@ -1624,7 +1624,7 @@ void SocialWindow::prevTab() tab = mTabs->getNumberOfTabs(); tab--; - mTabs->setSelectedTab(tab); + mTabs->setSelectedTabByPos(tab); } void SocialWindow::updateAttackFilter() diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index e7dda5067..9702d74f9 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -197,7 +197,7 @@ void TabbedArea::removeTab(gcn::Tab *tab) } else { - setSelectedTab(tabIndexToBeSelected); + setSelectedTabByPos(tabIndexToBeSelected); } adjustSize(); @@ -241,7 +241,7 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab) widgetResized(nullptr); } -void TabbedArea::setSelectedTab(const std::string &name) +void TabbedArea::setSelectedTabByName(const std::string &name) { for (TabContainer::const_iterator itr = mTabs.begin(), itr_end = mTabs.end(); itr != itr_end; ++itr) @@ -254,6 +254,11 @@ void TabbedArea::setSelectedTab(const std::string &name) } } +void TabbedArea::setSelectedTabByPos(int tab) +{ + gcn::TabbedArea::setSelectedTab(tab); +} + void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED) { int width = getWidth() - 2 * getFrameSize() @@ -460,7 +465,6 @@ void TabbedArea::removeAll() if (getSelectedTabIndex() != -1) { setSelectedTab(static_cast(0)); - } while (getNumberOfTabs() > 0) { diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 8e349a4b4..b202dfc9d 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -78,8 +78,6 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener */ gcn::Widget *getCurrentWidget(); - using gcn::TabbedArea::addTab; - /** * Add a tab. Overridden since it needs to size the widget. * @@ -112,11 +110,11 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener int getContainerHeight() const { return mWidgetContainer->getHeight(); } - using gcn::TabbedArea::setSelectedTab; - void setSelectedTab(gcn::Tab *tab); - void setSelectedTab(const std::string &name); + void setSelectedTabByPos(int tab); + + void setSelectedTabByName(const std::string &name); void widgetResized(const gcn::Event &event); -- cgit v1.2.3-70-g09d2 From bf1a006a34ba30143c00be899332acedef29575b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 13 Jan 2012 22:24:59 +0300 Subject: Fix possible incorrect memory access. --- src/gui/socialwindow.cpp | 2 +- src/map.cpp | 3 +++ src/map.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 2d8ecc54f..b2c28e84e 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -650,7 +650,7 @@ public: return; Map* map = socialWindow->getMap(); - if (!map) + if (!map || map->empty()) return; if (socialWindow->getProcessedPortals()) diff --git a/src/map.cpp b/src/map.cpp index 63b815af2..211504504 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1392,6 +1392,9 @@ Path Map::findPath(int startX, int startY, int destX, int destY, // Reset starting tile's G cost to 0 MetaTile *startTile = &mMetaTiles[startX + startY * mWidth]; + if (!startTile) + return path; + startTile->Gcost = 0; // Add the start point to the open list diff --git a/src/map.h b/src/map.h index 0f2f2bf47..db8b092de 100644 --- a/src/map.h +++ b/src/map.h @@ -498,6 +498,9 @@ class Map : public Properties, public ConfigListener void redrawMap(); + bool empty() + { return mLayers.empty(); } + protected: friend class Actor; friend class Minimap; -- cgit v1.2.3-70-g09d2 From 0957953b15a30f34491e2daf2834009331ebeb69 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 13 Jan 2012 23:16:26 +0300 Subject: Dont delete logger on exit, because network or other threads can still work with it. --- src/client.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/client.cpp b/src/client.cpp index 0f82a4514..cb4dbdb80 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -681,8 +681,8 @@ void Client::testsClear() { BeingInfo::clear(); - delete logger; - logger = nullptr; + //delete logger; + //logger = nullptr; } } @@ -787,8 +787,8 @@ void Client::gameClear() delete chatLogger; chatLogger = nullptr; - delete logger; - logger = nullptr; + //delete logger; + //logger = nullptr; mInstance = nullptr; } -- cgit v1.2.3-70-g09d2 From 7635fd3938bade7ff8323c36dfd9e7b001d10f1f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 14 Jan 2012 18:38:17 +0300 Subject: Fix name checking in chat logger. --- src/chatlogger.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp index 8017575c4..40fc5aa57 100644 --- a/src/chatlogger.cpp +++ b/src/chatlogger.cpp @@ -142,8 +142,9 @@ std::string ChatLogger::secureName(std::string &name) const { for (unsigned int f = 0; f < name.length(); f ++) { - if (name[f] < '0' && name[f] > '9' && name[f] < 'a' && name[f] > 'z' - && name[f] < 'A' && name[f] > 'Z' + if ((name[f] < '0' || name[f] > '9') + && (name[f] < 'a' || name[f] > 'z') + && (name[f] < 'A' || name[f] > 'Z') && name[f] != '-' && name[f] != '+' && name[f] != '=' && name[f] != '.' && name[f] != ',' && name[f] != ')' && name[f] != '(' && name[f] != '[' && name[f] != ']') -- cgit v1.2.3-70-g09d2 From 158dd2f34e7cbefa26bcfe9a3410640b1e7caa58 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 14 Jan 2012 19:32:01 +0300 Subject: Add additional pixel in shortcuts like windows for better moving. --- src/gui/shortcutwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index fed2deba8..888b97222 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -58,7 +58,7 @@ ShortcutWindow::ShortcutWindow(const std::string &title, { setWindowName(title); // no title presented, title bar is padding so window can be moved. - gcn::Window::setTitleBarHeight(gcn::Window::getPadding()); + gcn::Window::setTitleBarHeight(gcn::Window::getPadding() + 1); setShowTitle(false); setResizable(true); setDefaultVisible(false); @@ -104,7 +104,7 @@ ShortcutWindow::ShortcutWindow(const std::string &title, std::string skinFile, { setWindowName(title); // no title presented, title bar is padding so window can be moved. - gcn::Window::setTitleBarHeight(gcn::Window::getPadding()); + gcn::Window::setTitleBarHeight(gcn::Window::getPadding() + 1); setShowTitle(false); setResizable(true); setDefaultVisible(false); -- cgit v1.2.3-70-g09d2 From df9f983d747a430ed9c2fddbbf1496f265dad6a4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 14 Jan 2012 23:46:01 +0300 Subject: fix adding gcc 4.7 support. --- src/gui/chatwindow.cpp | 2 +- src/gui/widgets/tabbedarea.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index a775510b0..899bbdc36 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -460,7 +460,7 @@ void ChatWindow::closeTab() void ChatWindow::defaultTab() { if (mChatTabs) - mChatTabs->setSelectedTab(static_cast(0)); + mChatTabs->setSelectedTabByPos(static_cast(0)); } void ChatWindow::action(const gcn::ActionEvent &event) diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 9702d74f9..fc6526a13 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -464,7 +464,7 @@ void TabbedArea::removeAll() { if (getSelectedTabIndex() != -1) { - setSelectedTab(static_cast(0)); + setSelectedTabByPos(static_cast(0)); } while (getNumberOfTabs() > 0) { -- cgit v1.2.3-70-g09d2 From f6d283961cfdac6779a6e7ac07de211b44fc7bc7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 15 Jan 2012 00:25:57 +0300 Subject: Add support moving shortcuts like windows by header. --- src/gui/shortcutwindow.cpp | 38 ++++++++++++++++++++++++++++++++++++++ src/gui/shortcutwindow.h | 4 ++++ 2 files changed, 42 insertions(+) (limited to 'src') diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index 888b97222..0e968efef 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -23,6 +23,7 @@ #include "gui/shortcutwindow.h" #include "configuration.h" +#include "logger.h" #include "gui/setup.h" @@ -64,6 +65,9 @@ ShortcutWindow::ShortcutWindow(const std::string &title, setDefaultVisible(false); setSaveVisible(true); + mDragOffsetX = 0; + mDragOffsetY = 0; + setupWindow->registerWindowForReset(this); mTabs = nullptr; @@ -110,6 +114,9 @@ ShortcutWindow::ShortcutWindow(const std::string &title, std::string skinFile, setDefaultVisible(false); setSaveVisible(true); + mDragOffsetX = 0; + mDragOffsetY = 0; + setupWindow->registerWindowForReset(this); mTabs = new TabbedArea; @@ -178,3 +185,34 @@ void ShortcutWindow::widgetHidden(const gcn::Event &event) } } } + +void ShortcutWindow::mousePressed(gcn::MouseEvent &event) +{ + Window::mousePressed(event); + + if (event.isConsumed()) + return; + + if (event.getButton() == gcn::MouseEvent::LEFT) + { + mDragOffsetX = event.getX(); + mDragOffsetY = event.getY(); + } +} + +void ShortcutWindow::mouseDragged(gcn::MouseEvent &event) +{ + Window::mouseDragged(event); + + if (event.isConsumed()) + return; + + if (canMove() && isMovable() && mMoved) + { + int newX = std::max(0, getX() + event.getX() - mDragOffsetX); + int newY = std::max(0, getY() + event.getY() - mDragOffsetY); + newX = std::min(mainGraphics->mWidth - getWidth(), newX); + newY = std::min(mainGraphics->mHeight - getHeight(), newY); + setPosition(newX, newY); + } +} diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h index ceb82ef7b..bdff5ab0d 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/shortcutwindow.h @@ -58,6 +58,10 @@ class ShortcutWindow : public Window void widgetHidden(const gcn::Event &event); + void mousePressed(gcn::MouseEvent &event); + + void mouseDragged(gcn::MouseEvent &event); + private: ShortcutWindow(); ShortcutContainer *mItems; -- cgit v1.2.3-70-g09d2 From d33727beb44c97959a41caeb215f30162570bf48 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 15 Jan 2012 02:25:46 +0300 Subject: Fix default item shortcuts window size. --- src/game.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/game.cpp b/src/game.cpp index 81e93034f..14a988700 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -216,7 +216,9 @@ static void createGuiWindows() minimap = new Minimap; helpWindow = new HelpWindow; debugWindow = new DebugWindow; - itemShortcutWindow = new ShortcutWindow("ItemShortcut", "items.xml"); + itemShortcutWindow = new ShortcutWindow( + "ItemShortcut", "items.xml", 83, 460); + for (int f = 0; f < SHORTCUT_TABS; f ++) { itemShortcutWindow->addTab(toString(f + 1), -- cgit v1.2.3-70-g09d2 From deab6490899aa2c80861e47ccd3f043b712cae96 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 16 Jan 2012 17:22:43 +0300 Subject: Add error message for creation char with incorrect race. --- src/net/ea/charserverhandler.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index b05ed6b51..2dc51acf3 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -163,6 +163,9 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg) case 5: errorMessage = _("Incorrect slot."); break; + case 6: + errorMessage = _("Incorrect race."); + break; } new OkDialog(_("Error"), errorMessage); if (mCharCreateDialog) -- cgit v1.2.3-70-g09d2 From 7852b453367e7cbfd82f4262a46505152759ddce Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 16 Jan 2012 18:28:32 +0300 Subject: Fix player and monsters hp bars in evol server. --- src/being.cpp | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/being.cpp b/src/being.cpp index af3b14419..39d0bd450 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -2071,20 +2071,40 @@ void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage, int dx = static_cast(static_cast(width) / p); - if ((!damage && (this != player_node || hp == maxHP) && serverVersion < 1) - || (!hp && maxHP == damage)) - { - graphics->setColor(userPalette->getColorWithAlpha(color1)); - graphics->fillRectangle(gcn::Rectangle( - x, y, dx, height)); - return; + if (serverVersion < 1) + { // old servers + if ((!damage && (this != player_node || hp == maxHP)) + || (!hp && maxHP == damage)) + { + graphics->setColor(userPalette->getColorWithAlpha(color1)); + graphics->fillRectangle(gcn::Rectangle( + x, y, dx, height)); + return; + } + else if (width - dx <= 0) + { + graphics->setColor(userPalette->getColorWithAlpha(color2)); + graphics->fillRectangle(gcn::Rectangle( + x, y, width, height)); + return; + } } - else if (width - dx <= 0) - { - graphics->setColor(userPalette->getColorWithAlpha(color2)); - graphics->fillRectangle(gcn::Rectangle( - x, y, width, height)); - return; + else + { // evol servers + if (hp == maxHP) + { + graphics->setColor(userPalette->getColorWithAlpha(color1)); + graphics->fillRectangle(gcn::Rectangle( + x, y, dx, height)); + return; + } + else if (width - dx <= 0) + { + graphics->setColor(userPalette->getColorWithAlpha(color2)); + graphics->fillRectangle(gcn::Rectangle( + x, y, width, height)); + return; + } } graphics->setColor(userPalette->getColorWithAlpha(color1)); -- cgit v1.2.3-70-g09d2 From 2cefbbdce67c51e0728f46ef9086a565c0d187cc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 16 Jan 2012 18:44:23 +0300 Subject: Fix players online status in chat in evol server. --- src/gui/whoisonline.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 6004f706e..65bd1fcb5 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -288,6 +288,8 @@ void WhoIsOnline::loadList(std::vector &list) } updateWindow(friends, neutral, disregard, enemy, numOnline); + if (!mOnlinePlayers.empty() && chatWindow) + chatWindow->updateOnline(mOnlinePlayers); } void WhoIsOnline::loadWebList() -- cgit v1.2.3-70-g09d2 From 72277b0c8a16a5a2aabd634b127bcadd698430d5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 17 Jan 2012 02:32:13 +0300 Subject: Add friends tab to social window. --- src/gui/socialwindow.cpp | 131 ++++++++++++++++++++++++++++++++++++++++++++++- src/gui/socialwindow.h | 1 + src/gui/whoisonline.cpp | 22 ++++++-- src/playerrelations.cpp | 18 +++++++ src/playerrelations.h | 3 ++ 5 files changed, 168 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index b2c28e84e..4649c23a7 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -29,6 +29,8 @@ #include "logger.h" #include "map.h" #include "party.h" +#include "playerrelations.h" +#include "gui/whoisonline.h" #include "gui/confirmdialog.h" #include "gui/okdialog.h" @@ -60,6 +62,30 @@ #include "debug.h" +class SortFriendsFunctor +{ + public: + bool operator() (Avatar* m1, Avatar* m2) + { + if (!m1 || !m2) + return false; + + if (m1->getOnline() != m2->getOnline()) + return m1->getOnline() > m2->getOnline(); + + if (m1->getName() != m2->getName()) + { + std::string s1 = m1->getName(); + std::string s2 = m2->getName(); + toLower(s1); + toLower(s2); + return s1 < s2; + } + return false; + } +} friendSorter; + + class SocialTab : public Tab { protected: @@ -457,7 +483,6 @@ public: mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); -// mBeings->getMembers().push_back(new Avatar("test")); updateList(); setCaption(name); } @@ -550,7 +575,6 @@ public: if (actorSpriteManager) { -// std::list beings = actorSpriteManager->getAll(); std::vector names; actorSpriteManager->getPlayerNames(names, false); @@ -1058,6 +1082,103 @@ private: }; + +class SocialFriendsTab : public SocialTab +{ +public: + SocialFriendsTab(std::string name) + { + mBeings = new BeingsListModal(); + + mList = new AvatarListBox(mBeings); + mScroll = new ScrollArea(mList); + + mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + + updateList(); + setCaption(name); + } + + ~SocialFriendsTab() + { + delete mList; + mList = nullptr; + delete mScroll; + mScroll = nullptr; + delete mBeings; + mBeings = nullptr; + } + + void updateList() + { + getPlayersAvatars(); + } + + void updateAvatar(std::string name) + { + } + + void resetDamage(std::string name) + { + } + + void getPlayersAvatars() + { + if (!actorSpriteManager) + return; + + std::vector *avatars = mBeings->getMembers(); + if (!avatars) + return; + + std::vector::iterator ia = avatars->begin(); + while (ia != avatars->end()) + { + delete *ia; + ++ ia; + } + avatars->clear(); + + std::vector *players + = player_relations.getPlayersByRelation(PlayerRelation::FRIEND); + + std::set players2 = whoIsOnline->getOnlinePlayers(); + + if (!players) + return; + + std::vector::iterator it = players->begin(); + std::vector::iterator it_end = players->end(); + for (; it != it_end; ++ it) + { + Avatar *ava = nullptr; + ava = new Avatar(*it); + if (actorSpriteManager->findBeingByName(*it, Being::PLAYER) + || players2.find(*it) != players2.end()) + { + ava->setOnline(true); + } + avatars->push_back(ava); + } + std::sort(avatars->begin(), avatars->end(), friendSorter); + delete players; + } + +protected: + void invite() + { + } + + void leave() + { + } + +private: + BeingsListModal *mBeings; +}; + + class CreatePopup : public Popup, public LinkHandler { public: @@ -1155,6 +1276,9 @@ SocialWindow::SocialWindow() : mPlayers = new SocialPlayersTab("P"); mTabs->addTab(mPlayers, mPlayers->mScroll); + mFriends = new SocialFriendsTab("F"); + mTabs->addTab(mFriends, mFriends->mScroll); + mNavigation = new SocialNavigationTab(); mTabs->addTab(mNavigation, mNavigation->mScroll); @@ -1205,6 +1329,8 @@ SocialWindow::~SocialWindow() mNavigation = nullptr; delete mAttackFilter; mAttackFilter = nullptr; + delete mFriends; + mFriends = nullptr; } bool SocialWindow::addTab(Guild *guild) @@ -1523,6 +1649,7 @@ void SocialWindow::logic() if (mNeedUpdate && nowTime - mLastUpdateTime > 1) { mPlayers->updateList(); + mFriends->updateList(); mNeedUpdate = false; mLastUpdateTime = nowTime; } diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h index d99982c06..1429866ee 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/socialwindow.h @@ -141,6 +141,7 @@ protected: SocialTab *mAttackFilter; SocialTab *mPlayers; SocialTab *mNavigation; + SocialTab *mFriends; CreatePopup *mCreatePopup; diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 65bd1fcb5..a80fb4c89 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -21,14 +21,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "whoisonline.h" +#include "gui/whoisonline.h" #include #include #include #include +#include "gui/socialwindow.h" #include "gui/viewport.h" + #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/scrollarea.h" @@ -288,8 +290,13 @@ void WhoIsOnline::loadList(std::vector &list) } updateWindow(friends, neutral, disregard, enemy, numOnline); - if (!mOnlinePlayers.empty() && chatWindow) - chatWindow->updateOnline(mOnlinePlayers); + if (!mOnlinePlayers.empty()) + { + if (chatWindow) + chatWindow->updateOnline(mOnlinePlayers); + if (socialWindow) + socialWindow->updateActiveList(); + } } void WhoIsOnline::loadWebList() @@ -589,8 +596,13 @@ void WhoIsOnline::logic() mUpdateButton->setEnabled(true); mUpdateTimer = 0; updateSize(); - if (!mOnlinePlayers.empty() && chatWindow) - chatWindow->updateOnline(mOnlinePlayers); + if (!mOnlinePlayers.empty()) + { + if (chatWindow) + chatWindow->updateOnline(mOnlinePlayers); + if (socialWindow) + socialWindow->updateActiveList(); + } } break; case UPDATE_COMPLETE: diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 28596ac8b..6b5cb0199 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -361,6 +361,24 @@ std::vector * PlayerRelationsManager::getPlayers() return retval; } +std::vector *PlayerRelationsManager::getPlayersByRelation( + PlayerRelation::Relation rel) +{ + std::vector *retval = new std::vector(); + + for (std::map::const_iterator it = mRelations.begin(); + it != mRelations.end(); ++it) + { + if (it->second && it->second->mRelation == rel) + retval->push_back(it->first); + } + + sort(retval->begin(), retval->end(), playersSorter); + + return retval; +} + void PlayerRelationsManager::removePlayer(const std::string &name) { if (mRelations[name]) diff --git a/src/playerrelations.h b/src/playerrelations.h index 20ba55fce..143a82477 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -202,6 +202,9 @@ class PlayerRelationsManager */ std::vector *getPlayers(); + std::vector *getPlayersByRelation(PlayerRelation::Relation + rel); + /** * Removes all recorded player info. */ -- cgit v1.2.3-70-g09d2 From 7c3ee80e415f1531b20e2754346c105eee8d8d35 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 18 Jan 2012 03:53:45 +0300 Subject: Fix typo in guildmanager. --- src/net/ea/guildhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index dfbe53a6e..96a361838 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -496,7 +496,7 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) taGuild->removeFromMembers(); taGuild->clearMembers(); } - SERVER_NOTICE(_("You was kicked from guild.")); + SERVER_NOTICE(_("You were kicked from guild.")); delete guildTab; guildTab = nullptr; -- cgit v1.2.3-70-g09d2 From dea21e405d0cda6c21e2a25841ec0db2f3ace34a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 18 Jan 2012 16:41:46 +0300 Subject: Fix crash if pickup items. --- src/gui/popupmenu.cpp | 46 ++++++++++++++++++++++++++++------------------ src/gui/popupmenu.h | 2 +- 2 files changed, 29 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index f31d01cfa..cd3a4c5ad 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -85,7 +85,7 @@ std::string tradePartnerName(""); PopupMenu::PopupMenu(): Popup("PopupMenu", "popupmenu.xml"), mBeingId(0), - mFloorItem(nullptr), + mFloorItemId(0), mItem(nullptr), mItemId(0), mItemColor(1), @@ -529,7 +529,7 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem) if (!floorItem) return; - mFloorItem = floorItem; + mFloorItemId = floorItem->getId(); mX = x; mY = y; const ItemInfo &info = floorItem->getInfo(); @@ -871,7 +871,7 @@ void PopupMenu::showChangePos(int x, int y) else { mBeingId = 0; - mFloorItem = nullptr; + mFloorItemId = 0; mItem = nullptr; mMapItem = nullptr; mNick = ""; @@ -1038,10 +1038,14 @@ void PopupMenu::handleLink(const std::string &link, player_node->setImitate(mNick); } // Pick Up Floor Item action - else if ((link == "pickup") && mFloorItem) + else if ((link == "pickup") && mFloorItemId) { - if (player_node) - player_node->pickUp(mFloorItem); + if (player_node && actorSpriteManager) + { + FloorItem *item = actorSpriteManager->findItem(mFloorItemId); + if (item) + player_node->pickUp(item); + } } // Look To action else if (link == "look") @@ -1106,16 +1110,21 @@ void PopupMenu::handleLink(const std::string &link, chatWindow->addItemText(mItem->getInfo().getName()); } } - else if (mFloorItem) + else if (mFloorItemId && actorSpriteManager) { - if (serverVersion > 0) - { - chatWindow->addItemText(mFloorItem->getInfo().getName( - mFloorItem->getColor())); - } - else + FloorItem *item = actorSpriteManager->findItem(mFloorItemId); + + if (item) { - chatWindow->addItemText(mFloorItem->getInfo().getName()); + if (serverVersion > 0) + { + chatWindow->addItemText(item->getInfo().getName( + item->getColor())); + } + else + { + chatWindow->addItemText(item->getInfo().getName()); + } } } } @@ -1706,10 +1715,11 @@ void PopupMenu::handleLink(const std::string &link, int id = atoi(link.substr(10).c_str()); if (id) { - mFloorItem = actorSpriteManager->findItem(id); - if (mFloorItem) + FloorItem *item = actorSpriteManager->findItem(id); + if (item) { - showPopup(getX(), getY(), mFloorItem); + mFloorItemId = item->getId(); + showPopup(getX(), getY(), item); return; } } @@ -1744,7 +1754,7 @@ void PopupMenu::handleLink(const std::string &link, setVisible(false); mBeingId = 0; - mFloorItem = nullptr; + mFloorItemId = 0; mItem = nullptr; mItemId = 0; mItemColor = 1; diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 17a985a4f..8b9107300 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -160,7 +160,7 @@ class PopupMenu : public Popup, public LinkHandler BrowserBox* mBrowserBox; int mBeingId; - FloorItem* mFloorItem; + int mFloorItemId; Item *mItem; int mItemId; unsigned char mItemColor; -- cgit v1.2.3-70-g09d2 From eaa6f58f960f2ef5826de4fd2ea6ff0e383fac8b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Jan 2012 01:04:45 +0300 Subject: Allow pickup item with mouse under player. --- src/gui/viewport.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index aedfbe219..1407415fd 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -481,6 +481,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) if (mHoverBeing->canTalk()) { mHoverBeing->talkTo(); + return; } else { @@ -490,6 +491,9 @@ void Viewport::mousePressed(gcn::MouseEvent &event) { if (player_node != mHoverBeing || mSelfMouseHeal) actorSpriteManager->heal(mHoverBeing); + if (player_node == mHoverBeing && mHoverItem) + player_node->pickUp(mHoverItem); + return; } } else if (player_node->withinAttackRange(mHoverBeing) || @@ -499,17 +503,21 @@ void Viewport::mousePressed(gcn::MouseEvent &event) { player_node->attack(mHoverBeing, !keyboard.isKeyActive(keyboard.KEY_TARGET)); + return; } } else if (!keyboard.isKeyActive(keyboard.KEY_ATTACK)) { if (player_node != mHoverBeing) + { player_node->setGotoTarget(mHoverBeing); + return; + } } } - // Picks up a item if we clicked on one } - else if (mHoverItem) + // Picks up a item if we clicked on one + if (mHoverItem) { player_node->pickUp(mHoverItem); } @@ -739,7 +747,7 @@ void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED) } mHoverItem = nullptr; - if (!mHoverBeing && actorSpriteManager) + if (actorSpriteManager) { mHoverItem = actorSpriteManager->findItem(x / mMap->getTileWidth(), y / mMap->getTileHeight()); -- cgit v1.2.3-70-g09d2 From c053634fdbbcc3a9da7cd0eefa7a4c78ee7e1bef Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Jan 2012 16:02:34 +0300 Subject: In server dialog load by default all servers from external servers list. --- src/gui/serverdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 85b3bbf4e..0cfa2d40b 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -365,7 +365,7 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir): mConnectButton->requestFocus(); } - loadServers(false); + loadServers(true); if (mServers.empty()) downloadServerList(); -- cgit v1.2.3-70-g09d2 From faa6c2a26deb18469066a74b2d6c76fdae5931c7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Jan 2012 18:38:02 +0300 Subject: Prevent adding double attributes to status window. --- src/gui/statuswindow.cpp | 12 +++++++++++- src/gui/statuswindow.h | 2 ++ src/gui/widgets/vertcontainer.cpp | 1 + src/net/tmwa/generalhandler.cpp | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index b3e3f38f3..20a017a41 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -431,10 +431,20 @@ void StatusWindow::addAttribute(int id, const std::string &name, disp = new DerDisplay(id, name); mDAttrCont->add(disp); } - mAttrs[id] = disp; } +void StatusWindow::clearAttributes() +{ + mAttrCont->clear(); + mDAttrCont->clear(); + Attrs::iterator it = mAttrs.begin(); + Attrs::iterator it_end = mAttrs.end(); + for (; it != it_end; ++ it) + delete (*it).second; + mAttrs.clear(); +} + void StatusWindow::updateHPBar(ProgressBar *bar, bool showMax) { if (!bar) diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 87107694f..8e110a354 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -75,6 +75,8 @@ class StatusWindow : public Window, void action(const gcn::ActionEvent &event); + void clearAttributes(); + private: static std::string translateLetter(const char* letters); diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index 36daf7676..305343d1a 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -69,6 +69,7 @@ void VertContainer::clear() Container::clear(); mCount = 0; + mNextY = 0; } void VertContainer::widgetResized(const gcn::Event &event A_UNUSED) diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index ea44ec206..09c216ed3 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -259,6 +259,9 @@ void GeneralHandler::processEvent(Mana::Channels channel, if (!statusWindow) return; + // protection against double addition attributes. + statusWindow->clearAttributes(); + statusWindow->addAttribute(STR, _("Strength"), true, ""); statusWindow->addAttribute(AGI, _("Agility"), true, ""); statusWindow->addAttribute(VIT, _("Vitality"), true, ""); -- cgit v1.2.3-70-g09d2 From 79737ab60e31048233eabf09da10447358b3c79e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Jan 2012 19:53:09 +0300 Subject: Change translation string by adding %s. --- src/localplayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 01e864a6b..89eb3b40a 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -381,7 +381,8 @@ void LocalPlayer::setAction(Action action, int attackType) mLastTarget = -1; if (!mLastHitFrom.empty()) { - debugMsg(_("You were killed by ") + mLastHitFrom); + debugMsg(strprintf(_("You were killed by %s"), + mLastHitFrom.c_str())); mLastHitFrom = ""; } setTarget(nullptr); -- cgit v1.2.3-70-g09d2 From 5dc9a8a99e38a22c3c690d143e32901eeef7b9ab Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 20 Jan 2012 04:07:45 +0300 Subject: Fix possible crash with incorrect dirs. --- src/utils/paths.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index 2ef5bb6ae..8decb6e95 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -43,6 +43,8 @@ std::string getRealPath(const std::string &str) #else char *realPath = realpath(str.c_str(), nullptr); #endif + if (!realPath) + return ""; path = realPath; free(realPath); return path; -- cgit v1.2.3-70-g09d2 From 690579fef58390e1b28a0dc73174ab559cb3b40c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 20 Jan 2012 16:34:43 +0300 Subject: Add char '#' as allowed in file names in chat logger. --- src/chatlogger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp index 40fc5aa57..ad86de8e9 100644 --- a/src/chatlogger.cpp +++ b/src/chatlogger.cpp @@ -147,7 +147,8 @@ std::string ChatLogger::secureName(std::string &name) const && (name[f] < 'A' || name[f] > 'Z') && name[f] != '-' && name[f] != '+' && name[f] != '=' && name[f] != '.' && name[f] != ',' && name[f] != ')' - && name[f] != '(' && name[f] != '[' && name[f] != ']') + && name[f] != '(' && name[f] != '[' && name[f] != ']' + && name[f] != '#') { name[f] = '_'; } -- cgit v1.2.3-70-g09d2 From 3ce8eb744df104efc83e625b0aeb7b8fed1c3c79 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 20 Jan 2012 20:13:17 +0300 Subject: Fix ambient layer scalling in safe opengl mode. --- src/opengl1graphics.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index 672962f7b..b6ecd068b 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -377,6 +377,9 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y, // Draw a set of textured rectangles glBegin(GL_QUADS); + const float scaleFactorW = (float) scaledWidth / image->getWidth(); + const float scaleFactorH = (float) scaledHeight / image->getHeight(); + for (int py = 0; py < h; py += ih) { const int height = (py + ih >= h) ? h - py : ih; @@ -386,8 +389,8 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y, int width = (px + iw >= w) ? w - px : iw; int dstX = x + px; - drawRescaledQuad(image, srcX, srcY, dstX, dstY, - width, height, scaledWidth, scaledHeight); + drawRescaledQuad(image, srcX, srcY, dstX, dstY, width / scaleFactorW, + height / scaleFactorH, scaledWidth, scaledHeight); } } -- cgit v1.2.3-70-g09d2 From 54b1228263aeb48c766806c0391fbfdffe0bc1a5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 20 Jan 2012 21:10:08 +0300 Subject: Bit improve rescalled images drawing in fast opengl mode. --- src/openglgraphics.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index dc7e37e17..b744a3caf 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -588,22 +588,25 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image, const int height = (py + scaledHeight >= h) ? h - py : scaledHeight; const int dstY = y + py; + const int scaledY = srcY + height / scaleFactorH; for (int px = 0; px < w; px += scaledWidth) { - int width = (px + scaledWidth >= w) ? w - px : scaledWidth; - int dstX = x + px; + const int width = (px + scaledWidth >= w) + ? w - px : scaledWidth; + const int dstX = x + px; + const int scaledX = srcX + width / scaleFactorW; mIntTexArray[vp + 0] = srcX; mIntTexArray[vp + 1] = srcY; - mIntTexArray[vp + 2] = srcX + width / scaleFactorW; + mIntTexArray[vp + 2] = scaledX; mIntTexArray[vp + 3] = srcY; - mIntTexArray[vp + 4] = srcX + width / scaleFactorW; - mIntTexArray[vp + 5] = srcY + height / scaleFactorH; + mIntTexArray[vp + 4] = scaledX; + mIntTexArray[vp + 5] = scaledY; mIntTexArray[vp + 6] = srcX; - mIntTexArray[vp + 7] = srcY + height / scaleFactorH; + mIntTexArray[vp + 7] = scaledY; mIntVertArray[vp + 0] = dstX; mIntVertArray[vp + 1] = dstY; -- cgit v1.2.3-70-g09d2 From ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 20 Jan 2012 23:05:30 +0300 Subject: Fix code style. --- src/opengl1graphics.cpp | 5 +++-- src/test/testlauncher.cpp | 2 +- src/test/testmain.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index b6ecd068b..6f712f698 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -389,8 +389,9 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y, int width = (px + iw >= w) ? w - px : iw; int dstX = x + px; - drawRescaledQuad(image, srcX, srcY, dstX, dstY, width / scaleFactorW, - height / scaleFactorH, scaledWidth, scaledHeight); + drawRescaledQuad(image, srcX, srcY, dstX, dstY, + width / scaleFactorW, height / scaleFactorH, + scaledWidth, scaledHeight); } } diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 6f2f7a612..2f6860d43 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -117,7 +117,7 @@ int TestLauncher::testFps() timeval end; Wallpaper::loadWallpapers(); - const std::string wallpaperName = Wallpaper::getWallpaper(800, 600); + Wallpaper::getWallpaper(800, 600); Image *img[4]; img[0] = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif"); diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 287eeb706..70fcfc346 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -264,24 +264,24 @@ int TestMain::invokeFastOpenGLRenderTest(std::string test) { #if defined USE_OPENGL config.setValue("opengl", 1); -#else - return -1; -#endif config.write(); int ret = execFile(fileName, fileName, "-t", test, 30); log->log("%s: %d", test.c_str(), ret); return ret; +#else + return -1; +#endif } int TestMain::invokeSafeOpenGLRenderTest(std::string test) { #if defined USE_OPENGL config.setValue("opengl", 2); -#else - return -1; -#endif config.write(); int ret = execFile(fileName, fileName, "-t", test, 30); log->log("%s: %d", test.c_str(), ret); return ret; +#else + return -1; +#endif } -- cgit v1.2.3-70-g09d2 From 98dabed4de60bc86522632379f2499aecbae2b70 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 21 Jan 2012 01:26:07 +0300 Subject: Fix compilation errors and warnings for another gcc 4.7 snapshot. --- build/bmakesnapshot | 2 +- src/actorspritemanager.h | 6 ++--- src/client.cpp | 4 ++-- src/configuration.h | 4 ++-- src/gui/equipmentwindow.cpp | 2 +- src/gui/equipmentwindow.h | 2 +- src/gui/inventorywindow.cpp | 2 +- src/gui/inventorywindow.h | 2 +- src/gui/ministatuswindow.cpp | 2 +- src/gui/socialwindow.cpp | 4 ++-- src/gui/textdialog.h | 2 +- src/gui/widgets/dropdown.h | 2 +- src/gui/widgets/playerbox.h | 4 +++- src/gui/widgets/progressindicator.cpp | 4 ++-- src/localconsts.h | 3 +++ src/localplayer.cpp | 6 ++--- src/main.cpp | 44 +++++++++++++++++------------------ src/net/charhandler.h | 10 ++++---- src/net/tmwa/buysellhandler.cpp | 2 +- src/net/tmwa/generalhandler.cpp | 4 ++-- src/particleemitter.cpp | 4 ++-- src/resources/resourcemanager.cpp | 2 +- src/rotationalparticle.cpp | 2 +- src/test/testlauncher.cpp | 6 +++-- src/text.h | 5 ++-- src/utils/process.cpp | 1 + 26 files changed, 70 insertions(+), 61 deletions(-) (limited to 'src') diff --git a/build/bmakesnapshot b/build/bmakesnapshot index b701ed97a..d77f2eb0c 100755 --- a/build/bmakesnapshot +++ b/build/bmakesnapshot @@ -29,7 +29,7 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ -Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ -Wvector-operation-performance -Wfree-nonheap-object \ --Wfunction-elimination -Winvalid-memory-model -Wmaybe-uninitialized \ +-Winvalid-memory-model -Wmaybe-uninitialized \ -Wnarrowing -Wunused-local-typedefs -Wvector-operation-performance \ -Wzero-as-null-pointer-constant" diff --git a/src/actorspritemanager.h b/src/actorspritemanager.h index 90c667a73..7960c6301 100644 --- a/src/actorspritemanager.h +++ b/src/actorspritemanager.h @@ -123,7 +123,7 @@ class ActorSpriteManager: public ConfigListener */ Being *findNearestLivingBeing(int x, int y, int maxTileDist, ActorSprite::Type type = Being::UNKNOWN, - Being *excluded = 0) const; + Being *excluded = nullptr) const; /** * Returns a being nearest to another being. @@ -292,12 +292,12 @@ class ActorSpriteManager: public ConfigListener protected: bool validateBeing(Being *aroundBeing, Being* being, - Being::Type type, Being* excluded = 0, + Being::Type type, Being* excluded = nullptr, int maxCost = 20) const; Being *findNearestLivingBeing(Being *aroundBeing, int maxdist, Being::Type type, int x, int y, - Being *excluded = 0) const; + Being *excluded = nullptr) const; void loadAttackList(); void storeAttackList(); diff --git a/src/client.cpp b/src/client.cpp index cb4dbdb80..1c4629178 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -262,8 +262,8 @@ Client::Client(const Options &options): mState(STATE_CHOOSE_SERVER), mOldState(STATE_START), mIcon(nullptr), - mLogicCounterId(0), - mSecondsCounterId(0), + mLogicCounterId(nullptr), + mSecondsCounterId(nullptr), mLimitFps(false), mConfigAutoSaved(false), mIsMinimized(false), diff --git a/src/configuration.h b/src/configuration.h index 2a84588f6..00479933e 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -27,7 +27,7 @@ #include "utils/xml.h" #include "defaults.h" - +#include "localconsts.h" #include #include @@ -159,7 +159,7 @@ class ConfigurationObject } delete nextobj; - nextobj = 0; + nextobj = nullptr; } /** diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 0dadca2dc..275bf19bb 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -65,7 +65,7 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being, mEquipment(equipment), mSelected(-1), mForing(foring), - mImageSet(0) + mImageSet(nullptr) { mBeing = being; mItemPopup = new ItemPopup; diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index c8cf095f8..daeaeb3d7 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -85,7 +85,7 @@ class EquipmentWindow : public Window, public gcn::ActionListener void mousePressed(gcn::MouseEvent& mouseEvent); Item* getEquipment(int i) - { return mEquipment ? mEquipment->getEquipment(i) : 0; } + { return mEquipment ? mEquipment->getEquipment(i) : nullptr; } void setBeing(Being *being); diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index f1ea1ff6e..01e2bdd17 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -98,7 +98,7 @@ InventoryWindow::WindowList InventoryWindow::instances; InventoryWindow::InventoryWindow(Inventory *inventory): Window("Inventory", false, nullptr, "inventory.xml"), mInventory(inventory), - mDropButton(0), + mDropButton(nullptr), mSplit(false), mCompactMode(false) { diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 5f2c9cb0a..2b35ec9c4 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -128,7 +128,7 @@ class InventoryWindow : public Window, void processEvent(Mana::Channels channel, const Mana::Event &event); - void updateButtons(Item *item = 0); + void updateButtons(Item *item = nullptr); bool isInputFocused() const; diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index 3ab946fa8..00df97813 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -188,7 +188,7 @@ void MiniStatusWindow::updateBars() void MiniStatusWindow::setIcon(int index, AnimatedSprite *sprite) { if (index >= static_cast(mIcons.size())) - mIcons.resize(index + 1, 0); + mIcons.resize(index + 1, nullptr); delete mIcons[index]; diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 4649c23a7..3988c819c 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -1115,11 +1115,11 @@ public: getPlayersAvatars(); } - void updateAvatar(std::string name) + void updateAvatar(std::string name A_UNUSED) { } - void resetDamage(std::string name) + void resetDamage(std::string name A_UNUSED) { } diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h index f5395a17d..03deae8f6 100644 --- a/src/gui/textdialog.h +++ b/src/gui/textdialog.h @@ -44,7 +44,7 @@ public: * @see Window::Window */ TextDialog(const std::string &title, const std::string &msg, - Window *parent = 0, bool isPassword = false); + Window *parent = nullptr, bool isPassword = false); ~TextDialog(); diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index e9b61aa43..a769678ca 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -48,7 +48,7 @@ class DropDown : public gcn::DropDown * @param listBox the listBox to use. * @see ListModel, ScrollArea, ListBox. */ - DropDown(gcn::ListModel *listModel = 0, + DropDown(gcn::ListModel *listModel = nullptr, gcn::ActionListener* listener = nullptr, std::string eventId = ""); diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index a066c104e..d2393ca08 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -25,6 +25,8 @@ #include +#include "localconsts.h" + class Being; class ImageRect; @@ -40,7 +42,7 @@ class PlayerBox : public gcn::ScrollArea * Constructor. Takes the initial player character that this box should * display, which defaults to NULL. */ - PlayerBox(const Being *being = 0); + PlayerBox(const Being *being = nullptr); /** * Destructor. diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index ae94f0a0f..6adb5a2fa 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -51,7 +51,7 @@ ProgressIndicator::ProgressIndicator() } else { - mIndicator = 0; + mIndicator = nullptr; } setSize(32, 32); @@ -60,7 +60,7 @@ ProgressIndicator::ProgressIndicator() ProgressIndicator::~ProgressIndicator() { delete mIndicator; - mIndicator = 0; + mIndicator = nullptr; } void ProgressIndicator::logic() diff --git a/src/localconsts.h b/src/localconsts.h index 4a8bb062a..2d0eb5dea 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -21,6 +21,9 @@ #ifndef __GXX_EXPERIMENTAL_CXX0X__ #undef nullptr #define nullptr 0 +#else +#undef Z_NULL +#define Z_NULL nullptr #endif #ifdef __GNUC__ diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 89eb3b40a..0da291711 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -98,7 +98,7 @@ extern MiniStatusWindow *miniStatusWindow; extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(int id, int subtype): - Being(id, PLAYER, subtype, 0), + Being(id, PLAYER, subtype, nullptr), mTargetTime(-1), mLastTarget(-1), mTarget(nullptr), @@ -112,7 +112,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): mPathSetByMouse(false), mLocalWalkTime(-1), mMessageTime(0), - mAwayDialog(0), + mAwayDialog(nullptr), mAfkTime(0), mAwayMode(false), mPseudoAwayMode(false), @@ -151,7 +151,7 @@ LocalPlayer::LocalPlayer(int id, int subtype): if (userPalette) mNameColor = &userPalette->getColor(UserPalette::SELF); else - mNameColor = 0; + mNameColor = nullptr; mLastTargetX = 0; mLastTargetY = 0; diff --git a/src/main.cpp b/src/main.cpp index 9bffcfa2a..5025d6d29 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -93,28 +93,28 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) const struct option long_options[] = { - { "config-dir", required_argument, 0, 'C' }, - { "data", required_argument, 0, 'd' }, - { "default", no_argument, 0, 'D' }, - { "password", required_argument, 0, 'P' }, - { "character", required_argument, 0, 'c' }, - { "help", no_argument, 0, 'h' }, - { "localdata-dir", required_argument, 0, 'L' }, - { "update-host", required_argument, 0, 'H' }, - { "port", required_argument, 0, 'p' }, - { "server", required_argument, 0, 's' }, - { "skip-update", no_argument, 0, 'u' }, - { "username", required_argument, 0, 'U' }, - { "no-opengl", no_argument, 0, 'O' }, - { "chat-log-dir", required_argument, 0, 'l' }, - { "version", no_argument, 0, 'v' }, - { "log-file", required_argument, 0, 'l' }, - { "chat-log-dir", required_argument, 0, 'L' }, - { "screenshot-dir", required_argument, 0, 'i' }, - { "safemode", no_argument, 0, 'm' }, - { "tests", no_argument, 0, 'T' }, - { "test", required_argument, 0, 't' }, - { nullptr, 0, 0, 0 } + { "config-dir", required_argument, nullptr, 'C' }, + { "data", required_argument, nullptr, 'd' }, + { "default", no_argument, nullptr, 'D' }, + { "password", required_argument, nullptr, 'P' }, + { "character", required_argument, nullptr, 'c' }, + { "help", no_argument, nullptr, 'h' }, + { "localdata-dir", required_argument, nullptr, 'L' }, + { "update-host", required_argument, nullptr, 'H' }, + { "port", required_argument, nullptr, 'p' }, + { "server", required_argument, nullptr, 's' }, + { "skip-update", no_argument, nullptr, 'u' }, + { "username", required_argument, nullptr, 'U' }, + { "no-opengl", no_argument, nullptr, 'O' }, + { "chat-log-dir", required_argument, nullptr, 'l' }, + { "version", no_argument, nullptr, 'v' }, + { "log-file", required_argument, nullptr, 'l' }, + { "chat-log-dir", required_argument, nullptr, 'L' }, + { "screenshot-dir", required_argument, nullptr, 'i' }, + { "safemode", no_argument, nullptr, 'm' }, + { "tests", no_argument, nullptr, 'T' }, + { "test", required_argument, nullptr, 't' }, + { nullptr, 0, nullptr, 0 } }; while (optind < argc) diff --git a/src/net/charhandler.h b/src/net/charhandler.h index f8b3f4f98..492e27e55 100644 --- a/src/net/charhandler.h +++ b/src/net/charhandler.h @@ -44,14 +44,14 @@ struct Character { Character() : slot(0), - dummy(0) + dummy(nullptr) { } ~Character() { delete dummy; - dummy = 0; + dummy = nullptr; } int slot; /**< The index in the list of characters */ @@ -94,9 +94,9 @@ class CharHandler protected: CharHandler() : - mSelectedCharacter(0), - mCharSelectDialog(0), - mCharCreateDialog(0) + mSelectedCharacter(nullptr), + mCharSelectDialog(nullptr), + mCharCreateDialog(nullptr) {} void updateCharSelectDialog(); diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index b6473400a..629aa54f6 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -69,7 +69,7 @@ BuySellHandler::BuySellHandler() }; handledMessages = _messages; buySellHandler = this; - mBuyDialog = 0; + mBuyDialog = nullptr; } void BuySellHandler::handleMessage(Net::MessageIn &msg) diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 09c216ed3..a666fa5f4 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -201,9 +201,9 @@ void GeneralHandler::reload() static_cast(mLoginHandler.get())->clearWorlds(); static_cast( - mCharHandler.get())->setCharCreateDialog(0); + mCharHandler.get())->setCharCreateDialog(nullptr); static_cast( - mCharHandler.get())->setCharSelectDialog(0); + mCharHandler.get())->setCharSelectDialog(nullptr); static_cast(mPartyHandler.get())->reload(); } diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 62f6767c6..c6c819e92 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -43,7 +43,7 @@ ParticleEmitter::ParticleEmitter(XmlNodePtr emitterNode, Particle *target, Map *map, int rotation, const std::string& dyePalettes): mOutputPauseLeft(0), - mParticleImage(0) + mParticleImage(nullptr) { mMap = map; mParticleTarget = target; @@ -460,7 +460,7 @@ ParticleEmitter::~ParticleEmitter() if (mParticleImage) { mParticleImage->decRef(); - mParticleImage = 0; + mParticleImage = nullptr; } } diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 06818705c..3376394bc 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -456,7 +456,7 @@ struct DyedImageLoader if (!buffer) { delete d; - return 0; + return nullptr; } Resource *res = d ? Image::load(buffer, fileSize, *d) : Image::load(buffer, fileSize); diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp index e1a7fd035..89b978f4d 100644 --- a/src/rotationalparticle.cpp +++ b/src/rotationalparticle.cpp @@ -36,7 +36,7 @@ RotationalParticle::RotationalParticle(Map *map, Animation *animation): RotationalParticle::RotationalParticle(Map *map, XmlNodePtr animationNode, const std::string& dyePalettes): - ImageParticle(map, 0), + ImageParticle(map, nullptr), mAnimation(new SimpleAnimation(animationNode, dyePalettes)) { } diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 2f6860d43..d3caa8938 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -36,6 +36,8 @@ #include "resources/image.h" #include "resources/wallpaper.h" +#include + #ifdef WIN32 #include #define sleep(seconds) Sleep((seconds) * 1000) @@ -128,7 +130,7 @@ int TestLauncher::testFps() int cnt = 500; - gettimeofday(&start, NULL); + gettimeofday(&start, nullptr); for (int k = 0; k < cnt; k ++) { for (int x = 0; x < 800; x += 20) @@ -144,7 +146,7 @@ int TestLauncher::testFps() mainGraphics->updateScreen(); } - gettimeofday(&end, NULL); + gettimeofday(&end, nullptr); int tFps = calcFps(&start, &end, cnt); file << mTest << std::endl; file << tFps << std::endl; diff --git a/src/text.h b/src/text.h index e28e70ac7..25fbe66f0 100644 --- a/src/text.h +++ b/src/text.h @@ -26,6 +26,7 @@ #include "graphics.h" #include "guichanfwd.h" +#include "localconsts.h" #include @@ -42,7 +43,7 @@ class Text Text(const std::string &text, int x, int y, gcn::Graphics::Alignment alignment, const gcn::Color *color, bool isSpeech = false, - gcn::Font *font = 0); + gcn::Font *font = nullptr); /** * Destructor. The text is removed from the screen. @@ -90,7 +91,7 @@ class FlashText : public Text FlashText(const std::string &text, int x, int y, gcn::Graphics::Alignment alignment, const gcn::Color* color, - gcn::Font *font = 0); + gcn::Font *font = nullptr); /** * Remove the text from the screen diff --git a/src/utils/process.cpp b/src/utils/process.cpp index 45fdd51c6..4a2081514 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -25,6 +25,7 @@ #include #include +#include #include "localconsts.h" -- cgit v1.2.3-70-g09d2 From daf84780d386ee122ae4b4bd37b1e918f93fb202 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 21 Jan 2012 02:38:18 +0300 Subject: Fix more warnings. --- build/bmakesnapshot | 10 +++------- src/commandhandler.cpp | 2 +- src/gui/killstats.cpp | 10 +++++----- src/gui/serverdialog.cpp | 2 +- src/gui/statuswindow.cpp | 2 +- src/rotationalparticle.cpp | 4 ++-- 6 files changed, 13 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/build/bmakesnapshot b/build/bmakesnapshot index d77f2eb0c..89f465251 100755 --- a/build/bmakesnapshot +++ b/build/bmakesnapshot @@ -2,8 +2,6 @@ cd .. -#need fix: -Wzero-as-null-pointer-constant - dir=`pwd` export PATH=/usr/lib/gcc-snapshot/bin:$PATH @@ -23,15 +21,13 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ -Wcast-align -Wpointer-arith -Wundef \ -Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \ -Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \ --Wstack-protector -Wshadow -Wunused -Wunused-macros -Wsynth \ +-Wstack-protector -Wshadow -Wunused-macros -Wsynth \ -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \ -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \ -Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ --Wvector-operation-performance -Wfree-nonheap-object \ --Winvalid-memory-model -Wmaybe-uninitialized \ --Wnarrowing -Wunused-local-typedefs -Wvector-operation-performance \ --Wzero-as-null-pointer-constant" +-Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ +-Wnarrowing -Wzero-as-null-pointer-constant" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 0f8df546c..0f1e60a25 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -1112,7 +1112,7 @@ void CommandHandler::handleDumpGraphics(const std::string &args A_UNUSED, str += ",0"; #endif - str += strprintf(",%f,", Client::getGuiAlpha()); + str += strprintf(",%f,", static_cast(Client::getGuiAlpha())); str += config.getBoolValue("adjustPerfomance") ? "1" : "0"; str += config.getBoolValue("alphaCache") ? "1" : "0"; str += config.getBoolValue("enableMapReduce") ? "1" : "0"; diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index fa6241ef6..972c660ec 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -70,8 +70,8 @@ KillStats::KillStats(): xpNextLevel = 1; mLine1 = new Label(strprintf(_("Level: %d at %f%%"), - player_node->getLevel(), static_cast(xp) - / static_cast(xpNextLevel) * 100.0f)); + player_node->getLevel(), static_cast(xp) + / static_cast(xpNextLevel) * 100.0)); mLine2 = new Label(strprintf(_("Exp: %d/%d Left: %d"), xp, xpNextLevel, xpNextLevel - xp)); @@ -206,9 +206,9 @@ void KillStats::gainXp(int xp) timeDiff = 1; mLine1->setCaption(strprintf(_("Level: %d at %f%%"), - player_node->getLevel(), static_cast( - PlayerInfo::getAttribute(EXP)) / static_cast( - xpNextLevel) * 100.0f)); + player_node->getLevel(), static_cast( + PlayerInfo::getAttribute(EXP)) / static_cast( + xpNextLevel) * 100.0)); mLine2->setCaption(strprintf(_("Exp: %d/%d Left: %d"), PlayerInfo::getAttribute(EXP), xpNextLevel, diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 0cfa2d40b..019ea9f1c 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -558,7 +558,7 @@ void ServerDialog::logic() else if (mDownloadStatus == DOWNLOADING_IN_PROGRESS) { mDescription->setCaption(strprintf(_("Downloading server list..." - "%2.2f%%"), mDownloadProgress * 100)); + "%2.2f%%"), static_cast(mDownloadProgress * 100))); } else if (mDownloadStatus == DOWNLOADING_IDLE) { diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 20a017a41..410ee08e2 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -522,7 +522,7 @@ void StatusWindow::updateProgressBar(ProgressBar *bar, int value, int max, / static_cast(max); if (percent) - bar->setText(strprintf("%2.5f", 100 * progress) + "%"); + bar->setText(strprintf("%2.5f%%", static_cast(100 * progress))); else bar->setText(toString(value) + "/" + toString(max)); diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp index 89b978f4d..f92b0f3eb 100644 --- a/src/rotationalparticle.cpp +++ b/src/rotationalparticle.cpp @@ -61,12 +61,12 @@ bool RotationalParticle::update() float rad = static_cast(atan2(mVelocity.x, mVelocity.y)); if (rad < 0) - rad = static_cast(PI + (PI + rad)); + rad = static_cast(PI) + static_cast(PI) + rad; float range = static_cast(PI / size); // Determines which frame the particle should play - if (rad < range || rad > ((PI*2) - range)) + if (rad < range || rad > ((static_cast(PI)*2) - range)) { mAnimation->setFrame(0); } -- cgit v1.2.3-70-g09d2 From 30c7f7c0e0d3f5801e968077237103ee0dfadf7b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 21 Jan 2012 17:02:34 +0300 Subject: Change server list url to manaplus host. --- src/defaults.cpp | 2 +- src/gui/serverdialog.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/defaults.cpp b/src/defaults.cpp index 414714ebe..8c0b84ae2 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -241,7 +241,7 @@ DefaultsData* getBrandingDefaults() AddDEF(brandingData, "defaultPort", DEFAULT_PORT); AddDEF(brandingData, "defaultServerType", "tmwathena"); AddDEF(brandingData, "onlineServerList", - "http://manasource.org/serverlist.xml"); + "http://manaplus.evolonline.org/serverlist.xml"); AddDEF(brandingData, "appShort", "mana"); AddDEF(brandingData, "defaultUpdateHost", ""); AddDEF(brandingData, "helpPath", ""); diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 019ea9f1c..39ff19a89 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -609,9 +609,12 @@ void ServerDialog::downloadServerList() if (listFile.empty()) listFile = config.getStringValue("onlineServerList"); - // Fall back to manasource.org when neither branding nor config set it + // Fall back to manaplus.evolonline.org when neither branding nor config set it if (listFile.empty()) - listFile = "http://manasource.org/serverlist.xml"; + { + listFile = "http://manaplus.evolonline.org/" + "serverlist.xml/serverlist.xml"; + } if (mDownload) { -- cgit v1.2.3-70-g09d2 From bfeaa863d1ddca4a9e7f428f155cfffc8f3d2bd5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 21 Jan 2012 17:06:26 +0300 Subject: Change version to 1.2.1.22 --- ChangeLog | 13 +++++++++++++ README | 2 +- README.txt | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 6 files changed, 19 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/ChangeLog b/ChangeLog index 52e08dde2..cf8c29553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2012-01-22 New release 1.2.1.22 +fix: bad update hosts handling. +fix: possible crashes. +fix: player name checking in logging. +fix: default shortcuts window size. +fix: player and mob hp bar in evol server. +fix: mouse pickup logic. +fix: adding double attributes to status window. +fix: ambient layer drawing in safe opengl mode. +add: increase resize and moving areas in shortcut window and other similar windows. +add: friends tab in social window. +add: load all servers from list in server dialog. + 2012-01-08 New release 1.2.1.8 fix: -s command line parameter. fix: restore GL_PACK_ALIGNMENT after creating screenshots in opengl modes diff --git a/README b/README index b0f0394a1..995b0cda8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.1.8 Date: 2012-01-08 + Version: 1.2.1.22 Date: 2012-01-22 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 2f9700820..28a0ddd92 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.1.8 Date: 2012-01-08 + Version: 1.2.1.22 Date: 2012-01-22 Development team: - See AUTHORS file for a list diff --git a/build/packwin b/build/packwin index 7d09414c7..d855cf534 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.2.1.8" \ + -DPRODUCT_VERSION="1.2.1.22" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index 16b222908..7b1afbdaf 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.2.1.8], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.1.22], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/main.h b/src/main.h index 924d316b2..541296d22 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.2.1.8" -#define CHECK_VERSION "01.02.01.08" +#define SMALL_VERSION "1.2.1.22" +#define CHECK_VERSION "01.02.01.22" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2 From 5ce48d554ad93beea522d900a5175e7ec20d9356 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 21 Jan 2012 18:33:56 +0300 Subject: Prevent possible double map load attempts. --- src/net/ea/gamehandler.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 61ad8bfdb..b7566e271 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -52,9 +52,14 @@ void GameHandler::processEvent(Mana::Channels channel, if (channel == Mana::CHANNEL_GAME) { if (event.getName() == Mana::EVENT_ENGINESINITALIZED) - Game::instance()->changeMap(mMap); + { + if (mMap != "") + Game::instance()->changeMap(mMap); + } else if (event.getName() == Mana::EVENT_MAPLOADED) + { mapLoadedEvent(); + } } } -- cgit v1.2.3-70-g09d2