libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM HE: Fix libcurl compilation checks

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-10-24 00:14:08 +02:00
parent 2c5ae96356
commit e15428c43f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/scumm/he/logic/moonbase_logic.cpp
View File

@ -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]);
}

6
engines/scumm/he/moonbase/moonbase.cpp
View File

@ -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
}

2
engines/scumm/he/moonbase/moonbase.h
View File

@ -72,7 +72,7 @@ public:
uint32 _fowSentinelConditionBits;
AI *_ai;
#ifdef USE_CURL
#ifdef USE_LIBCURL
Net *_net;
#endif

2
engines/scumm/vars.cpp
View File

@ -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;