Merge branch 'save_ext' into jgrpp
# Conflicts: # Makefile.src.in # findversion.sh # projects/determineversion.vbs # src/gamelog.cpp # src/gamelog_internal.h # src/lang/german.txt # src/lang/korean.txt # src/network/core/config.h # src/network/network.cpp # src/network/network_udp.cpp # src/rev.h # src/saveload/afterload.cpp # src/saveload/company_sl.cpp # src/saveload/depot_sl.cpp # src/saveload/gamelog_sl.cpp # src/saveload/misc_sl.cpp # src/saveload/order_sl.cpp # src/saveload/saveload.cpp # src/saveload/station_sl.cpp # src/saveload/town_sl.cpp # src/saveload/vehicle_sl.cpp # src/table/settings.ini # src/viewport.cpp
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
#ifndef GAMELOG_INTERNAL_H
|
||||
#define GAMELOG_INTERNAL_H
|
||||
|
||||
#include "network/core/config.h"
|
||||
#include "gamelog.h"
|
||||
|
||||
/** Type of logged change */
|
||||
@@ -33,6 +32,8 @@ enum GamelogChangeType {
|
||||
};
|
||||
|
||||
|
||||
static const uint GAMELOG_REVISION_LENGTH = 15;
|
||||
|
||||
/** Contains information about one logged change */
|
||||
struct LoggedChange {
|
||||
GamelogChangeType ct; ///< Type of change logged in this struct
|
||||
|
||||
Reference in New Issue
Block a user