summaryrefslogtreecommitdiff
path: root/src/game.cpp
AgeCommit message (Collapse)AuthorFilesLines
2010-03-02Fix crash after viewport has been deletedJared Adams1-14/+9
2010-03-02Revert "Merge WindowContainer into Viewport and remove extra members"Jared Adams1-1/+12
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746. Conflicts: src/gui/gui.cpp src/gui/viewport.cpp
2010-03-01Merge WindowContainer into Viewport and remove extra membersJared Adams1-12/+1
Reviewed-by: Chuck Miller
2010-02-28Fix item pickupJared Adams1-2/+6
Reviewed-by: Freeyorp
2010-03-01Check and create screenshot directory only when a screenshot is madeBernd Wachter1-1/+11
2010-02-27Use appShort in screenshot nameJared Adams1-1/+2
Reviewed-by: http://pastebin.ca/1815165
2010-02-27No point in calling Viewport::setMap(0) before deleting itThorbjørn Lindeijer1-3/+0
Reviewed-by: Jared Adams
2010-02-26Fix calling setMap on deleted viewportAndrei Karas1-1/+1
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-02-24Fix talk request flood.Andrei Karas1-1/+2
Fix talk request flood from keyboard. Fix duplicate lines in NPC dialogs. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-02-24Move StorageWindow to instancing intead of globalJared Adams1-3/+0
Also make storage under eAthena more flexible. Reviewed-by: Dennis Friis
2010-02-23Fixed compile on WindowsThorbjørn Lindeijer1-2/+0
Reviewed-by: Bernd Wachter
2010-02-21Made tick counter and framerate limiter work during login sequenceThorbjørn Lindeijer1-141/+22
Much code was moved from main() to the new Client::exec(). This new event loop now integrates with the Game class, so that the tick counter and framerate limiter apply universally. The Client class is also responsible for some things that used to be global variables. Mantis-issue: ...
2010-02-22Modify copyright headersFreeyorp1-1/+2
2010-02-20License header update for The Mana ClientThorbjørn Lindeijer1-4/+3
2010-02-14Fixed windows appearing below the viewport when opened before getting inTametomo1-0/+1
game. Signed-off-by: Tametomo <irarice@gmail.com>
2010-02-14Don't create the viewport until it's really needed.Tametomo1-0/+10
Signed-off-by: Tametomo <irarice@gmail.com>
2010-02-13Make NPC dialogs instance instead of globalJared Adams1-46/+17
This change allows players to talk to multiple NPCs at a time (if the server agrees). Manaserv's netcode allows multiple commerce instances too. eAthena's is limited to one commerce instance, due to protocol limitations.
2010-02-13Moved keyboard input polling outside of the clock time loop. This isn'tTametomo1-1/+2
necessary so long as you're at least getting 1-2 fps (which would result in a typing speed between 60-120 wpm). Even then, you've got more serious things to be thinking about at that point than if all of your input is being tracked, and having it inside the clock time loop just cuts performance for everyone else. This loop should get removed altogether, but there are a few items left in it at the moment which would need to get reworked first before it can be eliminated. In cases where you can't accurately know where something would be because it's random, we should just scale the random formulas to take a more drastic adjustment to compensate for that lag. Signed-off-by: Tametomo <irarice@gmail.com> Manual-merge-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2010-02-12Add outfits wear and copy keys in settingsAndrei Karas1-65/+52
2010-02-08Merge PartyWindow and GuildWindow into SocialWindowJared Adams1-36/+32
2010-02-07Use SDL_gfx to limit the framerateThorbjørn Lindeijer1-28/+12
Makes sense if we depend on SDL_gfx anyway, and it seems to do a better job at it than the code we had.
2010-02-06Merged the Engine class into the Game classThorbjørn Lindeijer1-14/+90
There was little point in keeping the Engine class separate. It wasn't an engine at all, but only kept track of the currently active map, a job more suitable for the Game class anyway.
2010-01-31Unify eAthena and manaserv support in to one build.Daniel Bradshaw1-2/+2
Finish support for server types in the server dialog. Using the new server type function, strip out ifdefs, replacing them with if blocks for later merging in smaller atomic commits. Remove any remaining references to the support defs, including in build system.
2010-01-27Added mutators/accessors to being.h and smal cleanups.Bertram1-1/+1
2010-01-26Fix a few more _SUPPORT ifdefs and namespace PartyTabJared Adams1-5/+1
2010-01-18Unified BeingManager::findNearestLivingBeing for eAthena and manaservThorbjørn Lindeijer1-7/+2
It now always works with pixels.
2010-01-13Adds a follow manager for usersBlueSansDouze1-0/+4
Right click contextual menu on player "follow" entry Cancel the following by moving with mouse or keys Adds a special behavior for map changes
2010-01-12Standardize header orderJared Adams1-5/+7
Also remove some extra new lines and fix eAthena's PartyTab define guards.
2010-01-11Cleanup GUI classesJared Adams1-2/+2
Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.
2010-01-10Make sure TextDialogs get input precedenceJared Adams1-1/+3
2010-01-10Change code styleAndrei Karas1-1/+5
2010-01-09Allow change player direction by emote key+arrow keysAndrei Karas1-1/+14
2009-12-19Client now returns to server selection after server disconnectionStefan Dombrowski1-21/+5
This resolves http://bugs.manasource.org/view.php?id=37
2009-12-09Unifying the default folder for screenshots and making it configurableStefan Dombrowski1-6/+21
For all operating systems screenshots are now saved in ~/Desktop. If this folder does not exist, then the user's home is used. The players can change this with the new option --screenshot-dir. This patch is for http://mantis.themanaworld.org/view.php?id=969
2009-12-06Improve keyboard control of the QuitDialogJared Adams1-16/+6
Fixes http://mantis.themanaworld.org/view.php?id=562 .
2009-11-26Merge a little more and remove the BuddyWindowJared Adams1-20/+0
The BuddyWindow was only half implemented and would have been made redundant with the planned social window.
2009-11-03Remove more _SUPPORT ifdefs and do some cleanupJared Adams1-3/+0
2009-10-30Support switching characters under eAthenaJared Adams1-31/+30
2009-10-29Some random cleanupsThorbjørn Lindeijer1-44/+44
2009-10-29Disable keyboard shortcuts in windows with text input.Andrei Karas1-1/+1
Disable items shortcuts in setup window. Disable all shortcuts in ItemAmount window. Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2009-10-25Fix screenshot makingJared Adams1-3/+5
2009-10-24Make homedir accessible from other filesJared Adams1-7/+4
2009-10-24Basically finish rebrandingJared Adams1-1/+1
2009-10-24More rebrandingJared Adams1-1/+1
2009-10-24REplace instances of TMW with ManaJared Adams1-9/+9
2009-10-22Optimized game startup sequence for eAthena in order to cope a bit better ↵Bertram1-54/+61
with network errors. Unfortunately, it isn't enough: The bug seems to be elsewhere...
2009-10-06Some cleanup regarding keeping track of gender for eAthenaThorbjørn Lindeijer1-1/+2
LoginHandler now owns the world list and the token, instead of having them as global variables with pointers to the 'sex' member of the token from the GUI.
2009-10-06As little first step, move some specific out from game.cppBertram1-34/+29
I'll go step by step, in order no to screww everything... I also removed hard coded ticks reference in game.cpp
2009-09-30Merge login state machines for both clientsJared Adams1-35/+7
Also do some cleanup and refactoring of related code.
2009-09-29Outfits updateAndrei Karas1-21/+41
Increased outfits count to 15 Changed unequip outfits feature Added copy outfits feature