Skip to content

Commit

Permalink
HOPKINS: Replaced many occurrences of 640 with SCREEN_WIDTH
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreammaster
dreammaster committed Nov 25, 2012
1 parent 9f9bf34 commit fc33d2d
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 38 deletions.
16 changes: 8 additions & 8 deletions engines/hopkins/anim.cpp
View file
Expand Up @@ -74,7 +74,7 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
_vm->_graphicsManager.Cls_Video();
_vm->_graphicsManager.DD_Unlock();
}
if (_vm->_graphicsManager.WinScan / _vm->_graphicsManager.Winbpp > 640) {
if (_vm->_graphicsManager.WinScan / _vm->_graphicsManager.Winbpp > SCREEN_WIDTH) {
hasScreenCopy = true;
screenCopy = _vm->_globals.dos_malloc2(0x4B000u);
memcpy(screenCopy, v10, 0x4B000u);
Expand All @@ -88,15 +88,15 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
_vm->_graphicsManager.DD_Lock();
if (_vm->_graphicsManager.Winbpp == 2) {
if (hasScreenCopy)
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll16(v10, 0, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16(v10, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
if (_vm->_graphicsManager.Winbpp == 1) {
if (hasScreenCopy)
_vm->_graphicsManager.m_scroll2A(screenCopy, 0, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll2(v10, 0, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2(v10, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.DD_VBL();
Expand Down Expand Up @@ -151,9 +151,9 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
if (*v10 != kByteStop) {
_vm->_graphicsManager.Copy_WinScan_Vbe3(v10, screenCopy);
if (_vm->_graphicsManager.Winbpp == 2)
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll2A(screenCopy, 0, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
} else if (*v10 != kByteStop) {
if (_vm->_graphicsManager.Winbpp == 1)
Expand Down Expand Up @@ -190,7 +190,7 @@ void AnimationManager::PLAY_ANM(const Common::String &filename, uint32 rate1, ui
_vm->_globals.dos_free2(ptr);
f.close();

if (1 /*hasScreenCopy <= 640 */)
if (1 /*hasScreenCopy <= SCREEN_WIDTH */)
goto LABEL_2;
goto LABEL_55;
}
Expand Down
14 changes: 7 additions & 7 deletions engines/hopkins/events.cpp
View file
Expand Up @@ -441,8 +441,8 @@ void EventsManager::VBL() {
}
if (_vm->_graphicsManager.SCROLL < 0)
_vm->_graphicsManager.SCROLL = 0;
if (_vm->_graphicsManager.SCROLL > 640)
_vm->_graphicsManager.SCROLL = 640;
if (_vm->_graphicsManager.SCROLL > SCREEN_WIDTH)
_vm->_graphicsManager.SCROLL = SCREEN_WIDTH;
if (_vm->_graphicsManager.SDL_ECHELLE)
v4 = _vm->_graphicsManager.Magic_Number(_vm->_graphicsManager.SCROLL);
else
Expand All @@ -455,10 +455,10 @@ void EventsManager::VBL() {
if (_vm->_graphicsManager.SDL_ECHELLE) {
if (_vm->_graphicsManager.Winbpp == 2) {
int v5 = _vm->_graphicsManager.Reel_Zoom(0x14u, _vm->_graphicsManager.SDL_ECHELLE);
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_BUFFER, v4, 20, 640, 440, 0, v5);
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_BUFFER, v4, 20, SCREEN_WIDTH, 440, 0, v5);
} else {
int v6 = _vm->_graphicsManager.Reel_Zoom(0x14u, _vm->_graphicsManager.SDL_ECHELLE);
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_BUFFER, v4, 20, 640, 440, 0, v6);
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_BUFFER, v4, 20, SCREEN_WIDTH, 440, 0, v6);
}
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.dstrect[0].left = _vm->_graphicsManager.Reel_Zoom(0, _vm->_graphicsManager.SDL_ECHELLE);
Expand All @@ -467,11 +467,11 @@ void EventsManager::VBL() {
_vm->_graphicsManager.dstrect[0].setHeight(_vm->_graphicsManager.Reel_Zoom(0x1B8u, _vm->_graphicsManager.SDL_ECHELLE));
} else {
if (_vm->_graphicsManager.Winbpp == 2)
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_BUFFER, v4, 20, 640, 440, 0, 20);
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_BUFFER, v4, 20, SCREEN_WIDTH, 440, 0, 20);
else
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_BUFFER, v4, 20, 640, 440, 0, 20);
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_BUFFER, v4, 20, SCREEN_WIDTH, 440, 0, 20);
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.dstrect[0] = Common::Rect(0, 20, 640, 460);
_vm->_graphicsManager.dstrect[0] = Common::Rect(0, 20, SCREEN_WIDTH, 460);
}

// CHECKME: Useless?
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/graphics.cpp
View file
Expand Up @@ -1207,7 +1207,7 @@ void GraphicsManager::Copy_Video_Vbe16(const byte *srcData) {
}
}

if (destOffset > 640 * 480) {
if (destOffset > SCREEN_WIDTH * SCREEN_HEIGHT) {
warning("HACK: Stopping anim, out of bounds - 0x%x %d", srcByte, destOffset);
return;
}
Expand Down
12 changes: 6 additions & 6 deletions engines/hopkins/hopkins.cpp
View file
Expand Up @@ -1349,7 +1349,7 @@ bool HopkinsEngine::runLinuxFull() {
_globals.PERSO = _fileManager.CHARGE_FICHIER(_globals.NFICHIER);
_globals.PERSO_TYPE = 0;
_globals.iRegul = 0;
_graphicsManager.nbrligne = 640;
_graphicsManager.nbrligne = SCREEN_WIDTH;
break;
}
}
Expand Down Expand Up @@ -1402,7 +1402,7 @@ void HopkinsEngine::processIniParams(Common::StringMap &iniParams) {

void HopkinsEngine::INIT_SYSTEM() {
// Set graphics mode
_graphicsManager.SET_MODE(640, 480);
_graphicsManager.SET_MODE(SCREEN_WIDTH, SCREEN_HEIGHT);

// Synchronise the sound settings from ScummVM
_soundManager.syncSoundSettings();
Expand Down Expand Up @@ -1749,8 +1749,8 @@ void HopkinsEngine::ENDEMO() {
}

void HopkinsEngine::BOOM() {
_graphicsManager.nbrligne = 640;
_graphicsManager.SCANLINE(640);
_graphicsManager.nbrligne = SCREEN_WIDTH;
_graphicsManager.SCANLINE(SCREEN_WIDTH);
_graphicsManager.DD_Lock();
_graphicsManager.Cls_Video();
_graphicsManager.DD_Unlock();
Expand Down Expand Up @@ -1875,7 +1875,7 @@ void HopkinsEngine::INCENDIE() {

void HopkinsEngine::BASE() {
_globals.iRegul = 1;
_graphicsManager.nbrligne = 640;
_graphicsManager.nbrligne = SCREEN_WIDTH;
_graphicsManager.DD_Lock();
_graphicsManager.Cls_Video();
_graphicsManager.DD_Unlock();
Expand Down Expand Up @@ -2138,7 +2138,7 @@ void HopkinsEngine::JOUE_FIN() {
void HopkinsEngine::AVION() {
_soundManager.WSOUND(28);
_globals.iRegul = 1;
_globals.nbrligne = 640;
_globals.nbrligne = SCREEN_WIDTH;
_graphicsManager.DD_Lock();
_graphicsManager.Cls_Video();
_graphicsManager.DD_Unlock();
Expand Down
16 changes: 8 additions & 8 deletions engines/hopkins/objects.cpp
View file
Expand Up @@ -2929,8 +2929,8 @@ void ObjectsManager::PARADISE() {
_vm->_graphicsManager.SCROLL = 0;
v1 = 1;
}
if (_vm->_graphicsManager.SCROLL > 640) {
_vm->_graphicsManager.SCROLL = 640;
if (_vm->_graphicsManager.SCROLL > SCREEN_WIDTH) {
_vm->_graphicsManager.SCROLL = SCREEN_WIDTH;
v1 = 1;
}
if (_vm->_eventsManager.XMOUSE() > _vm->_graphicsManager.SCROLL + 620) {
Expand All @@ -2948,8 +2948,8 @@ void ObjectsManager::PARADISE() {
_vm->_graphicsManager.SCROLL = 0;
v1 = 1;
}
if (_vm->_graphicsManager.SCROLL > 640) {
_vm->_graphicsManager.SCROLL = 640;
if (_vm->_graphicsManager.SCROLL > SCREEN_WIDTH) {
_vm->_graphicsManager.SCROLL = SCREEN_WIDTH;
v1 = 1;
}
if (_vm->_eventsManager.XMOUSE() < _vm->_graphicsManager.SCROLL + 10) {
Expand Down Expand Up @@ -4263,15 +4263,15 @@ void ObjectsManager::SPECIAL_JEU() {
_vm->_graphicsManager.DD_Lock();
if (_vm->_graphicsManager.Winbpp == 2) {
if (_vm->_graphicsManager.SDL_ECHELLE)
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
if (_vm->_graphicsManager.Winbpp == 1) {
if (_vm->_graphicsManager.SDL_ECHELLE)
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
_vm->_graphicsManager.DD_Unlock();
v2 = _vm->_graphicsManager.VESA_BUFFER;
Expand Down
16 changes: 8 additions & 8 deletions engines/hopkins/talk.cpp
View file
Expand Up @@ -165,15 +165,15 @@ void TalkManager::PARLER_PERSO(const Common::String &filename) {
_vm->_graphicsManager.DD_LOCK();
if (_vm->_graphicsManager.Winbpp == 2) {
if (_vm->_graphicsManager.SDL_ECHELLE)
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
if (_vm->_graphicsManager.Winbpp == 1) {
if (_vm->_graphicsManager.SDL_ECHELLE)
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
_vm->_graphicsManager.DD_UNLOCK();
v8 = _vm->_graphicsManager.VESA_BUFFER;
Expand Down Expand Up @@ -1334,15 +1334,15 @@ void TalkManager::OBJET_VIVANT(const Common::String &a2) {
_vm->_graphicsManager.DD_Lock();
if (_vm->_graphicsManager.Winbpp == 2) {
if (_vm->_graphicsManager.SDL_ECHELLE)
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll16(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
if (_vm->_graphicsManager.Winbpp == 1) {
if (_vm->_graphicsManager.SDL_ECHELLE)
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2A(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
else
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, 640, 480, 0, 0);
_vm->_graphicsManager.m_scroll2(_vm->_graphicsManager.VESA_SCREEN, _vm->_eventsManager.start_x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
_vm->_graphicsManager.DD_Unlock();
_vm->_graphicsManager.setpal_vga256(_vm->_graphicsManager.Palette);
Expand Down

0 comments on commit fc33d2d

Please sign in to comment.