NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic

This commit is contained in:
lindaandersson 2014-02-04 16:08:53 +01:00
parent d8c7220569 b810fa1586
commit d364456189
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Game/GameLogic/LevelLoader/ObjectDefines.h
View File

@ -95,7 +95,7 @@ namespace GameLogic
struct LevelMetaData : ObjectTypeHeader struct LevelMetaData : ObjectTypeHeader
{ {
std::string levelName; std::string levelName;
FormatVersion levelVersion; int levelVersion;
std::string levelDescription; std::string levelDescription;
std::string levelAuthor; std::string levelAuthor;
int maxNumberOfPlayer; int maxNumberOfPlayer;

4
Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
View File

@ -58,8 +58,8 @@ namespace GameLogic
header.levelName.assign(&tempName[0], &tempName[tempSize]); header.levelName.assign(&tempName[0], &tempName[tempSize]);
start += tempSize; start += tempSize;
memcpy(&header.levelVersion, &buffer[start], 8); memcpy(&header.levelVersion, &buffer[start], 4);
start += 8; start += 4;
memcpy(&tempSize, &buffer[start], 4); memcpy(&tempSize, &buffer[start], 4);
start +=4; start +=4;