diff options
| author | uruk | 2014-04-29 11:26:39 +0200 |
|---|---|---|
| committer | uruk | 2014-04-29 11:26:39 +0200 |
| commit | 5b105566a5637edcf73fd6cbc690c1b3b958ff2a (patch) | |
| tree | 9b35a6c244e5f9fb7b01be1e6e1da994852534e2 /engines/cge | |
| parent | ec71f936280496d349310ea0091dbe26b90ae540 (diff) | |
| parent | 55127114349219d57b7a9143a5d3d9bfd97e3e88 (diff) | |
| download | scummvm-rg350-5b105566a5637edcf73fd6cbc690c1b3b958ff2a.tar.gz scummvm-rg350-5b105566a5637edcf73fd6cbc690c1b3b958ff2a.tar.bz2 scummvm-rg350-5b105566a5637edcf73fd6cbc690c1b3b958ff2a.zip | |
Merge remote-tracking branch 'origin/master' into cge2
Diffstat (limited to 'engines/cge')
| -rw-r--r-- | engines/cge/cge.cpp | 2 | ||||
| -rw-r--r-- | engines/cge/vga13h.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp index 3f7aa4abc9..7058314b9d 100644 --- a/engines/cge/cge.cpp +++ b/engines/cge/cge.cpp @@ -219,7 +219,7 @@ Common::Error CGEEngine::run() { } // Initialize graphics using following: - initGraphics(320, 200, false); + initGraphics(kScrWidth, kScrHeight, false); // Setup necessary game objects init(); diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index d5e1be5122..d7dccd2c65 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -819,14 +819,14 @@ void Vga::update() { _setPal = false; } if (_vm->_showBoundariesFl) { - Vga::_page[0]->hLine(0, 200 - kPanHeight, 320, 0xee); + Vga::_page[0]->hLine(0, kScrHeight - kPanHeight, kScrWidth, 0xee); if (_vm->_barriers[_vm->_now]._horz != 255) { for (int i = 0; i < 8; i++) - Vga::_page[0]->vLine((_vm->_barriers[_vm->_now]._horz * 8) + i, 0, 200, 0xff); + Vga::_page[0]->vLine((_vm->_barriers[_vm->_now]._horz * 8) + i, 0, kScrHeight, 0xff); } if (_vm->_barriers[_vm->_now]._vert != 255) { for (int i = 0; i < 4; i++) - Vga::_page[0]->hLine(0, 80 + (_vm->_barriers[_vm->_now]._vert * 4) + i, 320, 0xff); + Vga::_page[0]->hLine(0, 80 + (_vm->_barriers[_vm->_now]._vert * 4) + i, kScrWidth, 0xff); } } |