From dd569a1b7e48569ee854759fd0cc45c66c0d5b10 Mon Sep 17 00:00:00 2001 From: Arnaud BoutonnĂ© Date: Sun, 30 Aug 2009 23:39:25 +0000 Subject: Modify warning message for o5_deleteFile as it's not only used by Dynasty, and Add oPlaytoons_copyFile. The latest will need to be completed if a call requires it. For the moment, it only fixes the crash at the end of the 3rd video of the construction kit. svn-id: r43841 --- engines/gob/inter.h | 1 + engines/gob/inter_playtoons.cpp | 13 +++++++++++++ engines/gob/inter_v5.cpp | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/engines/gob/inter.h b/engines/gob/inter.h index c8d1ce2998..2817c0d5d1 100644 --- a/engines/gob/inter.h +++ b/engines/gob/inter.h @@ -563,6 +563,7 @@ protected: bool oPlaytoons_readData(OpFuncParams ¶ms); void oPlaytoons_CD_20_23(); void oPlaytoons_CD_25(); + void oPlaytoons_copyFile(); void oPlaytoons_openItk(); }; diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp index 2c14e64a57..121e194aa4 100644 --- a/engines/gob/inter_playtoons.cpp +++ b/engines/gob/inter_playtoons.cpp @@ -74,6 +74,7 @@ void Inter_Playtoons::setupOpcodesDraw() { OPCODEDRAW(0x20, oPlaytoons_CD_20_23); OPCODEDRAW(0x23, oPlaytoons_CD_20_23); OPCODEDRAW(0x25, oPlaytoons_CD_25); + OPCODEDRAW(0x60, oPlaytoons_copyFile); OPCODEDRAW(0x85, oPlaytoons_openItk); } @@ -269,6 +270,18 @@ void Inter_Playtoons::oPlaytoons_CD_25() { _vm->_game->_script->readVarIndex(); } +void Inter_Playtoons::oPlaytoons_copyFile() { + char fileName1[128]; + char fileName2[128]; + + _vm->_game->_script->evalExpr(0); + strncpy0(fileName1, _vm->_game->_script->getResultStr(), 127); + _vm->_game->_script->evalExpr(0); + strncpy0(fileName2, _vm->_game->_script->getResultStr(), 127); + + warning("Playtoons Stub: copy file from \"%s\" to \"%s\"", fileName1, fileName2); +} + void Inter_Playtoons::oPlaytoons_openItk() { char fileName[128]; char *backSlash; diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp index 986bad7cd3..b6cfe0ea3c 100644 --- a/engines/gob/inter_v5.cpp +++ b/engines/gob/inter_v5.cpp @@ -96,7 +96,7 @@ void Inter_v5::setupOpcodesGob() { void Inter_v5::o5_deleteFile() { _vm->_game->_script->evalExpr(0); - warning("Dynasty Stub: deleteFile \"%s\"", _vm->_game->_script->getResultStr()); + warning("deleteFile: \"%s\"", _vm->_game->_script->getResultStr()); } void Inter_v5::o5_initScreen() { -- cgit v1.2.3