Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
Use the last location the user gave instead. Also, do the same for the
inventory dialog.
|
|
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.
|
|
The cancel button in Video configuration window doesn't switch back the
"show name" setting to the original state. This patch fixes that.
|
|
|
|
|
|
|
|
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.
|
|
Both packets do the same, but we should be explicit anyways. Also,
seperate out NPC client packets.
|
|
|
|
|
|
|
|
NPCs are always in range, so show it. Also, don't attack NPCs (causes an
infinite talk loop with most).
|
|
|
|
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
|
|
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>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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.
|
|
No need to include localplayer.h from inventorywindow.h
|
|
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.
|
|
occur on each swing action.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
constant, particle attacks are now weapon specific, so that different
weapons can have different attacks.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also, increase auto target range to 20 tiles
|
|
|
|
|
|
This helps when your target is atually in another location due to
synchronization problems.
|
|
|
|
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
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
animation (case 1 is NOT death, but actually idle in SMSG_PLAYER_UPDATE_1)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Based on commit a1e483913672e55704e8fbafeff5ea0ccc0c9b07 from Aethyra.
|
|
The Being ID is used instead, as that is all that was ever really
needed.
|
|
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.
|
|
forgot to use it.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
text dialog.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Based on TMW commit a996d4bff3cc5a35ee5cdb6cb5bdef920cf44120
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Only checks in these two palces for now, as missing network in the
others would indicate a design flaw.
|
|
|
|
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>
|
|
(which would happen from using the keyboard instead of the mouse).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Let it be set by the netcode if the NPC responds. This caused a movement
bug if they didn't.
|
|
Let it be set by the netcode if the NPC responds. This caused a movement
bug if they didn't.
|