summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-03-08Add an interface for eAthena's storage systemJared Adams10-24/+94
2009-03-08Add units files to CMake listJared Adams1-0/+2
2009-03-08Fix some NPC-related bugsJared Adams1-15/+25
NPCs are always in range, so show it. Also, don't attack NPCs (causes an infinite talk loop with most).
2009-03-06Add the unit classes to the Code::Blocks fileJared Adams1-0/+2
2009-03-06Fix layout of debug windowJared Adams1-3/+2
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer44-282/+324
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
2009-03-05Made some optimizations based on some profiling done by Octalot, as wellIra Rice36-265/+248
as some other optimizations that I could see that cut down on some unneeded redraws, which in turn improved frame rates slightly. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-05Removed a check I added in the previous commit which isn't necessary.Ira Rice1-9/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-05Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer28-122/+122
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-06Microoptimization in compile speedBjørn Lindeijer2-4/+5
No need to include localplayer.h from inventorywindow.h
2009-03-06Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer25-90/+86
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-02Cut down on constant streaming of attacks. Attacks from players now onlyIra Rice2-2/+2
occur on each swing action. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-02Added particle attacks back on to the players. However, instead of beingIra Rice5-10/+67
constant, particle attacks are now weapon specific, so that different weapons can have different attacks. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-02Only auto target monstersJared Adams1-6/+3
Also, increase auto target range to 20 tiles
2009-03-01Added a note about some people also needing libtool. This wasIra Rice1-0/+5
encountered when stepping someone through a 64-bit install on Ubuntu. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-01Only talk to NPCs with the keyboard with a targetJared Adams1-6/+0
2009-02-28Allow chatting while talking to NPCsJared Adams3-30/+22
2009-02-28Allow sending attack packets when not in rangeJared Adams1-4/+2
This helps when your target is atually in another location due to synchronization problems.
2009-02-26Don't clear current NPC earlyJared Adams3-5/+0
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer42-169/+295
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-26Forgot to extend the player or NPC specifying fields as well.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-26Extended job numbers based on what's actually used for Ragnarok'sIra Rice1-3/+3
server. TODO: Make this externally configurable, so that specific servers can specify what they use specific sprite IDs for, as well as specifying good defaults as well, in case that configuration file isn't found. Signed-off-by: Ira Rice <irarice@gmail.com>
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-26Fixed an error in shoplistboxes as identified by Octalot.Ira Rice10-27/+14
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice19-141/+165
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Prevent duplicate NPC talking when using keyboardJared Adams3-2/+8
Based on commit a1e483913672e55704e8fbafeff5ea0ccc0c9b07 from Aethyra.
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams21-148/+142
The Being ID is used instead, as that is all that was ever really needed.
2009-02-25Don't delete the Being in the NPC classJared Adams1-4/+1
The BeingManager will clean it up when it's next cleared. One hanging Being isn't too much. A reference count system like resources use might be a better way to handle Beings.
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 Rice6-3/+15
text dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25If no network is set, then don't continueIra Rice1-1/+10
Based on TMW commit a996d4bff3cc5a35ee5cdb6cb5bdef920cf44120 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix some problems with deleting NPCs earlyJared Adams3-11/+14
2009-02-25If no network is set, then don't continueJared Adams1-0/+2
Only checks in these two palces for now, as missing network in the others would indicate a design flaw.
2009-02-25Don't delete the current NPC too earlyJared Adams1-3/+11
2009-02-25Fixed up NPC list dialogs to be navigatable by keyboard (scrollingIra Rice9-15/+136
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 Rice12-61/+89
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Don't set current_npc when initiating interractionJared Adams1-1/+0
Let it be set by the netcode if the NPC responds. This caused a movement bug if they didn't.
2009-02-24Don't set current_npc when initiating interractionJared Adams1-1/+0
Let it be set by the netcode if the NPC responds. This caused a movement bug if they didn't.
2009-02-24Prioritize monsters when targetingJared Adams1-3/+3
Players are then the next highest priority
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-24Remove debug statement that should've been removedJared Adams1-1/+0
It was for testing and shouldn't have been committed
2009-02-24Small dialog visibility fixJared Adams6-0/+27
Basically ensures that the NPC text dialog is visible before making NPC input dialogs visible
2009-02-24Send a next dialog packet when ending interactionJared Adams1-0/+1
Server seems to want it in some cases
2009-02-24Fix update handlingJared Adams1-11/+11
THis will prevent loading updates when -u is used, and prevent error messages in the log when -u is used.
2009-02-24Fixed compile warningsBjørn Lindeijer3-7/+7
Order of initialization and suggested parenthesis.
2009-02-24Fix update handlingJared Adams1-11/+11
THis will prevent loading updates when -u is used, and prevent error messages in the log when -u is used.
2009-02-23Allow to sell non-stackable items like stackablesMajin Sniper5-32/+259
Make it possible to sell non-stackable items all at once by introducing "Duplicate Items" and a Shop that can handle them. Also fix a trivial bug to correctly preview you money while selling.
2009-02-23Allow to sell non-stackable items like stackablesMajin Sniper5-33/+260
Make it possible to sell non-stackable items all at once by introducing "Duplicate Items" and a Shop that can handle them. Also fix a trivial bug to correctly preview you money while selling.
2009-02-23Hide the buy/sell dialogs when there is no NPCJared Adams6-0/+36
2009-02-23End NPC interraction when canceling list inpuJared Adams1-0/+1