[Scummvm-git-logs] scummvm master -> cda5fda164d3152236a079449a020acac96cee42

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cda5fda164 SCUMM HE: Really Fix Compilation


Commit: cda5fda164d3152236a079449a020acac96cee42
    https://github.com/scummvm/scummvm/commit/cda5fda164d3152236a079449a020acac96cee42
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-23T00:40:53+01:00

Commit Message:
SCUMM HE: Really Fix Compilation

Changed paths:
    engines/scumm/he/logic/moonbase_logic.cpp


diff --git a/engines/scumm/he/logic/moonbase_logic.cpp b/engines/scumm/he/logic/moonbase_logic.cpp
index d16f8f9..8b288d4 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_SDL_NET
+#ifdef USE_CURL
 #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_SDL_NET
+#ifdef USE_CURL
 	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,9 @@ int LogicHEmoonbase::versionID() {
 #define OP_NET_SET_AI_PLAYER_COUNT			1565
 
 int LogicHEmoonbase::startOfFrame() {
+#ifdef USE_CURL
 	_vm1->_moonbase->_net->doNetworkOnceAFrame(15); // Value should be passed in...
+#endif
 
 	return 0;
 }
@@ -208,7 +210,7 @@ int32 LogicHEmoonbase::dispatch(int op, int numArgs, int32 *args) {
 		op_ai_clean_up(op, numArgs, args);
 		break;
 
-#ifdef USE_SDL_NET
+#ifdef USE_CURL
 	case OP_NET_REMOTE_START_SCRIPT:
 		op_net_remote_start_script(op, numArgs, args);
 		break;
@@ -379,7 +381,7 @@ void LogicHEmoonbase::op_ai_clean_up(int op, int numArgs, int32 *args) {
 	_vm1->_moonbase->_ai->cleanUpAI();
 }
 
-#ifdef USE_SDL_NET
+#ifdef USE_CURL
 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]);
 }