summaryrefslogtreecommitdiff
path: root/src/game.cpp
AgeCommit message (Collapse)AuthorFilesLines
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-09Mostly whitespace fixesBjørn Lindeijer1-10/+10
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
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-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-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-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-12Fixed a path error that slipped through by accident.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-12Some rather pedantic changes. Unified all naming for emoticons in theIra Rice1-23/+23
code so that only one term is used everywhere (to simplify maintainability), as well as corrected several variable names and comments where there was copy/pasted code, but it wasn't corrected. Also moved emote shortcuts back to where they were originally, to reduce player confusion when the next build comes around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Fixed minimap state saving.Ira Rice1-21/+14
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Now, the real stage 2.0 of smiley window.Forge1-7/+3
All is done, and all files are now in the tree. (ok, copyright of new files is still opened... do as you want, if you care) Signed-off-by: Forge <jgrimbert@free.fr>
2009-01-08Fixed segvault when exiting with logToChat enabledPhilipp Sehmisch1-0/+1
2009-01-06Added support for unicode charset in textfields and chat.Guillaume Melquiond1-1/+1
Conflicts: src/Makefile.am src/game.cpp src/gui/browserbox.cpp src/gui/gui.cpp src/gui/textfield.cpp src/main.cpp (cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
2009-01-04Smiley step 1.91, the little part to make it workForge1-3/+23
TODO list of 1.9 still intact.
2009-01-02Step 1.5 of smiley update: allow usage of same key for smiley andForge1-460/+426
different purpose (as smiley are requiring a special key press, that's not a problem to assign the same key to differents purpose) The function of game.cpp get reindented in the process, but the actual change is minor. The keyboardconfig get a new function, returning directly the emoticon offset from the key pressed. (later, that function will return the index of the smiley shortcut/array that has been selected... later) Signed-off-by: Forge <jgrimbert@free.fr>
2009-01-01Customisable shortkey for smiley (defaulting to keypad 0-9/*)Forge1-26/+48
First step to more smileys... Fully functionnal, very minor modifications Provisions made for second step (windows for choosing smiley) Signed-off-by: Forge <jgrimbert@free.fr>
2008-12-14Code reformatting to conform to line lengthBjørn Lindeijer1-151/+160
(cherry picked from mainline) Conflicts: src/game.cpp
2008-12-10Obscure precise home directory name when making screenshotsFate1-9/+14
2008-12-09Make the window shortcuts configurableJared Adams1-11/+27
2008-12-07Added some initialization and removed ChargeDialogIra Rice1-8/+0
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> Conflicts: src/Makefile.am src/game.cpp src/gui/chargedialog.cpp src/gui/chargedialog.h src/localplayer.cpp src/localplayer.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Made minimap visible by defaultBjørn Lindeijer1-0/+2
Also remember its visibility state.
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-4/+11
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Add an effects manager (patch by Kage Jittai)Ira Rice1-0/+4
NOTE: This patch demonstrates the need to fix pixel coordinates in the eAthena client. Bjorn did the movement patch in the TMWClient, however, I still haven't got that fully working with the merges. It's likely that a clone will be developed to tackle this problem. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-27Merged a patch by Bjorn to fix allowing the joystick to be used without Ira Rice1-3/+1
being enabled first. A similar patch was asked for by Doorsman here, so this combined with the setup button on client startup, should be enough to fulfill that request from Doors.
2008-11-27Make sure to initialize joystick enabled stateBjørn Lindeijer1-2/+0
Joystick enabled state could end up uninitialized on unsuccesfully trying to open a joystick. In addition, the enabled state wasn't actually used in the accessor methods for the joystick buttons.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-9/+3
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-06Don't allow players to use items through item shortcuts while trading. Ira Rice1-74/+78
Patch done by Peavey on TMW.
2008-11-06Fix a missing brace that got lost on last commit (r4927)Dennis Friis1-0/+1
2008-11-06Do not activate shortcuts if tradewindow is visible.Dennis Friis1-9/+12
2008-11-03Fixed talk being recalled while t is held down. Thanks doors for Ira Rice1-9/+12
noticing this bug.
2008-10-31Last commit was a bit premature (was trying to cancel the commit). Ira Rice1-0/+6
Anyways, this patch improves keyboard support for NPCs by allowing the user to hit enter to proceed through the dialogs. What it doesn't do at the moment is give users a way to scroll through the dialog choices... yet. But once one is selected, you can hit enter to continue.
2008-10-31Improved keyboard support by putting the NPC ok button in focus, and Ira Rice1-0/+4
making it so that hitting enter on opening the dialog will close it.
2008-10-28Made it so that the trade window doesn't stay visible when it was open Ira Rice1-0/+1
before the client was closed. Patch by Trelos on TMW.
2008-10-28Fixed a fast walking bug that was caused by a state conflict Ira Rice1-3/+9
where the keys would tell the client to attack and stop attacking all at the same time. Thanks to SoftLace for reporting it.
2008-10-28Fixed trade window being visible on client startup when it was visible onBjørn Lindeijer1-0/+1
shutdown. Thanks to Trelos for looking into this problem.
2008-10-28Fixed attacking so that it will actually continue to attack in Ira Rice1-1/+1
succession like it's intended to if it's given a true keep flag, or just do one attack if that flag isn't set. Since most people seem to prefer to continue to attack when attacking, shift will be used for when someone only wants to hit the target once.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-03 02:49:29 +0000