From 45947f6ccc02b336497b896490e1ffe4d74c4965 Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Wed, 17 Aug 2016 15:59:41 +0600 Subject: [PATCH] SCUMM HE: Add init-related kludges --- engines/scumm/he/logic/moonbase_logic.cpp | 16 ++++++++-------- engines/scumm/he/moonbase/net_main.cpp | 20 ++++++++++++++++++++ engines/scumm/he/moonbase/net_main.h | 6 +++++- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/engines/scumm/he/logic/moonbase_logic.cpp b/engines/scumm/he/logic/moonbase_logic.cpp index da37417fe0af..63d25321284b 100644 --- a/engines/scumm/he/logic/moonbase_logic.cpp +++ b/engines/scumm/he/logic/moonbase_logic.cpp @@ -383,21 +383,21 @@ int LogicHEmoonbase::op_net_remote_start_function(int op, int numArgs, int32 *ar warning("STUB: op_net_remote_start_function()"); return 1; } + int LogicHEmoonbase::op_net_do_init_all(int op, int numArgs, int32 *args) { - warning("STUB: op_net_do_init_all()"); - return 1; + return _vm1->_moonbase->_net->initAll(); } + int LogicHEmoonbase::op_net_do_init_provider(int op, int numArgs, int32 *args) { - warning("STUB: op_net_do_init_provider()"); - return 1; + return _vm1->_moonbase->_net->initProvider(); } + int LogicHEmoonbase::op_net_do_init_session(int op, int numArgs, int32 *args) { - warning("STUB: op_net_do_init_session()"); - return 1; + return _vm1->_moonbase->_net->initSession(); } + int LogicHEmoonbase::op_net_do_init_user(int op, int numArgs, int32 *args) { - warning("STUB: op_net_do_init_user()"); - return 1; + return _vm1->_moonbase->_net->initUser(); } int LogicHEmoonbase::op_net_query_providers(int op, int numArgs, int32 *args) { diff --git a/engines/scumm/he/moonbase/net_main.cpp b/engines/scumm/he/moonbase/net_main.cpp index 8938e05ffb88..f2ef1c8cf1da 100644 --- a/engines/scumm/he/moonbase/net_main.cpp +++ b/engines/scumm/he/moonbase/net_main.cpp @@ -138,6 +138,26 @@ int Net::closeProvider() { return 0; } +bool Net::initAll() { + warning("STUB: Net::initAll()"); // PN_DoInitAll + return false; +} + +bool Net::initProvider() { + warning("STUB: Net::initProvider()"); // PN_DoInitProvider + return false; +} + +bool Net::initSession() { + warning("STUB: Net::initSession()"); // PN_DoInitSession + return false; +} + +bool Net::initUser() { + warning("STUB: Net::initUser()"); // PN_DoInitUser + return false; +} + bool Net::getHostName(char *hostname, int length) { warning("STUB: Net::getHostName(\"%s\", %d)", hostname, length); // PN_GetHostName return false; diff --git a/engines/scumm/he/moonbase/net_main.h b/engines/scumm/he/moonbase/net_main.h index 0490c1ce1044..dbfe08d40f2e 100644 --- a/engines/scumm/he/moonbase/net_main.h +++ b/engines/scumm/he/moonbase/net_main.h @@ -55,6 +55,10 @@ class Net { int queryProviders(); int setProvider(int providerIndex); int closeProvider(); + bool initAll(); + bool initProvider(); + bool initSession(); + bool initUser(); private: @@ -65,7 +69,7 @@ class Net { void getSessionName(int sessionNumber, char *buffer, int length); int getSessionPlayerCount(int sessionNumber); void getProviderName(int providerIndex, char *buffer, int length); - + private: //mostly getters