summaryrefslogtreecommitdiff
path: root/src/client.cpp
AgeCommit message (Collapse)AuthorFilesLines
2011-06-02Arbitrary code cleanupsThorbjørn Lindeijer1-3/+3
Just some stuff that piles up while "looking" at the code, which eventually gets annoying to ignore while staging real changes. * Replaced a few NULL occurrences with 0 * Rely on default parameter for std::vector::resize. * Replaced a few "" with std::string() * Prefer .empty() to == "" * Removed a few comparisons with NULL * Don't check pointers before deleting them * Removed a bunch of redundant semicolons * Made some global variables static (local to their compilation unit) * Prefer prefix ++/-- operators to postfix versions when possible * Corrected location of a comment
2011-05-04Avoid mixing the system login music with the existing song in TMW.Yohann Ferreira1-1/+2
Reviewed-by: CodyMartin.
2011-04-30De-dustify the get_elapsed-time function documentation a bit.Yohann Ferreira1-8/+4
Trivial.
2011-04-27Removed unused variable 'handledEvents'Thorbjørn Lindeijer1-4/+0
At some point this variable was used to avoid limiting the framerate when user input events were coming in. This is no longer relevant now that we limit the framerate globally using SDL_gfx.
2011-04-18A bit of cleanup in the way the Client pops up error dialogsThorbjørn Lindeijer1-64/+34
No point in using mCurrentDialog for the OkDialog, since it will clean up after itself, as was pointed out in many places throughout the code. Now there are two convenience functions for popping up the OkDialog and having it change to a specified state afterwards. This also gets rid of the 4 different ActionListener classes that existed solely for this purpose. Reviewed-by: Yohann Ferreira
2011-04-11Implemented a simple non-blocking fadeOutAndPlay system.Yohann Ferreira1-0/+2
It's currently used when changing maps. Resolves: TMW-Mantis: #750. Reviewed-by: Thorbjorn.
2011-04-09Removed the Mana namespaceThorbjørn Lindeijer1-9/+9
It's just an annoyance when it's only applied to a few classes. Either we place everything in this namespace or nothing, and at the moment I don't see any rationale for placing everything in a Mana namespace. Acked-by: Jared Adams
2011-04-09Moved Channels to Mana::Event::ChannelThorbjørn Lindeijer1-6/+6
Acked-by: Jared Adams
2011-04-09Moved Events to Mana::Event::TypeThorbjørn Lindeijer1-4/+4
Acked-by: Jared Adams
2011-02-21Merge branch '0.5'Thorbjørn Lindeijer1-6/+7
Translation file updates ignored. Conflicts: src/client.cpp src/commandhandler.cpp src/gui/popupmenu.cpp src/localplayer.cpp
2011-02-21Renamed local data directory back to just "mana"Thorbjørn Lindeijer1-7/+8
This name represents the name of the client software, not the branding it received. Cleaned up the rest of the code a bit. Reviewed-by: Jared Adams
2011-02-20Renamed default branding package from mana to manasource.Yohann Ferreira1-5/+5
Resolves: Mana-mantis #236. Reviewed-by: Mpa4Hu.
2011-02-15Fix compilation on Haiku and set config and data paths for it.DarkWind1-0/+7
2011-01-27Made the windows app able to load .ico files at runtime.Yohann Ferreira1-5/+17
Now the icon extension is computed against the os, except for mac where the behaviour is left untouched. This means that the 'icons/mana' appIcon branding parameter will now load icons/mana.png files for unices, and icons/mana.ico for Windows. Reviewed-by: Trapdoor. Resolves: Mana-Mantis: #135.
2011-01-27Made the windows app able to load .ico files at runtime.Yohann Ferreira1-5/+17
Now the icon extension is computed against the os. This means that the 'icons/mana' appIcon branding parameter will now load icons/mana.png files for unices and mac, and icons/mana.ico for Windows. Reviewed-by: Trapdoor. Resolves: Mana-Mantis: #135.
2011-01-24Refactored the item loading in a more extensible and per protocol way.Yohann Ferreira1-1/+13
This will greatly help into upgrading the need of each protocol separately. This is the first step to a new item and equipment system for manaserv. A subclassing of the EquipmentWindow will be done in the next commit, as requested by Thorbjorn. Reviewed-by: Thorbjorn.
2011-01-13Made the client handle better the lack of items.xml file.Yohann Ferreira1-1/+22
Now the client returns to server choice dialog with a warning instead of aborting. I'm kinda certain I'm not the only one getting crazy with such a lazy behaviour. Reviewed-by: Jaxad.
2010-11-13Replace config listeners with the event systemChuck Miller1-7/+18
Reviewed-by: Jared Adams
2010-11-11Replace Event names with enums instead of stringsChuck Miller1-2/+2
2010-11-11Have the event system channels use enums instead of stringsChuck Miller1-2/+2
Reviewed-by: Freeyorp
2010-11-02Adding double-click to server dialog and world select dialogStefan Dombrowski1-0/+16
This resolves http://bugs.manasource.org/view.php?id=259 Reviewed-by: Thorbjorn
2010-11-01Merge branch '0.5' of gitorious.org:mana/manaYohann Ferreira1-23/+77
Conflicts: src/being.cpp src/client.cpp src/commandhandler.cpp src/gui/setup_video.cpp src/gui/socialwindow.cpp src/gui/viewport.cpp src/gui/widgets/browserbox.cpp src/gui/widgets/itemcontainer.cpp src/imageparticle.cpp src/localplayer.cpp src/localplayer.h src/map.cpp src/net/tmwa/beinghandler.cpp src/particle.cpp src/particle.h src/player.cpp src/player.h
2010-10-22Changed 'Low CPU' options and related gui widgets name to 'Disable ↵Yohann Ferreira1-2/+2
transparency'. That name is more explicit about what it actually does. Reviewed-by: CodyMartin.
2010-10-22Turned the OpenGL and disable transparency options as static members.Yohann Ferreira1-2/+7
- Now OpenGL and the transparency disabling are set at startup and not read again for displaying graphics, preventing graphic errors before startup. - We also agreed long time ago that SDL specific functions should have a SDL prefix. The header has been rearranged a bit to do so. - Also fixed a possible discrepancy in the hasAlphaChannel() function. Reviewed-by: CodyMartin. Resolves: Mana-Mantis: #260.
2010-10-18Add portable support for windows version.Andrei Karas1-2/+58
Add portable option to windows installer. Reviewed-by: Thorbjorn
2010-10-17Added Low CPU Mode toggle in video setup. Defaults to On.madcamel@gmail.com1-0/+1
This disables the Image::setAlpha() function, which uses 60% of the client's CPU cycles. When enabled, visual quality is slightly decreased, especially with the particle system. Toggling this setting On from an Off state requires a client restart or the graphics look quite funny. Bertram's addition: - Renamed 'Low CPU' to 'Disable transparency (Low CPU)' in the gui for better understanding. - Removed the sprite display with 30% opacity when disabling transparency since it made monsters and drops be drawn above all layers at full opacity. - Made the OpenGL mode disable the 'low CPU mode'. - Fixed the GUI logic as much as possible. Please note that the GUI opacity slider stays enabled when transparency is disabled even if told to be disabled in that case. Reviewed-by: CodyMartin, 4144, MadCamel.
2010-10-16Implement opacity cache for SDL surfaces.Andrei Karas1-0/+2
Enabled by default. Can be disabled in configuration option "alphaCache" if set it to 0. Reviewed-by: Bertram
2010-10-13Fixing switch loginStefan Dombrowski1-8/+6
Switch login gets you stuck at the ConnectionDialog. That happens because logout is not implemented. TODO: Implementing proper logout. This resolves http://bugs.manasource.org/view.php?id=225
2010-10-10Fixing unusable config.xmlStefan Dombrowski1-12/+4
If config variable screenshotDirectory has national symbols in it, the client could not read cofig.xml, and always used default settings. In order to get ready for a client release, now the config.xml does not save the screenshot folder. The --screenshot-dir commandline option is working as before, the value is just not permanent anymore. This makes actually sense, since the options for update folder and config folder are not permanent either. This resolves http://bugs.manasource.org/view.php?id=112 Reviewed-by: Jaxad0127
2010-09-25Merge branch '1.0'Thorbjørn Lindeijer1-16/+18
Conflicts: src/actorspritemanager.h src/beingmanager.cpp src/game.cpp src/gui/beingpopup.cpp src/gui/chat.cpp src/gui/chat.h src/gui/inventorywindow.h src/gui/itempopup.cpp src/gui/socialwindow.cpp src/gui/statuswindow.cpp src/gui/widgets/chattab.cpp src/gui/widgets/chattab.h src/net/tmwa/inventoryhandler.cpp src/net/tmwa/partyhandler.cpp src/party.cpp src/sound.cpp src/utils/stringutils.cpp src/utils/stringutils.h
2010-09-13Fix loading of manaserv's attributes fileJared Adams1-0/+2
Reviewed-by: Bertram
2010-09-12Deactivating OpenGL by default on WindowsStefan Dombrowski1-1/+1
For Linux OpenGL was already deactivated. For OSX it is still by default switched on. Reviewed-by: Jaxad0127
2010-09-11Fixing misspelling in Setup_Video and removing empty lines from logStefan Dombrowski1-1/+1
Reviewed-by: Jaxad0127
2010-09-07Fixing logic that decides if ServerDialog shows upStefan Dombrowski1-13/+13
2010-09-05Fixing segmentation fault if server is given on command lineStefan Dombrowski1-5/+7
If server and port was given on the command line, then the server type was unknown. The command line options do work now, but only if standard ports 6901 and 9601 are used. This resolves http://bugs.manasource.org/view.php?id=177 TODO: Query the server about itself and choose the server type based on that. Reviewed-by: Jaxad0127
2010-08-26Merged testing branch into master.Yohann Ferreira1-2/+4
2010-08-12Simplify working with the event systemJared Adams1-2/+2
EventManager has been merged into Event, with some new convinience methods added. Reviewed-by: Chuck Miller
2010-08-03Move Theme and UserPalette to the resources folderJared Adams1-2/+2
Reviewed-by: Yohann Ferreira
2010-08-03Merge remote branch 'origin/1.0'Jared Adams1-2/+2
Conflicts: src/net/tmwa/chathandler.cpp
2010-07-28Centralized configuration default values using the VariableData system.Yohann Ferreira1-27/+23
Please note that I didn't turned all the getValue() call into new ones, simply because I have to have config object initiated which is not forcefully the case the branding file. Resolves: Manasource Mantis #170.
2010-07-19Merge branch '1.0'Yohann Ferreira1-0/+4
Conflicts: src/gui/itempopup.cpp src/item.cpp src/monster.cpp src/net/manaserv/playerhandler.cpp src/net/tmwa/partyhandler.cpp src/npc.cpp src/player.cpp src/resources/itemdb.cpp src/resources/monsterdb.cpp src/resources/monsterinfo.cpp src/resources/npcdb.cpp src/resources/spritedef.cpp
2010-07-18Add event.h to eventmanager.h and listener.h to reduce total number of includesChuck Miller1-1/+0
You'll have to include it anyways 99% of the time
2010-07-18Replace some state-related netcode methods with eventsJared Adams1-4/+0
Also move the virtual destructors of the Net handler base classes to the top of their method lists. Reviewed-by: Chuck Miller
2010-07-18Move more from LocalPlayer to PlayerInfoJared Adams1-0/+12
Also cleanup PlayerInfo a bit. Reviewed-by: Chuck Miller
2010-07-17Fixed config directory, updated project file.David Athay1-2/+2
2010-07-11Made the different hard-coded paths and files be now taken from theYohann Ferreira1-0/+4
data/paths.xml configuration file. Also added default gui theme path in branding and default wallpaper path and file searched respectively in the branding and paths.xml files. Hard-coded values are still used as fallbacks. Resolves: Manasource Mantis #148. Reviewed-by: jaxad0127.
2010-07-10Moved parsing of specials.xml from gui/specialswindow.cpp to separate source ↵Philipp Sehmisch1-0/+2
files. Restored functional recharge bars in specials window. Individual specials are only shown after the server informed the client about their status. Made level label, use button and progress bars optional. Their use is controlled through specials.xml. The special window button is again shown even when the player has no specials. This problem needs to be solved differently now for architecture reasons. Reviewed-by: Jaxad0127
2010-06-13Merge remote branch '1.0/1.0'Jared Adams1-13/+13
Conflicts: data/graphics/CMakeLists.txt data/graphics/Makefile.am src/client.cpp
2010-06-13Handle char-server login errors betterJared Adams1-0/+1
Also fix a small compilation error sometimes reported. Reviewed-by: Chuck Miller
2010-06-10Fix a bug with empty update hostsJared Adams1-0/+4