aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/bladerunner.h
diff options
context:
space:
mode:
authorThanasis Antoniou2019-07-17 19:08:43 +0300
committerThanasis Antoniou2019-07-17 19:09:15 +0300
commitcaa4578add35021bfbb00b5f81359592402096a3 (patch)
tree2133b0dd3f4e71324bafc1ca65699ba79483e512 /engines/bladerunner/bladerunner.h
parentd1ff73cbb381db1876e2dbdf0457c9efc76fcd1a (diff)
downloadscummvm-rg350-caa4578add35021bfbb00b5f81359592402096a3.tar.gz
scummvm-rg350-caa4578add35021bfbb00b5f81359592402096a3.tar.bz2
scummvm-rg350-caa4578add35021bfbb00b5f81359592402096a3.zip
BLADERUNNER: Use unsigned 32bit diff for time durations
Diffstat (limited to 'engines/bladerunner/bladerunner.h')
-rw-r--r--engines/bladerunner/bladerunner.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index ceff3d70c4..3293741915 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -36,9 +36,9 @@
#include "graphics/surface.h"
//TODO: change this to debugflag
-#define BLADERUNNER_DEBUG_CONSOLE 0
+#define BLADERUNNER_DEBUG_CONSOLE 0
#define BLADERUNNER_ORIGINAL_SETTINGS 0
-#define BLADERUNNER_ORIGINAL_BUGS 0
+#define BLADERUNNER_ORIGINAL_BUGS 0
namespace Common {
struct Event;
@@ -108,13 +108,16 @@ class ZBuffer;
class BladeRunnerEngine : public Engine {
public:
static const int kArchiveCount = 12; // +2 to original value (10) to accommodate for SUBTITLES.MIX and one extra resource file, to allow for capability of loading all VQAx.MIX and the MODE.MIX file (debug purposes)
- static const int kActorCount = 100;
+ static const int kActorCount = 100;
static const int kActorVoiceOver = kActorCount - 1;
// Incremental number to keep track of significant revisions of the ScummVM bladerunner engine
// that could potentially introduce incompatibilities with old save files or require special actions to restore compatibility
// This is stored in game global variable "kVariableGameVersion"
// Original (classic) save game files will have version number of 0
- static const int kBladeRunnerScummVMVersion = 1; // 1: alpha testing (since May 15, 2019)
+ // Values:
+ // 1: alpha testing (from May 15, 2019 to July 17, 2019)
+ // 2: all time code uses uint32 (since July 17 2019),
+ static const int kBladeRunnerScummVMVersion = 2;
bool _gameIsRunning;
bool _windowIsActive;
@@ -214,8 +217,8 @@ public:
int _walkSoundPan;
int _runningActorId;
- int _mouseClickTimeLast;
- int _mouseClickTimeDiff;
+ uint32 _mouseClickTimeLast;
+ uint32 _mouseClickTimeDiff;
int _walkingToExitId;
bool _isInsideScriptExit;
@@ -232,8 +235,8 @@ public:
int _walkingToActorId;
bool _isInsideScriptActor;
- int _actorUpdateCounter;
- int _actorUpdateTimeLast;
+ int _actorUpdateCounter;
+ uint32 _actorUpdateTimeLast;
private:
MIXArchive _archives[kArchiveCount];