Age | Commit message (Collapse) | Author | Files | Lines |
|
Uses counts in PlayerInfo instead.
Reviewed-by: Chuck Miller
|
|
Uses a state variable in PlayerInfo instead. Moves isTalking from Being
to PlayerInfo. Also some small cleanups.
Reviewed-by: Chuck Miller
|
|
Reviewed-By: Jared Adams
|
|
Conflicts:
src/gui/itempopup.cpp
src/item.cpp
src/monster.cpp
src/net/manaserv/playerhandler.cpp
src/net/tmwa/partyhandler.cpp
src/npc.cpp
src/player.cpp
src/resources/itemdb.cpp
src/resources/monsterdb.cpp
src/resources/monsterinfo.cpp
src/resources/npcdb.cpp
src/resources/spritedef.cpp
|
|
You'll have to include it anyways 99% of the time
|
|
Also move the virtual destructors of the Net handler base classes to
the top of their method lists.
Reviewed-by: Chuck Miller
|
|
Also cleanup PlayerInfo a bit.
Reviewed-by: Chuck Miller
|
|
data/paths.xml configuration file.
Also added default gui theme path in branding and default wallpaper path
and file searched respectively in the branding and paths.xml files.
Hard-coded values are still used as fallbacks.
Resolves: Manasource Mantis #148.
Reviewed-by: jaxad0127.
|
|
No need for two different classes to manage ActorSprites.
Reviewed-by: Chuck Miller
|
|
Instead of having these three subclasses with minor differences, this
commit merges them back into Being. In the future, we can make Beings
that are talkable to some, attackable by others, etc. This also puts
back support for monster equipment.
Also changes remaining references to Being::Type and the constants to
refer to ActorSprite::Type.
Reviewed-by: Freeyorp
|
|
This simplifies handling of target cursors, centralizing their logic into a
single class, instead of two. Also make them more flexible and move the image
files outside of the theme so servers can can control them and give them
better names.
Reviewed-by: Thorbjørn Lindeijer
|
|
This commit adds a sprite hierarchy (Sprite->ImageSprite,AnimatedSprite,CompundSprite;
CompoundSprite,Actor->ActorSprite;ActorSprite->Being,FloorItem) to collect common
functionailty into new base classes which will make other Mantis tickets easier to do.
Also allows monsters to use particle effects.
Reviewed-by: Bertram
|
|
Add variable cur_time for current time.
Add command /away [text]
Reviewed by: Bertram
|
|
Also do some cleanup that's been needed for a while.
Reviewed-by: Bertram
|
|
The remaining instances can't easily or safely be changed as the classes
involved don't have type information like Being does.
Reviewed-by: Freeyorp
|
|
This moves inventory/storage type into the Inventory class, having
size default to a call to the netcode to get the sive for the given
type.
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Chuck Miller
|
|
|
|
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.
Conflicts:
src/gui/gui.cpp
src/gui/viewport.cpp
|
|
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Freeyorp
|
|
|
|
Reviewed-by: http://pastebin.ca/1815165
|
|
Reviewed-by: Jared Adams
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Fix talk request flood from keyboard.
Fix duplicate lines in NPC dialogs.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Also make storage under eAthena more flexible.
Reviewed-by: Dennis Friis
|
|
Reviewed-by: Bernd Wachter
|
|
Much code was moved from main() to the new Client::exec(). This new
event loop now integrates with the Game class, so that the tick counter
and framerate limiter apply universally.
The Client class is also responsible for some things that used to be
global variables.
Mantis-issue: ...
|
|
|
|
|
|
game.
Signed-off-by: Tametomo <irarice@gmail.com>
|
|
Signed-off-by: Tametomo <irarice@gmail.com>
|
|
This change allows players to talk to multiple NPCs at a time (if the server agrees). Manaserv's netcode allows multiple commerce instances too. eAthena's is limited to one commerce instance, due to protocol limitations.
|
|
necessary so long as you're at least getting 1-2 fps (which would
result in a typing speed between 60-120 wpm). Even then, you've got
more serious things to be thinking about at that point than if all of
your input is being tracked, and having it inside the clock time loop
just cuts performance for everyone else.
This loop should get removed altogether, but there are a few items left
in it at the moment which would need to get reworked first before it can
be eliminated. In cases where you can't accurately know where something
would be because it's random, we should just scale the random formulas
to take a more drastic adjustment to compensate for that lag.
Signed-off-by: Tametomo <irarice@gmail.com>
Manual-merge-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
|
|
|
|
|
|
Makes sense if we depend on SDL_gfx anyway, and it seems to do a better
job at it than the code we had.
|
|
There was little point in keeping the Engine class separate. It wasn't
an engine at all, but only kept track of the currently active map, a job
more suitable for the Game class anyway.
|
|
Finish support for server types in the server dialog.
Using the new server type function, strip out ifdefs, replacing them with if
blocks for later merging in smaller atomic commits.
Remove any remaining references to the support defs, including in build system.
|
|
|
|
|
|
It now always works with pixels.
|
|
Right click contextual menu on player "follow" entry
Cancel the following by moving with mouse or keys
Adds a special behavior for map changes
|
|
Also remove some extra new lines and fix eAthena's PartyTab define guards.
|
|
Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.
|
|
|
|
|
|
|
|
This resolves http://bugs.manasource.org/view.php?id=37
|