summaryrefslogtreecommitdiff
path: root/src/net
AgeCommit message (Collapse)AuthorFilesLines
2009-03-10Extended hit type handlingsniper1-6/+9
The client can now differentiate between the following hit types: - hit (normal) - critical (full attack) - multi (more than one hit at once, currently not used) - reflect (reflected damage, currently not used) - flee (dodging criticals) The Being's showCrit method is now merged into takeDamage. Being's takeDamage and handleAttack now both get the opponent, the amount of damage and the attack type as parameter.
2009-03-10Made it so that when windows load previous states, they are neverIra Rice1-2/+1
smaller than the minimum width and height (a check that should have been enforced in the first place), as well as modified the NPC list and text dialogs to remember where they were when they were moved or resized last. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Expand the scope where item links workKess Vargavind1-1/+1
This patch makes item links work in any chatLog() message, not only chatSend() as before. I enabled it for the "You picked <nr> <item>" message by explicitly adding [] around the item name in the string.
2009-03-09Send the correct packet for the NPC close buttonJared Adams2-8/+11
Both packets do the same, but we should be explicit anyways. Also, seperate out NPC client packets.
2009-03-09Add an interface for eAthena's storage systemJared Adams2-26/+60
2009-03-05Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer10-34/+34
Using unsigned rarely makes sense, especially when the server doesn't use it either. Other uses of unsigned should be reviewed. In all other cases, int is the fastest integer type on any architecture. Using 8 or 16 bits can basically only be a memory optimization.
2009-02-26Fixed showing being deaths. I removed the wrong pointless deathIra Rice1-6/+3
animation (case 1 is NOT death, but actually idle in SMSG_PLAYER_UPDATE_1) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice4-29/+33
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Added method for resetting npc integer dialogs in the last commit, butIra Rice1-0/+1
forgot to use it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Make sure that all dialogs are cleared on player death, not just the NPCIra Rice2-3/+3
text dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
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 Rice2-8/+8
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper1-3/+12
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer6-10/+9
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-17Fixed closing for NPC dialogs.Ira Rice1-1/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Fixed up NPC dialogs to behave more like eAthena expects.Jared Adams1-2/+1
2009-02-12Fix some spelling and whitespaceKess Vargavind2-25/+41
Also a few whitespace and spelling fixes.
2009-02-11Removed a few unneeded includes in the being handler.Ira Rice1-2/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Don't make log statements translatableBjørn Lindeijer1-4/+4
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-10Removed many pointless comparisons with NULLBjørn Lindeijer1-1/+1
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 Rice38-82/+118
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 Lindeijer7-88/+87
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-07Some more include cleanups.Ira Rice4-4/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Exposed some more strings I found to be translatable.Ira Rice6-29/+44
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Put back the 0x06b packet, which apparently our server uses. WillIra Rice1-0/+21
investigate why we use it and what this packet is meant to do. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Added a few translation strings to the char server handler, as well asIra Rice1-43/+14
remove the need for extensions.h in it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Modified the NPC string and integer classes to automatically take focusIra Rice1-0/+2
to the input fields. Now the only NPC dialog which isn't completely navigatable by the keyboard alone is the NPC list dialog (seems to have regressed slightly recently). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice4-18/+5
include anything not needed by that specific widget or window. This appears to have cleaned up system performance a bit on my current setup, where it went from idling on 45% in game with opengl down to 30% now. Also moved iptostring to the tostring header, as importing all of network.h is a little overkill to use that function, and it goes along with the basic functions that are in that header file anyways. TODO: find out a way to get rid of warnings when a class doesn't use this function. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Fix handling of packet 0x81Jared Adams4-33/+79
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer19-41/+43
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer36-144/+144
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-18Fixed the NPC Integer input field, as well as cut some bull from theIra Rice1-1/+1
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 Adams2-1/+26
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice7-88/+53
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Added support for internationalizationIra Rice1-34/+35
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch2-4/+7
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-12-26Fixed a potential leak in setup, changed the default border color toIra Rice1-2/+1
white for wallpapers (matches our wallpapers better), and fixed the effect manager. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Added some initialization and removed ChargeDialogIra Rice1-3/+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-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice10-30/+32
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-06Prevent the player from continuing to walk after opening a NPC dialog.Ira Rice1-0/+3
This used to be caused by right clicking on an NPC, then clicking on it and telling the sprite to move at the same time. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03While there is still a small visual artifact, this patch fixes the buyIra Rice1-0/+3
window so that it properly reports how much money you have.
2008-12-03Add an effects manager (patch by Kage Jittai)Ira Rice1-1/+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-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice1-1/+1
a confusion on git.
2008-11-22Fixed warning about passing NULL for a non-pointerBjørn Lindeijer1-1/+1
Encountered by z0ro.
2008-11-22While there is still a small visual artifact, this patch fixes the buy Ira Rice1-0/+1
window so that it properly reports how much money you have.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice38-123/+32
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 Lindeijer36-72/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-09Fixed NPC's reporting as dead on the new server.Ira Rice1-1/+2
2008-11-06Ported a patch by Peavey on TMW to keep all item pointers inside of Ira Rice1-4/+4
inventory. For us, this should get rid of the arrow crashing bug, if it still exists (been a few weeks since I've heard of it happening now).
2008-11-06Have equipment tied into player inventory instead of keeping its own list of ↵Dennis Friis1-4/+4
pointers to items. This ensures the ressource is up-to-date and avoids crashes on stale item pointers.