cpp/openttd-patchpack/source Changeset - r23269:0ff1cc4177d3

Changeset - r23269:0ff1cc4177d3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Niels Martin Hansen - 5 years ago 2019-01-27 14:35:12
nielsm@indvikleren.dk

Codechange: Separate gamelog revision length from network revision length

2 files changed with 4 insertions and 3 deletions:

src/gamelog_internal.h

src/saveload/gamelog_sl.cpp

0 comments (0 inline, 0 general)

src/gamelog_internal.h

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file gamelog_internal.h Declaration shared among gamelog.cpp and saveload/gamelog_sl.cpp */
 #ifndef GAMELOG_INTERNAL_H
 #define GAMELOG_INTERNAL_H
 #include "network/core/config.h"
 #include "gamelog.h"
 /** Type of logged change */
 enum GamelogChangeType {
 	GLCT_MODE,        ///< Scenario editor x Game, different landscape
 	GLCT_REVISION,    ///< Changed game revision string
@@ @@ -30,22 +29,24 @@ enum GamelogChangeType { @@
 	GLCT_EMERGENCY,   ///< Emergency savegame
 	GLCT_END,         ///< So we know how many GLCTs are there
 	GLCT_NONE = 0xFF, ///< In savegames, end of list
 };
 static const uint GAMELOG_REVISION_LENGTH = 15;
 /** Contains information about one logged change */
 struct LoggedChange {
 	GamelogChangeType ct; ///< Type of change logged in this struct
 	union {
 		struct {
 			byte mode;       ///< new game mode - Editor x Game
 			byte landscape;  ///< landscape (temperate, arctic, ...)
 		} mode;
 		struct {
-			char text[NETWORK_REVISION_LENGTH]; ///< revision string, _openttd_revision
+			char text[GAMELOG_REVISION_LENGTH]; ///< revision string, _openttd_revision
 			uint32 newgrf;   ///< _openttd_newgrf_version
 			uint16 slver;    ///< _sl_version
 			byte modified;   ///< _openttd_revision_modified
 		} revision;
 		struct {
 			uint32 type;     ///< type of savegame, @see SavegameType

src/saveload/gamelog_sl.cpp

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ static const SaveLoad _glog_mode_desc[] @@
 	SLE_VAR(LoggedChange, mode.mode,         SLE_UINT8),
 	SLE_VAR(LoggedChange, mode.landscape,    SLE_UINT8),
 	SLE_END()
 };
 static const SaveLoad _glog_revision_desc[] = {
-	SLE_ARR(LoggedChange, revision.text,     SLE_UINT8,  NETWORK_REVISION_LENGTH),
+	SLE_ARR(LoggedChange, revision.text,     SLE_UINT8,  GAMELOG_REVISION_LENGTH),
 	SLE_VAR(LoggedChange, revision.newgrf,   SLE_UINT32),
 	SLE_VAR(LoggedChange, revision.slver,    SLE_UINT16),
 	SLE_VAR(LoggedChange, revision.modified, SLE_UINT8),
 	SLE_END()
 };

0 comments (0 inline, 0 general)