converted internal representation of palette from 6-bit to 8-bit

yazoo implemented remapActor

svn-id: r3526
This commit is contained in:
Ludvig Strigeus 2001-12-11 13:34:15 +00:00
parent a117505403
commit 083d9204c3
9 changed files with 114 additions and 70 deletions

View file

@ -266,7 +266,7 @@ void Scumm::executeScript() {
}
byte Scumm::fetchScriptByte() {
if (*_lastCodePtr + sizeof(ResHeader) != _scriptOrgPointer) {
if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
getScriptBaseAddress();
_scriptPointer = _scriptOrgPointer + oldoffs;
@ -276,7 +276,7 @@ byte Scumm::fetchScriptByte() {
int Scumm::fetchScriptWord() {
int a;
if (*_lastCodePtr + sizeof(ResHeader) != _scriptOrgPointer) {
if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
getScriptBaseAddress();
_scriptPointer = _scriptOrgPointer + oldoffs;