diff options
| author | Eugene Sandulenko | 2019-10-24 00:03:53 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-10-24 00:15:33 +0200 |
| commit | 22ba110e829d62af3e014b0a73a7155aa6bbbe3c (patch) | |
| tree | 2b00c2267efc67cceee08aaf884f6109f8f5ad91 | |
| parent | a0c58a53b3db7710c333da66cde3125ea74559b8 (diff) | |
| download | scummvm-rg350-22ba110e829d62af3e014b0a73a7155aa6bbbe3c.tar.gz scummvm-rg350-22ba110e829d62af3e014b0a73a7155aa6bbbe3c.tar.bz2 scummvm-rg350-22ba110e829d62af3e014b0a73a7155aa6bbbe3c.zip | |
SCUMM HE: Set up networking variable later during execution
| -rw-r--r-- | engines/scumm/he/intern_he.h | 1 | ||||
| -rw-r--r-- | engines/scumm/he/moonbase/moonbase.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/vars.cpp | 12 |
3 files changed, 13 insertions, 3 deletions
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index bd0ab76f09..d1487c76fc 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -611,6 +611,7 @@ public: virtual void resetScumm(); virtual void setupScummVars(); + virtual void resetScummVars(); protected: virtual void setupOpcodes(); diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp index 1c03fc7300..cfdfde6b13 100644 --- a/engines/scumm/he/moonbase/moonbase.cpp +++ b/engines/scumm/he/moonbase/moonbase.cpp @@ -35,9 +35,6 @@ Moonbase::Moonbase(ScummEngine_v100he *vm) : _vm(vm) { _ai = new AI(_vm); #ifdef USE_CURL _net = new Net(_vm); - _vm->VAR(_vm->VAR_NETWORK_AVAILABLE) = 1; -#else - _vm->VAR(_vm->VAR_NETWORK_AVAILABLE) = 0; #endif } diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 4f00e71f0d..6fa5409ddd 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -740,6 +740,18 @@ void ScummEngine_v99he::resetScummVars() { } #endif +void ScummEngine_v100he::resetScummVars() { + ScummEngine_v99he::resetScummVars(); + + if (_game.id == GID_MOONBASE) { +#ifdef USE_CURL + VAR(VAR_NETWORK_AVAILABLE) = 1; +#else + VAR(VAR_NETWORK_AVAILABLE) = 0; +#endif + } +} + void ScummEngine::resetScummVars() { if (_game.heversion < 70 && _game.version <= 6) { // VAR_SOUNDCARD modes |