diff options
| author | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-01-10 20:19:06 +0100 |
|---|---|---|
| committer | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-01-10 20:19:06 +0100 |
| commit | d65dfcfa04a622effcd4cebdfaa5e713ca7627d8 (patch) | |
| tree | abcc3c0aa41ca2f860ee2e6d43491ff555fd0512 | |
| parent | 7f712f1c9d00182660298d123d120444ef6a4996 (diff) | |
| download | manaserv-d65dfcfa04a622effcd4cebdfaa5e713ca7627d8.tar.gz manaserv-d65dfcfa04a622effcd4cebdfaa5e713ca7627d8.tar.xz manaserv-d65dfcfa04a622effcd4cebdfaa5e713ca7627d8.zip | |
Removing default argument values from Map definition
The default argument values had no effect, because they are
not in the declaration.
Updating the codeblock project, because protocol.h had been renamed.
Reviewed-by: Bertram
| -rw-r--r-- | accountserver.cbp | 2 | ||||
| -rw-r--r-- | gameserver.cbp | 2 | ||||
| -rw-r--r-- | src/game-server/map.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/accountserver.cbp b/accountserver.cbp index 5b9e1d4..6aa5643 100644 --- a/accountserver.cbp +++ b/accountserver.cbp @@ -144,7 +144,7 @@ <Unit filename="src\net\netcomputer.cpp" /> <Unit filename="src\net\netcomputer.h" /> <Unit filename="src\utils\point.h" /> - <Unit filename="src\protocol.h" /> + <Unit filename="src\manaserv_protocol.h" /> <Unit filename="src\serialize\characterdata.h" /> <Unit filename="src\utils\base64.cpp" /> <Unit filename="src\utils\base64.h" /> diff --git a/gameserver.cbp b/gameserver.cbp index 4f700b9..94cc130 100644 --- a/gameserver.cbp +++ b/gameserver.cbp @@ -172,7 +172,7 @@ <Unit filename="src\net\netcomputer.cpp" /> <Unit filename="src\net\netcomputer.h" /> <Unit filename="src\utils\point.h" /> - <Unit filename="src\protocol.h" /> + <Unit filename="src\manaserv_protocol.h" /> <Unit filename="src\scripting\lua.cpp" /> <Unit filename="src\scripting\luascript.cpp" /> <Unit filename="src\scripting\luascript.h" /> diff --git a/src/game-server/map.cpp b/src/game-server/map.cpp index e1cebd0..390649d 100644 --- a/src/game-server/map.cpp +++ b/src/game-server/map.cpp @@ -45,8 +45,7 @@ bool Location::operator< (const Location &loc) const return tile->Fcost > loc.tile->Fcost; } -Map::Map(int width = 0, int height = 0, - int twidth = DEFAULT_TILE_LENGTH, int theight = DEFAULT_TILE_LENGTH): +Map::Map(int width, int height, int twidth, int theight): mWidth(width), mHeight(height), mTileWidth(twidth), mTileHeight(theight), onClosedList(1), onOpenList(2) |