From ccd934e4bfaa2997bf2dcec6818e0c418a11624f Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 13 Jun 2011 00:40:19 +0200 Subject: CGE: Add a couple of STUB warnings --- engines/cge/cfile.cpp | 2 +- engines/cge/cge_main.cpp | 8 +- engines/cge/config.cpp | 1 + engines/cge/keybd.cpp | 4 +- engines/cge/mixer.cpp | 1 + engines/cge/snail.cpp | 2 + engines/cge/startup.cpp | 12 +- engines/cge/text.cpp | 2 +- engines/cge/vga13h.cpp | 314 +++++++---------------------------------------- 9 files changed, 61 insertions(+), 285 deletions(-) (limited to 'engines/cge') diff --git a/engines/cge/cfile.cpp b/engines/cge/cfile.cpp index 1a23c3d0f9..fdbd6ad315 100644 --- a/engines/cge/cfile.cpp +++ b/engines/cge/cfile.cpp @@ -293,12 +293,12 @@ void CFILE::Flush (void) if (Mode > REA) WriteBuff(); else Lim = 0; - // TODO replace by scummvm files. /* _BX = Handle; _AH = 0x68; // Flush buffer asm int 0x21 */ + warning("FIXME: CFILE::Flush"); } diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 9a2ce931f0..cdbb94f785 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -1832,8 +1832,8 @@ static void LoadSprite (const char *fname, int ref, int cav, int col = 0, int ro Sprite->Flags.Tran = tran; Sprite->Flags.Kill = true; Sprite->Flags.BDel = true; - // TODO : Get Filename from entire path //fnsplit(fname, NULL, NULL, Sprite->File, NULL); + warning("LoadSprite: use of fnsplit"); Sprite->ShpCnt = shpcnt; VGA::SpareQ.Append(Sprite); @@ -2090,6 +2090,7 @@ static void RunGame (void) { //TODO Change the SNPOST message send to a special way to send function pointer // if (FINIS) SNPOST(SNEXEC, -1, 0, (void *)&QGame); + warning("RunGame: problematic use of SNPOST"); MainLoop(); } @@ -2188,8 +2189,9 @@ bool ShowTitle (const char * name) #ifdef CD STARTUP::Summa |= (0xC0 + (DriveCD(0) << 6)) & 0xFF; #else - // TODO : do good boot... - Boot * b = ReadBoot(0); //getdisk()); +// Boot * b = ReadBoot(getdisk()); + warning("ShowTitle: FIXME ReadBoot"); + Boot * b = ReadBoot(0); uint32 sn = (b->XSign == 0x29) ? b->Serial : b->lTotSecs; free(b); sn -= ((IDENT *)Copr)->disk; diff --git a/engines/cge/config.cpp b/engines/cge/config.cpp index 38da4cda58..ee4d1771f9 100644 --- a/engines/cge/config.cpp +++ b/engines/cge/config.cpp @@ -210,6 +210,7 @@ static void Select (CHOICE * cho, int hlp) Hlp = hlp; //TODO Change the SNPOST message send to a special way to send function pointer //SNPOST(SNEXEC, -1, 0, (void *)&SNSelect); + warning("STUB: Select"); } diff --git a/engines/cge/keybd.cpp b/engines/cge/keybd.cpp index e4858d1d04..95899bed55 100644 --- a/engines/cge/keybd.cpp +++ b/engines/cge/keybd.cpp @@ -57,6 +57,7 @@ KEYBOARD::KEYBOARD (void) OldKeyboard = getvect(KEYBD_INT); setvect(KEYBD_INT, NewKeyboard); */ + warning("STUB: KEYBOARD::KEYBOARD"); } @@ -68,6 +69,7 @@ KEYBOARD::~KEYBOARD (void) /* TODO replace totally by scummvm handling setvect(KEYBD_INT, OldKeyboard); */ + warning("STUB: KEYBOARD::~KEYBOARD"); } @@ -86,7 +88,6 @@ SPRITE * KEYBOARD::SetClient (SPRITE * spr) void KEYBOARD::NewKeyboard (...) { // table address - // TODO keyboard ASM /* _SI = (uint16) Key; @@ -146,6 +147,7 @@ void KEYBOARD::NewKeyboard (...) asm mov al,20h // send End-Of-Interrupt asm out 20h,al // to the 8259 IC */ + warning("STUB: KEYBOARD::NewKeyboard"); } } // End of namespace CGE diff --git a/engines/cge/mixer.cpp b/engines/cge/mixer.cpp index 346631b08a..385634d4b8 100644 --- a/engines/cge/mixer.cpp +++ b/engines/cge/mixer.cpp @@ -154,6 +154,7 @@ void MIXER::Update (void) //TODO Change the SNPOST message send to a special way to send function pointer //SNPOST_(SNEXEC, -1, 0, (void*)&SNDSetVolume); + warning("FIXME: MIXER::Update"); } } // End of namespace CGE diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index c63ba824b4..82ec4c596d 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -387,6 +387,7 @@ void SNGhost (BITMAP * bmp) //bmp->Hide(FP_OFF(bmp->M), FP_SEG(bmp->M)); bmp->M = NULL; delete bmp; + warning("STUB: SNGhost"); } @@ -1288,6 +1289,7 @@ void SNAIL::RunCom (void) // TODO: Handle correctly the execution of function pointer coming from Message send SNPOST //case SNEXEC : ((void(*)(int)) (snc->Ptr))(snc->Val); break; + case SNEXEC : warning("STUB: SNEXEC code"); case SNSTEP : sprel->Step(); break; case SNZTRIM : SNZTrim(sprel); break; case SNGHOST : SNGhost((BITMAP *) snc->Ptr); break; diff --git a/engines/cge/startup.cpp b/engines/cge/startup.cpp index 7e5ac71782..c2badee266 100644 --- a/engines/cge/startup.cpp +++ b/engines/cge/startup.cpp @@ -66,10 +66,9 @@ void quit_now(int ref){ -bool STARTUP::get_parms (void) +bool STARTUP::get_parms(void) { - // TODO do params - /* +/* int i = _argc; while (i > 1) { @@ -114,16 +113,16 @@ bool STARTUP::get_parms (void) #endif if (SNDDrvInfo.MDEV != DEV_GM) SNDDrvInfo.MDEV = SNDDrvInfo.DDEV; */ + warning("STUB: STARTUP::get_parms"); return true; } -STARTUP::STARTUP (void) +STARTUP::STARTUP(void) { - //TOdO startup in scummvm - /* +/* uint32 m = farcoreleft() >> 10; if (m < 0x7FFF) Core = (int) m; else Core = 0x7FFF; @@ -152,6 +151,7 @@ STARTUP::STARTUP (void) } } */ + warning("STUB: STARTUP::STARTUP"); } diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp index 9ee6244f22..5b79131a26 100644 --- a/engines/cge/text.cpp +++ b/engines/cge/text.cpp @@ -288,7 +288,6 @@ void Inf (const char * txt) void SayTime (SPRITE * spr) { -//TODO Get Time /* static char t[] = "00:00"; struct time ti; @@ -297,6 +296,7 @@ void SayTime (SPRITE * spr) wtom(ti.ti_min, t+3, 10, 2); Say((*t == '0') ? (t+1) : t, spr); */ + warning("STUB: SayTime"); } diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index f771767c7b..01441c85a3 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -30,15 +30,12 @@ #include "cge/bitmap.h" #include "cge/vol.h" #include "cge/text.h" -//#include #include #include #include #include #include -//#include #include -//#include #include namespace CGE { @@ -143,7 +140,7 @@ static void Video (void) uint16 * SaveScreen (void) { - /* TODO ASM +/* uint16 cxy, cur, siz, * scr = NULL, * sav; // horizontal size of text mode screen @@ -195,17 +192,14 @@ uint16 * SaveScreen (void) } return sav; */ + warning("STUB: SaveScreen"); return 0; } - - - void RestoreScreen (uint16 * &sav) { - // TODO RestoreScreen ASM - /* +/* uint16 * scr = NULL; asm mov ax,0x40 // system data segment @@ -232,13 +226,10 @@ void RestoreScreen (uint16 * &sav) free(sav); sav = NULL; */ + warning("STUB: RestoreScreen"); } - - - - DAC MkDAC (uint8 r, uint8 g, uint8 b) { static DAC x; @@ -249,8 +240,6 @@ DAC MkDAC (uint8 r, uint8 g, uint8 b) } - - RGB MkRGB (uint8 r, uint8 g, uint8 b) { static TRGB x; @@ -261,10 +250,6 @@ RGB MkRGB (uint8 r, uint8 g, uint8 b) } - - - - SPRITE * Locate (int ref) { SPRITE * spr = VGA::ShowQ.Locate(ref); @@ -272,18 +257,10 @@ SPRITE * Locate (int ref) } - - - -//-------------------------------------------------------------------------- - - bool HEART::Enable = false; uint16 * HEART::XTimer = NULL; - - HEART::HEART (void) : ENGINE(TMR_DIV) { @@ -327,11 +304,10 @@ extern "C" void TimerProc (void) */ -void ENGINE::NewTimer (...) +void ENGINE::NewTimer(...) { static SPRITE * spr; static uint8 run = 0, cntr1 = TMR_RATE1, cntr2 = TMR_RATE2; - // TODO Timer ASM /* ___1152_Hz___: @@ -391,12 +367,10 @@ void ENGINE::NewTimer (...) } */ + warning("STUB: ENGINE::NewTimer"); } - - - void HEART::SetXTimer (uint16 * ptr) { if (XTimer && ptr != XTimer) *XTimer = 0; @@ -404,8 +378,6 @@ void HEART::SetXTimer (uint16 * ptr) } - - void HEART::SetXTimer (uint16 * ptr, uint16 time) { SetXTimer(ptr); @@ -413,16 +385,6 @@ void HEART::SetXTimer (uint16 * ptr, uint16 time) } - - -//-------------------------------------------------------------------------- - - - - - - - SPRITE::SPRITE (BMP_PTR * shp) : X(0), Y(0), Z(0), NearPtr(0), TakePtr(0), Next(NULL), Prev(NULL), SeqPtr(NO_SEQ), Time(0), //Delay(0), @@ -434,18 +396,12 @@ SPRITE::SPRITE (BMP_PTR * shp) } - - - - SPRITE::~SPRITE (void) { Contract(); } - - BMP_PTR SPRITE::Shp (void) { register SPREXT * e = Ext; @@ -459,7 +415,7 @@ BMP_PTR SPRITE::Shp (void) //sprintf(s, "Seq=%p ShpCnt=%d SeqPtr=%d Now=%d Next=%d", // Seq, ShpCnt, SeqPtr, Seq[SeqPtr].Now, Seq[SeqPtr].Next); //VGA::Exit(s, File); - VGA::Exit("Invalid PHASE in SPRITE::Shp()", File); + error("Invalid PHASE in SPRITE::Shp() %s", File); } #endif return e->ShpList[i]; @@ -468,9 +424,6 @@ BMP_PTR SPRITE::Shp (void) } - - - BMP_PTR * SPRITE::SetShapeList (BMP_PTR * shp) { BMP_PTR * r = (Ext) ? Ext->ShpList : NULL; @@ -497,9 +450,6 @@ BMP_PTR * SPRITE::SetShapeList (BMP_PTR * shp) } - - - void SPRITE::MoveShapes (uint8 * buf) { BMP_PTR * p; @@ -510,9 +460,6 @@ void SPRITE::MoveShapes (uint8 * buf) } - - - bool SPRITE::Works (SPRITE * spr) { if (spr) if (spr->Ext) @@ -530,9 +477,6 @@ bool SPRITE::Works (SPRITE * spr) } - - - SEQ * SPRITE::SetSeq (SEQ * seq) { Expand(); @@ -545,10 +489,6 @@ SEQ * SPRITE::SetSeq (SEQ * seq) } - - - - bool SPRITE::SeqTest (int n) { if (n >= 0) return (SeqPtr == n); @@ -557,10 +497,6 @@ bool SPRITE::SeqTest (int n) } - - - - SNAIL::COM * SPRITE::SnList (SNLIST type) { register SPREXT * e = Ext; @@ -569,10 +505,6 @@ SNAIL::COM * SPRITE::SnList (SNLIST type) } - - - - void SPRITE::SetName (char * n) { if (Ext) @@ -592,9 +524,6 @@ void SPRITE::SetName (char * n) } - - - SPRITE * SPRITE::Expand (void) { if (! Ext) @@ -732,8 +661,6 @@ SPRITE * SPRITE::Expand (void) } - - SPRITE * SPRITE::Contract (void) { register SPREXT * e = Ext; @@ -756,10 +683,6 @@ SPRITE * SPRITE::Contract (void) } - - - - SPRITE * SPRITE::BackShow (bool fast) { Expand(); @@ -771,12 +694,6 @@ SPRITE * SPRITE::BackShow (bool fast) } - - - - - - void SPRITE::Step (int nr) { if (nr >= 0) SeqPtr = nr; @@ -794,19 +711,12 @@ void SPRITE::Step (int nr) } - - - - void SPRITE::Tick (void) { Step(); } - - - void SPRITE::MakeXlat (uint8 * x) { if (Ext) @@ -820,9 +730,6 @@ void SPRITE::MakeXlat (uint8 * x) } - - - void SPRITE::KillXlat (void) { if (Flags.Xlat && Ext) @@ -841,9 +748,6 @@ void SPRITE::KillXlat (void) } - - - void SPRITE::Goto (int x, int y) { int xo = X, yo = Y; @@ -864,28 +768,12 @@ void SPRITE::Goto (int x, int y) } - - - - - - - - - - void SPRITE::Center (void) { Goto((SCR_WID - W) / 2, (SCR_HIG - H) / 2); } - - - - - - void SPRITE::Show (void) { register SPREXT * e; @@ -906,11 +794,6 @@ void SPRITE::Show (void) } - - - - - void SPRITE::Show (uint16 pg) { uint8 * a = VGA::Page[1]; @@ -920,12 +803,6 @@ void SPRITE::Show (uint16 pg) } - - - - - - void SPRITE::Hide (void) { register SPREXT * e = Ext; @@ -933,8 +810,6 @@ void SPRITE::Hide (void) } - - BMP_PTR SPRITE::Ghost (void) { register SPREXT * e = Ext; @@ -956,10 +831,6 @@ BMP_PTR SPRITE::Ghost (void) } - - - - SPRITE * SpriteAt (int x, int y) { SPRITE * spr = NULL, * tail = VGA::ShowQ.Last(); @@ -974,32 +845,18 @@ SPRITE * SpriteAt (int x, int y) } - - - -//-------------------------------------------------------------------------- - - - - - - QUEUE::QUEUE (bool show) : Head(NULL), Tail(NULL), Show(show) { } - - QUEUE::~QUEUE (void) { Clear(); } - - void QUEUE::Clear (void) { while (Head) @@ -1010,8 +867,6 @@ void QUEUE::Clear (void) } - - void QUEUE::ForAll (void (*fun)(SPRITE *)) { SPRITE * s = Head; @@ -1024,9 +879,6 @@ void QUEUE::ForAll (void (*fun)(SPRITE *)) } - - - void QUEUE::Append (SPRITE * spr) { if (Tail) @@ -1041,9 +893,6 @@ void QUEUE::Append (SPRITE * spr) } - - - void QUEUE::Insert (SPRITE * spr, SPRITE * nxt) { if (nxt == Head) @@ -1064,9 +913,6 @@ void QUEUE::Insert (SPRITE * spr, SPRITE * nxt) } - - - void QUEUE::Insert (SPRITE * spr) { SPRITE * s; @@ -1080,9 +926,6 @@ void QUEUE::Insert (SPRITE * spr) } - - - SPRITE * QUEUE::Remove (SPRITE * spr) { if (spr == Head) Head = spr->Next; @@ -1095,9 +938,6 @@ SPRITE * QUEUE::Remove (SPRITE * spr) } - - - SPRITE * QUEUE::Locate (int ref) { SPRITE * spr; @@ -1106,14 +946,6 @@ SPRITE * QUEUE::Locate (int ref) } - - - -//-------------------------------------------------------------------------- - - - - uint16 VGA::StatAdr = VGAST1_; uint16 VGA::OldMode = 0; uint16 * VGA::OldScreen = NULL; @@ -1177,9 +1009,6 @@ VGA::VGA (int mode) } - - - VGA::~VGA (void) { Mono = 0; @@ -1205,7 +1034,7 @@ VGA::~VGA (void) void VGA::SetStatAdr (void) { - /* TODO SetStatADR ASM + /* asm mov dx,VGAMIr_ asm in al,dx asm test al,1 // CGA addressing mode flag @@ -1215,17 +1044,13 @@ void VGA::SetStatAdr (void) set_mode_adr: StatAdr = _AX; */ + warning("STUB: VGA::SetStatADR"); } - - - - #pragma argsused void VGA::WaitVR (bool on) { - // TODO Wait vertical retrace ASM /* _DX = StatAdr; _AH = (on) ? 0x00 : 0x08; @@ -1240,16 +1065,13 @@ void VGA::WaitVR (bool on) asm xor ah,0x08 asm loop wait */ + warning("STUB: VGA::WaitVR"); } - - - - void VGA::Setup (VgaRegBlk * vrb) { -/* TODO VGA setup +/* WaitVR(); // *--LOOK!--* resets VGAATR logic asm cld asm mov si, vrb // take address of parameter table @@ -1287,17 +1109,13 @@ void VGA::Setup (VgaRegBlk * vrb) xit: */ + warning("STUB: VGA::Setup"); } - - - - -int VGA::SetMode (int mode) +int VGA::SetMode(int mode) { - /* TODO VGA Set Mode - +/* Clear(); // get current mode asm mov ah,0x0F @@ -1317,17 +1135,14 @@ int VGA::SetMode (int mode) asm pop ax return _AX; */ + warning("STUB: VGA::SetMode"); return 0; } - - - - -void VGA::GetColors (DAC * tab) +void VGA::GetColors(DAC * tab) { - /* TODO GetColors ASM +/* asm cld asm les di,tab // color table asm mov dx,0x3C7 // PEL address read mode register @@ -1344,18 +1159,14 @@ void VGA::GetColors (DAC * tab) sto: asm stosb // store 1 color asm loop gc // next one? - */ + warning("STUB: VGA::GetColors"); } - - -void VGA::SetColors (DAC * tab, int lum) +void VGA::SetColors(DAC * tab, int lum) { - - /* TODO SetColors - +/* DAC * des = NewColors; asm push ds @@ -1401,13 +1212,10 @@ void VGA::SetColors (DAC * tab, int lum) } */ SetPal = true; + warning("STUB: VGA::SetColors"); } - - - - void VGA::SetColors (void) { memset(NewColors, 0, PAL_SIZ); @@ -1415,10 +1223,6 @@ void VGA::SetColors (void) } - - - - void VGA::Sunrise (DAC * tab) { int i; @@ -1431,10 +1235,6 @@ void VGA::Sunrise (DAC * tab) } - - - - void VGA::Sunset (void) { DAC tab[256]; @@ -1449,13 +1249,6 @@ void VGA::Sunset (void) } - - - - - - - void VGA::Show (void) { SPRITE * spr = ShowQ.First(); @@ -1468,11 +1261,9 @@ void VGA::Show (void) } - - -void VGA::UpdateColors (void) +void VGA::UpdateColors(void) { - /* TODO UpdateColors ASM +/* DAC * tab = NewColors; asm push ds @@ -1497,18 +1288,13 @@ void VGA::UpdateColors (void) asm pop ds */ + warning("STUB: VGA::UpdateColors"); } - - - - - -void VGA::Update (void) +void VGA::Update(void) { - // TODO VGA Update - /* +/* uint8 * p = Page[1]; Page[1] = Page[0]; Page[0] = p; @@ -1528,18 +1314,13 @@ void VGA::Update (void) UpdateColors(); SetPal = false; } + warning("STUB: VGA::Update"); } - - - - - - -void VGA::Clear (uint8 color) +void VGA::Clear(uint8 color) { - /* TODO Clear ASM +/* uint8 * a = (uint8 *) MK_FP(SCR_SEG, 0); asm mov dx,VGASEQ_ @@ -1553,16 +1334,13 @@ void VGA::Clear (uint8 color) asm rep stosb asm stosb */ + warning("STUB: VGA::Clear"); } - - - - -void VGA::CopyPage (uint16 d, uint16 s) +void VGA::CopyPage(uint16 d, uint16 s) { - /* TODO CopyPage +/* uint8 * S = Page[s & 3], * D = Page[d & 3]; asm mov dx,VGAGRA_ @@ -1594,14 +1372,14 @@ void VGA::CopyPage (uint16 d, uint16 s) asm pop ax asm out dx,al // end of copy mode */ + warning("STUB: VGA::CopyPage"); } //-------------------------------------------------------------------------- -void BITMAP::XShow (int x, int y) +void BITMAP::XShow(int x, int y) { - // TODO XShow ASM - /* +/* uint8 rmsk = x % 4, mask = 1 << rmsk, * scr = VGA::Page[1] + y * (SCR_WID / 4) + x / 4; @@ -1617,8 +1395,6 @@ void BITMAP::XShow (int x, int y) asm lds si,v asm mov bx,m - - asm mov al,0x02 // map mask register asm mov ah,mask @@ -1679,19 +1455,13 @@ void BITMAP::XShow (int x, int y) asm pop ds asm pop si asm pop bx - */ + warning("STUB: BITMAP::XShow"); } - - - - -void BITMAP::Show (int x, int y) +void BITMAP::Show(int x, int y) { - - // TODO Show ASM /* uint8 mask = 1 << (x & 3), * scr = VGA::Page[1] + y * (SCR_WID >> 2) + (x >> 2); @@ -1757,16 +1527,13 @@ void BITMAP::Show (int x, int y) asm jne plane asm pop ds */ + warning("STUB: BITMAP::Show"); } - - - -void BITMAP::Hide (int x, int y) +void BITMAP::Hide(int x, int y) { - // TODO Bitmap Hide ASM - /* +/* uint8 * scr = VGA::Page[1] + y * (SCR_WID / 4) + x / 4; uint16 d = FP_OFF(VGA::Page[2]) - FP_OFF(VGA::Page[1]); HideDesc * b = B; @@ -1828,6 +1595,7 @@ void BITMAP::Hide (int x, int y) asm pop si // asm pop bx */ + warning("STUB: BITMAP::Hide"); } } // End of namespace CGE -- cgit v1.2.3