diff options
| author | jacob1 <jfu614@gmail.com> | 2013-06-24 04:02:00 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-06-24 04:02:00 (GMT) |
| commit | 776b2f6607acf43ec64f0479001d049a4cc0d854 (patch) | |
| tree | 08e5a50617adc5776c6561c70ee51705078dbad1 /src | |
| parent | 76ce2de1ce23fbe79d2794713d132eeb871642bd (diff) | |
| download | powder-776b2f6607acf43ec64f0479001d049a4cc0d854.zip powder-776b2f6607acf43ec64f0479001d049a4cc0d854.tar.gz | |
fix version tagging in saves
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/GameSave.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/Simulation.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp index 2a7c996..c3aee45 100644 --- a/src/client/GameSave.cpp +++ b/src/client/GameSave.cpp @@ -1962,8 +1962,8 @@ char * GameSave::serialiseOPS(int & dataLength) bson_append_start_object(&b, "origin"); bson_append_int(&b, "majorVersion", SAVE_VERSION); bson_append_int(&b, "minorVersion", MINOR_VERSION); - bson_append_int(&b, "buildNum", MINOR_VERSION); - bson_append_int(&b, "snapshotId", MINOR_VERSION); + bson_append_int(&b, "buildNum", BUILD_NUM); + bson_append_int(&b, "snapshotId", SNAPSHOT_ID); bson_append_string(&b, "releaseType", IDENT_RELTYPE); bson_append_string(&b, "platform", IDENT_PLATFORM); bson_append_string(&b, "builtType", IDENT_BUILD); diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index d741b8f..a45ef10 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1996,7 +1996,7 @@ void Simulation::init_can_move() } for (movingType = 1; movingType < PT_NUM; movingType++) { - // everything "swaps" with VACU and BHOL to make them eat things + //everything "swaps" with VACU and BHOL to make them eat things can_move[movingType][PT_BHOL] = 1; can_move[movingType][PT_NBHL] = 1; //nothing goes through stickmen @@ -2005,7 +2005,7 @@ void Simulation::init_can_move() can_move[movingType][PT_FIGH] = 0; //INVS behaviour varies with pressure can_move[movingType][PT_INVIS] = 3; - //stop CNCT being displaced by other particles + //stop CNCT from being displaced by other particles can_move[movingType][PT_CNCT] = 0; //VOID and PVOD behaviour varies with powered state and ctype can_move[movingType][PT_PVOD] = 3; |