diff options
author | Alexander Tkachev | 2016-08-15 17:05:24 +0600 |
---|---|---|
committer | Eugene Sandulenko | 2016-08-30 23:26:29 +0200 |
commit | aafc1ba145149b063c3c4f96c0f666eb98b522d5 (patch) | |
tree | a679cad6f8c31af1b1ad659e942d4d54ac550d10 | |
parent | 4df16d6e1255e627665294bf60da0fc3d3e5d9a4 (diff) | |
download | scummvm-rg350-aafc1ba145149b063c3c4f96c0f666eb98b522d5.tar.gz scummvm-rg350-aafc1ba145149b063c3c4f96c0f666eb98b522d5.tar.bz2 scummvm-rg350-aafc1ba145149b063c3c4f96c0f666eb98b522d5.zip |
HE: Add net_defines.h and a few stubs updates
SPUTM_CStringArrayFromScummString is still has to be implemented to
finish those stubs.
Net now has joinGame() and hostGame(), which are not implemented yet.
-rw-r--r-- | engines/scumm/he/logic/moonbase_logic.cpp | 21 | ||||
-rw-r--r-- | engines/scumm/he/moonbase/net_defines.h | 66 | ||||
-rw-r--r-- | engines/scumm/he/moonbase/net_main.cpp | 10 | ||||
-rw-r--r-- | engines/scumm/he/moonbase/net_main.h | 3 |
4 files changed, 96 insertions, 4 deletions
diff --git a/engines/scumm/he/logic/moonbase_logic.cpp b/engines/scumm/he/logic/moonbase_logic.cpp index 89e1e95a16..328d288bfc 100644 --- a/engines/scumm/he/logic/moonbase_logic.cpp +++ b/engines/scumm/he/logic/moonbase_logic.cpp @@ -26,6 +26,7 @@ #include "scumm/he/moonbase/ai_main.h" #ifdef USE_SDL_NET #include "scumm/he/moonbase/net_main.h" +#include "scumm/he/moonbase/net_defines.h" #endif namespace Scumm { @@ -509,12 +510,24 @@ int LogicHEmoonbase::op_net_get_ip_from_name(int op, int numArgs, int32 *args) { return 1; } int LogicHEmoonbase::op_net_host_tcpip_game(int op, int numArgs, int32 *args) { - warning("STUB: op_net_host_tcpip_game()"); - return 1; + char sessionName[MAX_SESSION_NAME]; + char userName[MAX_PLAYER_NAME]; + + // TODO: + //SPUTM_CStringArrayFromScummString(args[0], sessionName, sizeof(sessionName)); + //SPUTM_CStringArrayFromScummString(args[1], userName, sizeof(userName)); + + return _vm1->_moonbase->_net->hostGame(sessionName, userName); } int LogicHEmoonbase::op_net_join_tcpip_game(int op, int numArgs, int32 *args) { - warning("STUB: op_net_join_tcpip_game()"); - return 1; + char szIP[MAX_IP_SIZE]; + char userName[MAX_PLAYER_NAME]; + + // TODO: + //SPUTM_CStringArrayFromScummString(args[0], szIP, sizeof(szIP)); + //SPUTM_CStringArrayFromScummString(args[1], userName, sizeof(userName)); + + return _vm1->_moonbase->_net->joinGame(szIP, userName); } #endif diff --git a/engines/scumm/he/moonbase/net_defines.h b/engines/scumm/he/moonbase/net_defines.h new file mode 100644 index 0000000000..130ca1db94 --- /dev/null +++ b/engines/scumm/he/moonbase/net_defines.h @@ -0,0 +1,66 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef SCUMM_HE_MOONBASE_NET_DEFINES_H +#define SCUMM_HE_MOONBASE_NET_DEFINES_H + +namespace Scumm { + +// pnetwin.h + +#define PN_PRIORITY_HIGH 0x00000001 + +#define PN_SENDTYPE_INDIVIDUAL 1 +#define PN_SENDTYPE_GROUP 2 +#define PN_SENDTYPE_HOST 3 +#define PN_SENDTYPE_ALL 4 + +#define MAX_GAME_NAME 128 /* Used for the multiplayer networking code */ +#define MAX_PLAYER_NAME 128 /* Used for the multiplayer networking code */ +#define MAX_PROVIDER_NAME 128 +#define MAX_SESSION_NAME 128 + +#define MAX_GAMES_POLLED 16 +#define MAX_PROVIDERS 16 + +#define PACKETTYPE_REMOTESTARTSCRIPT 1 +#define PACKETTYPE_REMOTESTARTSCRIPTRETURN 2 +#define PACKETTYPE_REMOTESTARTSCRIPTRESULT 3 +#define PACKETTYPE_REMOTESENDSCUMMARRAY 4 + +const int SESSION_ERROR = 0; +const int USER_CREATED_SESSION = 1; +const int USER_JOINED_SESSION = 2; + +const int TCPIP_PROVIDER = -1; +const int NO_PROVIDER = -2; + +const int MAX_PACKET_SIZE = 4096; // bytes +const int MAX_HOSTNAME_SIZE = 256; +const int MAX_IP_SIZE = 32; +const char LOCAL_HOST[] = "127.0.0.1"; //localhost + +#define NULL_IP ""; //no IP address (causes enumsessions to search local subnet) + +} // End of namespace Scumm + +#endif diff --git a/engines/scumm/he/moonbase/net_main.cpp b/engines/scumm/he/moonbase/net_main.cpp index 554d0b0e71..dc95303f9f 100644 --- a/engines/scumm/he/moonbase/net_main.cpp +++ b/engines/scumm/he/moonbase/net_main.cpp @@ -30,4 +30,14 @@ Net::Net(ScummEngine_v100he *vm) : _vm(vm) { //some defaults for fields } +int Net::hostGame(char *sessionName, char *userName) { + warning("STUB: op_net_host_tcpip_game()"); // PN_HostTCPIPGame + return 0; +} + +int Net::joinGame(char *IP, char *userName) { + warning("STUB: Net::joinGame()"); // PN_JoinTCPIPGame + return 0; +} + } // End of namespace Scumm diff --git a/engines/scumm/he/moonbase/net_main.h b/engines/scumm/he/moonbase/net_main.h index 0a3acc1a82..4a7f898834 100644 --- a/engines/scumm/he/moonbase/net_main.h +++ b/engines/scumm/he/moonbase/net_main.h @@ -33,6 +33,9 @@ class Net { public: Net(ScummEngine_v100he *vm); + int hostGame(char *sessionName, char *userName); + int joinGame(char *IP, char *userName); + private: public: |