thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PRINCE: O_CHANGEMOB(), getMobVisible(), setMobVisible()

Browse source
This commit is contained in:
lukaslw 2014-06-28 09:51:14 +02:00
parent 011ecf0c6d
commit 49de202a21
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/prince/prince.cpp
View file

@ -401,7 +401,7 @@ bool PrinceEngine::loadLocation(uint16 locationNr) {
_mainHero->setShadowScale(_script->getShadowScale(_locationNr)); _mainHero->setShadowScale(_script->getShadowScale(_locationNr));
for (uint i = 0; i < _mobList.size(); i++) { for (uint i = 0; i < _mobList.size(); i++) {
_mobList[i]._visible = _script->getMobVisible(_room->_mobs, i); _mobList[i]._visible = _script->getMobVisible(i);
} }
clearBackAnimList(); clearBackAnimList();

4
engines/prince/prince.h
View file

@ -266,6 +266,8 @@ public:
int32 _picWindowY; int32 _picWindowY;
Image::BitmapDecoder *_roomBmp; Image::BitmapDecoder *_roomBmp;
MhwanhDecoder *_suitcaseBmp; MhwanhDecoder *_suitcaseBmp;
Room *_room;
Script *_script;
Common::Array<AnimListItem> _animList; Common::Array<AnimListItem> _animList;
Common::Array<BackgroundAnim> _backAnimList; Common::Array<BackgroundAnim> _backAnimList;
@ -403,12 +405,10 @@ private:
Cursor *_cursor3; Cursor *_cursor3;
Debugger *_debugger; Debugger *_debugger;
GraphicsMan *_graph; GraphicsMan *_graph;
Script *_script;
InterpreterFlags *_flags; InterpreterFlags *_flags;
Interpreter *_interpreter; Interpreter *_interpreter;
Font *_font; Font *_font;
MusicPlayer *_midiPlayer; MusicPlayer *_midiPlayer;
Room *_room;
static const uint32 MAX_SAMPLES = 60; static const uint32 MAX_SAMPLES = 60;
Common::SeekableReadStream *_voiceStream[MAX_SAMPLES]; Common::SeekableReadStream *_voiceStream[MAX_SAMPLES];

17
engines/prince/script.cpp
View file

@ -224,8 +224,12 @@ uint32 Script::getStartGameOffset() {
return _scriptInfo.startGame; return _scriptInfo.startGame;
} }
bool Script::getMobVisible(int roomMobOffset, int mobNr) { bool Script::getMobVisible(int mob) {
return _data[roomMobOffset + mobNr]; return _data[_vm->_room->_mobs + mob];
}
void Script::setMobVisible(int mob, int value) {
_data[_vm->_room->_mobs + mob] = value;
} }
uint8 *Script::getRoomOffset(int locationNr) { uint8 *Script::getRoomOffset(int locationNr) {
@ -458,7 +462,9 @@ void Interpreter::debugInterpreter(const char *s, ...) {
Common::String str = Common::String::format("@0x%08X: ", _lastInstruction); Common::String str = Common::String::format("@0x%08X: ", _lastInstruction);
str += Common::String::format("op %04d: ", _lastOpcode); str += Common::String::format("op %04d: ", _lastOpcode);
//debugC(10, DebugChannel::kScript, "PrinceEngine::Script %s %s", str.c_str(), buf); //debugC(10, DebugChannel::kScript, "PrinceEngine::Script %s %s", str.c_str(), buf);
if (_mode == "fg") {
debug(10, "PrinceEngine::Script %s %s", str.c_str(), buf); debug(10, "PrinceEngine::Script %s %s", str.c_str(), buf);
}
//debug("Prince::Script frame %08ld mode %s %s %s", _vm->_frameNr, _mode, str.c_str(), buf); //debug("Prince::Script frame %08ld mode %s %s %s", _vm->_frameNr, _mode, str.c_str(), buf);
} }
@ -536,7 +542,7 @@ Flags::Id Interpreter::readScriptFlagId() {
} }
void Interpreter::O_WAITFOREVER() { void Interpreter::O_WAITFOREVER() {
debugInterpreter("O_WAITFOREVER"); //debugInterpreter("O_WAITFOREVER");
_opcodeNF = 1; _opcodeNF = 1;
_currentInstruction -= 2; _currentInstruction -= 2;
} }
@ -965,7 +971,10 @@ void Interpreter::O_CHANGEMOB() {
uint16 mob = readScriptFlagValue(); uint16 mob = readScriptFlagValue();
uint16 value = readScriptFlagValue(); uint16 value = readScriptFlagValue();
debugInterpreter("O_CHANGEMOB mob %d, value %d", mob, value); debugInterpreter("O_CHANGEMOB mob %d, value %d", mob, value);
// Probably sets mobs visible flag to value
value ^= 1;
_vm->_script->setMobVisible(mob, value);
_vm->_mobList[mob]._visible = value;
} }
void Interpreter::O_ADDINV() { void Interpreter::O_ADDINV() {

3
engines/prince/script.h
View file

@ -143,7 +143,8 @@ public:
int scanMobEvents(int mobMask, int dataEventOffset); int scanMobEvents(int mobMask, int dataEventOffset);
int scanMobEventsWithItem(int mobMask, int dataEventOffset, int itemMask); int scanMobEventsWithItem(int mobMask, int dataEventOffset, int itemMask);
bool getMobVisible(int roomMobOffset, int mobNr); bool getMobVisible(int mob);
void setMobVisible(int mob, int value);
const char *getString(uint32 offset) { const char *getString(uint32 offset) {
return (const char *)(&_data[offset]); return (const char *)(&_data[offset]);