summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-10 05:22:25 +0000
committerJared Adams <jaxad0127@gmail.com>2010-01-10 05:22:25 +0000
commit5757066312cab082378dbc5d8df97dea3fe40af0 (patch)
tree1f41ef6c5fce15d4ce823efa843ad4f4df3ad338
parent0c86751e2ca0674e1ae6e584b9e017af8d1e48fe (diff)
downloadmana-5757066312cab082378dbc5d8df97dea3fe40af0.tar.gz
mana-5757066312cab082378dbc5d8df97dea3fe40af0.tar.bz2
mana-5757066312cab082378dbc5d8df97dea3fe40af0.tar.xz
mana-5757066312cab082378dbc5d8df97dea3fe40af0.zip
Fix initialization order in Being and Map
-rw-r--r--src/being.cpp4
-rw-r--r--src/map.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 6ae71f85..6e8449a4 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -94,8 +94,8 @@ Being::Being(int id, int job, Map *map):
#endif
mPx(0), mPy(0),
mX(0), mY(0),
- mUsedTargetCursor(NULL),
- mTakedDamage(0)
+ mTakedDamage(0),
+ mUsedTargetCursor(NULL)
{
setMap(map);
diff --git a/src/map.cpp b/src/map.cpp
index 73686d61..db1e9aa2 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -185,9 +185,9 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
mWidth(width), mHeight(height),
mTileWidth(tileWidth), mTileHeight(tileHeight),
mMaxTileHeight(height),
+ mDebugFlags(MAP_NORMAL),
mOnClosedList(1), mOnOpenList(2),
- mLastScrollX(0.0f), mLastScrollY(0.0f),
- mDebugFlags(MAP_NORMAL)
+ mLastScrollX(0.0f), mLastScrollY(0.0f)
{
const int size = mWidth * mHeight;