| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/game-server/inventory.cpp
src/game-server/inventory.h
src/game-server/item.h
src/game-server/main-game.cpp
src/game-server/skillmanager.cpp
src/utils/point.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
and item managers.
ack-by: o11c.
note: The managers still need to auto deinit when already loaded.
This will be done in another trivial commit.
|
| |
| |
| |
| |
| |
| |
| | |
Reviewed-by: o11c.
Note: the initialize/reload() api problem will be fixed in another
commit.
|
| |
| |
| |
| | |
TriggerArea::update() function.
|
| |
| |
| |
| |
| | |
This will permit better handling of both skills names and id.
This is needed to start reworking on the auto-attack system.
|
| |
| |
| |
| | |
Ack-by: o11c.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As the server was exitting when the insertion was failing
anyway, and because the GameState::update() doesn't allow
actor insertion while the update process, it was then
pretty weird to not use an enqueued insertion for it.
Plus, it fixes an assertion failure when scheduling
an npc creation.
Resolves: Mana-Mantis #360.
Reviewed-by: o11c.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The bug was pretty generic, as the contains() method
of the Rectangle class wasn't checking against left and top
sides according to the client view point.
I also documented the call site.
Resolves: Mana-Mantis #317.
Reviewed-by: o11c.
|
| |
| |
| |
| |
| |
| | |
This doesn't change anything yet.
Reviewed-by: o11c.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add chatcommand @getpos <character> which return the mapid and location of the character.
Part of: Mana-Mantis: #385.
Reviewed-by: Bertram.
|
| |
| |
| |
| |
| |
| | |
Resolves: Mana-Mantis #386
Reviewed-by: o11c.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also made some random changes where useful, including:
- Code formatting fixes,
- Design fix about the fact that only the game config option
should be checked.
- Fixed the size of the values sent and receive to follow
the rest of the development.
- Fixed variables names to make them show what they are,
and not why they are used.
Resolves: Mana-Mantis #142.
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/account-server/storage.cpp
src/game-server/mapreader.cpp
src/sql/mysql/createTables.sql
|
| |
| |
| |
| |
| |
| | |
Resolves: Mana-Mantis: #388.
Reviewed-by: Bertram.
|
| |
| |
| |
| | |
Reviewed-by: Bertram.
|
| |
| |
| |
| |
| |
| | |
Resolves: Mana-Mantis: #379.
Reviewed-by: Bertram.
|
| |
| |
| |
| |
| |
| | |
Resolves: Mana-Mantis #293.
Reviewed-by: Bertram.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
You now can change the anger of a monster to a being using
mana.monster_change_anger(monster, being, anger)
Resolves: Mana-Mantis #366.
|
| | |
|
| |
| |
| |
| | |
Resolves: Mana-Mantis: #388.
|
| |
| |
| |
| |
| | |
Add chatcommand @getpos <character> which return the mapid and location of the character.
Part of: Mana-Mantis: #385.
|
| |
| |
| |
| | |
Resolves: Mana-Mantis: #379.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A race condition on the being pointer could happen when
the being queue was highly requested.
IMHO, using queues to add being but remove them directly
is the way to go.
Resolves: Mana-Mantis #384
|
| |
| |
| |
| | |
Resolves: Mana-Mantis #386
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It was uneasy to not miss something when updating the db.
And as the db version is somewhat corresponding to a certain
protocol version, adding it in the protocol file sounds relevant
to me, and helps when updating it.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
This will permit better handling of both skills names and id.
This is needed to start reworking on the auto-attack system.
|
| | |
| | |
| | |
| | | |
TriggerArea::update() function.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As the server was exitting when the insertion was failing
anyway, and because the GameState::update() doesn't allow
actor insertion while the update process, it was then
pretty weird to not use an enqueued insertion for it.
Plus, it fixes an assertion failure when scheduling
an npc creation.
Resolves: Mana-Mantis #360.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The bug was pretty generic, as the contains() method
of the Rectangle class wasn't checking against left and top
sides according to the client view point.
Resolves: Mana-Mantis #317.
|
|\| | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
equipment-fix
Conflicts:
example/serverdata/scripts/maps/desert.lua
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
an arbitrary number of layers. (up to 255).
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Made the server handle only one slot type requirement since
it's irrelevant to have more anyway.
Plus, it simplifies the code for both equipping/unequipping.
I also added a dagger to show how equipping/unequipping
is working.
|
| |\| |
| | | |
| | | |
| | | | |
equipment-fix
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It will make the client capable to tell which item
is to be unequipped when there are several item equipped
within a slot type, for instance.
The client has now yet to be upgraded to follow the new protocol.
|
| | | | |
|
| |\| |
| | |/
| |/|
| | |
| | |
| | |
| | | |
git://gitorious.org/~bertram/mana/manaserv-equipment-fix into equipment-fix
Conflicts:
src/common/manaserv_protocol.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I made the system handle the fact that equipment item
are completely unlinked to the inventory items.
Equip items now have a unique itemInstance number permitting
to equip the same item type multiple time when the slot capacity
is wide enough to do so.
I also prepared the functions to welcome in the near tests against
scripted equipment.
The equip process is known to be working server-side but the unequip
process has yet to be reviewed, even if implemented.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously it was a list of pair ofunsigned int,
used to get the equipment slot requirements.
It didn't make sense as the ItemEquipsInfo was already a list of it.
So you had to manage with a list of list and that ended up being
irrelevant to the need.
I had to disable the equip function to permit compilation.
This will be fixed in my next commit.
|
| | | |
|
| | |
| | |
| | |
| | | |
to something more meaningful.
|
| | |\ |
|