From ff1bc9e5a54061b2eb9edd4975f05b5f88b0fca0 Mon Sep 17 00:00:00 2001 From: uruk Date: Fri, 26 Jul 2013 14:50:15 +0200 Subject: AVALANCHE: Get rid of Lucerna::mblit() and Lucerna::blitfix(). --- engines/avalanche/celer2.cpp | 2 - engines/avalanche/dropdown2.cpp | 2 - engines/avalanche/enid2.cpp | 1 - engines/avalanche/lucerna2.cpp | 117 +--------------------------------------- engines/avalanche/lucerna2.h | 4 -- engines/avalanche/pingo2.cpp | 1 - engines/avalanche/trip6.cpp | 9 ++-- 7 files changed, 5 insertions(+), 131 deletions(-) (limited to 'engines/avalanche') diff --git a/engines/avalanche/celer2.cpp b/engines/avalanche/celer2.cpp index be925ed767..4d4a1fa872 100644 --- a/engines/avalanche/celer2.cpp +++ b/engines/avalanche/celer2.cpp @@ -343,8 +343,6 @@ void Celer::display_it(int16 x, int16 y, int16 xl, int16 yl, flavourtype flavour break; case ch_ega : { r.x2 = x + xl; - - _vm->_lucerna->blitfix(); } break; } diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp index 134a3b0905..d2282c97bb 100644 --- a/engines/avalanche/dropdown2.cpp +++ b/engines/avalanche/dropdown2.cpp @@ -309,8 +309,6 @@ void Dropdown::chalk(int16 x, int16 y, char t, Common::String z, bool valid) { *_vm->_graphics->getPixel(x * 8 + fv * 8 + 7 - bit, y + 8) = pixelBit | (pixelBit << 1) | (pixelBit << 2); } } - - _vm->_lucerna->blitfix(); } void Dropdown::hlchalk(int16 x, int16 y, char t, Common::String z, bool valid) { diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid2.cpp index 9b67359ff0..ee37cc7dfc 100644 --- a/engines/avalanche/enid2.cpp +++ b/engines/avalanche/enid2.cpp @@ -246,7 +246,6 @@ void Enid::avvy_background() { /* Not really a filing procedure, @the_end: end; */ - _vm->_lucerna->blitfix(); } void Enid::to_sundry(sundry &sund) { diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index c1136ed20c..7fe24cecc8 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -1044,118 +1044,6 @@ void Lucerna::showrw() { // It's data is loaded in load_digits(). warning("STUB: Lucerna::showrw()"); } -void Lucerna::mblit(byte x1, byte y1, byte x2, byte y2, byte f, byte t) /* assembler; */ -/* The Minstrel Blitter */ -/* asm -{ ofsfr:=f*$4000+x1+y1*80; - ofsto:=t*$4000+x1+y1*80;} - - mov bx,80; { We're multiplying by 80. } - mov al,y1; - mul bl; { AX now contains y1*80. } - xor cx,cx; { Zero CX. } - mov cl,x1; { CX now equals x1 } - add ax,cx; { AX now contains x1+y1*80. } - mov si,ax; - mov di,ax; - - mov ax,$4000; - mov bl,f; - mul bx; { Note that this is a *uint16*! } - add si,ax; - - mov ax,$4000; - mov bl,t; - mul bx; { Note that this is a *uint16*! } - add di,ax; - - push ds; { *** <<<< *** WE MUST PRESERVE THIS! } - cld; { Clear Direction flag - we're going forwards! } - - mov ax,$A000; { The screen memory. } - mov ds,ax; - mov es,ax; { The same. } - - { AH stores the number of bytes to copy. } - { len:=(x2-x1)+1; } - - mov ah,x2; - sub ah,x1; - inc ah; - - { Firstly, let's decide how many times we're going round. } - - mov cl,y2; { How many numbers between y1 and y2? } - sub cl,y1; - inc cl; { Inclusive reckoning (for example, from 3 to 5 is 5-3+1=3 turns. } - - { We'll use SI and DI to be Ofsfr and Ofsto. } - - @Y_axis_loop: - push cx; - - - { OK... We've changed this loop from a for-next loop. "Bit" is - represented by CX. } - -{ port[$3c4]:=2; port[$3ce]:=4; } - mov dx,$3c4; - mov al,2; - out dx,al; - mov dx,$3ce; - mov al,4; - out dx,al; - - mov cx,4; { We have to copy planes 3, 2, 1 and Zero. We'll add 1 to the - number, because at zero it stops. } - - mov bx,3; { This has a similar function to that of CX. } - - @start_of_loop: - - push cx; - -{ port[$3C5]:=1 shl bit; } - mov dx,$3C5; - mov al,1; - mov cl,bl; { BL = bit. } - shl al,cl; - out dx,al; -{ port[$3CF]:=bit; } - mov dx,$3CF; - mov al,bl; { BL = bit. } - out dx,al; - -{ move(mem[$A000:ofsfr],mem[$A000:ofsto],len); } - - xor ch,ch; { Clear CH. } - mov cl,ah; - - repz movsb; { That's all we need to say! } - - mov cl,ah; - sub si,cx; { This is MUCH, MUCH faster than pushing and popping them! } - sub di,cx; - - pop cx; { Get the loop count back again. } - dec bx; { One less... } - loop @start_of_loop; { Until cx=0. } - - add si,80; { Do the next line... } - add di,80; - - pop cx; - loop @Y_axis_loop; - - pop ds; { Get it back again (or we'll be in trouble with TP!) } -*/ -{ -} - -void Lucerna::blitfix() { - warning("STUB: Lucerna::blitfix()"); -} - @@ -1194,10 +1082,9 @@ void Lucerna::delavvy() { _vm->_gyro->off(); triptype &with = _vm->_trip->tr[0]; - for (page_ = 0; page_ <= 1; page_ ++) - mblit(with.x / 8, with.y, (with.x + with._info.xl) / 8 + 1, with.y + with._info.yl, 3, page_); + /*for (page_ = 0; page_ <= 1; page_ ++) + mblit(with.x / 8, with.y, (with.x + with._info.xl) / 8 + 1, with.y + with._info.yl, 3, page_);*/ - blitfix(); _vm->_gyro->on(); } diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna2.h index 7486b0d364..efb45e2878 100644 --- a/engines/avalanche/lucerna2.h +++ b/engines/avalanche/lucerna2.h @@ -86,10 +86,6 @@ public: void showrw(); - void mblit(byte x1, byte y1, byte x2, byte y2, byte f, byte t); /* The Minstrel Blitter */ - - void blitfix(); - void clock_lucerna(); void flip_page(); diff --git a/engines/avalanche/pingo2.cpp b/engines/avalanche/pingo2.cpp index 00c99788be..4f3d17192b 100644 --- a/engines/avalanche/pingo2.cpp +++ b/engines/avalanche/pingo2.cpp @@ -128,7 +128,6 @@ void Pingo::winning_pic() { warning("STUB: Pingo::winning_pic()"); f.close(); - _vm->_lucerna->blitfix(); //setvisualpage(0); warning("STUB: Pingo::winning_pic()"); diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp index 1a525d765e..8abf313082 100644 --- a/engines/avalanche/trip6.cpp +++ b/engines/avalanche/trip6.cpp @@ -909,8 +909,8 @@ void Trip::call_special(uint16 which) { _vm->_gyro->magics[10].op = _vm->_gyro->nix; stopwalking(); _vm->_timeout->lose_timer(_vm->_timeout->reason_falling_down_oubliette); - _vm->_lucerna->mblit(12, 80, 38, 160, 3, 0); - _vm->_lucerna->mblit(12, 80, 38, 160, 3, 1); + /*_vm->_lucerna->mblit(12, 80, 38, 160, 3, 0); + _vm->_lucerna->mblit(12, 80, 38, 160, 3, 1);*/ _vm->_scrolls->display("Oh dear, you seem to be down the bottom of an oubliette."); _vm->_timeout->set_up_timer(200, _vm->_timeout->procmeet_avaroid, _vm->_timeout->reason_meeting_avaroid); break; @@ -1130,11 +1130,8 @@ void Trip::getback() { end; */ - _vm->_lucerna->mblit(r.x1, r.y1, r.x2, r.y2, 3, 1 - _vm->_gyro->cp); + //_vm->_lucerna->mblit(r.x1, r.y1, r.x2, r.y2, 3, 1 - _vm->_gyro->cp); } - - _vm->_lucerna->blitfix(); - /* if endangered then Super_On; -- cgit v1.2.3