summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accountserver.cbp2
-rw-r--r--gameserver.cbp2
-rw-r--r--src/game-server/map.cpp3
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)