diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-21 20:40:07 +0100 |
---|---|---|
committer | Chuck Miller <shadowmil@gmail.com> | 2010-02-21 17:05:40 -0500 |
commit | c8b0d1e56f27c3141895d28b2fc768afffe7bb2d (patch) | |
tree | 0a03458836badee3e1b0da13a0721c9261e7fa86 /src/map.cpp | |
parent | 204a14c91bbe4436eb3b26bebf30cbe5669bdd1a (diff) | |
download | mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.gz mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.bz2 mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.xz mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.zip |
Made tick counter and framerate limiter work during login sequence
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: ...
Diffstat (limited to 'src/map.cpp')
-rw-r--r-- | src/map.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/map.cpp b/src/map.cpp index 7c45050b..6d332d48 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -19,11 +19,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "map.h" + #include "beingmanager.h" +#include "client.h" #include "configuration.h" -#include "game.h" #include "graphics.h" -#include "map.h" #include "particle.h" #include "simpleanimation.h" #include "sprite.h" @@ -38,8 +39,6 @@ #include <queue> -extern volatile int tick_time; - /** * A location on a tile map. Used for pathfinding, open list. */ @@ -291,14 +290,13 @@ bool spriteCompare(const Sprite *a, const Sprite *b) void Map::update(int ticks) { - //update animated tiles + // Update animated tiles for (std::map<int, TileAnimation*>::iterator iAni = mTileAnimations.begin(); iAni != mTileAnimations.end(); iAni++) { iAni->second->update(ticks); } - } void Map::draw(Graphics *graphics, int scrollX, int scrollY) |