dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add flags for mismatch type to client desync log

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-08-20 20:47:17 +01:00
parent ec892879f4
commit 459a49cb24
7 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/crashlog.h
View File

@@ -12,8 +12,22 @@
#ifndef CRASHLOG_H
#define CRASHLOG_H
#include "core/enum_type.hpp"
#include <string>
struct DesyncExtraInfo {
enum Flags {
DEIF_NONE = 0, ///< no flags
DEIF_RAND1 = 1 << 0, ///< random 1 mismatch
DEIF_RAND2 = 1 << 1, ///< random 2 mismatch
DEIF_STATE = 1 << 2, ///< state mismatch
DEIF_DBL_RAND = 1 << 3, ///< double-seed sent
};
Flags flags = DEIF_NONE;
};
DECLARE_ENUM_AS_BIT_SET(DesyncExtraInfo::Flags)
/**
* Helper class for creating crash logs.
*/
@@ -113,7 +127,7 @@ public:
virtual ~CrashLog() {}
char *FillCrashLog(char *buffer, const char *last) const;
char *FillDesyncCrashLog(char *buffer, const char *last) const;
char *FillDesyncCrashLog(char *buffer, const char *last, const DesyncExtraInfo &info) const;
bool WriteCrashLog(const char *buffer, char *filename, const char *filename_last, const char *name = "crash") const;
/**
@@ -130,7 +144,7 @@ public:
bool WriteScreenshot(char *filename, const char *filename_last, const char *name = "crash") const;
bool MakeCrashLog() const;
bool MakeDesyncCrashLog(const std::string *log_in, std::string *log_out) const;
bool MakeDesyncCrashLog(const std::string *log_in, std::string *log_out, const DesyncExtraInfo &info) const;
bool MakeCrashSavegameAndScreenshot() const;
/**
@@ -140,7 +154,7 @@ public:
*/
static void InitialiseCrashLog();
static void DesyncCrashLog(const std::string *log_in, std::string *log_out);
static void DesyncCrashLog(const std::string *log_in, std::string *log_out, const DesyncExtraInfo &info);
static void SetErrorMessage(const char *message);
static void AfterCrashLogCleanup();