Age | Commit message (Collapse) | Author | Files | Lines |
|
This required moving to C++0x, so it does that too, and fixes a few errors with
that.
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
|
|
|
|
Just some stuff that piles up while "looking" at the code, which
eventually gets annoying to ignore while staging real changes.
* Replaced a few NULL occurrences with 0
* Rely on default parameter for std::vector::resize.
* Replaced a few "" with std::string()
* Prefer .empty() to == ""
* Removed a few comparisons with NULL
* Don't check pointers before deleting them
* Removed a bunch of redundant semicolons
* Made some global variables static (local to their compilation unit)
* Prefer prefix ++/-- operators to postfix versions when possible
* Corrected location of a comment
|
|
Also fix position of being names.
Reviewed-by: Bertram
|
|
|
|
|
|
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Trivial change, no review needed.
|
|
Conflicts:
CMakeLists.txt
po/fi.po
po/fr.po
src/gui/skilldialog.cpp
src/localplayer.cpp
src/net/manaserv/generalhandler.cpp
src/net/tmwa/buysellhandler.cpp
src/net/tmwa/generalhandler.cpp
src/net/tmwa/playerhandler.cpp
src/net/tmwa/specialhandler.cpp
src/winver.h
|
|
This, instead of the protocol specific filenames that are
mana-skills.xml and ea-skills.xml.
This is backward compatible as the old skills.xml file was once
used before the 0.0.29.1 release which is the last alive from
the 0.0.x serie.
The skills.xml will have to added to world data
to make this working, though. (Done in another patch.)
|
|
This resolves http://bugs.manasource.org/view.php?id=330
Reviewed-by: Bertram
|
|
This is fixng many issues and (hopefully) will make the movement
rendering much smoother.
Merge branch 'master' of gitorious.org:~bertram/mana/mana-movement-code-merge
Conflicts:
src/being.cpp
src/net/manaserv/beinghandler.cpp
Resolves: TMW-Mantis #946.
Reviewed-by: Thorbjorn.
|
|
|
|
Reviewd-by: Thorbjorn
|
|
The thanks messages got removed, because they are useless and when
selling many items they completely trashed the chat.
The pick-up information for money now respects the configuration.
Reviewed-by: thorbjorn
|
|
I have to admit I contributed a large part of these. Sorry for that.
Less empty space, more attention to the code.
Acked-by: Jared Adams
|
|
Makes it clear what kind of listener it is, since there are other
listener classes as well.
Acked-by: Jared Adams
|
|
It's just an annoyance when it's only applied to a few classes. Either
we place everything in this namespace or nothing, and at the moment I
don't see any rationale for placing everything in a Mana namespace.
Acked-by: Jared Adams
|
|
Acked-by: Jared Adams
|
|
Acked-by: Jared Adams
|
|
The position is centered to the nearest tile center in tA.
|
|
and made use of it through the tA code.
I also remove the obsolete TODO in the flooritem class.
|
|
- Removed another bogus comment.
- Made functions used only in the tA::beinghandler static.
- Don't init the destination to an irrelevant value
in being::setDestination()
|
|
- Fixed bogus documentation.
- Fixed Vector parameters to const Vector& where releavant.
- Removed a false comment.
- Removed superfluous headers in src/net/tmwa/beinghandler.h.
- Optimize a bit the tmwa::beingHandler::getPixelsPerTickMoveSpeed()
function.
|
|
Also made the destination equal to the desired position
in that case since it's what the tA server expects.
This fixes monsters going to strange destinations while fighting
them, and makes it all much smoother.
|
|
The attack range is still hardcoded for Manaserv as long
as generic equipment handling hasn't been implemented.
|
|
This avoids code duplication.
|
|
I made it so that the behaviour can be changed with only
a boolean setting in the playerhandler.
|
|
by removing a now useless reset in the beinghandler.
Also added checks for flawed directions.
|
|
The attack range is always the default for manaserv, as proper
equipment handling is to be added.
Anyway, now the proper attack range is handled in tmwAthena
and is always set a proper minimum for both protocols.
|
|
Also fixed again a condition in Being::logic().
I'll beautify the code in tmwAthena:Beinghandler once everything
will be working better.
Note: I also suspect current clients to flood the server with
keyboard messages, hence blocking the animation when they are remote.
I'll need to test that with someone having the same client than here..
|
|
Also removed dead code.
|
|
The screen can either be "nudged" in a random direction with a specific
intensity or you can define an exact x and y intensity, decay factor and
duration. On a tmwAthena server an effect is triggered when the player
character dies. A method for stopping all shake effects is also
implemented, but not used yet. I added a netcode message for Manaserv to
trigger an effect server-sided. Because our protocol has currently no way
to transport floating point values, the decay is transported as a fixed
point value with 4 decimals which is entirely sufficient for this purpose.
|
|
This fix the following bug:
When changing map, the local player sometimes walks randomly
until the player reacts.
|
|
|
|
This was made in favour of the manaserv way of doing things.
I also added a way to keep the original server speed value
so the pixel value can be recomputed at each map change, as this
was necessary since the speed is given before the first map
is loaded.
The code is much more simpler now about movement handling,
and we can already see improvements on other characters
movements in The Mana World with this.
Everything can't be perfect the first time; here are bugs
identified so far:
- Monsters direction isn't updated on TmwAthena for obscure reasons.
- Remote players walking animation is sometimes reset on each steps.
- When changing map, the local player sometimes walks randomly
until the player reacts.
Stay tuned!
|
|
Translation file updates ignored.
Conflicts:
src/client.cpp
src/commandhandler.cpp
src/gui/popupmenu.cpp
src/localplayer.cpp
|
|
Reviewed-by: Jaxad0127
|
|
This will greatly help into upgrading the need of
each protocol separately.
This is the first step to a new item and equipment system for manaserv.
A subclassing of the EquipmentWindow will be done in the next commit,
as requested by Thorbjorn.
Reviewed-by: Thorbjorn.
|
|
Conflicts:
po/es.po
po/fr.po
src/net/tmwa/adminhandler.cpp
update-creator.sh
|
|
Could happen sometimes for GMs when the message is received either
before the player instance is created or after it was destroyed.
Also changed to a dynamic_cast, putting a little less trust in the
server.
Reviewed-by: Freeyorp
|
|
Was happening when logging to the dev manaserv server
and then to TMW-eA.
The client is still crashing after selecting the characters after
relogging but that's not introduced with this patch anyway.
Reviewed-by: Crush.
|
|
Instead of using events to invoke netcode,
invoke netcode directly and have it send events
Reviewed-by: Freeyorp
|
|
|
|
Reviewed-by: Freeyorp
|
|
Reviewed-by: Jared Adams
|
|
Conflicts:
src/being.cpp
src/client.cpp
src/commandhandler.cpp
src/gui/setup_video.cpp
src/gui/socialwindow.cpp
src/gui/viewport.cpp
src/gui/widgets/browserbox.cpp
src/gui/widgets/itemcontainer.cpp
src/imageparticle.cpp
src/localplayer.cpp
src/localplayer.h
src/map.cpp
src/net/tmwa/beinghandler.cpp
src/particle.cpp
src/particle.h
src/player.cpp
src/player.h
|
|
Following Rotonen's advise to "make anything and everything you
can think of recolorable", a theme can now define colors for
PARTY_CHAT_TAB and PARTY_SOCIAL_TAB. This was badly needed, because
the requirements for a color of a chat tab and of a player name
are quite different.
TODO: When guild support gets enabled, then have a look at the
colors for guilds.
Reviewed-by: 4144
|
|
As an upcoming feature the TMW-Athena server sends IP addresses or
IP hashes to game masters. The current client freezes if it receives
such a packet, therefor the game masters need to use a new client before
the server can use it. Normal players are not affected, because they
do not get this packet.
Showing the IP is optional and can be enable with the chat command
"/showip 1". The IP is then shown behind the players name.
Reviewed-by: Bertram
|