summaryrefslogtreecommitdiff
path: root/src/game.cpp
AgeCommit message (Collapse)AuthorFilesLines
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-2/+3
2009-03-10Start NPC dialogs out hiddenJared 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>
2009-02-05Forgot to check which key called the keyboard event for the ok or chatIra Rice1-15/+22
toggling. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Reduced the required checks slightly by handling the chat key and ok keyIra Rice1-10/+3
together. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Rather than to settle for a broken default (if it's left at space,Ira Rice1-40/+51
then you won't be able to type spaces in the NPC integer or string dialogs. And no, assigning focus to the ok button doesn't resolve anything, but makes things worse, as then the user has to click on the input field to input text, then must click the ok button, as the chat window already overrode it's confirmation action), this commit allows for both the chat input and the NPC dialog confirming to share the same key, but allows for people to change one or the other if they want to. This will still allow for the player to use the keyboard fully for NPC dialogs, but allow for people who don't like not being able to use chat with an NPC dialog open to assign confirmation to another key and get their way as well. This is a rather ugly way of resolving both sides of the issue, but it's the only way to appease both sides. The Aethyra players want things the way they were, while Bjorn wanted things a different way. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Three things: Split chat and NPC dialog functionality based on the TMWIra Rice1-62/+48
complaint commit d2876ad85935c5d0b181d050bd4c19a4682123b1 (btw, if you're concerned about that, return is also a bad choice for the chat window in general, which overrides the GuiChan default for use widget. Tab would also be a bad choice, as it cycles through the widgets), next, I made the text displayed by the keyboard configuration setup dialog translatable, and lastly, I exposed the rest of the previously unconfigurable keys to be configurable through the keyboard setup tab. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Fixed inability to chat while talking to NPCsBjørn Lindeijer1-20/+0
These checks were meant to allow the keyboard to be used to close the NPC dialogs, however in this form they prevent the user from being able to chat while talking to NPCs. Better make sure the Ok button is focused, so you can use Space to close the NPC dialog.
2009-02-04Simplified equipment window initialization, since only the local playerIra Rice1-1/+1
has an inventory or an equipment. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Slight bit of code cleanup, as well as minor fixes to logic. For someIra Rice1-6/+2
reason, the windows will gladly shrink when resizeable, but not grow. This will need to get resolved some time later. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-19Didn't know that one set of brackets I used was needed for compiling forIra Rice1-297/+281
GNU. Fixed that, as well as found why we were indented as many lines as we were in the first place. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-19Fixed up indentation in game so that the indentation isn't misleading.Ira Rice1-251/+251
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-19Fixes to the NPC Integer input fieldIra Rice1-1/+21
Also don't set "The Mana World" to start with. Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774) Conflicts: src/game.cpp src/gui/inttextfield.cpp src/gui/item_amount.cpp src/gui/textfield.h
2009-01-19Removed tabs from game.cpp.Ira Rice1-445/+445
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-18Fixed the NPC Integer input field, as well as cut some bull from theIra Rice1-0/+10
NPC String class. The Integer input field was rather horribly broken to the point where it could send invalid data, the increment and decrement buttons didn't work, and overall it was tripping over itself. As for the NPC String, "The Mana World" as a string is not needed to set the field to that length, but instead fills the text field with that text for starting. This is completely inappropriate for a text entry field, and a more sensible default would be to leave it empty, so that people can type in what they want without having to delete it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-18Add dialogs to input text and numbers for scriptsJared Adams1-1/+10
2009-01-18Fixed the minimap so that it properly remembers if it was open onIra Rice1-4/+4
closing, rather than opening every time the client loads. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-18Add dialogs to input text and numbers for scriptsJared Adams1-1/+10
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-12 19:53:41 +0000