Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
Reviewed-by: CodyMartin.
|
|
Trivial.
|
|
At some point this variable was used to avoid limiting the framerate
when user input events were coming in. This is no longer relevant now
that we limit the framerate globally using SDL_gfx.
|
|
No point in using mCurrentDialog for the OkDialog, since it will clean
up after itself, as was pointed out in many places throughout the code.
Now there are two convenience functions for popping up the OkDialog and
having it change to a specified state afterwards. This also gets rid of
the 4 different ActionListener classes that existed solely for this
purpose.
Reviewed-by: Yohann Ferreira
|
|
It's currently used when changing maps.
Resolves: TMW-Mantis: #750.
Reviewed-by: Thorbjorn.
|
|
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
|
|
Translation file updates ignored.
Conflicts:
src/client.cpp
src/commandhandler.cpp
src/gui/popupmenu.cpp
src/localplayer.cpp
|
|
This name represents the name of the client software, not the branding
it received.
Cleaned up the rest of the code a bit.
Reviewed-by: Jared Adams
|
|
Resolves: Mana-mantis #236.
Reviewed-by: Mpa4Hu.
|
|
|
|
Now the icon extension is computed against the os,
except for mac where the behaviour is left untouched.
This means that the 'icons/mana' appIcon branding parameter
will now load icons/mana.png files for unices,
and icons/mana.ico for Windows.
Reviewed-by: Trapdoor.
Resolves: Mana-Mantis: #135.
|
|
Now the icon extension is computed against the os.
This means that the 'icons/mana' appIcon branding parameter
will now load icons/mana.png files for unices and mac,
and icons/mana.ico for Windows.
Reviewed-by: Trapdoor.
Resolves: Mana-Mantis: #135.
|
|
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.
|
|
Now the client returns to server choice dialog with a warning
instead of aborting.
I'm kinda certain I'm not the only one getting crazy
with such a lazy behaviour.
Reviewed-by: Jaxad.
|
|
Reviewed-by: Jared Adams
|
|
|
|
Reviewed-by: Freeyorp
|
|
This resolves http://bugs.manasource.org/view.php?id=259
Reviewed-by: Thorbjorn
|
|
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
|
|
transparency'.
That name is more explicit about what it actually does.
Reviewed-by: CodyMartin.
|
|
- Now OpenGL and the transparency disabling are set at startup and
not read again for displaying graphics, preventing graphic errors
before startup.
- We also agreed long time ago that SDL specific functions
should have a SDL prefix. The header has been rearranged a bit
to do so.
- Also fixed a possible discrepancy in the hasAlphaChannel() function.
Reviewed-by: CodyMartin.
Resolves: Mana-Mantis: #260.
|
|
Add portable option to windows installer.
Reviewed-by: Thorbjorn
|
|
This disables the Image::setAlpha() function, which
uses 60% of the client's CPU cycles.
When enabled, visual quality is slightly decreased,
especially with the particle system.
Toggling this setting On from an Off state requires
a client restart or the graphics look quite funny.
Bertram's addition:
- Renamed 'Low CPU' to 'Disable transparency (Low CPU)' in the gui
for better understanding.
- Removed the sprite display with 30% opacity when disabling
transparency since it made monsters and drops be drawn above all layers
at full opacity.
- Made the OpenGL mode disable the 'low CPU mode'.
- Fixed the GUI logic as much as possible. Please note that the GUI opacity
slider stays enabled when transparency is disabled even if told to be disabled
in that case.
Reviewed-by: CodyMartin, 4144, MadCamel.
|
|
Enabled by default.
Can be disabled in configuration option "alphaCache" if set it to 0.
Reviewed-by: Bertram
|
|
Switch login gets you stuck at the ConnectionDialog. That
happens because logout is not implemented.
TODO: Implementing proper logout.
This resolves http://bugs.manasource.org/view.php?id=225
|
|
If config variable screenshotDirectory has national symbols in it, the
client could not read cofig.xml, and always used default settings.
In order to get ready for a client release, now the config.xml does not
save the screenshot folder. The --screenshot-dir commandline option
is working as before, the value is just not permanent anymore. This
makes actually sense, since the options for update folder and config
folder are not permanent either.
This resolves http://bugs.manasource.org/view.php?id=112
Reviewed-by: Jaxad0127
|
|
Conflicts:
src/actorspritemanager.h
src/beingmanager.cpp
src/game.cpp
src/gui/beingpopup.cpp
src/gui/chat.cpp
src/gui/chat.h
src/gui/inventorywindow.h
src/gui/itempopup.cpp
src/gui/socialwindow.cpp
src/gui/statuswindow.cpp
src/gui/widgets/chattab.cpp
src/gui/widgets/chattab.h
src/net/tmwa/inventoryhandler.cpp
src/net/tmwa/partyhandler.cpp
src/party.cpp
src/sound.cpp
src/utils/stringutils.cpp
src/utils/stringutils.h
|
|
Reviewed-by: Bertram
|
|
For Linux OpenGL was already deactivated.
For OSX it is still by default switched on.
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Jaxad0127
|
|
|
|
If server and port was given on the command line, then the server type
was unknown. The command line options do work now, but only if standard
ports 6901 and 9601 are used.
This resolves http://bugs.manasource.org/view.php?id=177
TODO: Query the server about itself and choose the server type based on that.
Reviewed-by: Jaxad0127
|
|
|
|
EventManager has been merged into Event, with some new convinience methods
added.
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Yohann Ferreira
|
|
Conflicts:
src/net/tmwa/chathandler.cpp
|
|
Please note that I didn't turned all the getValue() call into new ones,
simply because I have to have config object initiated which is not
forcefully the case the branding file.
Resolves: Manasource Mantis #170.
|
|
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.
|
|
files.
Restored functional recharge bars in specials window.
Individual specials are only shown after the server informed the client about their status.
Made level label, use button and progress bars optional. Their use is controlled through specials.xml.
The special window button is again shown even when the player has no specials. This problem needs to be solved differently now for architecture reasons.
Reviewed-by: Jaxad0127
|
|
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
|
|
Also fix a small compilation error sometimes reported.
Reviewed-by: Chuck Miller
|
|
|