Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
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
|
|
encountered when stepping someone through a 64-bit install on Ubuntu.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
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.
|
|
Players are then the next highest priority
|
|
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).
|
|
It was for testing and shouldn't have been committed
|
|
Basically ensures that the NPC text dialog is visible before making NPC
input dialogs visible
|
|
Server seems to want it in some cases
|
|
THis will prevent loading updates when -u is used, and prevent error
messages in the log when -u is used.
|
|
Order of initialization and suggested parenthesis.
|
|
THis will prevent loading updates when -u is used, and prevent error
messages in the log when -u is used.
|
|
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.
|
|
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.
|
|
|
|
|