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

cleanup

Browse source 
svn-id: r12139
This commit is contained in:
Max Horn 2004-01-04 14:49:14 +00:00
parent 2ce4d13c04
commit 1081c789a2
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/gfx.cpp
View file

@ -170,7 +170,7 @@ Gdi::Gdi(ScummEngine *vm) {
_roomPalette += 16; _roomPalette += 16;
} }
void ScummEngine::initScreens(int b, int w, int h) { void ScummEngine::initScreens(int b, int h) {
int i; int i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -2264,7 +2264,7 @@ void ScummEngine::transitionEffect(int a) {
b = tab_2[i * 4 + 3]; b = tab_2[i * 4 + 3];
if (t == b) { if (t == b) {
while (l <= r) { while (l <= r) {
if (l >= 0 && l < gdi._numStrips && (uint) t < (uint) bottom) { if (l >= 0 && l < gdi._numStrips && t < bottom) {
virtscr[0].tdirty[l] = t * 8; virtscr[0].tdirty[l] = t * 8;
/* /*
//HACK: this is bad place of this hack //HACK: this is bad place of this hack
@ -2272,10 +2272,10 @@ void ScummEngine::transitionEffect(int a) {
//this is only for maniac classic version becouse that game //this is only for maniac classic version becouse that game
//has bigger height of room gfx layer //has bigger height of room gfx layer
if ((_version == 1) && (_gameId == GID_MANIAC)) if ((_version == 1) && (_gameId == GID_MANIAC))
virtscr[0].bdirty[l] = (t + 2) * 8; virtscr[0].bdirty[l] = (b + 2) * 8;
else else
*/ */
virtscr[0].bdirty[l] = (t + 1) * 8; virtscr[0].bdirty[l] = (b + 1) * 8;
} }
l++; l++;
} }

2
scumm/saveload.cpp
View file

@ -205,7 +205,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) {
} }
// Restore the virtual screens and force a fade to black. // Restore the virtual screens and force a fade to black.
initScreens(_screenB, _screenWidth, _screenH); initScreens(_screenB, _screenH);
VirtScreen *vs = &virtscr[0]; VirtScreen *vs = &virtscr[0];
memset(vs->screenPtr + vs->xstart, 0, vs->width * vs->height); memset(vs->screenPtr + vs->xstart, 0, vs->width * vs->height);
vs->setDirtyRange(0, vs->height); vs->setDirtyRange(0, vs->height);

2
scumm/script_v5.cpp
View file

@ -1847,7 +1847,7 @@ void ScummEngine_v5::o5_roomOps() {
a = getVarOrDirectWord(PARAM_1); a = getVarOrDirectWord(PARAM_1);
b = getVarOrDirectWord(PARAM_2); b = getVarOrDirectWord(PARAM_2);
} }
initScreens(a, _screenWidth, b); initScreens(a, b);
break; break;
case 4: // SO_ROOM_PALETTE case 4: // SO_ROOM_PALETTE
if (_features & GF_SMALL_HEADER) { if (_features & GF_SMALL_HEADER) {

2
scumm/script_v6.cpp
View file

@ -1526,7 +1526,7 @@ void ScummEngine_v6::o6_roomOps() {
case 174: // SO_ROOM_SCREEN case 174: // SO_ROOM_SCREEN
b = pop(); b = pop();
a = pop(); a = pop();
initScreens(a, _screenWidth, b); initScreens(a, b);
break; break;
case 175: // SO_ROOM_PALETTE case 175: // SO_ROOM_PALETTE

2
scumm/scumm.h
View file

@ -789,7 +789,7 @@ protected:
StripTable *_roomStrips; StripTable *_roomStrips;
void initScreens(int b, int w, int h); void initScreens(int b, int h);
void initVirtScreen(VirtScreenNumber slot, int number, int top, int width, int height, bool twobufs, bool scrollable); void initVirtScreen(VirtScreenNumber slot, int number, int top, int width, int height, bool twobufs, bool scrollable);
void initBGBuffers(int height); void initBGBuffers(int height);
void initCycl(const byte *ptr); // Color cycle void initCycl(const byte *ptr); // Color cycle

6
scumm/scummvm.cpp
View file

@ -997,11 +997,11 @@ void ScummEngine::scummInit() {
debug(9, "scummInit"); debug(9, "scummInit");
if ((_gameId == GID_MANIAC) && (_version == 1)) { if ((_gameId == GID_MANIAC) && (_version == 1)) {
initScreens(16, _screenWidth, 152); initScreens(16, 152);
} else if (_version >= 7) { } else if (_version >= 7) {
initScreens(0, _screenWidth, _screenHeight); initScreens(0, _screenHeight);
} else { } else {
initScreens(16, _screenWidth, 144); initScreens(16, 144);
} }
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)