diff options
| author | Eugene Sandulenko | 2019-11-01 00:28:46 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-01 00:29:11 +0100 |
| commit | 53db8dc5ff8d7276d635bc12766f494e7b7a9030 (patch) | |
| tree | e49ddcc4fb25bf8fc36238be6201b287630e6def /engines | |
| parent | 8fb57967d75b5ef9911fbbbf15eb25b43458c997 (diff) | |
| download | scummvm-rg350-53db8dc5ff8d7276d635bc12766f494e7b7a9030.tar.gz scummvm-rg350-53db8dc5ff8d7276d635bc12766f494e7b7a9030.tar.bz2 scummvm-rg350-53db8dc5ff8d7276d635bc12766f494e7b7a9030.zip | |
SCUMM HE: MBC: Read script params from the JSON packets
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/he/moonbase/net_main.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/engines/scumm/he/moonbase/net_main.cpp b/engines/scumm/he/moonbase/net_main.cpp index dbed749e5d..4df7dd6075 100644 --- a/engines/scumm/he/moonbase/net_main.cpp +++ b/engines/scumm/he/moonbase/net_main.cpp @@ -497,22 +497,16 @@ bool Net::remoteReceiveData() { uint from = _packetdata->child("from")->asIntegerNumber(); uint type = _packetdata->child("type")->asIntegerNumber(); - int datalen = _packetdata->child("data")->asArray().size(); - for (uint i = 0; i < datalen; i++) { - _packbuffer[i] = _packetdata->child("data")->asArray()[i]->asIntegerNumber(); - } - - Common::MemoryReadStream pack(_packbuffer, datalen); - uint32 *params; switch (type) { case PACKETTYPE_REMOTESTARTSCRIPT: { + int datalen = _packetdata->child("data")->child("params")->asArray().size(); params = (uint32 *)_tmpbuffer; - for (int i = 0; i < 24; i++) { - *params = pack.readUint32LE(); + for (int i = 0; i < datalen; i++) { + *params = _packetdata->child("data")->child("params")->asArray()[i]->asIntegerNumber(); params++; } @@ -522,10 +516,11 @@ bool Net::remoteReceiveData() { case PACKETTYPE_REMOTESTARTSCRIPTRETURN: { + int datalen = _packetdata->child("data")->child("params")->asArray().size(); params = (uint32 *)_tmpbuffer; - for (int i = 0; i < 24; i++) { - *params = pack.readUint32LE(); + for (int i = 0; i < datalen; i++) { + *params = _packetdata->child("data")->child("params")->asArray()[i]->asIntegerNumber(); params++; } @@ -553,7 +548,7 @@ bool Net::remoteReceiveData() { // and unpack it into an scumm array :-) newArray = _vm->findFreeArrayId(); - unpackageArray(newArray, _packbuffer, datalen); + //unpackageArray(newArray, _packbuffer, datalen); memset(_tmpbuffer, 0, 25 * 4); WRITE_UINT32(_tmpbuffer, newArray); |