From cab0cf80f75d890b908c4526c9c83abd1e9017c1 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 13 Dec 2021 15:30:47 -0300 Subject: Initial attempt at mass renaming --- .cirrus.yml | 4 +- .gitlab-ci.yml | 18 +-- .travis.yml | 28 ++-- Android.mk | 2 +- CMakeLists.txt.legacy | 14 +- INSTALL | 18 +-- Makefile.am | 10 +- PKGBUILD.in | 2 +- README | 14 +- README-SWITCH.md | 4 +- README.md | 26 ++-- README.txt | 14 +- azure-pipelines_windows.yml | 24 ++-- build/update-creator.sh | 2 +- configure.ac | 22 +-- data/evol/evol.desktop.in | 2 +- data/evol/evol.in | 2 +- data/evol/evol.manaplus | 6 +- data/graphics/badges/away.xml | 2 +- data/graphics/badges/gm.xml | 2 +- data/graphics/badges/inactive.xml | 2 +- data/graphics/badges/shop.xml | 2 +- data/graphics/badges/team1.xml | 2 +- data/graphics/badges/team2.xml | 2 +- data/graphics/badges/team3.xml | 2 +- data/graphics/sprites/manaplus_emote.xml | 2 +- data/help/about.txt | 8 +- data/help/download.txt | 10 +- data/help/header.txt | 2 +- data/help/idx/about.idx | 6 +- data/help/idx/team.idx | 2 +- data/help/index.txt | 2 +- data/help/support.txt | 4 +- data/help/team.txt | 6 +- data/icons/CMakeLists.txt | 4 +- data/icons/Makefile.am | 12 +- data/test/itemxmlutils_test.xml | 2 +- data/test/serverlistplus.xml | 12 +- data/test/testintmap.xml | 2 +- data/themes/blacknblack/info.xml | 2 +- data/themes/enchilado/info.xml | 2 +- data/themes/golden-delicious/CHANGELOG.txt | 16 +-- data/themes/golden-delicious/info.xml | 2 +- data/themes/jewelry-simple/info.xml | 2 +- data/themes/jewelry/info.xml | 2 +- data/tmw/tmw.desktop.in | 2 +- data/tmw/tmw.in | 2 +- data/translations/help/ca.po | 30 ++--- data/translations/help/cs.po | 30 ++--- data/translations/help/de.po | 28 ++-- data/translations/help/es.po | 28 ++-- data/translations/help/fr.po | 28 ++-- data/translations/help/id.po | 18 +-- data/translations/help/it.po | 20 +-- data/translations/help/ja.po | 16 +-- data/translations/help/nl.po | 22 +-- data/translations/help/nl_BE.po | 22 +-- data/translations/help/pl.po | 28 ++-- data/translations/help/pt_BR.po | 28 ++-- data/translations/help/ru.po | 30 ++--- data/translations/help/sr.po | 20 +-- data/translations/help/sv_SE.po | 16 +-- data/translations/help/tr.po | 18 +-- data/translations/help/uk.po | 30 ++--- data/translations/help/zh_CN.po | 20 +-- data/translations/help/zh_HK.po | 16 +-- data/translations/help/zh_TW.po | 16 +-- data/translations/manaplus/README | 2 +- data/translations/test/test1.po | 16 +-- docs/FAQ.txt | 4 +- docs/HACKING.txt | 2 +- docs/Makefile.am | 4 +- docs/example.manaplus | 2 +- docs/manaplus.6 | 10 +- docs/manaplustest.6 | 10 +- manaplus.appdata.xml | 4 +- manaplus.desktop | 6 +- manaplus.menu | 6 +- manaplus.spec.in | 12 +- manaplustest.desktop | 26 ++-- packaging/debian/changelog | 148 ++++++++++----------- packaging/debian/control | 16 +-- packaging/debian/copyright | 14 +- packaging/debian/manaplus.lintian-overrides | 6 +- packaging/debian/manaplus.menu | 6 +- packaging/debian/source.lintian-overrides | 4 +- packaging/debian/watch | 2 +- packaging/nacl/ports/manaplus/pkg_info | 2 +- packaging/openSUSE Build Service/manaplus.spec | 12 +- packaging/switch/CMakeLists.txt.switch | 8 +- packaging/windows/evol.nsi | 54 ++++---- packaging/windows/setup.nsi | 84 ++++++------ po/CMakeLists.txt | 6 +- po/Makevars | 2 +- po/ca.po | 22 +-- po/cs.po | 22 +-- po/de.po | 20 +-- po/eo.po | 24 ++-- po/es.po | 22 +-- po/fi.po | 16 +-- po/fr.po | 22 +-- po/id.po | 12 +- po/it.po | 12 +- po/ja.po | 18 +-- po/manaplus.pot | 10 +- po/nl.po | 16 +-- po/nl_BE.po | 16 +-- po/pl.po | 18 +-- po/pt.po | 18 +-- po/pt_BR.po | 22 +-- po/ru.po | 20 +-- po/sr.po | 12 +- po/sv.po | 14 +- po/sv_SE.po | 14 +- po/tr.po | 12 +- po/uk.po | 18 +-- po/unused/ar.po | 12 +- po/unused/bg.po | 12 +- po/unused/en_GB.po | 12 +- po/unused/et.po | 12 +- po/unused/fa.po | 12 +- po/unused/he.po | 12 +- po/unused/hr.po | 12 +- po/unused/hu.po | 12 +- po/unused/ka.po | 12 +- po/unused/nb.po | 12 +- po/unused/sk.po | 12 +- po/unused/sq.po | 12 +- po/unused/te.po | 12 +- po/unused/th.po | 12 +- po/unused/vls.po | 12 +- po/unused/zh_TW.po | 12 +- po/zh_CN.po | 12 +- po/zh_HK.po | 18 +-- src/CMakeLists.txt | 18 +-- src/Makefile.am | 72 +++++----- src/actions/actiondef.h | 4 +- src/actions/actionfuncptr.h | 4 +- src/actions/actions.h | 4 +- src/actions/chat.h | 4 +- src/actions/commands.h | 4 +- src/actions/move.h | 4 +- src/actions/pets.h | 4 +- src/actions/statusbar.h | 4 +- src/actions/tabs.h | 4 +- src/actions/target.h | 4 +- src/actions/windows.h | 4 +- src/actormanager.cpp | 4 +- src/actormanager.h | 4 +- src/avatar.cpp | 4 +- src/avatar.h | 4 +- src/being/actor.cpp | 4 +- src/being/actor.h | 4 +- src/being/actorsprite.cpp | 4 +- src/being/actorsprite.h | 4 +- src/being/being.cpp | 4 +- src/being/being.h | 4 +- src/being/beingcacheentry.h | 4 +- src/being/beingflag.h | 4 +- src/being/beingspeech.h | 4 +- src/being/castingeffect.cpp | 4 +- src/being/castingeffect.h | 4 +- src/being/compounditem.h | 4 +- src/being/compoundsprite.cpp | 4 +- src/being/compoundsprite.h | 4 +- src/being/crazymoves.cpp | 4 +- src/being/crazymoves.h | 4 +- src/being/flooritem.cpp | 4 +- src/being/flooritem.h | 4 +- src/being/homunculusinfo.h | 4 +- src/being/localclan.cpp | 4 +- src/being/localclan.h | 4 +- src/being/localplayer.cpp | 4 +- src/being/localplayer.h | 4 +- src/being/mercenaryinfo.h | 4 +- src/being/petinfo.h | 4 +- src/being/playerignorestrategy.h | 4 +- src/being/playerinfo.cpp | 4 +- src/being/playerinfo.h | 4 +- src/being/playerrelation.cpp | 4 +- src/being/playerrelation.h | 4 +- src/being/playerrelations.cpp | 4 +- src/being/playerrelations.h | 4 +- src/beingequipbackend.cpp | 4 +- src/beingequipbackend.h | 4 +- src/chatlogger.cpp | 4 +- src/chatlogger.h | 4 +- src/client.h | 4 +- src/commandline.cpp | 12 +- src/commandline.h | 4 +- src/configmanager.cpp | 4 +- src/configmanager.h | 4 +- src/configuration.cpp | 4 +- src/configuration.h | 4 +- src/const/emoteshortcut.h | 4 +- src/const/equipment.h | 4 +- src/const/gui/chat.h | 4 +- src/const/gui/pages.h | 4 +- src/const/gui/theme.h | 4 +- src/const/itemshortcut.h | 4 +- src/const/net/inventory.h | 4 +- src/const/net/maxpacketversion.h | 4 +- src/const/net/net.h | 4 +- src/const/net/nostat.h | 4 +- src/const/net/skill.h | 4 +- src/const/render/graphics.h | 4 +- src/const/resources/currency.h | 4 +- src/const/resources/item/cards.h | 4 +- src/const/resources/item/itemoptions.h | 4 +- src/const/resources/map/map.h | 4 +- src/const/resources/skill.h | 4 +- src/const/resources/spriteaction.h | 4 +- src/const/sound.h | 4 +- src/const/spells.h | 4 +- src/const/utils/perfstat.h | 4 +- src/const/utils/timer.h | 4 +- src/const/utils/utf8.h | 4 +- src/debug.h | 4 +- src/defaults.cpp | 8 +- src/defaults.h | 4 +- src/dirs.cpp | 14 +- src/dirs.h | 4 +- src/dragdrop.h | 4 +- src/effectmanager.cpp | 4 +- src/effectmanager.h | 4 +- src/enums/being/actortype.h | 4 +- src/enums/being/attacktype.h | 4 +- src/enums/being/attributes.h | 4 +- src/enums/being/attributesstrings.cpp | 4 +- src/enums/being/attributesstrings.h | 4 +- src/enums/being/badgedrawtype.h | 4 +- src/enums/being/badgeindex.h | 4 +- src/enums/being/beingaction.h | 4 +- src/enums/being/beingdirection.h | 4 +- src/enums/being/cookingtype.h | 4 +- src/enums/being/gender.h | 4 +- src/enums/being/pickup.h | 4 +- src/enums/being/rank.h | 4 +- src/enums/being/reachable.h | 4 +- src/enums/being/relation.h | 4 +- src/enums/being/targetcursorsize.h | 4 +- src/enums/being/targetcursortype.h | 4 +- src/enums/being/visiblename.h | 4 +- src/enums/being/visiblenamepos.h | 4 +- src/enums/commandtarget.h | 4 +- src/enums/cutin.h | 4 +- src/enums/dragdropsource.h | 4 +- src/enums/emotetype.h | 4 +- src/enums/equipslot.h | 4 +- src/enums/events/keyeventtype.h | 4 +- src/enums/events/mousebutton.h | 4 +- src/enums/events/mouseeventtype.h | 4 +- src/enums/fs/fsentrytype.h | 4 +- src/enums/gui/chatmsgtype.h | 4 +- src/enums/gui/chattabtype.h | 4 +- src/enums/gui/colorname.h | 4 +- src/enums/gui/dialogtype.h | 4 +- src/enums/gui/gradienttype.h | 4 +- src/enums/gui/itemamountwindowusage.h | 4 +- src/enums/gui/layouttype.h | 4 +- src/enums/gui/linkhighlightmode.h | 4 +- src/enums/gui/npcactionstate.h | 4 +- src/enums/gui/npcinputstate.h | 4 +- src/enums/gui/orientation.h | 4 +- src/enums/gui/pincodestate.h | 4 +- src/enums/gui/progresscolorid.h | 4 +- src/enums/gui/serverdialogdonwloadstatus.h | 4 +- src/enums/gui/shoplistboxtype.h | 4 +- src/enums/gui/slidergrid.h | 4 +- src/enums/gui/themecolorid.h | 4 +- src/enums/gui/updatedownloadstatus.h | 4 +- src/enums/gui/usercolorid.h | 4 +- src/enums/guildpositionflags.h | 4 +- src/enums/input/inputaction.h | 4 +- src/enums/input/inputcondition.h | 4 +- src/enums/input/inputgroup.h | 4 +- src/enums/input/inputtype.h | 4 +- src/enums/input/keyboardfocus.h | 4 +- src/enums/input/keyvalue.h | 4 +- src/enums/inventorytype.h | 4 +- src/enums/magicschool.h | 4 +- src/enums/net/auctionsearchtype.h | 4 +- src/enums/net/battlegroundtype.h | 4 +- src/enums/net/beingtype.h | 4 +- src/enums/net/deleteitemreason.h | 4 +- src/enums/net/downloadstatus.h | 4 +- src/enums/net/mailmessagetype.h | 4 +- src/enums/net/mailopentype.h | 4 +- src/enums/net/menutype.h | 4 +- src/enums/net/netinventorytype.h | 4 +- src/enums/net/npcaction.h | 4 +- src/enums/net/packettype.h | 4 +- src/enums/net/partyshare.h | 4 +- src/enums/net/serverfreetype.h | 4 +- src/enums/net/servertype.h | 4 +- src/enums/net/storesearchtype.h | 4 +- src/enums/net/updatetype.h | 4 +- src/enums/particle/alivestatus.h | 4 +- src/enums/particle/particlechangefunc.h | 4 +- src/enums/particle/particlephysics.h | 4 +- src/enums/particle/particletype.h | 4 +- src/enums/render/blitmode.h | 4 +- src/enums/render/rendertype.h | 4 +- src/enums/resources/cursor.h | 4 +- src/enums/resources/displaytype.h | 4 +- src/enums/resources/frametype.h | 4 +- src/enums/resources/imageposition.h | 4 +- src/enums/resources/imagetype.h | 4 +- src/enums/resources/item/itemdbtype.h | 4 +- src/enums/resources/item/itemsoundevent.h | 4 +- src/enums/resources/item/itemtype.h | 4 +- src/enums/resources/mailqueuetype.h | 4 +- src/enums/resources/map/blockmask.h | 4 +- src/enums/resources/map/blocktype.h | 4 +- src/enums/resources/map/collisiontype.h | 4 +- src/enums/resources/map/mapitemtype.h | 4 +- src/enums/resources/map/maplayerposition.h | 4 +- src/enums/resources/map/maplayertype.h | 4 +- src/enums/resources/map/maptype.h | 4 +- src/enums/resources/notifyflags.h | 4 +- src/enums/resources/notifytypes.h | 4 +- src/enums/resources/questtype.h | 4 +- src/enums/resources/servercommandenable.h | 4 +- src/enums/resources/servercommandtype.h | 4 +- src/enums/resources/serverpermissiontype.h | 4 +- src/enums/resources/skill/casttype.h | 4 +- src/enums/resources/skill/skillowner.h | 4 +- src/enums/resources/skill/skillsettype.h | 4 +- src/enums/resources/skill/skilltype.h | 4 +- src/enums/resources/skill/skilltype2.h | 4 +- src/enums/resources/spritedirection.h | 4 +- src/enums/screendensity.h | 4 +- src/enums/simpletypes/advanced.h | 4 +- src/enums/simpletypes/allowquit.h | 4 +- src/enums/simpletypes/allowsort.h | 4 +- src/enums/simpletypes/allplayers.h | 4 +- src/enums/simpletypes/append.h | 4 +- src/enums/simpletypes/autorelease.h | 4 +- src/enums/simpletypes/autotarget.h | 4 +- src/enums/simpletypes/beingid.h | 4 +- src/enums/simpletypes/beingtypeid.h | 4 +- src/enums/simpletypes/booldefines.h | 4 +- src/enums/simpletypes/damaged.h | 4 +- src/enums/simpletypes/donotalign.h | 4 +- src/enums/simpletypes/enable.h | 4 +- src/enums/simpletypes/enumdefines.h | 4 +- src/enums/simpletypes/equipm.h | 4 +- src/enums/simpletypes/equipped.h | 4 +- src/enums/simpletypes/favorite.h | 4 +- src/enums/simpletypes/forcedisplay.h | 4 +- src/enums/simpletypes/forcequantity.h | 4 +- src/enums/simpletypes/identified.h | 4 +- src/enums/simpletypes/ignorerecord.h | 4 +- src/enums/simpletypes/intdefines.h | 4 +- src/enums/simpletypes/issell.h | 4 +- src/enums/simpletypes/isstart.h | 4 +- src/enums/simpletypes/itemcolor.h | 4 +- src/enums/simpletypes/keep.h | 4 +- src/enums/simpletypes/losefocusontab.h | 4 +- src/enums/simpletypes/mainconfig.h | 4 +- src/enums/simpletypes/modal.h | 4 +- src/enums/simpletypes/modifiable.h | 4 +- src/enums/simpletypes/move.h | 4 +- src/enums/simpletypes/notify.h | 4 +- src/enums/simpletypes/npcnames.h | 4 +- src/enums/simpletypes/online.h | 4 +- src/enums/simpletypes/onthefly.h | 4 +- src/enums/simpletypes/opaque.h | 4 +- src/enums/simpletypes/protected.h | 4 +- src/enums/simpletypes/separator.h | 4 +- src/enums/simpletypes/sfx.h | 4 +- src/enums/simpletypes/showcenter.h | 4 +- src/enums/simpletypes/showemptyrows.h | 4 +- src/enums/simpletypes/skiperror.h | 4 +- src/enums/simpletypes/speech.h | 4 +- src/enums/simpletypes/stringdefines.h | 4 +- src/enums/simpletypes/stringdefines2.h | 4 +- src/enums/simpletypes/trading.h | 4 +- src/enums/simpletypes/tryremovecolors.h | 4 +- src/enums/simpletypes/useargs.h | 4 +- src/enums/simpletypes/usebase64.h | 4 +- src/enums/simpletypes/usevirtfs.h | 4 +- src/enums/simpletypes/visible.h | 4 +- src/enums/state.h | 4 +- src/enums/textcommandtype.h | 4 +- src/equipment.h | 4 +- src/events/actionevent.h | 4 +- src/events/event.h | 4 +- src/events/inputevent.h | 4 +- src/events/inputguievent.h | 4 +- src/events/keyevent.h | 4 +- src/events/mouseevent.h | 4 +- src/events/selectionevent.h | 4 +- src/eventsmanager.cpp | 4 +- src/eventsmanager.h | 4 +- src/fs/files.cpp | 4 +- src/fs/files.h | 4 +- src/fs/mkdir.cpp | 4 +- src/fs/mkdir.h | 4 +- src/fs/paths.cpp | 8 +- src/fs/paths.h | 4 +- src/fs/specialfolder.cpp | 4 +- src/fs/specialfolder.h | 4 +- src/fs/virtfs/direntry.cpp | 4 +- src/fs/virtfs/direntry.h | 4 +- src/fs/virtfs/file.cpp | 4 +- src/fs/virtfs/file.h | 4 +- src/fs/virtfs/fileapi.h | 4 +- src/fs/virtfs/fs.cpp | 4 +- src/fs/virtfs/fs.h | 4 +- src/fs/virtfs/fsdir.cpp | 4 +- src/fs/virtfs/fsdir.h | 4 +- src/fs/virtfs/fsdirrwops.cpp | 4 +- src/fs/virtfs/fsdirrwops.h | 4 +- src/fs/virtfs/fsentry.cpp | 4 +- src/fs/virtfs/fsentry.h | 4 +- src/fs/virtfs/fsfuncs.h | 4 +- src/fs/virtfs/fszip.cpp | 4 +- src/fs/virtfs/fszip.h | 4 +- src/fs/virtfs/fsziprwops.cpp | 4 +- src/fs/virtfs/fsziprwops.h | 4 +- src/fs/virtfs/list.cpp | 4 +- src/fs/virtfs/list.h | 4 +- src/fs/virtfs/rwops.cpp | 4 +- src/fs/virtfs/rwops.h | 4 +- src/fs/virtfs/rwopstypes.h | 4 +- src/fs/virtfs/tools.cpp | 4 +- src/fs/virtfs/tools.h | 4 +- src/fs/virtfs/zipentry.cpp | 4 +- src/fs/virtfs/zipentry.h | 4 +- src/fs/virtfs/ziplocalheader.cpp | 4 +- src/fs/virtfs/ziplocalheader.h | 4 +- src/fs/virtfs/zipreader.cpp | 4 +- src/fs/virtfs/zipreader.h | 4 +- src/game.cpp | 8 +- src/game.h | 4 +- src/gamemodifiers.cpp | 4 +- src/gamemodifiers.h | 4 +- src/graphicsmanager.cpp | 6 +- src/graphicsmanager.h | 4 +- src/gui/browserlink.h | 4 +- src/gui/buttoninfo.h | 4 +- src/gui/buttontext.h | 4 +- src/gui/chatlog.h | 4 +- src/gui/cliprect.h | 4 +- src/gui/color.h | 4 +- src/gui/colorpair.h | 4 +- src/gui/dialogsmanager.cpp | 4 +- src/gui/dialogsmanager.h | 4 +- src/gui/focushandler.cpp | 4 +- src/gui/focushandler.h | 4 +- src/gui/fonts/font.cpp | 4 +- src/gui/fonts/font.h | 4 +- src/gui/fonts/textchunk.cpp | 4 +- src/gui/fonts/textchunk.h | 4 +- src/gui/fonts/textchunklist.cpp | 4 +- src/gui/fonts/textchunklist.h | 4 +- src/gui/fonts/textchunksmall.cpp | 4 +- src/gui/fonts/textchunksmall.h | 4 +- src/gui/gui.cpp | 4 +- src/gui/gui.h | 4 +- src/gui/mailmessage.h | 4 +- src/gui/models/avatarlistmodel.h | 4 +- src/gui/models/beingslistmodel.h | 4 +- src/gui/models/colorlistmodel.h | 4 +- src/gui/models/colormodel.cpp | 4 +- src/gui/models/colormodel.h | 4 +- src/gui/models/extendedlistmodel.h | 4 +- src/gui/models/extendednamesmodel.cpp | 4 +- src/gui/models/extendednamesmodel.h | 4 +- src/gui/models/fontsizechoicelistmodel.h | 4 +- src/gui/models/fontsmodel.h | 4 +- src/gui/models/iconsmodel.h | 4 +- src/gui/models/ignorechoiceslistmodel.h | 4 +- src/gui/models/itemsmodel.h | 4 +- src/gui/models/keylistmodel.h | 4 +- src/gui/models/langlistmodel.h | 4 +- src/gui/models/listmodel.h | 4 +- src/gui/models/magicschoolmodel.h | 4 +- src/gui/models/modelistmodel.cpp | 4 +- src/gui/models/modelistmodel.h | 4 +- src/gui/models/namesmodel.cpp | 4 +- src/gui/models/namesmodel.h | 4 +- src/gui/models/opengllistmodel.h | 4 +- src/gui/models/playerrelationlistmodel.h | 4 +- src/gui/models/playertablemodel.cpp | 4 +- src/gui/models/playertablemodel.h | 4 +- src/gui/models/questsmodel.h | 4 +- src/gui/models/serverslistmodel.h | 4 +- src/gui/models/shopitems.cpp | 4 +- src/gui/models/shopitems.h | 4 +- src/gui/models/skillmodel.cpp | 4 +- src/gui/models/skillmodel.h | 4 +- src/gui/models/sortlistmodelbuy.h | 4 +- src/gui/models/sortlistmodelinv.h | 4 +- src/gui/models/soundsmodel.h | 4 +- src/gui/models/tablemodel.cpp | 4 +- src/gui/models/tablemodel.h | 4 +- src/gui/models/targettypemodel.h | 4 +- src/gui/models/themesmodel.h | 4 +- src/gui/models/touchactionmodel.cpp | 4 +- src/gui/models/touchactionmodel.h | 4 +- src/gui/models/typelistmodel.h | 4 +- src/gui/models/updatelistmodel.h | 4 +- src/gui/models/updatetypemodel.h | 4 +- src/gui/models/worldlistmodel.h | 4 +- src/gui/mouseoverlink.h | 4 +- src/gui/onlineplayer.h | 4 +- src/gui/palette.cpp | 4 +- src/gui/palette.h | 4 +- src/gui/popupmanager.cpp | 4 +- src/gui/popupmanager.h | 4 +- src/gui/popups/beingpopup.cpp | 4 +- src/gui/popups/beingpopup.h | 4 +- src/gui/popups/itempopup.cpp | 4 +- src/gui/popups/itempopup.h | 4 +- src/gui/popups/popupmenu.cpp | 4 +- src/gui/popups/popupmenu.h | 4 +- src/gui/popups/skillpopup.cpp | 4 +- src/gui/popups/skillpopup.h | 4 +- src/gui/popups/speechbubble.cpp | 4 +- src/gui/popups/speechbubble.h | 4 +- src/gui/popups/spellpopup.cpp | 4 +- src/gui/popups/spellpopup.h | 4 +- src/gui/popups/statuspopup.cpp | 4 +- src/gui/popups/statuspopup.h | 4 +- src/gui/popups/textboxpopup.cpp | 4 +- src/gui/popups/textboxpopup.h | 4 +- src/gui/popups/textpopup.cpp | 4 +- src/gui/popups/textpopup.h | 4 +- src/gui/rect.h | 4 +- src/gui/sdlinput.cpp | 4 +- src/gui/sdlinput.h | 4 +- src/gui/setupactiondata.h | 4 +- src/gui/setupinputpages.cpp | 4 +- src/gui/setupinputpages.h | 4 +- src/gui/shortcut/dropshortcut.cpp | 4 +- src/gui/shortcut/dropshortcut.h | 4 +- src/gui/shortcut/emoteshortcut.cpp | 4 +- src/gui/shortcut/emoteshortcut.h | 4 +- src/gui/shortcut/itemshortcut.cpp | 4 +- src/gui/shortcut/itemshortcut.h | 4 +- src/gui/shortcut/shortcutbase.cpp | 4 +- src/gui/shortcut/shortcutbase.h | 4 +- src/gui/shortcut/spellshortcut.cpp | 4 +- src/gui/shortcut/spellshortcut.h | 4 +- src/gui/skin.cpp | 4 +- src/gui/skin.h | 4 +- src/gui/theme.cpp | 4 +- src/gui/theme.h | 4 +- src/gui/themecolorsidoperators.cpp | 4 +- src/gui/themecolorsidoperators.h | 4 +- src/gui/themecolortype.inc | 4 +- src/gui/themeinfo.h | 4 +- src/gui/touchactiondata.cpp | 4 +- src/gui/touchactiondata.h | 4 +- src/gui/userpalette.cpp | 4 +- src/gui/userpalette.h | 4 +- src/gui/viewport.h | 4 +- src/gui/widgets/attrs/attrdisplay.cpp | 4 +- src/gui/widgets/attrs/attrdisplay.h | 4 +- src/gui/widgets/attrs/changedisplay.cpp | 4 +- src/gui/widgets/attrs/changedisplay.h | 4 +- src/gui/widgets/attrs/derdisplay.cpp | 4 +- src/gui/widgets/attrs/derdisplay.h | 4 +- src/gui/widgets/avatarlistbox.cpp | 4 +- src/gui/widgets/avatarlistbox.h | 4 +- src/gui/widgets/basiccontainer.cpp | 4 +- src/gui/widgets/basiccontainer.h | 4 +- src/gui/widgets/basiccontainer2.cpp | 4 +- src/gui/widgets/basiccontainer2.h | 4 +- src/gui/widgets/browserbox.cpp | 4 +- src/gui/widgets/browserbox.h | 4 +- src/gui/widgets/browserbox.inc | 4 +- src/gui/widgets/button.cpp | 4 +- src/gui/widgets/button.h | 4 +- src/gui/widgets/characterdisplay.cpp | 4 +- src/gui/widgets/characterdisplay.h | 4 +- src/gui/widgets/characterviewbase.h | 4 +- src/gui/widgets/characterviewnormal.cpp | 4 +- src/gui/widgets/characterviewnormal.h | 4 +- src/gui/widgets/characterviewsmall.cpp | 4 +- src/gui/widgets/characterviewsmall.h | 4 +- src/gui/widgets/chatinput.h | 4 +- src/gui/widgets/checkbox.cpp | 4 +- src/gui/widgets/checkbox.h | 4 +- src/gui/widgets/colorpage.cpp | 4 +- src/gui/widgets/colorpage.h | 4 +- src/gui/widgets/container.cpp | 4 +- src/gui/widgets/container.h | 4 +- src/gui/widgets/containerplacer.cpp | 4 +- src/gui/widgets/containerplacer.h | 4 +- src/gui/widgets/createwidget.h | 4 +- src/gui/widgets/desktop.cpp | 6 +- src/gui/widgets/desktop.h | 4 +- src/gui/widgets/dropdown.cpp | 4 +- src/gui/widgets/dropdown.h | 4 +- src/gui/widgets/emotepage.cpp | 4 +- src/gui/widgets/emotepage.h | 4 +- src/gui/widgets/emoteshortcutcontainer.cpp | 4 +- src/gui/widgets/emoteshortcutcontainer.h | 4 +- src/gui/widgets/equipmentbox.h | 4 +- src/gui/widgets/equipmentpage.h | 4 +- src/gui/widgets/extendedlistbox.cpp | 4 +- src/gui/widgets/extendedlistbox.h | 4 +- src/gui/widgets/extendedlistboxitem.h | 4 +- src/gui/widgets/flowcontainer.cpp | 4 +- src/gui/widgets/flowcontainer.h | 4 +- src/gui/widgets/guitable.cpp | 4 +- src/gui/widgets/guitable.h | 4 +- src/gui/widgets/horizontcontainer.cpp | 4 +- src/gui/widgets/horizontcontainer.h | 4 +- src/gui/widgets/icon.cpp | 4 +- src/gui/widgets/icon.h | 4 +- src/gui/widgets/inttextfield.cpp | 4 +- src/gui/widgets/inttextfield.h | 4 +- src/gui/widgets/itemcontainer.cpp | 4 +- src/gui/widgets/itemcontainer.h | 4 +- src/gui/widgets/itemlinkhandler.cpp | 4 +- src/gui/widgets/itemlinkhandler.h | 4 +- src/gui/widgets/itemshortcutcontainer.cpp | 4 +- src/gui/widgets/itemshortcutcontainer.h | 4 +- src/gui/widgets/label.cpp | 4 +- src/gui/widgets/label.h | 4 +- src/gui/widgets/layout.cpp | 4 +- src/gui/widgets/layout.h | 4 +- src/gui/widgets/layoutarray.cpp | 4 +- src/gui/widgets/layoutarray.h | 4 +- src/gui/widgets/layoutcell.cpp | 4 +- src/gui/widgets/layoutcell.h | 4 +- src/gui/widgets/layouthelper.cpp | 4 +- src/gui/widgets/layouthelper.h | 4 +- src/gui/widgets/linepart.cpp | 4 +- src/gui/widgets/linepart.h | 4 +- src/gui/widgets/linkhandler.h | 4 +- src/gui/widgets/listbox.cpp | 4 +- src/gui/widgets/listbox.h | 4 +- src/gui/widgets/passwordfield.cpp | 4 +- src/gui/widgets/passwordfield.h | 4 +- src/gui/widgets/pincode.cpp | 4 +- src/gui/widgets/pincode.h | 4 +- src/gui/widgets/playerbox.cpp | 4 +- src/gui/widgets/playerbox.h | 4 +- src/gui/widgets/popup.cpp | 4 +- src/gui/widgets/popup.h | 4 +- src/gui/widgets/popuplist.cpp | 4 +- src/gui/widgets/popuplist.h | 4 +- src/gui/widgets/progressbar.cpp | 4 +- src/gui/widgets/progressbar.h | 4 +- src/gui/widgets/progressindicator.cpp | 4 +- src/gui/widgets/progressindicator.h | 4 +- src/gui/widgets/radiobutton.cpp | 4 +- src/gui/widgets/radiobutton.h | 4 +- src/gui/widgets/radiogroup.cpp | 4 +- src/gui/widgets/radiogroup.h | 4 +- src/gui/widgets/scrollarea.cpp | 4 +- src/gui/widgets/scrollarea.h | 4 +- src/gui/widgets/selldialog.cpp | 4 +- src/gui/widgets/selldialog.h | 4 +- src/gui/widgets/serverslistbox.h | 4 +- src/gui/widgets/setupbuttonitem.cpp | 4 +- src/gui/widgets/setupbuttonitem.h | 4 +- src/gui/widgets/setupitem.cpp | 4 +- src/gui/widgets/setupitem.h | 4 +- src/gui/widgets/setupquickitem.cpp | 4 +- src/gui/widgets/setupquickitem.h | 4 +- src/gui/widgets/setuptouchitem.cpp | 4 +- src/gui/widgets/setuptouchitem.h | 4 +- src/gui/widgets/shoplistbox.cpp | 4 +- src/gui/widgets/shoplistbox.h | 4 +- src/gui/widgets/shortcutcontainer.cpp | 4 +- src/gui/widgets/shortcutcontainer.h | 4 +- src/gui/widgets/skilllistbox.h | 4 +- src/gui/widgets/skillrectanglelistbox.h | 4 +- src/gui/widgets/slider.cpp | 4 +- src/gui/widgets/slider.h | 4 +- src/gui/widgets/sliderlist.cpp | 4 +- src/gui/widgets/sliderlist.h | 4 +- src/gui/widgets/spellshortcutcontainer.cpp | 4 +- src/gui/widgets/spellshortcutcontainer.h | 4 +- src/gui/widgets/staticbrowserbox.cpp | 4 +- src/gui/widgets/staticbrowserbox.h | 4 +- src/gui/widgets/statspage.cpp | 4 +- src/gui/widgets/statspage.h | 4 +- src/gui/widgets/statspagebasic.cpp | 4 +- src/gui/widgets/statspagebasic.h | 4 +- src/gui/widgets/tabbedarea.cpp | 4 +- src/gui/widgets/tabbedarea.h | 4 +- src/gui/widgets/tabs/chat/battletab.cpp | 4 +- src/gui/widgets/tabs/chat/battletab.h | 4 +- src/gui/widgets/tabs/chat/channeltab.cpp | 4 +- src/gui/widgets/tabs/chat/channeltab.h | 4 +- src/gui/widgets/tabs/chat/chattab.cpp | 4 +- src/gui/widgets/tabs/chat/chattab.h | 4 +- src/gui/widgets/tabs/chat/clantab.cpp | 4 +- src/gui/widgets/tabs/chat/clantab.h | 4 +- src/gui/widgets/tabs/chat/emulateguildtab.cpp | 4 +- src/gui/widgets/tabs/chat/emulateguildtab.h | 4 +- src/gui/widgets/tabs/chat/gmtab.cpp | 4 +- src/gui/widgets/tabs/chat/gmtab.h | 4 +- src/gui/widgets/tabs/chat/guildtab.cpp | 4 +- src/gui/widgets/tabs/chat/guildtab.h | 4 +- src/gui/widgets/tabs/chat/langtab.cpp | 4 +- src/gui/widgets/tabs/chat/langtab.h | 4 +- src/gui/widgets/tabs/chat/partytab.cpp | 4 +- src/gui/widgets/tabs/chat/partytab.h | 4 +- src/gui/widgets/tabs/chat/tradetab.cpp | 4 +- src/gui/widgets/tabs/chat/tradetab.h | 4 +- src/gui/widgets/tabs/chat/whispertab.cpp | 4 +- src/gui/widgets/tabs/chat/whispertab.h | 4 +- src/gui/widgets/tabs/clanwindowtabs.cpp | 4 +- src/gui/widgets/tabs/clanwindowtabs.h | 4 +- src/gui/widgets/tabs/debugtab.h | 4 +- src/gui/widgets/tabs/mapdebugtab.cpp | 4 +- src/gui/widgets/tabs/mapdebugtab.h | 4 +- src/gui/widgets/tabs/netdebugtab.cpp | 4 +- src/gui/widgets/tabs/netdebugtab.h | 4 +- src/gui/widgets/tabs/setup_audio.cpp | 4 +- src/gui/widgets/tabs/setup_audio.h | 4 +- src/gui/widgets/tabs/setup_chat.cpp | 8 +- src/gui/widgets/tabs/setup_chat.h | 4 +- src/gui/widgets/tabs/setup_colors.cpp | 4 +- src/gui/widgets/tabs/setup_colors.h | 4 +- src/gui/widgets/tabs/setup_input.cpp | 4 +- src/gui/widgets/tabs/setup_input.h | 4 +- src/gui/widgets/tabs/setup_joystick.cpp | 4 +- src/gui/widgets/tabs/setup_joystick.h | 4 +- src/gui/widgets/tabs/setup_misc.cpp | 4 +- src/gui/widgets/tabs/setup_misc.h | 4 +- src/gui/widgets/tabs/setup_mods.cpp | 4 +- src/gui/widgets/tabs/setup_mods.h | 4 +- src/gui/widgets/tabs/setup_perfomance.cpp | 4 +- src/gui/widgets/tabs/setup_perfomance.h | 4 +- src/gui/widgets/tabs/setup_players.cpp | 4 +- src/gui/widgets/tabs/setup_players.h | 4 +- src/gui/widgets/tabs/setup_quick.cpp | 4 +- src/gui/widgets/tabs/setup_quick.h | 4 +- src/gui/widgets/tabs/setup_relations.cpp | 4 +- src/gui/widgets/tabs/setup_relations.h | 4 +- src/gui/widgets/tabs/setup_theme.cpp | 4 +- src/gui/widgets/tabs/setup_theme.h | 4 +- src/gui/widgets/tabs/setup_touch.cpp | 4 +- src/gui/widgets/tabs/setup_touch.h | 4 +- src/gui/widgets/tabs/setup_video.cpp | 4 +- src/gui/widgets/tabs/setup_video.h | 4 +- src/gui/widgets/tabs/setup_visual.cpp | 4 +- src/gui/widgets/tabs/setup_visual.h | 4 +- src/gui/widgets/tabs/setuptab.cpp | 4 +- src/gui/widgets/tabs/setuptab.h | 4 +- src/gui/widgets/tabs/setuptabscroll.cpp | 4 +- src/gui/widgets/tabs/setuptabscroll.h | 4 +- src/gui/widgets/tabs/shortcuttab.h | 4 +- src/gui/widgets/tabs/skilltab.h | 4 +- src/gui/widgets/tabs/socialattacktab.h | 4 +- src/gui/widgets/tabs/socialfriendsfunctor.h | 4 +- src/gui/widgets/tabs/socialfriendstab.h | 4 +- src/gui/widgets/tabs/socialguildtab.h | 4 +- src/gui/widgets/tabs/socialguildtab2.h | 4 +- src/gui/widgets/tabs/socialnavigationtab.h | 4 +- src/gui/widgets/tabs/socialpartytab.h | 4 +- src/gui/widgets/tabs/socialpickuptab.h | 4 +- src/gui/widgets/tabs/socialplayerstab.h | 4 +- src/gui/widgets/tabs/socialtab.h | 4 +- src/gui/widgets/tabs/socialtabbase.h | 4 +- src/gui/widgets/tabs/statdebugtab.cpp | 4 +- src/gui/widgets/tabs/statdebugtab.h | 4 +- src/gui/widgets/tabs/tab.cpp | 4 +- src/gui/widgets/tabs/tab.h | 4 +- src/gui/widgets/tabs/targetdebugtab.cpp | 4 +- src/gui/widgets/tabs/targetdebugtab.h | 4 +- src/gui/widgets/tabstrip.cpp | 4 +- src/gui/widgets/tabstrip.h | 4 +- src/gui/widgets/textbox.cpp | 4 +- src/gui/widgets/textbox.h | 4 +- src/gui/widgets/textfield.cpp | 4 +- src/gui/widgets/textfield.h | 4 +- src/gui/widgets/textpreview.cpp | 4 +- src/gui/widgets/textpreview.h | 4 +- src/gui/widgets/vertcontainer.cpp | 4 +- src/gui/widgets/vertcontainer.h | 4 +- src/gui/widgets/virtshortcutcontainer.cpp | 4 +- src/gui/widgets/virtshortcutcontainer.h | 4 +- src/gui/widgets/widget.cpp | 4 +- src/gui/widgets/widget.h | 4 +- src/gui/widgets/widget2.h | 4 +- src/gui/widgets/widgetgroup.cpp | 4 +- src/gui/widgets/widgetgroup.h | 4 +- src/gui/widgets/window.cpp | 4 +- src/gui/widgets/window.h | 4 +- src/gui/widgets/windowcontainer.cpp | 4 +- src/gui/widgets/windowcontainer.h | 4 +- src/gui/windowmanager.cpp | 4 +- src/gui/windowmanager.h | 4 +- src/gui/windowmenu.cpp | 4 +- src/gui/windowmenu.h | 4 +- src/gui/windows/bankwindow.cpp | 4 +- src/gui/windows/bankwindow.h | 4 +- src/gui/windows/buydialog.cpp | 4 +- src/gui/windows/buydialog.h | 4 +- src/gui/windows/buyingstoreselldialog.cpp | 4 +- src/gui/windows/buyingstoreselldialog.h | 4 +- src/gui/windows/buyselldialog.cpp | 4 +- src/gui/windows/buyselldialog.h | 4 +- src/gui/windows/changeemaildialog.cpp | 4 +- src/gui/windows/changeemaildialog.h | 4 +- src/gui/windows/changepassworddialog.cpp | 4 +- src/gui/windows/changepassworddialog.h | 4 +- src/gui/windows/charcreatedialog.cpp | 4 +- src/gui/windows/charcreatedialog.h | 4 +- src/gui/windows/chardeleteconfirm.h | 4 +- src/gui/windows/charselectdialog.cpp | 4 +- src/gui/windows/charselectdialog.h | 4 +- src/gui/windows/chatwindow.cpp | 4 +- src/gui/windows/chatwindow.h | 4 +- src/gui/windows/clanwindow.cpp | 4 +- src/gui/windows/clanwindow.h | 4 +- src/gui/windows/confirmdialog.cpp | 4 +- src/gui/windows/confirmdialog.h | 4 +- src/gui/windows/connectiondialog.cpp | 4 +- src/gui/windows/connectiondialog.h | 4 +- src/gui/windows/cutinwindow.cpp | 4 +- src/gui/windows/cutinwindow.h | 4 +- src/gui/windows/debugwindow.cpp | 4 +- src/gui/windows/debugwindow.h | 4 +- src/gui/windows/didyouknowwindow.cpp | 4 +- src/gui/windows/didyouknowwindow.h | 4 +- src/gui/windows/editdialog.cpp | 4 +- src/gui/windows/editdialog.h | 4 +- src/gui/windows/editserverdialog.cpp | 4 +- src/gui/windows/editserverdialog.h | 4 +- src/gui/windows/eggselectiondialog.cpp | 4 +- src/gui/windows/eggselectiondialog.h | 4 +- src/gui/windows/emotewindow.cpp | 4 +- src/gui/windows/emotewindow.h | 4 +- src/gui/windows/equipmentwindow.cpp | 4 +- src/gui/windows/equipmentwindow.h | 4 +- src/gui/windows/helpwindow.cpp | 4 +- src/gui/windows/helpwindow.h | 4 +- src/gui/windows/insertcarddialog.cpp | 4 +- src/gui/windows/insertcarddialog.h | 4 +- src/gui/windows/inventorywindow.cpp | 4 +- src/gui/windows/inventorywindow.h | 4 +- src/gui/windows/itemamountwindow.cpp | 4 +- src/gui/windows/itemamountwindow.h | 4 +- src/gui/windows/killstats.cpp | 4 +- src/gui/windows/killstats.h | 4 +- src/gui/windows/logindialog.cpp | 4 +- src/gui/windows/logindialog.h | 4 +- src/gui/windows/maileditwindow.cpp | 4 +- src/gui/windows/maileditwindow.h | 4 +- src/gui/windows/mailviewwindow.cpp | 4 +- src/gui/windows/mailviewwindow.h | 4 +- src/gui/windows/mailwindow.cpp | 4 +- src/gui/windows/mailwindow.h | 4 +- src/gui/windows/minimap.cpp | 4 +- src/gui/windows/minimap.h | 4 +- src/gui/windows/ministatuswindow.cpp | 4 +- src/gui/windows/ministatuswindow.h | 4 +- src/gui/windows/npcdialog.cpp | 4 +- src/gui/windows/npcdialog.h | 4 +- src/gui/windows/npcselldialog.cpp | 4 +- src/gui/windows/npcselldialog.h | 4 +- src/gui/windows/okdialog.cpp | 4 +- src/gui/windows/okdialog.h | 4 +- src/gui/windows/outfitwindow.cpp | 4 +- src/gui/windows/outfitwindow.h | 4 +- src/gui/windows/pincodedialog.cpp | 4 +- src/gui/windows/pincodedialog.h | 4 +- src/gui/windows/questswindow.cpp | 4 +- src/gui/windows/questswindow.h | 4 +- src/gui/windows/quitdialog.cpp | 4 +- src/gui/windows/quitdialog.h | 4 +- src/gui/windows/registerdialog.cpp | 4 +- src/gui/windows/registerdialog.h | 4 +- src/gui/windows/serverdialog.cpp | 6 +- src/gui/windows/serverdialog.h | 4 +- src/gui/windows/serverinfowindow.cpp | 4 +- src/gui/windows/serverinfowindow.h | 4 +- src/gui/windows/setupwindow.cpp | 4 +- src/gui/windows/setupwindow.h | 4 +- src/gui/windows/shopselldialog.cpp | 4 +- src/gui/windows/shopselldialog.h | 4 +- src/gui/windows/shopwindow.cpp | 4 +- src/gui/windows/shopwindow.h | 4 +- src/gui/windows/shortcutwindow.cpp | 4 +- src/gui/windows/shortcutwindow.h | 4 +- src/gui/windows/skilldialog.cpp | 4 +- src/gui/windows/skilldialog.h | 4 +- src/gui/windows/socialwindow.cpp | 4 +- src/gui/windows/socialwindow.h | 4 +- src/gui/windows/statuswindow.cpp | 4 +- src/gui/windows/statuswindow.h | 4 +- src/gui/windows/textcommandeditor.cpp | 4 +- src/gui/windows/textcommandeditor.h | 4 +- src/gui/windows/textdialog.cpp | 4 +- src/gui/windows/textdialog.h | 4 +- src/gui/windows/textselectdialog.cpp | 4 +- src/gui/windows/textselectdialog.h | 4 +- src/gui/windows/tradewindow.cpp | 4 +- src/gui/windows/tradewindow.h | 4 +- src/gui/windows/updaterwindow.cpp | 18 +-- src/gui/windows/updaterwindow.h | 8 +- src/gui/windows/whoisonline.cpp | 4 +- src/gui/windows/whoisonline.h | 4 +- src/gui/windows/worldselectdialog.cpp | 4 +- src/gui/windows/worldselectdialog.h | 4 +- src/guild.cpp | 4 +- src/guild.h | 4 +- src/input/inputactiondata.h | 4 +- src/input/inputactionmap.h | 4 +- src/input/inputactionoperators.cpp | 4 +- src/input/inputactionoperators.h | 4 +- src/input/inputactionsortfunctor.h | 4 +- src/input/inputfunction.h | 4 +- src/input/inputitem.h | 4 +- src/input/inputmanager.cpp | 4 +- src/input/inputmanager.h | 4 +- src/input/joystick.cpp | 4 +- src/input/joystick.h | 4 +- src/input/key.cpp | 4 +- src/input/key.h | 4 +- src/input/keyboardconfig.cpp | 4 +- src/input/keyboardconfig.h | 4 +- src/input/keyinput.h | 4 +- src/input/mouseinput.h | 4 +- src/input/pages/basic.cpp | 4 +- src/input/pages/basic.h | 4 +- src/input/pages/chat.cpp | 4 +- src/input/pages/chat.h | 4 +- src/input/pages/craft.cpp | 4 +- src/input/pages/craft.h | 4 +- src/input/pages/emotes.cpp | 4 +- src/input/pages/emotes.h | 4 +- src/input/pages/gui.cpp | 4 +- src/input/pages/gui.h | 4 +- src/input/pages/move.cpp | 4 +- src/input/pages/move.h | 4 +- src/input/pages/other.cpp | 4 +- src/input/pages/other.h | 4 +- src/input/pages/outfits.cpp | 4 +- src/input/pages/outfits.h | 4 +- src/input/pages/shortcuts.cpp | 4 +- src/input/pages/shortcuts.h | 4 +- src/input/pages/windows.cpp | 4 +- src/input/pages/windows.h | 4 +- src/input/touch/multitouchmanager.cpp | 4 +- src/input/touch/multitouchmanager.h | 4 +- src/input/touch/touchactions.cpp | 4 +- src/input/touch/touchactions.h | 4 +- src/input/touch/touchmanager.cpp | 4 +- src/input/touch/touchmanager.h | 4 +- src/itemcolormanager.cpp | 4 +- src/itemcolormanager.h | 4 +- src/itemsoundmanager.cpp | 4 +- src/itemsoundmanager.h | 4 +- src/listeners/actionlistener.h | 4 +- src/listeners/actorspritelistener.h | 4 +- src/listeners/arrowslistener.cpp | 4 +- src/listeners/arrowslistener.h | 4 +- src/listeners/assertlistener.cpp | 4 +- src/listeners/assertlistener.h | 4 +- src/listeners/attributelistener.cpp | 4 +- src/listeners/attributelistener.h | 4 +- src/listeners/awaylistener.cpp | 4 +- src/listeners/awaylistener.h | 4 +- src/listeners/banklistener.cpp | 4 +- src/listeners/banklistener.h | 4 +- src/listeners/baselistener.hpp | 4 +- src/listeners/buyingstoremodelistener.cpp | 4 +- src/listeners/buyingstoremodelistener.h | 4 +- src/listeners/buyingstoreslotslistener.cpp | 4 +- src/listeners/buyingstoreslotslistener.h | 4 +- src/listeners/changepincodelistener.cpp | 4 +- src/listeners/changepincodelistener.h | 4 +- src/listeners/charrenamelistener.cpp | 4 +- src/listeners/charrenamelistener.h | 4 +- src/listeners/configlistener.h | 4 +- src/listeners/debugmessagelistener.cpp | 4 +- src/listeners/debugmessagelistener.h | 4 +- src/listeners/errorlistener.cpp | 4 +- src/listeners/errorlistener.h | 4 +- src/listeners/focuslistener.h | 4 +- src/listeners/gamemodifierlistener.cpp | 4 +- src/listeners/gamemodifierlistener.h | 4 +- src/listeners/guiconfiglistener.h | 4 +- src/listeners/guitableactionlistener.cpp | 4 +- src/listeners/guitableactionlistener.h | 4 +- src/listeners/inputactionremotelistener.cpp | 4 +- src/listeners/inputactionremotelistener.h | 4 +- src/listeners/inputactionreplaylistener.cpp | 4 +- src/listeners/inputactionreplaylistener.h | 4 +- src/listeners/insertcardlistener.h | 4 +- src/listeners/inventorylistener.h | 4 +- src/listeners/keylistener.h | 4 +- src/listeners/mouselistener.h | 4 +- src/listeners/newpincodelistener.cpp | 4 +- src/listeners/newpincodelistener.h | 4 +- src/listeners/newpincoderetrylistener.cpp | 4 +- src/listeners/newpincoderetrylistener.h | 4 +- src/listeners/openurllistener.h | 4 +- src/listeners/pincodelistener.cpp | 4 +- src/listeners/pincodelistener.h | 4 +- src/listeners/playerdeathlistener.cpp | 4 +- src/listeners/playerdeathlistener.h | 4 +- src/listeners/playerlistener.cpp | 4 +- src/listeners/playerlistener.h | 4 +- src/listeners/playerpostdeathlistener.h | 4 +- src/listeners/playerrelationslistener.h | 4 +- src/listeners/renamelistener.cpp | 4 +- src/listeners/renamelistener.h | 4 +- src/listeners/requestadoptchildlistener.h | 4 +- src/listeners/requesttradelistener.h | 4 +- src/listeners/selectionlistener.h | 4 +- src/listeners/shoprenamelistener.cpp | 4 +- src/listeners/shoprenamelistener.h | 4 +- src/listeners/skillwarplistener.cpp | 4 +- src/listeners/skillwarplistener.h | 4 +- src/listeners/statlistener.cpp | 4 +- src/listeners/statlistener.h | 4 +- src/listeners/tablemodellistener.h | 4 +- src/listeners/textskilllistener.cpp | 4 +- src/listeners/textskilllistener.h | 4 +- src/listeners/tooltiplistener.cpp | 4 +- src/listeners/tooltiplistener.h | 4 +- src/listeners/updatestatuslistener.cpp | 4 +- src/listeners/updatestatuslistener.h | 4 +- src/listeners/uploadlistener.cpp | 4 +- src/listeners/uploadlistener.h | 4 +- src/listeners/vendingmodelistener.cpp | 4 +- src/listeners/vendingmodelistener.h | 4 +- src/listeners/vendingslotslistener.cpp | 4 +- src/listeners/vendingslotslistener.h | 4 +- src/listeners/weightlistener.h | 4 +- src/listeners/widgetdeathlistener.h | 4 +- src/listeners/widgetlistener.h | 4 +- src/listeners/wrongdatanoticelistener.cpp | 4 +- src/listeners/wrongdatanoticelistener.h | 4 +- src/localconsts.h | 4 +- src/logger.cpp | 12 +- src/logger.h | 4 +- src/main.cpp | 4 +- src/main.h | 8 +- src/maingui.cpp | 4 +- src/maingui.h | 4 +- src/manaplus.rc | 6 +- src/mumblemanager.cpp | 4 +- src/navigationmanager.cpp | 4 +- src/navigationmanager.h | 4 +- src/net/achievementhandler.h | 4 +- src/net/adminhandler.h | 4 +- src/net/attendancehandler.h | 4 +- src/net/auctionhandler.h | 4 +- src/net/bankhandler.h | 4 +- src/net/barterhandler.h | 4 +- src/net/battlegroundhandler.h | 4 +- src/net/beinghandler.h | 4 +- src/net/buyingstorehandler.h | 4 +- src/net/buysellhandler.h | 4 +- src/net/cashshophandler.h | 4 +- src/net/character.h | 4 +- src/net/characters.h | 4 +- src/net/charserverhandler.cpp | 4 +- src/net/charserverhandler.h | 4 +- src/net/chathandler.h | 4 +- src/net/clanhandler.h | 4 +- src/net/download.cpp | 4 +- src/net/download.h | 4 +- src/net/ea/adminhandler.cpp | 4 +- src/net/ea/adminhandler.h | 4 +- src/net/ea/adminrecv.cpp | 4 +- src/net/ea/adminrecv.h | 4 +- src/net/ea/beinghandler.cpp | 4 +- src/net/ea/beinghandler.h | 4 +- src/net/ea/beingrecv.cpp | 4 +- src/net/ea/beingrecv.h | 4 +- src/net/ea/buysellhandler.cpp | 4 +- src/net/ea/buysellhandler.h | 4 +- src/net/ea/buysellrecv.cpp | 4 +- src/net/ea/buysellrecv.h | 4 +- src/net/ea/charserverhandler.cpp | 4 +- src/net/ea/charserverhandler.h | 4 +- src/net/ea/charserverrecv.cpp | 4 +- src/net/ea/charserverrecv.h | 4 +- src/net/ea/chathandler.cpp | 4 +- src/net/ea/chathandler.h | 4 +- src/net/ea/chatrecv.cpp | 4 +- src/net/ea/chatrecv.h | 4 +- src/net/ea/eaprotocol.h | 4 +- src/net/ea/equipbackend.h | 4 +- src/net/ea/gamehandler.cpp | 4 +- src/net/ea/gamehandler.h | 4 +- src/net/ea/gamerecv.cpp | 4 +- src/net/ea/gamerecv.h | 4 +- src/net/ea/inventoryhandler.cpp | 4 +- src/net/ea/inventoryhandler.h | 4 +- src/net/ea/inventoryitem.h | 4 +- src/net/ea/inventoryrecv.cpp | 4 +- src/net/ea/inventoryrecv.h | 4 +- src/net/ea/itemhandler.cpp | 4 +- src/net/ea/itemhandler.h | 4 +- src/net/ea/itemrecv.cpp | 4 +- src/net/ea/itemrecv.h | 4 +- src/net/ea/loginhandler.cpp | 4 +- src/net/ea/loginhandler.h | 4 +- src/net/ea/loginrecv.cpp | 4 +- src/net/ea/loginrecv.h | 4 +- src/net/ea/maprecv.cpp | 4 +- src/net/ea/maprecv.h | 4 +- src/net/ea/network.cpp | 4 +- src/net/ea/network.h | 4 +- src/net/ea/npchandler.cpp | 4 +- src/net/ea/npchandler.h | 4 +- src/net/ea/npcrecv.cpp | 4 +- src/net/ea/npcrecv.h | 4 +- src/net/ea/partyhandler.cpp | 4 +- src/net/ea/partyhandler.h | 4 +- src/net/ea/partyrecv.cpp | 4 +- src/net/ea/partyrecv.h | 4 +- src/net/ea/playerhandler.cpp | 4 +- src/net/ea/playerhandler.h | 4 +- src/net/ea/playerrecv.cpp | 4 +- src/net/ea/playerrecv.h | 4 +- src/net/ea/skillhandler.cpp | 4 +- src/net/ea/skillhandler.h | 4 +- src/net/ea/skillrecv.cpp | 4 +- src/net/ea/skillrecv.h | 4 +- src/net/ea/token.h | 4 +- src/net/ea/tradehandler.cpp | 4 +- src/net/ea/tradehandler.h | 4 +- src/net/ea/traderecv.cpp | 4 +- src/net/ea/traderecv.h | 4 +- src/net/eathena/achievementhandler.cpp | 4 +- src/net/eathena/achievementhandler.h | 4 +- src/net/eathena/achievementrecv.cpp | 4 +- src/net/eathena/achievementrecv.h | 4 +- src/net/eathena/adminhandler.cpp | 4 +- src/net/eathena/adminhandler.h | 4 +- src/net/eathena/adminrecv.cpp | 4 +- src/net/eathena/adminrecv.h | 4 +- src/net/eathena/attendancehandler.cpp | 4 +- src/net/eathena/attendancehandler.h | 4 +- src/net/eathena/attendancerecv.cpp | 4 +- src/net/eathena/attendancerecv.h | 4 +- src/net/eathena/auctionhandler.cpp | 4 +- src/net/eathena/auctionhandler.h | 4 +- src/net/eathena/auctionrecv.cpp | 4 +- src/net/eathena/auctionrecv.h | 4 +- src/net/eathena/bankhandler.cpp | 4 +- src/net/eathena/bankhandler.h | 4 +- src/net/eathena/bankrecv.cpp | 4 +- src/net/eathena/bankrecv.h | 4 +- src/net/eathena/barterhandler.cpp | 4 +- src/net/eathena/barterhandler.h | 4 +- src/net/eathena/barterrecv.cpp | 4 +- src/net/eathena/barterrecv.h | 4 +- src/net/eathena/battlegroundhandler.cpp | 4 +- src/net/eathena/battlegroundhandler.h | 4 +- src/net/eathena/battlegroundrecv.cpp | 4 +- src/net/eathena/battlegroundrecv.h | 4 +- src/net/eathena/beinghandler.cpp | 4 +- src/net/eathena/beinghandler.h | 4 +- src/net/eathena/beingrecv.cpp | 4 +- src/net/eathena/beingrecv.h | 4 +- src/net/eathena/buyingstorehandler.cpp | 4 +- src/net/eathena/buyingstorehandler.h | 4 +- src/net/eathena/buyingstorerecv.cpp | 4 +- src/net/eathena/buyingstorerecv.h | 4 +- src/net/eathena/buysellhandler.cpp | 4 +- src/net/eathena/buysellhandler.h | 4 +- src/net/eathena/buysellrecv.cpp | 4 +- src/net/eathena/buysellrecv.h | 4 +- src/net/eathena/cashshophandler.cpp | 4 +- src/net/eathena/cashshophandler.h | 4 +- src/net/eathena/cashshoprecv.cpp | 4 +- src/net/eathena/cashshoprecv.h | 4 +- src/net/eathena/charserverhandler.cpp | 4 +- src/net/eathena/charserverhandler.h | 4 +- src/net/eathena/charserverrecv.cpp | 4 +- src/net/eathena/charserverrecv.h | 4 +- src/net/eathena/chathandler.cpp | 4 +- src/net/eathena/chathandler.h | 4 +- src/net/eathena/chatrecv.cpp | 4 +- src/net/eathena/chatrecv.h | 4 +- src/net/eathena/clanhandler.cpp | 4 +- src/net/eathena/clanhandler.h | 4 +- src/net/eathena/clanrecv.cpp | 4 +- src/net/eathena/clanrecv.h | 4 +- src/net/eathena/elementalhandler.cpp | 4 +- src/net/eathena/elementalhandler.h | 4 +- src/net/eathena/elementalrecv.cpp | 4 +- src/net/eathena/elementalrecv.h | 4 +- src/net/eathena/familyhandler.cpp | 4 +- src/net/eathena/familyhandler.h | 4 +- src/net/eathena/familyrecv.cpp | 4 +- src/net/eathena/familyrecv.h | 4 +- src/net/eathena/friendshandler.cpp | 4 +- src/net/eathena/friendshandler.h | 4 +- src/net/eathena/friendsrecv.cpp | 4 +- src/net/eathena/friendsrecv.h | 4 +- src/net/eathena/gamehandler.cpp | 4 +- src/net/eathena/gamehandler.h | 4 +- src/net/eathena/gamerecv.cpp | 4 +- src/net/eathena/gamerecv.h | 4 +- src/net/eathena/generalhandler.cpp | 4 +- src/net/eathena/generalhandler.h | 4 +- src/net/eathena/generalrecv.cpp | 4 +- src/net/eathena/generalrecv.h | 4 +- src/net/eathena/guildhandler.cpp | 4 +- src/net/eathena/guildhandler.h | 4 +- src/net/eathena/guildrecv.cpp | 4 +- src/net/eathena/guildrecv.h | 4 +- src/net/eathena/homunculushandler.cpp | 4 +- src/net/eathena/homunculushandler.h | 4 +- src/net/eathena/homunculusrecv.cpp | 4 +- src/net/eathena/homunculusrecv.h | 4 +- src/net/eathena/inventoryhandler.cpp | 4 +- src/net/eathena/inventoryhandler.h | 4 +- src/net/eathena/inventoryrecv.cpp | 4 +- src/net/eathena/inventoryrecv.h | 4 +- src/net/eathena/itemflags.h | 4 +- src/net/eathena/itemhandler.cpp | 4 +- src/net/eathena/itemhandler.h | 4 +- src/net/eathena/itemrecv.cpp | 4 +- src/net/eathena/itemrecv.h | 4 +- src/net/eathena/loginhandler.cpp | 4 +- src/net/eathena/loginhandler.h | 4 +- src/net/eathena/loginrecv.cpp | 4 +- src/net/eathena/loginrecv.h | 4 +- src/net/eathena/mail2handler.cpp | 4 +- src/net/eathena/mail2handler.h | 4 +- src/net/eathena/mail2recv.cpp | 4 +- src/net/eathena/mail2recv.h | 4 +- src/net/eathena/mailhandler.cpp | 4 +- src/net/eathena/mailhandler.h | 4 +- src/net/eathena/mailrecv.cpp | 4 +- src/net/eathena/mailrecv.h | 4 +- src/net/eathena/maphandler.cpp | 4 +- src/net/eathena/maphandler.h | 4 +- src/net/eathena/maprecv.cpp | 4 +- src/net/eathena/maprecv.h | 4 +- src/net/eathena/maptypeproperty2.h | 4 +- src/net/eathena/markethandler.cpp | 4 +- src/net/eathena/markethandler.h | 4 +- src/net/eathena/marketrecv.cpp | 4 +- src/net/eathena/marketrecv.h | 4 +- src/net/eathena/menu.cpp | 4 +- src/net/eathena/menu.h | 4 +- src/net/eathena/mercenaryhandler.cpp | 4 +- src/net/eathena/mercenaryhandler.h | 4 +- src/net/eathena/mercenaryrecv.cpp | 4 +- src/net/eathena/mercenaryrecv.h | 4 +- src/net/eathena/messagein.cpp | 4 +- src/net/eathena/messagein.h | 4 +- src/net/eathena/messageout.cpp | 4 +- src/net/eathena/messageout.h | 4 +- src/net/eathena/network.cpp | 4 +- src/net/eathena/network.h | 4 +- src/net/eathena/npchandler.cpp | 4 +- src/net/eathena/npchandler.h | 4 +- src/net/eathena/npcrecv.cpp | 4 +- src/net/eathena/npcrecv.h | 4 +- src/net/eathena/packetsin.inc | 4 +- src/net/eathena/packetsout.inc | 4 +- src/net/eathena/packetsout_shuffle_main.inc | 4 +- src/net/eathena/packetsout_shuffle_re.inc | 4 +- src/net/eathena/packetsout_shuffle_zero.inc | 4 +- src/net/eathena/partyhandler.cpp | 4 +- src/net/eathena/partyhandler.h | 4 +- src/net/eathena/partyrecv.cpp | 4 +- src/net/eathena/partyrecv.h | 4 +- src/net/eathena/pethandler.cpp | 4 +- src/net/eathena/pethandler.h | 4 +- src/net/eathena/petrecv.cpp | 4 +- src/net/eathena/petrecv.h | 4 +- src/net/eathena/playerhandler.cpp | 4 +- src/net/eathena/playerhandler.h | 4 +- src/net/eathena/playerrecv.cpp | 4 +- src/net/eathena/playerrecv.h | 4 +- src/net/eathena/protocolout.cpp | 4 +- src/net/eathena/protocolout.h | 4 +- src/net/eathena/questhandler.cpp | 4 +- src/net/eathena/questhandler.h | 4 +- src/net/eathena/questrecv.cpp | 6 +- src/net/eathena/questrecv.h | 4 +- src/net/eathena/recvpackets.inc | 4 +- src/net/eathena/refinehandler.cpp | 4 +- src/net/eathena/refinehandler.h | 4 +- src/net/eathena/refinerecv.cpp | 4 +- src/net/eathena/refinerecv.h | 4 +- src/net/eathena/roulettehandler.cpp | 4 +- src/net/eathena/roulettehandler.h | 4 +- src/net/eathena/rouletterecv.cpp | 4 +- src/net/eathena/rouletterecv.h | 4 +- src/net/eathena/searchstorehandler.cpp | 4 +- src/net/eathena/searchstorehandler.h | 4 +- src/net/eathena/searchstorerecv.cpp | 4 +- src/net/eathena/searchstorerecv.h | 4 +- src/net/eathena/serverfeatures.cpp | 4 +- src/net/eathena/serverfeatures.h | 4 +- src/net/eathena/skillhandler.cpp | 4 +- src/net/eathena/skillhandler.h | 4 +- src/net/eathena/skillrecv.cpp | 4 +- src/net/eathena/skillrecv.h | 4 +- src/net/eathena/sp.h | 4 +- src/net/eathena/sprite.h | 4 +- src/net/eathena/tradehandler.cpp | 4 +- src/net/eathena/tradehandler.h | 4 +- src/net/eathena/traderecv.cpp | 4 +- src/net/eathena/traderecv.h | 4 +- src/net/eathena/updateprotocol.cpp | 4 +- src/net/eathena/updateprotocol.h | 4 +- src/net/eathena/updateprotocol_main.cpp | 4 +- src/net/eathena/updateprotocol_main.h | 4 +- src/net/eathena/updateprotocol_re.cpp | 4 +- src/net/eathena/updateprotocol_re.h | 4 +- src/net/eathena/updateprotocol_zero.cpp | 4 +- src/net/eathena/updateprotocol_zero.h | 4 +- src/net/eathena/vendinghandler.cpp | 4 +- src/net/eathena/vendinghandler.h | 4 +- src/net/eathena/vendingrecv.cpp | 4 +- src/net/eathena/vendingrecv.h | 4 +- src/net/elementalhandler.h | 4 +- src/net/familyhandler.h | 4 +- src/net/friendshandler.h | 4 +- src/net/gamehandler.h | 4 +- src/net/generalhandler.h | 4 +- src/net/guildhandler.h | 4 +- src/net/homunculushandler.h | 4 +- src/net/hostsgroup.h | 4 +- src/net/inventoryhandler.h | 4 +- src/net/ipc.cpp | 4 +- src/net/ipc.h | 4 +- src/net/logindata.h | 4 +- src/net/loginhandler.h | 4 +- src/net/mail2handler.h | 4 +- src/net/mailhandler.h | 4 +- src/net/maphandler.h | 4 +- src/net/markethandler.h | 4 +- src/net/mercenaryhandler.h | 4 +- src/net/messagein.cpp | 4 +- src/net/messagein.h | 4 +- src/net/messageout.cpp | 4 +- src/net/messageout.h | 4 +- src/net/net.cpp | 4 +- src/net/net.h | 4 +- src/net/npchandler.h | 4 +- src/net/packetcounters.cpp | 4 +- src/net/packetcounters.h | 4 +- src/net/packetfunction.h | 4 +- src/net/packetinfo.h | 4 +- src/net/packetlimiter.cpp | 4 +- src/net/packetlimiter.h | 4 +- src/net/partyhandler.h | 4 +- src/net/pethandler.h | 4 +- src/net/playerhandler.h | 4 +- src/net/protocoloutdefine.h | 4 +- src/net/protocoloutinclude.h | 4 +- src/net/protocoloutupdate.h | 4 +- src/net/questhandler.h | 4 +- src/net/recvpacketdefine.h | 4 +- src/net/refinehandler.h | 4 +- src/net/roulettehandler.h | 4 +- src/net/sdltcpnet.cpp | 4 +- src/net/sdltcpnet.h | 4 +- src/net/searchstorehandler.h | 4 +- src/net/serverfeatures.h | 4 +- src/net/serverinfo.h | 4 +- src/net/serverurlinfo.h | 4 +- src/net/skillhandler.h | 4 +- src/net/tmwa/achievementhandler.cpp | 4 +- src/net/tmwa/achievementhandler.h | 4 +- src/net/tmwa/adminhandler.cpp | 4 +- src/net/tmwa/adminhandler.h | 4 +- src/net/tmwa/attendancehandler.cpp | 4 +- src/net/tmwa/attendancehandler.h | 4 +- src/net/tmwa/auctionhandler.cpp | 4 +- src/net/tmwa/auctionhandler.h | 4 +- src/net/tmwa/bankhandler.cpp | 4 +- src/net/tmwa/bankhandler.h | 4 +- src/net/tmwa/barterhandler.cpp | 4 +- src/net/tmwa/barterhandler.h | 4 +- src/net/tmwa/battlegroundhandler.cpp | 4 +- src/net/tmwa/battlegroundhandler.h | 4 +- src/net/tmwa/beinghandler.cpp | 4 +- src/net/tmwa/beinghandler.h | 4 +- src/net/tmwa/beingrecv.cpp | 4 +- src/net/tmwa/beingrecv.h | 4 +- src/net/tmwa/buyingstorehandler.cpp | 4 +- src/net/tmwa/buyingstorehandler.h | 4 +- src/net/tmwa/buysellhandler.cpp | 4 +- src/net/tmwa/buysellhandler.h | 4 +- src/net/tmwa/buysellrecv.cpp | 4 +- src/net/tmwa/buysellrecv.h | 4 +- src/net/tmwa/cashshophandler.cpp | 4 +- src/net/tmwa/cashshophandler.h | 4 +- src/net/tmwa/charserverhandler.cpp | 4 +- src/net/tmwa/charserverhandler.h | 4 +- src/net/tmwa/charserverrecv.cpp | 4 +- src/net/tmwa/charserverrecv.h | 4 +- src/net/tmwa/chathandler.cpp | 4 +- src/net/tmwa/chathandler.h | 4 +- src/net/tmwa/chatrecv.cpp | 4 +- src/net/tmwa/chatrecv.h | 4 +- src/net/tmwa/clanhandler.cpp | 4 +- src/net/tmwa/clanhandler.h | 4 +- src/net/tmwa/elementalhandler.cpp | 4 +- src/net/tmwa/elementalhandler.h | 4 +- src/net/tmwa/familyhandler.cpp | 4 +- src/net/tmwa/familyhandler.h | 4 +- src/net/tmwa/friendshandler.cpp | 4 +- src/net/tmwa/friendshandler.h | 4 +- src/net/tmwa/gamehandler.cpp | 4 +- src/net/tmwa/gamehandler.h | 4 +- src/net/tmwa/gamerecv.cpp | 4 +- src/net/tmwa/gamerecv.h | 4 +- src/net/tmwa/generalhandler.cpp | 4 +- src/net/tmwa/generalhandler.h | 4 +- src/net/tmwa/generalrecv.cpp | 4 +- src/net/tmwa/generalrecv.h | 4 +- src/net/tmwa/guildhandler.cpp | 4 +- src/net/tmwa/guildhandler.h | 4 +- src/net/tmwa/guildmanager.cpp | 4 +- src/net/tmwa/guildmanager.h | 4 +- src/net/tmwa/homunculushandler.cpp | 4 +- src/net/tmwa/homunculushandler.h | 4 +- src/net/tmwa/inventoryhandler.cpp | 4 +- src/net/tmwa/inventoryhandler.h | 4 +- src/net/tmwa/inventoryrecv.cpp | 4 +- src/net/tmwa/inventoryrecv.h | 4 +- src/net/tmwa/itemhandler.cpp | 4 +- src/net/tmwa/itemhandler.h | 4 +- src/net/tmwa/itemrecv.cpp | 4 +- src/net/tmwa/itemrecv.h | 4 +- src/net/tmwa/loginhandler.cpp | 4 +- src/net/tmwa/loginhandler.h | 4 +- src/net/tmwa/loginrecv.cpp | 4 +- src/net/tmwa/loginrecv.h | 4 +- src/net/tmwa/mail2handler.cpp | 4 +- src/net/tmwa/mail2handler.h | 4 +- src/net/tmwa/mailhandler.cpp | 4 +- src/net/tmwa/mailhandler.h | 4 +- src/net/tmwa/maphandler.cpp | 4 +- src/net/tmwa/maphandler.h | 4 +- src/net/tmwa/markethandler.cpp | 4 +- src/net/tmwa/markethandler.h | 4 +- src/net/tmwa/mercenaryhandler.cpp | 4 +- src/net/tmwa/mercenaryhandler.h | 4 +- src/net/tmwa/messagein.cpp | 4 +- src/net/tmwa/messagein.h | 4 +- src/net/tmwa/messageout.cpp | 4 +- src/net/tmwa/messageout.h | 4 +- src/net/tmwa/network.cpp | 4 +- src/net/tmwa/network.h | 4 +- src/net/tmwa/npchandler.cpp | 4 +- src/net/tmwa/npchandler.h | 4 +- src/net/tmwa/packetsin.inc | 4 +- src/net/tmwa/packetsout.inc | 4 +- src/net/tmwa/partyhandler.cpp | 4 +- src/net/tmwa/partyhandler.h | 4 +- src/net/tmwa/partyrecv.cpp | 4 +- src/net/tmwa/partyrecv.h | 4 +- src/net/tmwa/pethandler.cpp | 4 +- src/net/tmwa/pethandler.h | 4 +- src/net/tmwa/playerhandler.cpp | 4 +- src/net/tmwa/playerhandler.h | 4 +- src/net/tmwa/playerrecv.cpp | 4 +- src/net/tmwa/playerrecv.h | 4 +- src/net/tmwa/protocolout.cpp | 4 +- src/net/tmwa/protocolout.h | 4 +- src/net/tmwa/questhandler.cpp | 4 +- src/net/tmwa/questhandler.h | 4 +- src/net/tmwa/questrecv.cpp | 4 +- src/net/tmwa/questrecv.h | 4 +- src/net/tmwa/recvpackets.inc | 4 +- src/net/tmwa/refinehandler.cpp | 4 +- src/net/tmwa/refinehandler.h | 4 +- src/net/tmwa/roulettehandler.cpp | 4 +- src/net/tmwa/roulettehandler.h | 4 +- src/net/tmwa/searchstorehandler.cpp | 4 +- src/net/tmwa/searchstorehandler.h | 4 +- src/net/tmwa/serverfeatures.cpp | 4 +- src/net/tmwa/serverfeatures.h | 4 +- src/net/tmwa/skillhandler.cpp | 4 +- src/net/tmwa/skillhandler.h | 4 +- src/net/tmwa/skillrecv.cpp | 4 +- src/net/tmwa/skillrecv.h | 4 +- src/net/tmwa/sp.h | 4 +- src/net/tmwa/sprite.h | 4 +- src/net/tmwa/tradehandler.cpp | 4 +- src/net/tmwa/tradehandler.h | 4 +- src/net/tmwa/traderecv.cpp | 4 +- src/net/tmwa/traderecv.h | 4 +- src/net/tmwa/updateprotocol.cpp | 4 +- src/net/tmwa/updateprotocol.h | 4 +- src/net/tmwa/vendinghandler.cpp | 4 +- src/net/tmwa/vendinghandler.h | 4 +- src/net/tradehandler.h | 4 +- src/net/updatetypeoperators.cpp | 4 +- src/net/updatetypeoperators.h | 4 +- src/net/uploadcharinfo.h | 4 +- src/net/useragent.cpp | 4 +- src/net/useragent.h | 4 +- src/net/vendinghandler.h | 4 +- src/net/worldinfo.h | 4 +- src/notifymanager.cpp | 4 +- src/notifymanager.h | 4 +- src/options.h | 4 +- src/particle/animationparticle.cpp | 4 +- src/particle/animationparticle.h | 4 +- src/particle/imageparticle.cpp | 4 +- src/particle/imageparticle.h | 4 +- src/particle/particle.cpp | 4 +- src/particle/particle.h | 4 +- src/particle/particlecontainer.cpp | 4 +- src/particle/particlecontainer.h | 4 +- src/particle/particleemitter.cpp | 4 +- src/particle/particleemitter.h | 4 +- src/particle/particleemitterprop.h | 4 +- src/particle/particleengine.cpp | 4 +- src/particle/particleengine.h | 4 +- src/particle/particleinfo.h | 4 +- src/particle/particlelist.cpp | 4 +- src/particle/particlelist.h | 4 +- src/particle/particletimer.h | 4 +- src/particle/particlevector.cpp | 4 +- src/particle/particlevector.h | 4 +- src/particle/rotationalparticle.cpp | 4 +- src/particle/rotationalparticle.h | 4 +- src/particle/textparticle.cpp | 4 +- src/particle/textparticle.h | 4 +- src/party.cpp | 4 +- src/party.h | 4 +- src/pincodemanager.cpp | 4 +- src/pincodemanager.h | 4 +- src/position.cpp | 4 +- src/position.h | 4 +- src/progs/dyecmd/actions/actions.cpp | 4 +- src/progs/dyecmd/actions/chat.cpp | 4 +- src/progs/dyecmd/actions/commands.cpp | 4 +- src/progs/dyecmd/actions/move.cpp | 4 +- src/progs/dyecmd/actions/pets.cpp | 4 +- src/progs/dyecmd/actions/statusbar.cpp | 4 +- src/progs/dyecmd/actions/tabs.cpp | 4 +- src/progs/dyecmd/actions/target.cpp | 4 +- src/progs/dyecmd/actions/windows.cpp | 4 +- src/progs/dyecmd/client.cpp | 6 +- src/progs/dyecmd/client.h | 4 +- src/progs/dyecmd/dyemain.cpp | 4 +- src/progs/dyecmd/gui/viewport.cpp | 4 +- src/progs/dyecmd/gui/viewport.h | 4 +- src/progs/manaplus/actions/actions.cpp | 4 +- src/progs/manaplus/actions/chat.cpp | 4 +- src/progs/manaplus/actions/commands.cpp | 4 +- src/progs/manaplus/actions/move.cpp | 4 +- src/progs/manaplus/actions/pets.cpp | 4 +- src/progs/manaplus/actions/statusbar.cpp | 4 +- src/progs/manaplus/actions/tabs.cpp | 4 +- src/progs/manaplus/actions/target.cpp | 4 +- src/progs/manaplus/actions/windows.cpp | 4 +- src/progs/manaplus/client.cpp | 6 +- src/progs/manaplus/client.h | 4 +- src/progs/manaplus/gui/viewport.cpp | 4 +- src/progs/manaplus/gui/viewport.h | 4 +- src/render/graphics.cpp | 4 +- src/render/graphics.h | 4 +- src/render/graphics_calcImageRect.hpp | 4 +- src/render/graphics_drawImageRect.hpp | 4 +- src/render/graphicsdef.hpp | 4 +- src/render/imagegraphics.cpp | 4 +- src/render/imagegraphics.h | 4 +- src/render/mobileopengl2graphics.cpp | 6 +- src/render/mobileopengl2graphics.h | 4 +- src/render/mobileopenglgraphics.cpp | 4 +- src/render/mobileopenglgraphics.h | 4 +- src/render/modernopenglgraphics.cpp | 6 +- src/render/modernopenglgraphics.h | 4 +- src/render/nacl/naclfunctions.h | 4 +- src/render/nacl/naclgles.cpp | 4 +- src/render/nacl/naclgles.h | 4 +- src/render/normalopenglgraphics.cpp | 4 +- src/render/normalopenglgraphics.h | 4 +- src/render/nullopenglgraphics.cpp | 4 +- src/render/nullopenglgraphics.h | 4 +- src/render/opengl/mgl.cpp | 4 +- src/render/opengl/mgl.h | 4 +- src/render/opengl/mgl.hpp | 4 +- src/render/opengl/mglcheck.h | 4 +- src/render/opengl/mgldefines.h | 4 +- src/render/opengl/mglemu.cpp | 4 +- src/render/opengl/mglemu.h | 4 +- src/render/opengl/mglfunctions.h | 4 +- src/render/opengl/mgltypes.h | 4 +- src/render/opengl/naclglfunctions.h | 4 +- src/render/opengl/opengldebug.h | 4 +- src/render/openglgraphicsdef.hpp | 4 +- src/render/openglgraphicsdef1.hpp | 4 +- src/render/openglgraphicsdefadvanced.hpp | 4 +- src/render/openglx/mglx.cpp | 4 +- src/render/openglx/mglx.h | 4 +- src/render/openglx/mglx.hpp | 4 +- src/render/openglx/mglxinit.cpp | 4 +- src/render/openglx/mglxinit.h | 4 +- src/render/openglx/mglxtypes.h | 4 +- src/render/renderers.cpp | 4 +- src/render/renderers.h | 4 +- src/render/rendererslistsdl.h | 4 +- src/render/rendererslistsdl2.h | 4 +- src/render/safeopenglgraphics.cpp | 4 +- src/render/safeopenglgraphics.h | 4 +- src/render/sdl2graphics.cpp | 4 +- src/render/sdl2graphics.h | 4 +- src/render/sdl2softwaregraphics.cpp | 4 +- src/render/sdl2softwaregraphics.h | 4 +- src/render/sdlgraphics.cpp | 4 +- src/render/sdlgraphics.h | 4 +- src/render/shaders/shader.cpp | 4 +- src/render/shaders/shader.h | 4 +- src/render/shaders/shaderprogram.cpp | 4 +- src/render/shaders/shaderprogram.h | 4 +- src/render/shaders/shadersmanager.cpp | 4 +- src/render/shaders/shadersmanager.h | 4 +- src/render/softwaregraphicsdef.hpp | 4 +- src/render/surfacegraphics.cpp | 4 +- src/render/surfacegraphics.h | 4 +- src/render/vertexes/imagecollection.cpp | 4 +- src/render/vertexes/imagecollection.h | 4 +- src/render/vertexes/imagevertexes.cpp | 4 +- src/render/vertexes/imagevertexes.h | 4 +- src/render/vertexes/openglgraphicsvertexes.cpp | 4 +- src/render/vertexes/openglgraphicsvertexes.h | 4 +- src/resources/action.cpp | 4 +- src/resources/action.h | 4 +- src/resources/ambientlayer.cpp | 4 +- src/resources/ambientlayer.h | 4 +- src/resources/animation/animation.cpp | 4 +- src/resources/animation/animation.h | 4 +- src/resources/animation/simpleanimation.cpp | 4 +- src/resources/animation/simpleanimation.h | 4 +- src/resources/atlas/atlasitem.h | 4 +- src/resources/atlas/atlasmanager.cpp | 4 +- src/resources/atlas/atlasmanager.h | 4 +- src/resources/atlas/atlasresource.cpp | 4 +- src/resources/atlas/atlasresource.h | 4 +- src/resources/atlas/textureatlas.h | 4 +- src/resources/attack.h | 4 +- src/resources/basicstat.h | 4 +- src/resources/beingcommon.cpp | 4 +- src/resources/beingcommon.h | 4 +- src/resources/beinginfo.cpp | 4 +- src/resources/beinginfo.h | 4 +- src/resources/beingmenuitem.h | 4 +- src/resources/beingslot.cpp | 4 +- src/resources/beingslot.h | 4 +- src/resources/chatobject.cpp | 4 +- src/resources/chatobject.h | 4 +- src/resources/claninfo.h | 4 +- src/resources/cursors.cpp | 4 +- src/resources/cursors.h | 4 +- src/resources/db/avatardb.cpp | 4 +- src/resources/db/avatardb.h | 4 +- src/resources/db/badgesdb.cpp | 4 +- src/resources/db/badgesdb.h | 4 +- src/resources/db/chardb.cpp | 4 +- src/resources/db/chardb.h | 4 +- src/resources/db/clandb.cpp | 4 +- src/resources/db/clandb.h | 4 +- src/resources/db/colordb.cpp | 4 +- src/resources/db/colordb.h | 4 +- src/resources/db/commandsdb.cpp | 4 +- src/resources/db/commandsdb.h | 4 +- src/resources/db/deaddb.cpp | 4 +- src/resources/db/deaddb.h | 4 +- src/resources/db/elementaldb.cpp | 4 +- src/resources/db/elementaldb.h | 4 +- src/resources/db/emotedb.cpp | 4 +- src/resources/db/emotedb.h | 4 +- src/resources/db/groupdb.cpp | 4 +- src/resources/db/groupdb.h | 4 +- src/resources/db/homunculusdb.cpp | 4 +- src/resources/db/homunculusdb.h | 4 +- src/resources/db/horsedb.cpp | 4 +- src/resources/db/horsedb.h | 4 +- src/resources/db/itemdb.cpp | 4 +- src/resources/db/itemdb.h | 4 +- src/resources/db/itemfielddb.cpp | 4 +- src/resources/db/itemfielddb.h | 4 +- src/resources/db/itemoptiondb.cpp | 4 +- src/resources/db/itemoptiondb.h | 4 +- src/resources/db/languagedb.cpp | 4 +- src/resources/db/languagedb.h | 4 +- src/resources/db/mapdb.cpp | 4 +- src/resources/db/mapdb.h | 4 +- src/resources/db/mercenarydb.cpp | 4 +- src/resources/db/mercenarydb.h | 4 +- src/resources/db/moddb.cpp | 4 +- src/resources/db/moddb.h | 4 +- src/resources/db/monsterdb.cpp | 4 +- src/resources/db/monsterdb.h | 4 +- src/resources/db/networkdb.cpp | 4 +- src/resources/db/networkdb.h | 4 +- src/resources/db/npcdb.cpp | 4 +- src/resources/db/npcdb.h | 4 +- src/resources/db/npcdialogdb.cpp | 4 +- src/resources/db/npcdialogdb.h | 4 +- src/resources/db/palettedb.cpp | 4 +- src/resources/db/palettedb.h | 4 +- src/resources/db/petdb.cpp | 4 +- src/resources/db/petdb.h | 4 +- src/resources/db/questdb.cpp | 4 +- src/resources/db/questdb.h | 4 +- src/resources/db/skillunitdb.cpp | 4 +- src/resources/db/skillunitdb.h | 4 +- src/resources/db/sounddb.cpp | 4 +- src/resources/db/sounddb.h | 4 +- src/resources/db/statdb.cpp | 4 +- src/resources/db/statdb.h | 4 +- src/resources/db/statuseffectdb.cpp | 4 +- src/resources/db/statuseffectdb.h | 4 +- src/resources/db/textdb.cpp | 4 +- src/resources/db/textdb.h | 4 +- src/resources/db/unitsdb.cpp | 4 +- src/resources/db/unitsdb.h | 4 +- src/resources/db/weaponsdb.cpp | 4 +- src/resources/db/weaponsdb.h | 4 +- src/resources/dbmanager.cpp | 4 +- src/resources/dbmanager.h | 4 +- src/resources/delayedmanager.cpp | 4 +- src/resources/delayedmanager.h | 4 +- src/resources/dye/dye.cpp | 4 +- src/resources/dye/dye.h | 4 +- src/resources/dye/dyecolor.h | 4 +- src/resources/dye/dyepalette.cpp | 4 +- src/resources/dye/dyepalette.h | 4 +- src/resources/dye/dyepalette_replaceacolor.cpp | 4 +- src/resources/dye/dyepalette_replaceaoglcolor.cpp | 4 +- src/resources/dye/dyepalette_replacescolor.cpp | 4 +- src/resources/dye/dyepalette_replacesoglcolor.cpp | 4 +- src/resources/dye/dyepaletteptr.h | 4 +- src/resources/effectdescription.h | 4 +- src/resources/emoteinfo.h | 4 +- src/resources/emotesprite.h | 4 +- src/resources/equipmentslots.h | 4 +- src/resources/fboinfo.h | 4 +- src/resources/frame.h | 4 +- src/resources/groupinfo.cpp | 4 +- src/resources/groupinfo.h | 4 +- src/resources/horseinfo.h | 4 +- src/resources/horseoffset.h | 4 +- src/resources/image/image.cpp | 4 +- src/resources/image/image.h | 4 +- src/resources/image/subimage.cpp | 4 +- src/resources/image/subimage.h | 4 +- src/resources/imagehelper.cpp | 4 +- src/resources/imagehelper.h | 4 +- src/resources/imagerect.h | 4 +- src/resources/imageset.cpp | 4 +- src/resources/imageset.h | 4 +- src/resources/inventory/complexinventory.cpp | 4 +- src/resources/inventory/complexinventory.h | 4 +- src/resources/inventory/inventory.cpp | 4 +- src/resources/inventory/inventory.h | 4 +- src/resources/item/cardslist.cpp | 4 +- src/resources/item/cardslist.h | 4 +- src/resources/item/complexitem.cpp | 4 +- src/resources/item/complexitem.h | 4 +- src/resources/item/item.cpp | 4 +- src/resources/item/item.h | 4 +- src/resources/item/itemfieldtype.h | 4 +- src/resources/item/itemoption.h | 4 +- src/resources/item/itemoptionslist.h | 4 +- src/resources/item/shopitem.cpp | 4 +- src/resources/item/shopitem.h | 4 +- src/resources/itemcolordata.h | 4 +- src/resources/itemfieldinfos.h | 4 +- src/resources/iteminfo.cpp | 4 +- src/resources/iteminfo.h | 4 +- src/resources/itemmenuitem.h | 4 +- src/resources/itemtypemap.h | 4 +- src/resources/itemtypemapdata.h | 4 +- src/resources/loaders/atlasloader.cpp | 4 +- src/resources/loaders/atlasloader.h | 4 +- src/resources/loaders/emptyatlasloader.cpp | 4 +- src/resources/loaders/emptyatlasloader.h | 4 +- src/resources/loaders/imageloader.cpp | 4 +- src/resources/loaders/imageloader.h | 4 +- src/resources/loaders/imagesetloader.cpp | 4 +- src/resources/loaders/imagesetloader.h | 4 +- src/resources/loaders/musicloader.cpp | 4 +- src/resources/loaders/musicloader.h | 4 +- src/resources/loaders/rescaledloader.cpp | 4 +- src/resources/loaders/rescaledloader.h | 4 +- src/resources/loaders/shaderloader.cpp | 4 +- src/resources/loaders/shaderloader.h | 4 +- src/resources/loaders/shaderprogramloader.cpp | 4 +- src/resources/loaders/shaderprogramloader.h | 4 +- src/resources/loaders/soundloader.cpp | 4 +- src/resources/loaders/soundloader.h | 4 +- src/resources/loaders/spritedefloader.cpp | 4 +- src/resources/loaders/spritedefloader.h | 4 +- src/resources/loaders/subimageloader.cpp | 4 +- src/resources/loaders/subimageloader.h | 4 +- src/resources/loaders/subimagesetloader.cpp | 4 +- src/resources/loaders/subimagesetloader.h | 4 +- src/resources/loaders/walklayerloader.cpp | 4 +- src/resources/loaders/walklayerloader.h | 4 +- src/resources/loaders/xmlloader.cpp | 4 +- src/resources/loaders/xmlloader.h | 4 +- src/resources/mailqueue.h | 4 +- src/resources/map/location.h | 4 +- src/resources/map/map.cpp | 4 +- src/resources/map/map.h | 4 +- src/resources/map/mapheights.cpp | 4 +- src/resources/map/mapheights.h | 4 +- src/resources/map/mapitem.cpp | 4 +- src/resources/map/mapitem.h | 4 +- src/resources/map/maplayer.cpp | 4 +- src/resources/map/maplayer.h | 4 +- src/resources/map/mapobject.h | 4 +- src/resources/map/mapobjectlist.h | 4 +- src/resources/map/maprowvertexes.h | 4 +- src/resources/map/metatile.h | 4 +- src/resources/map/objectslayer.cpp | 4 +- src/resources/map/objectslayer.h | 4 +- src/resources/map/properties.h | 4 +- src/resources/map/speciallayer.cpp | 4 +- src/resources/map/speciallayer.h | 4 +- src/resources/map/tileanimation.cpp | 4 +- src/resources/map/tileanimation.h | 4 +- src/resources/map/tileinfo.h | 4 +- src/resources/map/tileset.h | 4 +- src/resources/map/walklayer.cpp | 4 +- src/resources/map/walklayer.h | 4 +- src/resources/mapinfo.h | 4 +- src/resources/mapreader.cpp | 6 +- src/resources/mapreader.h | 4 +- src/resources/memorycounter.cpp | 4 +- src/resources/memorycounter.h | 4 +- src/resources/memorymanager.cpp | 4 +- src/resources/memorymanager.h | 4 +- src/resources/missileinfo.h | 4 +- src/resources/mobileopenglscreenshothelper.cpp | 4 +- src/resources/mobileopenglscreenshothelper.h | 4 +- src/resources/modinfo.cpp | 4 +- src/resources/modinfo.h | 4 +- src/resources/mstack.h | 4 +- src/resources/notificationinfo.h | 4 +- src/resources/notifications.h | 4 +- src/resources/npcbuttoninfo.h | 4 +- src/resources/npcdialoginfo.h | 4 +- src/resources/npcdialogmenuinfo.h | 4 +- src/resources/npcimageinfo.h | 4 +- src/resources/npcinventoryinfo.h | 4 +- src/resources/npctextinfo.h | 4 +- src/resources/openglimagehelper.cpp | 4 +- src/resources/openglimagehelper.h | 4 +- src/resources/openglscreenshothelper.cpp | 4 +- src/resources/openglscreenshothelper.h | 4 +- src/resources/questeffect.h | 4 +- src/resources/questitem.h | 4 +- src/resources/questitemtext.h | 4 +- src/resources/questvar.h | 4 +- src/resources/rect/doublerect.h | 4 +- src/resources/resource.cpp | 4 +- src/resources/resource.h | 4 +- src/resources/resourcefunctiontypes.h | 4 +- src/resources/resourcemanager/resourcemanager.cpp | 4 +- src/resources/resourcemanager/resourcemanager.h | 4 +- src/resources/resourcetypes.h | 4 +- src/resources/safeopenglimagehelper.cpp | 4 +- src/resources/safeopenglimagehelper.h | 4 +- src/resources/screenshothelper.h | 4 +- src/resources/sdl2imagehelper.cpp | 4 +- src/resources/sdl2imagehelper.h | 4 +- src/resources/sdl2softwareimagehelper.cpp | 4 +- src/resources/sdl2softwareimagehelper.h | 4 +- src/resources/sdl2softwarescreenshothelper.cpp | 4 +- src/resources/sdl2softwarescreenshothelper.h | 4 +- src/resources/sdlgfxblitfunc.cpp | 4 +- src/resources/sdlgfxblitfunc.h | 4 +- src/resources/sdlimagehelper.cpp | 4 +- src/resources/sdlimagehelper.h | 4 +- src/resources/sdlmusic.cpp | 4 +- src/resources/sdlmusic.h | 4 +- src/resources/sdlscreenshothelper.cpp | 4 +- src/resources/sdlscreenshothelper.h | 4 +- src/resources/servercommands.inc | 4 +- src/resources/serverpermissions.inc | 4 +- src/resources/skill/skilldata.cpp | 4 +- src/resources/skill/skilldata.h | 4 +- src/resources/skill/skillinfo.cpp | 4 +- src/resources/skill/skillinfo.h | 4 +- src/resources/skill/skilltypeentry.h | 4 +- src/resources/skill/skilltypelist.h | 4 +- src/resources/soundeffect.cpp | 4 +- src/resources/soundeffect.h | 4 +- src/resources/soundinfo.h | 4 +- src/resources/sprite/animatedsprite.cpp | 4 +- src/resources/sprite/animatedsprite.h | 4 +- src/resources/sprite/animationdelayload.cpp | 4 +- src/resources/sprite/animationdelayload.h | 4 +- src/resources/sprite/imagesprite.cpp | 4 +- src/resources/sprite/imagesprite.h | 4 +- src/resources/sprite/sprite.h | 4 +- src/resources/sprite/spritedef.cpp | 4 +- src/resources/sprite/spritedef.h | 4 +- src/resources/sprite/spritedisplay.h | 4 +- src/resources/sprite/spritereference.h | 4 +- src/resources/surfaceimagehelper.cpp | 4 +- src/resources/surfaceimagehelper.h | 4 +- src/resources/updatefile.h | 4 +- src/resources/vector.cpp | 4 +- src/resources/vector.h | 4 +- src/resources/wallpaper.cpp | 4 +- src/resources/wallpaper.h | 4 +- src/resources/wallpaperdata.h | 4 +- src/sdl2gfx/SDL2_framerate.cpp | 2 +- src/sdl2gfx/SDL2_framerate.h | 2 +- src/sdl2gfx/SDL2_rotozoom.cpp | 2 +- src/sdl2gfx/SDL2_rotozoom.h | 2 +- src/sdlshared.h | 4 +- src/settings.cpp | 4 +- src/settings.h | 4 +- src/soundmanager.cpp | 4 +- src/soundmanager.h | 4 +- src/spellmanager.cpp | 4 +- src/spellmanager.h | 4 +- src/statuseffect.cpp | 4 +- src/statuseffect.h | 4 +- src/test/testlauncher.cpp | 4 +- src/test/testlauncher.h | 4 +- src/test/testmain.cpp | 6 +- src/test/testmain.h | 4 +- src/text.cpp | 4 +- src/text.h | 4 +- src/textcommand.cpp | 4 +- src/textcommand.h | 4 +- src/textmanager.cpp | 4 +- src/textmanager.h | 4 +- src/unittests/configuration.cc | 4 +- src/unittests/endian.cc | 4 +- src/unittests/enums/enums.cc | 4 +- src/unittests/enums/render/mockdrawtype.h | 4 +- src/unittests/fs/files.cc | 4 +- src/unittests/fs/virtfs/throw.cc | 4 +- src/unittests/fs/virtfs/virtfs.cc | 4 +- src/unittests/fs/virtfs/virtfs1_basic.cc | 4 +- src/unittests/fs/virtfs/virtfs1_enumerate.cc | 4 +- src/unittests/fs/virtfs/virtfs1_exists.cc | 4 +- src/unittests/fs/virtfs/virtfs1_getrealdir.cc | 4 +- src/unittests/fs/virtfs/virtfs1_mountdir1.cc | 4 +- src/unittests/fs/virtfs/virtfs1_mountdir2.cc | 4 +- src/unittests/fs/virtfs/virtfs1_mountzip1.cc | 4 +- src/unittests/fs/virtfs/virtfs1_mountzip2.cc | 4 +- src/unittests/fs/virtfs/virtfs1_unmount.cc | 4 +- src/unittests/fs/virtfs/virtfs2.cc | 4 +- src/unittests/fs/virtfs/zip.cc | 4 +- src/unittests/gui/fonts/textchunklist.cc | 4 +- src/unittests/gui/widgets/browserbox.cc | 4 +- src/unittests/gui/widgets/staticbrowserbox.cc | 4 +- src/unittests/gui/windowmanager.cc | 4 +- src/unittests/integrity.cc | 4 +- src/unittests/render/mockdrawitem.h | 4 +- src/unittests/render/mockgraphics.cc | 4 +- src/unittests/render/mockgraphics.h | 4 +- src/unittests/resources/dye/dye.cc | 4 +- src/unittests/resources/dye/dyepalette.cc | 4 +- src/unittests/resources/map/maplayer/draw.cc | 4 +- .../resources/map/maplayer/drawfringenormal.cc | 4 +- .../resources/map/maplayer/drawfringesimple.cc | 4 +- .../resources/map/maplayer/drawspeciallayer1.cc | 4 +- .../resources/map/maplayer/drawspeciallayer2.cc | 4 +- .../map/maplayer/getemptytiledrawwidth.cc | 4 +- .../resources/map/maplayer/gettiledrawwidth.cc | 4 +- .../resources/map/maplayer/updatecache.cc | 4 +- .../resources/map/maplayer/updateconditiontiles.cc | 4 +- src/unittests/resources/map/speciallayer.cc | 4 +- src/unittests/resources/mstack.cc | 4 +- .../resources/resourcemanager/resourcemanager.cc | 4 +- src/unittests/resources/sdlimagehelper.cc | 4 +- src/unittests/resources/sprite/animatedsprite.cc | 4 +- src/unittests/sdl.cc | 4 +- src/unittests/unittests.h | 4 +- src/unittests/utils/chatutils.cc | 4 +- src/unittests/utils/checkutils.cc | 4 +- src/unittests/utils/dumplibs.cc | 4 +- src/unittests/utils/itemxmlutils.cc | 4 +- src/unittests/utils/langs.cc | 4 +- src/unittests/utils/mathutils.cc | 4 +- src/unittests/utils/parameters.cc | 4 +- src/unittests/utils/stringutils.cc | 4 +- src/unittests/utils/timer.cc | 4 +- src/unittests/utils/translation/poparser.cc | 4 +- src/unittests/utils/xml.cc | 4 +- src/unittests/utils/xmlutils.cc | 4 +- src/utils/booleanoptions.h | 4 +- src/utils/browserboxtools.cpp | 4 +- src/utils/browserboxtools.h | 4 +- src/utils/buildhex.h | 4 +- src/utils/cast.h | 4 +- src/utils/chatutils.cpp | 4 +- src/utils/chatutils.h | 4 +- src/utils/checkutils.cpp | 4 +- src/utils/checkutils.h | 4 +- src/utils/copynpaste.cpp | 4 +- src/utils/copynpaste.h | 4 +- src/utils/cpu.cpp | 4 +- src/utils/cpu.h | 4 +- src/utils/delete2.h | 4 +- src/utils/dtor.h | 4 +- src/utils/dumplibs.cpp | 4 +- src/utils/dumplibs.h | 4 +- src/utils/dumpsizes.cpp | 4 +- src/utils/dumpsizes.h | 4 +- src/utils/env.cpp | 4 +- src/utils/env.h | 4 +- src/utils/foreach.h | 4 +- src/utils/fuzzer.cpp | 4 +- src/utils/fuzzer.h | 4 +- src/utils/gettext.h | 4 +- src/utils/gettexthelper.cpp | 12 +- src/utils/gettexthelper.h | 4 +- src/utils/glxhelper.cpp | 4 +- src/utils/glxhelper.h | 4 +- src/utils/gmfunctions.cpp | 4 +- src/utils/gmfunctions.h | 4 +- src/utils/intmap.h | 4 +- src/utils/itemxmlutils.cpp | 4 +- src/utils/itemxmlutils.h | 4 +- src/utils/langs.cpp | 4 +- src/utils/langs.h | 4 +- src/utils/likely.h | 4 +- src/utils/mathutils.h | 4 +- src/utils/mrand.cpp | 4 +- src/utils/mrand.h | 4 +- src/utils/mutex.h | 4 +- src/utils/naclmessages.cpp | 4 +- src/utils/naclmessages.h | 4 +- src/utils/parameters.cpp | 4 +- src/utils/parameters.h | 4 +- src/utils/perfomance.cpp | 4 +- src/utils/perfomance.h | 4 +- src/utils/perfstat.cpp | 4 +- src/utils/perfstat.h | 4 +- src/utils/pnglib.cpp | 4 +- src/utils/pnglib.h | 4 +- src/utils/process.cpp | 4 +- src/utils/process.h | 4 +- src/utils/sdl2helper.cpp | 4 +- src/utils/sdl2helper.h | 4 +- src/utils/sdl2logger.cpp | 4 +- src/utils/sdl2logger.h | 4 +- src/utils/sdl2musichelper.cpp | 4 +- src/utils/sdl2musichelper.h | 4 +- src/utils/sdlcheckutils.cpp | 4 +- src/utils/sdlcheckutils.h | 4 +- src/utils/sdlhelper.cpp | 4 +- src/utils/sdlhelper.h | 4 +- src/utils/sdlmemoryobject.h | 4 +- src/utils/sdlmusichelper.cpp | 4 +- src/utils/sdlmusichelper.h | 4 +- src/utils/sdlpixel.h | 4 +- src/utils/sdlsharedhelper.cpp | 4 +- src/utils/sdlsharedhelper.h | 4 +- src/utils/stdmove.h | 4 +- src/utils/stringmap.h | 4 +- src/utils/stringutils.cpp | 4 +- src/utils/stringutils.h | 4 +- src/utils/stringvector.h | 4 +- src/utils/timer.cpp | 4 +- src/utils/timer.h | 4 +- src/utils/translation/podict.cpp | 4 +- src/utils/translation/podict.h | 4 +- src/utils/translation/poparser.cpp | 4 +- src/utils/translation/poparser.h | 4 +- src/utils/translation/translationmanager.cpp | 4 +- src/utils/translation/translationmanager.h | 4 +- src/utils/vector.h | 4 +- src/utils/x11logger.cpp | 4 +- src/utils/x11logger.h | 4 +- src/utils/xml.h | 4 +- src/utils/xml.inc | 4 +- src/utils/xml/libxml.cpp | 4 +- src/utils/xml/libxml.h | 4 +- src/utils/xml/libxml.inc | 4 +- src/utils/xml/pugixml.cpp | 4 +- src/utils/xml/pugixml.h | 4 +- src/utils/xml/pugixml.inc | 4 +- src/utils/xml/pugixmlwriter.cpp | 4 +- src/utils/xml/pugixmlwriter.h | 4 +- src/utils/xml/tinyxml2.cpp | 4 +- src/utils/xml/tinyxml2.h | 4 +- src/utils/xml/tinyxml2.inc | 4 +- src/utils/xmlutils.cpp | 4 +- src/utils/xmlutils.h | 4 +- src/utils/xmlwriter.h | 4 +- src/variabledata.h | 4 +- src/winver.h | 4 +- src/winver.h.in | 4 +- tools/ci/branches/.gitlab-ci_header.yml | 2 +- tools/ci/branches/ci_clang6/.gitlab-ci.yml | 8 +- tools/ci/branches/ci_clang7/.gitlab-ci.yml | 8 +- tools/ci/branches/ci_fedora/.gitlab-ci.yml | 8 +- tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml | 48 +++---- tools/ci/branches/ci_gcc49/.gitlab-ci.yml | 4 +- tools/ci/branches/ci_gcc5/.gitlab-ci.yml | 18 +-- tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml | 28 ++-- tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml | 42 +++--- tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml | 48 +++---- tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml | 48 +++---- tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml | 6 +- tools/ci/branches/ci_malloc/.gitlab-ci.yml | 16 +-- tools/ci/branches/ci_mse/.gitlab-ci.yml | 2 +- tools/ci/branches/ci_mxe/.gitlab-ci.yml | 4 +- tools/ci/branches/ci_site/.gitlab-ci.yml | 18 +-- tools/ci/branches/ci_xmllibs/.gitlab-ci.yml | 4 +- tools/ci/branches/master/.gitlab-ci.yml | 16 +-- tools/ci/jobs/gitstatsh.sh | 2 +- tools/ci/jobs/windowstest.cmd | 4 +- tools/ci/scripts/azure/mxetest.sh | 2 +- tools/ci/scripts/circleci/gcc6_sanitize_tests.sh | 4 +- tools/ci/scripts/circleci/gcc6_tests.sh | 8 +- tools/ci/scripts/circleci/gcc7_sanitize_tests.sh | 4 +- tools/ci/scripts/circleci/gcc7_tests.sh | 8 +- tools/ci/scripts/clonesrc.sh | 4 +- tools/ci/scripts/init.sh | 2 +- tools/ci/scripts/runtest.sh | 16 +-- tools/doxygen/doxygen.conf | 2 +- tools/update-copyright.sh | 2 +- 2128 files changed, 5137 insertions(+), 5137 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8e5a85288..5687c4e6b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -53,7 +53,7 @@ task: build_tests_script: - make clean - - ./tools/ci/jobs/any_compiler_tests.sh --without-dyecmd --without-manaplusgame --with-libintl-prefix=${LOCALBASE} + - ./tools/ci/jobs/any_compiler_tests.sh --without-dyecmd --without-manaversegame --with-libintl-prefix=${LOCALBASE} always: config_tests_artifacts: @@ -123,7 +123,7 @@ task: build_tests_script: - make clean - - ./tools/ci/jobs/any_compiler_tests.sh --without-dyecmd --without-manaplusgame --with-libintl-prefix=${LOCALBASE} --with-sdl2 + - ./tools/ci/jobs/any_compiler_tests.sh --without-dyecmd --without-manaversegame --with-libintl-prefix=${LOCALBASE} --with-sdl2 always: config_tests_artifacts: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0218daf7..144a4af4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -278,7 +278,7 @@ gcc-10_dyecmd_only: stage: prebuild script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10.sh --without-manaplusgame + - ./tools/ci/jobs/gcc10.sh --without-manaversegame - ./tools/ci/scripts/rundyecmd.sh <<: *job-push variables: @@ -291,7 +291,7 @@ gcc-8_unittestsbin: stage: prebuild script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaversegame --without-dyecmd image: debian:buster <<: *job-push variables: @@ -364,7 +364,7 @@ gcov_gcc6: script: - mkdir -p coverage/ - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaversegame variables: PACKAGES: gcc-6 g++-6 make autoconf automake autopoint gettext @@ -432,7 +432,7 @@ triggers: - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd - export LD_PRELOAD - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests - ldd ./src/manaplustests | grep "libasan" @@ -458,7 +458,7 @@ triggers: script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4 - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd - export LD_PRELOAD - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests - ldd ./src/manaplustests | grep "libasan" @@ -485,7 +485,7 @@ triggers: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -507,7 +507,7 @@ triggers: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -532,7 +532,7 @@ triggers: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests - ldd ./src/manaplustests | grep "libasan" <<: *job-push @@ -556,7 +556,7 @@ triggers: stage: build script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests - ldd ./src/manaplustests | grep "libasan" <<: *job-push diff --git a/.travis.yml b/.travis.yml index 2caece97a..87b87c0db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,22 +41,22 @@ env: PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL1}" - IMAGE=ubuntu:xenial - COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1} valgrind" - IMAGE=debian:stretch - COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame" PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL1} valgrind" - IMAGE=ubuntu:xenial - COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1} valgrind" @@ -75,17 +75,17 @@ env: PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL1}" - IMAGE=i386/ubuntu:xenial - COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1} valgrind" - IMAGE=i386/debian:stretch - COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" - IMAGE=i386/debian:unstable - COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame" PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL1} valgrind" @@ -104,22 +104,22 @@ env: PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL2}" - IMAGE=ubuntu:xenial - COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" + COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=debian:stretch - COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" + COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" + COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame --with-sdl2" PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=ubuntu:xenial - COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" + COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} valgrind" @@ -138,17 +138,17 @@ env: PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL2}" - IMAGE=i386/ubuntu:xenial - COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" + COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=i386/debian:stretch - COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" + COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=i386/debian:unstable - COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" + COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaversegame --with-sdl2" PACKAGES="gcc-10 g++-10 ${LIBS_PACKAGES} ${SDL2} valgrind" diff --git a/Android.mk b/Android.mk index c069363f6..87ee94f1a 100644 --- a/Android.mk +++ b/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := manaplus +LOCAL_MODULE := manaverse ROOT_PATH := $(LOCAL_PATH)/.. SDL_PATH := ../SDL diff --git a/CMakeLists.txt.legacy b/CMakeLists.txt.legacy index 45a1e156c..e27809fda 100644 --- a/CMakeLists.txt.legacy +++ b/CMakeLists.txt.legacy @@ -54,23 +54,23 @@ IF (GETTEXT_FOUND AND ENABLE_NLS) ENDIF() If(UNIX) - INSTALL(FILES manaplus.desktop DESTINATION share/applications) - INSTALL(FILES manaplustest.desktop DESTINATION share/applications) + INSTALL(FILES manaverse.desktop DESTINATION share/applications) + INSTALL(FILES manaversetest.desktop DESTINATION share/applications) - INSTALL(FILES manaplus.appdata.xml DESTINATION share/appdata) + INSTALL(FILES manaverse.appdata.xml DESTINATION share/appdata) ENDIF() -SET(CPACK_PACKAGE_NAME "manaplus") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaPlus") +SET(CPACK_PACKAGE_NAME "manaverse") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaVerse") SET(CPACK_PACKAGE_VENDOR "ManaPlus Development Team") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus") +SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaVerse") SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE}) IF(WIN32) - SET(CPACK_NSIS_DISPLAY_NAME "ManaPlus") + SET(CPACK_NSIS_DISPLAY_NAME "ManaVerse") SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico") SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.org") diff --git a/INSTALL b/INSTALL index 9b539bd8f..95fd32da6 100644 --- a/INSTALL +++ b/INSTALL @@ -1,19 +1,19 @@ -How to compile and run ManaPlus on your GNU/Linux Box +How to compile and run ManaVerse on your GNU/Linux Box ================================================= Homepage: http://manaplus.org/ -IRC: irc.freenode.net / #manaplus +IRC: irc.freenode.net / #manaverse 1) Requirements -2) Compiling And Installing ManaPlus +2) Compiling And Installing ManaVerse 3) Notes 1. Requirements =============== -You are expected to have either checked out ManaPlus from Git or you have downloaded -a source release. To get ManaPlus to compile, you need a compiler (GCC) +You are expected to have either checked out ManaVerse from Git or you have downloaded +a source release. To get ManaVerse to compile, you need a compiler (GCC) and some libraries. The required libraries are: * SDL http://www.libsdl.org/ @@ -42,7 +42,7 @@ Installing these dependencies is distributions-specific, and we'll leave it to you to figure this out. -2. Compiling And Installing ManaPlus +2. Compiling And Installing ManaVerse ==================================== 1) Go to the directory you have extracted the source to. @@ -52,12 +52,12 @@ you to figure this out. 4) Run "make" 5) Run "make install" as root -It should have installed ManaPlus on your system now, and you can run it -with "manaplus". By default all files are installed to /usr/local, you can pass +It should have installed ManaVerse on your system now, and you can run it +with "manaverse". By default all files are installed to /usr/local, you can pass a different prefix to configure as usual. - NOTE: It is possible to compile ManaPlus without support for OpenGL rendering. + NOTE: It is possible to compile ManaVerse without support for OpenGL rendering. To do this perform step 3 as follows: ./configure --without-opengl diff --git a/Makefile.am b/Makefile.am index 603cf8e16..a4fd4097b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,12 +3,12 @@ SUBDIRS = data docs po src desktopdir = $(datarootdir)/applications -desktop_DATA = manaplus.desktop \ - manaplustest.desktop +desktop_DATA = manaverse.desktop \ + manaversetest.desktop appdatadir = $(datarootdir)/appdata -appdata_DATA = manaplus.appdata.xml +appdata_DATA = manaverse.appdata.xml # Extra files to include EXTRA_DIST = $(desktop_DATA) \ @@ -19,8 +19,8 @@ EXTRA_DIST = $(desktop_DATA) \ CMake/Modules/FindLibIntl.cmake \ CMake/Modules/FindSDL_gfx.cmake \ Android.mk \ - manaplus.menu \ - manaplus.spec \ + manaverse.menu \ + manaverse.spec \ AUTHORS \ ChangeLog \ INSTALL \ diff --git a/PKGBUILD.in b/PKGBUILD.in index 2de85a80d..e80e36f9f 100644 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -3,7 +3,7 @@ pkgname=manaplus-git pkgver=@PACKAGE_VERSION@ pkgrel=1 -pkgdesc="ManaPlus is a 2D MMORPG game advanced client for games based on eAthena fork The Mana World (tAthena) also for other forks like Evol. More info here: http://manaplus.evolonline.org" +pkgdesc="ManaVerse is a 2D MMORPG game advanced client for games based on eAthena fork The Mana World (tAthena) also for other forks like Evol. More info here: http://manaplus.germantmw.de" arch=('i686' 'x86_64') url="http://manaplus.org" depends=('libxml2' 'sdl_image' 'sdl_mixer' 'sdl_net' 'sdl_ttf' 'sdl_gfx') diff --git a/README b/README index b912473cd..9fc86a079 100644 --- a/README +++ b/README @@ -1,15 +1,15 @@ -THE MANA PLUS CLIENT +THE MANA VERSE CLIENT =============== Version: 1.9.3.23 Date: 2019-03-23 Build status: - ManaPlus CI: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg + ManaVerse CI: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg Windows: https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg AppImg: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg deb: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg Coverage: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/coverage.svg - Doxygen: http://stats.manaplus.org/docs/index.html + Doxygen: https://themanaworld.gitlab.io/manaplus/manaplus/doxygen/index.html Coverity: https://scan.coverity.com/projects/manaplus Development team: @@ -157,9 +157,9 @@ Other: If you're having issues with this client, feel free to report them to us. You can report on forum (http://forums.themanaworld.org/viewforum.php?f=12), -bugtracker (https://gitlab.com/themanaworld/manaplus/manaplus/issues/) or IRC on irc.freenode.net in the #germantmw channel. +bugtracker (https://gitlab.com/themanaworld/manaplus/manaplus/issues/) or IRC on irc.libera.chat in the #germantmw channel. -If you have feedback about a specific game that uses the ManaPlus client, be sure +If you have feedback about a specific game that uses the ManaVerse client, be sure to contact the developers of the game instead. 5. Licenses @@ -170,6 +170,6 @@ All code in this repository under GPL 2+ license. Art can be under CC-BY-SA or G Github, Bitbucked or other non free hostings may use strange TOS what may violate this licenses. If any of this hostings want to violate GPL or/and CC-BY-SA licenses, they not have any rights to do so. -This hostings have rights to remove ManaPlus repositories if they want violate given licenses. +This hostings have rights to remove ManaVerse repositories if they want violate given licenses. -ManaPlus main repository hosted on https://gitlab.com/manaplus/manaplus/ +ManaVerse main repository hosted on https://gitlab.com/themanaworld/manaplus/manaplus diff --git a/README-SWITCH.md b/README-SWITCH.md index f2f23f290..3592bd762 100644 --- a/README-SWITCH.md +++ b/README-SWITCH.md @@ -1,7 +1,7 @@ Installation - - Register for a "Mana World" account on your computer: https://www.themanaworld.org/register - - Copy the "manaplus" folder to your sdcard ("/switch/manaplus") + - Copy the "manaverse" folder to your sdcard ("/switch/manaplus") - Launch the game, login and enjoy Default buttons mapping: @@ -42,4 +42,4 @@ cp packaging/switch/CMakeLists.txt.switch CMakeLists.txt mkdir cmake-build-release && cd cmake-build-release cmake -DPLATFORM_SWITCH=ON -DCMAKE_BUILD_TYPE=Release ../ make ManaPlus.nro -``` \ No newline at end of file +``` diff --git a/README.md b/README.md index 17787bbc8..4556c2cb4 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ -# The Mana Plus Client +# The Mana Verse Client -![ManaPlus logo](data/icons/manaplus.png) +![ManaVerse logo](data/icons/manaplus.png) Version: 1.9.3.23 Date: 2019-03-23 ### Build status - - ManaPlus CI: [![gitlab build status](https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg?key_text=master)](https://gitlab.com/themanaworld/manaplus/manaplus/commits/master) + - ManaVerse CI: [![gitlab build status](https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg?key_text=master)](https://gitlab.com/themanaworld/manaplus/manaplus/commits/master) - Downloads: [![gitlab windows build](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg?key_text=Windows+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/commits/master), [![gitlab appimg build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=AppImg+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master), [![gitlab .deb build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=.deb+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master) - - Coverage: ![coverage report](https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/coverage.svg) + - Coverage: [![coverage report](https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/coverage.svg)](https://themanaworld.gitlab.io/manaplus/manaplus/coverage/gcc-6.html) - - Doxygen: ![doxygen](https://img.shields.io/badge/Docs-Doxygen-blue.svg) + - Doxygen: [![doxygen](https://img.shields.io/badge/Docs-Doxygen-blue.svg)](https://themanaworld.gitlab.io/manaplus/manaplus/doxygen/index.html) - Coverity: ![coverity](https://scan.coverity.com/projects/318/badge.svg) @@ -172,10 +172,10 @@ Whispers: If you're having issues with this client, feel free to report them to us. You can report on [![forum](https://img.shields.io/badge/forum-forums.themanaworld.org-yellow.svg)](http://forums.themanaworld.org/viewforum.php?f=12), [![Issues](https://badgen.net/gitlab/open-issues/themanaworld%2fmanaplus/manaplus?label=Issues)](https://gitlab.com/themanaworld/manaplus/manaplus/issues/), -[![IRC](https://img.shields.io/badge/IRC-FreeNode/germantmw-yellow.svg)](webchat.freenode.net/?channels=germantmw) or +[![IRC](https://img.shields.io/badge/IRC-FreeNode/germantmw-yellow.svg)](web.libera.chat/?channels=germantmw) or ![discord](https://shields.io/discord/775612630836445206.svg?label=Discord) -If you have feedback about a specific game that uses the ManaPlus client, be sure +If you have feedback about a specific game that uses the ManaVerse client, be sure to contact the developers of the game instead. ## 5. Licenses @@ -183,6 +183,6 @@ to contact the developers of the game instead. All code in this repository under ![GPL 2+](https://img.shields.io/badge/license-GPL2+-blue.svg) license. Art can be under ![CC-BY-SA](https://img.shields.io/badge/license-CC_BY_SA-blue.svg) or ![GPL 2+](https://img.shields.io/badge/license-GPL2+-blue.svg). Github, Bitbucked or other non free hostings may use strange TOS what may violate this licenses. If any of this hostings want to violate GPL or/and CC-BY-SA licenses, -they not have any rights to do so. This hostings have rights to remove ManaPlus repositories if they want violate given licenses. +they do not have any rights to do so. This hostings have rights to remove ManaVerse repositories if they want to violate given licenses. -ManaPlus main repository hosted on [gitlab.com](https://gitlab.com/manaplus/manaplus/) +ManaVerse main repository hosted on [gitlab.com](https://gitlab.com/themanaworld/manaplus/manaplus) diff --git a/README.txt b/README.txt index 0bdf856c5..8c1a3e513 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -THE MANA PLUS CLIENT +THE MANA VERSE CLIENT =============== Version: 1.9.3.23 Date: 2019-03-23 @@ -7,12 +7,12 @@ THE MANA PLUS CLIENT - See AUTHORS file for a list Build status: - ManaPlus CI: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg + ManaVerse CI: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg Windows: https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg AppImg: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg deb: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg Coverage: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/coverage.svg - Doxygen: http://stats.manaplus.org/docs/index.html + Doxygen: https://themanaworld.gitlab.io/manaplus/manaplus/doxygen/index.html Coverity: https://scan.coverity.com/projects/manaplus Dependencies: @@ -157,9 +157,9 @@ Other: If you're having issues with this client, feel free to report them to us. You can report on forum (http://forums.themanaworld.org/viewforum.php?f=12), -bugtracker (https://gitlab.com/themanaworld/manaplus/manaplus/issues/) or IRC on irc.freenode.net in the #germantmw channel. +bugtracker (https://gitlab.com/themanaworld/manaplus/manaplus/issues/) or IRC on irc.libera.chat in the #germantmw channel. -If you have feedback about a specific game that uses the ManaPlus client, be sure +If you have feedback about a specific game that uses the ManaVerse client, be sure to contact the developers of the game instead. 5. Licenses @@ -170,6 +170,6 @@ All code in this repository under GPL 2+ license. Art can be under CC-BY-SA or G Github, Bitbucked or other non free hostings may use strange TOS what may violate this licenses. If any of this hostings want to violate GPL or/and CC-BY-SA licenses, they not have any rights to do so. -This hostings have rights to remove ManaPlus repositories if they want violate given licenses. +This hostings have rights to remove ManaVerse repositories if they want violate given licenses. -ManaPlus main repository hosted on https://gitlab.com/manaplus/manaplus/ +ManaVerse main repository hosted on https://gitlab.com/themanaworld/manaplus/manaplus diff --git a/azure-pipelines_windows.yml b/azure-pipelines_windows.yml index 0538d8a8b..9c39d5d0c 100644 --- a/azure-pipelines_windows.yml +++ b/azure-pipelines_windows.yml @@ -18,7 +18,7 @@ jobs: GITLABTOKEN: $(gitlabtoken) - task: PublishBuildArtifacts@1 inputs: - artifactName: manaplus32 + artifactName: manaverse32 - job: mxe_32_test dependsOn: mxe_32_build @@ -29,16 +29,16 @@ jobs: - task: DownloadBuildArtifacts@0 inputs: buildType: 'current' - project: 'ManaPlus' - artifactName: 'manaplus32' - - script: dir "$(Build.ArtifactStagingDirectory)\manaplus32" - - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaplus32\*" . + project: 'ManaVerse' + artifactName: 'manaverse32' + - script: dir "$(Build.ArtifactStagingDirectory)\manaverse32" + - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaverse32\*" . - script: tools\ci\scripts\addextrafiles.cmd - script: dir - script: | set SDL_VIDEODRIVER=dummy echo run - manaplustests.exe + manaversetests.exe - job: mxe_64_build pool: @@ -59,7 +59,7 @@ jobs: GITLABTOKEN: $(gitlabtoken) - task: PublishBuildArtifacts@1 inputs: - artifactName: manaplus64 + artifactName: manaverse64 - job: mxe_64_test dependsOn: mxe_64_build @@ -70,13 +70,13 @@ jobs: - task: DownloadBuildArtifacts@0 inputs: buildType: 'current' - project: 'ManaPlus' - artifactName: 'manaplus64' - - script: dir "$(Build.ArtifactStagingDirectory)\manaplus64" - - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaplus64\*" . + project: 'ManaVerse' + artifactName: 'manaverse64' + - script: dir "$(Build.ArtifactStagingDirectory)\manaverse64" + - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaverse64\*" . - script: tools\ci\scripts\addextrafiles.cmd - script: dir - script: | set SDL_VIDEODRIVER=dummy echo run - manaplustests.exe + manaversetests.exe diff --git a/build/update-creator.sh b/build/update-creator.sh index f3fc9e28c..37e8af733 100755 --- a/build/update-creator.sh +++ b/build/update-creator.sh @@ -8,4 +8,4 @@ find -name \*.cpp \ -o -name \*.txt \ -o -name \*.xml \ -o -name \*.manaplus \ - | sort > manaplus.files + | sort > manaverse.files diff --git a/configure.ac b/configure.ac index a333ab97e..ef7000ff1 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([ManaPlus], [1.9.3.23], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaVerse], [1.9.3.23], [support@themanaworld.org], [manaverse]) AM_INIT_AUTOMAKE([1.9]) AC_LANG_CPLUSPLUS @@ -188,14 +188,14 @@ fi AM_CONDITIONAL(ENABLE_DYECMD, test x$with_dyecmd = xyes) -# Option to enable ManaPlus game -AC_ARG_WITH(manaplusgame,[ --without-manaplusgame don't build ManaPlus game ] ) -if test "x$with_manaplusgame" == "xno"; then - with_manaplusgame=no +# Option to enable ManaVerse game +AC_ARG_WITH(manaversegame,[ --without-manaversegame don't build ManaVerse game ] ) +if test "x$with_manaversegame" == "xno"; then + with_manaversegame=no else - with_manaplusgame=yes + with_manaversegame=yes fi -AM_CONDITIONAL(ENABLE_MANAPLUSGAME, test x$with_manaplusgame = xyes) +AM_CONDITIONAL(ENABLE_MANAPLUSGAME, test x$with_manaversegame = xyes) # Enable nacl build AC_ARG_ENABLE(naclbuild, @@ -379,7 +379,7 @@ if test "x$with_internalsdlgfx" == "xno"; then AC_CHECK_HEADERS(SDL2_rotozoom.h, ,) else with_internalsdlgfx=yes - AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaPlus should use internal sdlgfx2]) + AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaVerse should use internal sdlgfx2]) fi AM_CONDITIONAL(USE_INTERNALSDLGFX, test x$with_internalsdlgfx = xyes) @@ -888,7 +888,7 @@ AC_CHECK_HEADERS([execinfo.h], AM_CONDITIONAL(HAVE_EXECINFO, test x$have_execinfo = xyes) AC_CONFIG_FILES([ -manaplus.spec +manaverse.spec Makefile PKGBUILD src/Makefile @@ -943,8 +943,8 @@ AC_CONFIG_FILES([data/tmw/tmw], [chmod +x data/tmw/tmw]) AC_OUTPUT echo -if test "$with_manaplusgame" == "yes"; then - echo "Enabled building manaplus game." +if test "$with_manaversegame" == "yes"; then + echo "Enabled building manaverse game." fi if test "$with_dyecmd" == "yes"; then echo "Enabled building dyecmd." diff --git a/data/evol/evol.desktop.in b/data/evol/evol.desktop.in index 8ab97e773..b18967307 100644 --- a/data/evol/evol.desktop.in +++ b/data/evol/evol.desktop.in @@ -3,7 +3,7 @@ Version=1.0 Name=EvolOnline Comment=A 2D MMORPG client -Exec=manaplus @datadir@/manaplus/data/evol/evol.manaplus +Exec=manaverse @datadir@/manaplus/data/evol/evol.manaplus StartupNotify=false Terminal=false Type=Application diff --git a/data/evol/evol.in b/data/evol/evol.in index 2b010dc80..5833af7f9 100755 --- a/data/evol/evol.in +++ b/data/evol/evol.in @@ -1,2 +1,2 @@ #!/bin/sh -exec manaplus @datadir@/manaplus/data/evol/evol.manaplus "$@" +exec manaverse @datadir@/manaplus/data/evol/evol.manaplus "$@" diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus index 969fe06f0..97aca42d3 100644 --- a/data/evol/evol.manaplus +++ b/data/evol/evol.manaplus @@ -5,10 +5,10 @@