diff options
| author | Eugene Sandulenko | 2019-10-24 00:14:08 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-10-24 00:15:33 +0200 |
| commit | e15428c43fc62f3e139d6b97e61624941f7e08ba (patch) | |
| tree | 0d5d1af7e3876c264f0da13c675bbea306128678 | |
| parent | 2c5ae963561eead1dcfdd5885e1f1ebc8d9293eb (diff) | |
| download | scummvm-rg350-e15428c43fc62f3e139d6b97e61624941f7e08ba.tar.gz scummvm-rg350-e15428c43fc62f3e139d6b97e61624941f7e08ba.tar.bz2 scummvm-rg350-e15428c43fc62f3e139d6b97e61624941f7e08ba.zip | |
SCUMM HE: Fix libcurl compilation checks
| -rw-r--r-- | engines/scumm/he/logic/moonbase_logic.cpp | 10 | ||||
| -rw-r--r-- | engines/scumm/he/moonbase/moonbase.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/he/moonbase/moonbase.h | 2 | ||||
| -rw-r--r-- | engines/scumm/vars.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/scumm/he/logic/moonbase_logic.cpp b/engines/scumm/he/logic/moonbase_logic.cpp index 8b288d429e..880d86d017 100644 --- a/engines/scumm/he/logic/moonbase_logic.cpp +++ b/engines/scumm/he/logic/moonbase_logic.cpp @@ -24,7 +24,7 @@ #include "scumm/he/logic_he.h" #include "scumm/he/moonbase/moonbase.h" #include "scumm/he/moonbase/ai_main.h" -#ifdef USE_CURL +#ifdef USE_LIBCURL #include "scumm/he/moonbase/net_main.h" #include "scumm/he/moonbase/net_defines.h" #endif @@ -60,7 +60,7 @@ private: void op_ai_set_type(int op, int numArgs, int32 *args); void op_ai_clean_up(int op, int numArgs, int32 *args); -#ifdef USE_CURL +#ifdef USE_LIBCURL void op_net_remote_start_script(int op, int numArgs, int32 *args); void op_net_remote_send_array(int op, int numArgs, int32 *args); int op_net_remote_start_function(int op, int numArgs, int32 *args); @@ -165,7 +165,7 @@ int LogicHEmoonbase::versionID() { #define OP_NET_SET_AI_PLAYER_COUNT 1565 int LogicHEmoonbase::startOfFrame() { -#ifdef USE_CURL +#ifdef USE_LIBCURL _vm1->_moonbase->_net->doNetworkOnceAFrame(15); // Value should be passed in... #endif @@ -210,7 +210,7 @@ int32 LogicHEmoonbase::dispatch(int op, int numArgs, int32 *args) { op_ai_clean_up(op, numArgs, args); break; -#ifdef USE_CURL +#ifdef USE_LIBCURL case OP_NET_REMOTE_START_SCRIPT: op_net_remote_start_script(op, numArgs, args); break; @@ -381,7 +381,7 @@ void LogicHEmoonbase::op_ai_clean_up(int op, int numArgs, int32 *args) { _vm1->_moonbase->_ai->cleanUpAI(); } -#ifdef USE_CURL +#ifdef USE_LIBCURL void LogicHEmoonbase::op_net_remote_start_script(int op, int numArgs, int32 *args) { _vm1->_moonbase->_net->remoteStartScript(args[0], args[1], args[2], numArgs - 3, &args[3]); } diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp index cfdfde6b13..cb76c3f273 100644 --- a/engines/scumm/he/moonbase/moonbase.cpp +++ b/engines/scumm/he/moonbase/moonbase.cpp @@ -23,7 +23,7 @@ #include "scumm/he/intern_he.h" #include "scumm/he/moonbase/moonbase.h" #include "scumm/he/moonbase/ai_main.h" -#ifdef USE_CURL +#ifdef USE_LIBCURL #include "scumm/he/moonbase/net_main.h" #endif @@ -33,14 +33,14 @@ Moonbase::Moonbase(ScummEngine_v100he *vm) : _vm(vm) { initFOW(); _ai = new AI(_vm); -#ifdef USE_CURL +#ifdef USE_LIBCURL _net = new Net(_vm); #endif } Moonbase::~Moonbase() { delete _ai; -#ifdef USE_CURL +#ifdef USE_LIBCURL delete _net; #endif } diff --git a/engines/scumm/he/moonbase/moonbase.h b/engines/scumm/he/moonbase/moonbase.h index 61efd42d16..d5fa4550ac 100644 --- a/engines/scumm/he/moonbase/moonbase.h +++ b/engines/scumm/he/moonbase/moonbase.h @@ -72,7 +72,7 @@ public: uint32 _fowSentinelConditionBits; AI *_ai; -#ifdef USE_CURL +#ifdef USE_LIBCURL Net *_net; #endif diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 6fa5409ddd..67416b465f 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -744,7 +744,7 @@ void ScummEngine_v100he::resetScummVars() { ScummEngine_v99he::resetScummVars(); if (_game.id == GID_MOONBASE) { -#ifdef USE_CURL +#ifdef USE_LIBCURL VAR(VAR_NETWORK_AVAILABLE) = 1; #else VAR(VAR_NETWORK_AVAILABLE) = 0; |