libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XEEN: Implement cmdCheckProtection and cmdAlterEvent opcodes

Browse Source
This commit is contained in:
Paul Gilbert 2015-01-24 19:38:58 -05:00
parent 0d8d66cb82
commit fe6b580ff1
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engines/xeen/scripts.cpp
View File

@ -178,7 +178,7 @@ void Scripts::doOpcode(MazeEvent &event) {
&Scripts::cmdAlterHed, &Scripts::cmdDisplayStat, &Scripts::cmdTakeOrGive,
&Scripts::cmdSeatTextSml, &Scripts::cmdPlayEventVoc, &Scripts::cmdDisplayBottom,
&Scripts::cmdIfMapFlag, &Scripts::cmdSelRndChar, &Scripts::cmdGiveEnchanted,
&Scripts::cmdItemType, &Scripts::cmdMakeNothingHere, &Scripts::cmdNoAction2,
&Scripts::cmdItemType, &Scripts::cmdMakeNothingHere, &Scripts::cmdCheckProtection,
&Scripts::cmdChooseNumeric, &Scripts::cmdDisplayBottomTwoLines,
&Scripts::cmdDisplayLarge, &Scripts::cmdExchObj, &Scripts::cmdFallToMap,
&Scripts::cmdDisplayMain, &Scripts::cmdGoto, &Scripts::cmdConfirmWord,
@ -534,7 +534,25 @@ void Scripts::cmdJumpRnd(Common::Array<byte> &params) {
cmdNoAction(params);
}
void Scripts::cmdAlterEvent(Common::Array<byte> &params) { error("TODO"); }
/**
* Alter an existing event
*/
void Scripts::cmdAlterEvent(Common::Array<byte> &params) {
Map &map = *_vm->_map;
Party &party = *_vm->_party;
for (uint idx = 0; idx < map._events.size(); ++idx) {
MazeEvent &evt = map._events[idx];
if (evt._position == party._mazePosition &&
(evt._direction == DIR_ALL || evt._direction == party._mazeDirection) &&
evt._line == params[0]) {
evt._opcode = (Opcode)params[1];
}
}
_var4F = true;
cmdNoAction(params);
}
/**
* Stores the current location and line for later resuming, and set up to execute
@ -607,7 +625,13 @@ void Scripts::cmdMakeNothingHere(Common::Array<byte> &params) {
cmdExit(params);
}
void Scripts::cmdNoAction2(Common::Array<byte> &params) { error("TODO"); }
void Scripts::cmdCheckProtection(Common::Array<byte> &params) {
if (copyProtectionCheck())
cmdNoAction(params);
else
cmdExit(params);
}
void Scripts::cmdChooseNumeric(Common::Array<byte> &params) { error("TODO"); }
void Scripts::cmdDisplayBottomTwoLines(Common::Array<byte> &params) { error("TODO"); }
void Scripts::cmdDisplayLarge(Common::Array<byte> &params) { error("TODO"); }
@ -907,8 +931,7 @@ bool Scripts::ifProc(int action, uint32 mask, int mode, int charIndex) {
break;
case 44:
v = YesNo::show(_vm, mask, 0);
if (!mask && v)
v = 0;
v = (!v && !mask) ? 2 : mask;
break;
case 45:
// Might base (before bonus)
@ -1101,4 +1124,9 @@ bool Scripts::ifProc(int action, uint32 mask, int mode, int charIndex) {
}
}
bool Scripts::copyProtectionCheck() {
// Currentl not implemented
return true;
}
} // End of namespace Xeen

4
engines/xeen/scripts.h
View File

@ -183,7 +183,7 @@ private:
void cmdGiveEnchanted(Common::Array<byte> &params);
void cmdItemType(Common::Array<byte> &params);
void cmdMakeNothingHere(Common::Array<byte> &params);
void cmdNoAction2(Common::Array<byte> &params);
void cmdCheckProtection(Common::Array<byte> &params);
void cmdChooseNumeric(Common::Array<byte> &params);
void cmdDisplayBottomTwoLines(Common::Array<byte> &params);
void cmdDisplayLarge(Common::Array<byte> &params);
@ -208,6 +208,8 @@ private:
void doEnding(const Common::String &endStr, int v2);
bool ifProc(int action, uint32 mask, int mode, int charIndex);
bool copyProtectionCheck();
public:
int _animCounter;
bool _eventSkipped;