summaryrefslogtreecommitdiff
path: root/src/net
AgeCommit message (Collapse)AuthorFilesLines
2009-03-27Fixed position of dots on minimapBjørn Lindeijer1-0/+1
Also made mPx and mPy private and synchronize with mPos on setPosition(). The side effects of setting destination and clearing the path have been removed from setPosition(). Only the tmwserv PlayerHandler seemed to rely on that feature. Mantis-issue: 672
2009-03-27Fix some problems with NPC dialogsJared Adams1-0/+2
NPCListDialog couldn't be opened because of infinite recursion, and it and NPCTextDialog both had resize bugs.
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+4
Conflicts: src/beingmanager.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/label.cpp src/gui/label.h src/gui/popup.cpp src/gui/popup.h src/gui/scrollarea.cpp src/gui/skin.cpp src/gui/skin.h src/gui/speechbubble.cpp src/gui/window.cpp src/gui/window.h src/localplayer.h src/main.cpp src/net/ea/playerhandler.cpp src/resources/ambientoverlay.h src/resources/dye.cpp src/resources/imagewriter.cpp src/resources/itemdb.cpp src/shopitem.cpp
2009-03-27Fixed some compiler warningsBjørn Lindeijer1-5/+4
Fixed a faulty == statement that should have been an assignment and a mismatched 'else' block.
2009-03-27Moved choosing of random death message to a functionBjørn Lindeijer1-55/+58
Also dynamically calculated the size of the array, so that you don't have to count the messages manually. :P
2009-03-27Changed the includes for the net/tmwserv/ directoryBjørn Lindeijer48-281/+285
2009-03-27Include statement cleanup for net/ea/ directory.Bjørn Lindeijer32-239/+264
2009-03-26Major clean up of ChatTab handlingJared Adams12-68/+69
ChatTabs now manage their own adding/removal from the chat window, which lost most of it's chat related messages. Whisper handling is stil done by the ChatWindow, but it no longer manages any other tabs. ChannelTab handling is now the sole responsability of the Channels they are attached to. The general tab is handled by Game.
2009-03-26Add whisper tabs for TMWServJared Adams1-6/+1
2009-03-26Add WhisperTabsJared Adams1-7/+4
2009-03-27Compile warning fixesBjørn Lindeijer1-1/+1
Mostly unsigned/signed mismatches and an unused variable.
2009-03-26Some code cleanups (mostly reducing how many calculations need to beIra Rice1-3/+3
done in certain statements, rearranging arguements to make them look cleaner, or overall making the code slightly more flexible) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-26Add ChannelTab for chat channelsJared Adams2-9/+14
This fixes TMWServ compilation form the previous commit.
2009-03-26Fixes to file headers and header guardsBjørn Lindeijer46-223/+223
Mostly removal of branding for tmwserv related files, as was done for the eAthena client before.
2009-03-25A host of code style fixesBjørn Lindeijer3-4/+4
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'origin/master'Bjørn Lindeijer2-0/+102
Conflicts: .mailmap
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer14-133/+188
Conflicts: A lot of files.
2009-03-24Forgot to add eAthena's item handlerJared Adams2-0/+102
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer2-3/+2
Conflicts: Many files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams56-129/+129
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-23Remove the CHATSKILL structJared Adams1-9/+0
2009-03-23Remove extra function for skill messagesJared Adams1-95/+89
2009-03-22Move handling of eA skill messages to SkillHandlerJared Adams1-1/+129
2009-03-22Fixed map name saving in the engine class. Somehow, the const getsIra Rice1-3/+2
overridden after map_path, so the saved map path needs to get saved before that. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer91-2507/+7819
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-18Fix up the NPC interraction widnows a bitJared Adams2-9/+3
2009-03-18Fix up the NPC interraction widnows a bitJared Adams2-9/+3
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-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-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-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-09Send the correct packet for the NPC close buttonJared Adams2-9/+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-08Forgot the actual storage windowJared Adams2-7/+8
2009-03-08Add an interface for eAthena's storage systemJared Adams1-20/+53
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-03-06Got 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-26Merge branch 'aethyra/master'Bjørn Lindeijer4-26/+22
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-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-25Fix NPC handling to not need a handle on the NPCJared Adams4-25/+24
The Being ID is used instead, as that is all that was ever really needed.
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-25Fix some problems with deleting NPCs earlyJared Adams1-1/+1
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-24Fix handling of next and close packetsJared Adams1-5/+15
If we aren't talking with the NPC that they originate from, just send off the next dialog packet, as empty dialogs don't help. This prevents problems with ivisible NPCs that just send close (which was ignored by older clients anyways).
2009-02-23Clear text from NpcTextDialog when character diesJared Adams1-1/+8
Also hid the integer and string dialogs
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-14 11:15:00 +0000