summaryrefslogtreecommitdiff
path: root/src/game.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25A host of code style fixesBjørn Lindeijer1-1/+1
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-91/+93
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-4/+7
Conflicts: Many files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams1-12/+17
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-23Merge eA's command handling into CommandHandlerJared Adams1-9/+12
Also drop Aethyra's custom magic code
2009-03-22Fix chat under eAthenaJared Adams1-4/+4
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-35/+246
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-03-19Throttle framerates down to save CPU cycles. Now that we're getting highIra Rice1-2/+5
framerates in OpenGL even on older hardware, this should be done to conserve on CPU usage, rather than stressing it with more frames than the monitor can render. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-15Fix some mem leaksJared Adams1-1/+2
2009-03-11Added a new Popup class, which overall is functionally similar to theIra Rice1-2/+2
Window class, but stripped down to the bare essential functionality to just draw and position them. This means no resizing, no close buttons, no ability to move them, etc. This should help reduce the overhead in drawing speech bubbles, as well as other popup type dialogs, but is also not a drop in replacement for the Window class as well. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-11Moved the Skin class outside of the Window class, in order to allowIra Rice1-1/+0
other widget containers to use skins as well, and to make it easier to extend later. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Delete local player earlier and fix a rare crashJared Adams1-0/+1
Rare crash is in KeyboardConfig, where the active keys array is accessed before it's initialized. Also remove some debug prints that made it into a previous commit.
2009-03-10Delete local player earlier and fix a rare crashJared Adams1-1/+1
Rare crash is in KeyboardConfig, where the active keys array is accessed before it's initialized. Also remove some debug prints that made it into a previous commit.
2009-03-10Remove some SetupWindow weirdnessJared Adams1-2/+0
2009-03-10Fix some mem leaksJared Adams1-3/+2
2009-03-10Remove some SetupWindow weirdnessJared Adams1-2/+0
2009-03-10Fix some mem leaksJared Adams1-2/+3
2009-03-10Fix some mem leaksJared Adams1-2/+3
2009-03-10Start NPC dialogs out hiddenJared Adams1-0/+5
2009-03-10Start NPC dialogs out hiddenJared Adams1-0/+5
2009-03-09Add an interface for eAthena's storage systemJared Adams1-0/+5
2009-03-08Add an interface for eAthena's storage systemJared Adams1-0/+5
2009-03-02Only auto target monstersJared Adams1-6/+3
Also, increase auto target range to 20 tiles
2009-03-01Only talk to NPCs with the keyboard with a targetJared Adams1-6/+0
2009-02-28Allow chatting while talking to NPCsJared Adams1-28/+12
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer1-15/+17
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice1-5/+5
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams1-5/+5
The Being ID is used instead, as that is all that was ever really needed.
2009-02-25Fixed up NPC list dialogs to be navigatable by keyboard (scrollingIra Rice1-1/+1
through the list requires the use of the mouse wheel at the moment), fixed wrapping behavior for wrapping around lists to actually wrap around lists properly, and placed a few checks for current_npc where they were assumed before which could cause the client to hang or crash in case the NPC is no longer around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Cleaned up some code, as well as removed redundant talk client requestingIra Rice1-20/+24
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Prioritize monsters when targetingJared Adams1-3/+3
Players are then the next highest priority
2009-02-20Restore old attack behaviorJared Adams1-2/+1
2009-02-19Prevent target toggling when the button is heldJared Adams1-27/+25
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-26/+26
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-3/+14
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-13Ignore "window manager + arrow" key combinationsSteve Cotton1-0/+9
Adds two configurable "ignore" keys. Stops the character moving about if the user's window manager uses "ignore+arrow key" to switch virtual desktops.
2009-02-11Separated out the setup and help windows from the chat shortcut so thatIra Rice1-3/+5
they are now under the OK shortcut. Figured that if anyone doesn't like the NPC dialogs trumping their chat dialogs, then we should also allow for it under the setup and help buttons as well. The only window behavior that this keeps under the chat shortcut now is the confirmation for exiting shortcut. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Don't make log statements translatableBjørn Lindeijer1-5/+5
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-10Whitespace fixesBjørn Lindeijer1-3/+3
Mainly removed trailing whitespace. Also small fix in header of recorder.cpp.
2009-02-10Removed many pointless comparisons with NULLBjørn Lindeijer1-2/+2
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Removed many pointless comparisons with NULLBjørn Lindeijer1-2/+2
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Don't make log statements translatableBjørn Lindeijer1-5/+5
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-10Whitespace fixesBjørn Lindeijer1-3/+3
Mainly removed trailing whitespace. Also small fix in header of recorder.cpp.
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-10/+10
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-89/+93
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-11/+11
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merge branch 'master' of git@gitorious.org:tmw/eathenaBjørn Lindeijer1-12/+0
Conflicts: src/game.cpp src/net/charserverhandler.cpp src/net/loginhandler.cpp src/net/protocol.h
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-156/+174
Conflicts: Almost everywhere.
2009-02-07Some more include cleanups.Ira Rice1-6/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-20 03:52:14 +0000