From 4116189395a87959f1981ca7ebae0604aa4ca9a4 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 3 Jul 2011 11:28:22 +0200 Subject: CGE: Some more renaming (WIP) --- engines/cge/cge.cpp | 18 +-- engines/cge/cge_main.cpp | 309 ++++++++++++++++++++++++----------------------- engines/cge/cge_main.h | 6 +- engines/cge/config.cpp | 60 ++++----- engines/cge/events.cpp | 2 +- engines/cge/events.h | 2 +- engines/cge/general.cpp | 18 +-- engines/cge/gettext.cpp | 16 +-- engines/cge/gettext.h | 2 +- engines/cge/mixer.cpp | 30 ++--- engines/cge/snail.cpp | 72 +++++------ engines/cge/snddrv.h | 58 ++++----- engines/cge/sound.cpp | 22 ++-- engines/cge/startup.cpp | 39 +++--- engines/cge/startup.h | 18 +-- engines/cge/talk.cpp | 144 +++++++++++----------- engines/cge/talk.h | 56 ++++----- engines/cge/text.cpp | 166 ++++++++++++------------- engines/cge/text.h | 42 +++---- engines/cge/vga13h.cpp | 136 ++++++++++----------- engines/cge/vga13h.h | 73 +++++------ engines/cge/vmenu.cpp | 12 +- engines/cge/vmenu.h | 4 +- 23 files changed, 654 insertions(+), 651 deletions(-) diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp index 89d5c0a86e..6eae8f3c0e 100644 --- a/engines/cge/cge.cpp +++ b/engines/cge/cge.cpp @@ -61,10 +61,10 @@ void CGEEngine::setup() { VGA::init(); VFILE::init(); Bitmap::init(); - TALK::init(); + Talk::init(); // Initialise engine objects - Text = new TEXT(this, progName(), 128); + _text = new Text(this, progName(), 128); Vga = new VGA(M13H); _heart = new Heart; Hero = new WALK(this, NULL); @@ -76,9 +76,9 @@ void CGEEngine::setup() { _miniCave = new Sprite(this, NULL); _shadow = new Sprite(this, NULL); _horzLine = new Sprite(this, HL); - InfoLine = new INFO_LINE(this, INFO_W); + _infoLine = new InfoLine(this, INFO_W); _cavLight = new Sprite(this, PR); - DebugLine = new INFO_LINE(this, SCR_WID); + _debugLine = new InfoLine(this, SCR_WID); MB[0] = new Bitmap("BRICK", true); MB[1] = NULL; HL[0] = new Bitmap("HLINE", true); @@ -102,14 +102,14 @@ void CGEEngine::setup() { _mouse = new MOUSE(this); _keyboard = new Keyboard(); _eventManager = new EventManager(); - OffUseCount = atoi(Text->getText(OFF_USE_COUNT)); + _offUseCount = atoi(_text->getText(OFF_USE_COUNT)); } CGEEngine::~CGEEngine() { debug("CGEEngine::~CGEEngine"); // Call classes with static members to clear them up - TALK::deinit(); + Talk::deinit(); Bitmap::deinit(); VFILE::deinit(); VGA::deinit(); @@ -124,9 +124,9 @@ CGEEngine::~CGEEngine() { delete _miniCave; delete _shadow; delete _horzLine; - delete InfoLine; + delete _infoLine; delete _cavLight; - delete DebugLine; + delete _debugLine; delete MB[0]; delete HL[0]; delete MC[0]; @@ -138,7 +138,7 @@ CGEEngine::~CGEEngine() { delete LI[1]; delete LI[2]; delete LI[3]; - delete Text; + delete _text; delete _heart; delete _pocLight; delete _keyboard; diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 5f27f99c3c..33abf7917d 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -68,9 +68,9 @@ Sprite *_sprite; Sprite *_miniCave; Sprite *_shadow; Sprite *_horzLine; -INFO_LINE *InfoLine; +InfoLine *_infoLine; Sprite *_cavLight; -INFO_LINE *DebugLine; +InfoLine *_debugLine; BMP_PTR MB[2]; BMP_PTR HL[2]; @@ -90,24 +90,24 @@ Snail *_snail_; // 1.01 - 17VII95 - default savegame with sound ON // coditionals EVA for 2-month evaluation version -static char UsrFnam[15] = "\0ɱ%^þúȼ´ ÇÉ"; +static char _usrFnam[15] = "\0ɱ%^þúȼ´ ÇÉ"; static int _oldLev = 0; static int _demoText = DEMO_TEXT; //-------------------------------------------------------------------------- -bool JBW = false; +bool _jbw = false; //------------------------------------------------------------------------- -int PocPtr = 0; +int _pocPtr = 0; -static EMS *Mini = MiniEmm.alloc((uint16)MINI_EMM_SIZE); -static BMP_PTR *MiniShpList = NULL; -static BMP_PTR MiniShp[] = { NULL, NULL }; -static bool Finis = false; -static int Startup = 1; -int OffUseCount; -uint16 *intStackPtr = false; +static EMS *_mini = _miniEmm.alloc((uint16)MINI_EMM_SIZE); +static BMP_PTR *_miniShpList = NULL; +static BMP_PTR _miniShp[] = { NULL, NULL }; +static bool _finis = false; +static int _startup = 1; +int _offUseCount; +uint16 *_intStackPtr = false; Hxy _heroXY[CAVE_MAX] = {{0, 0}}; Bar _barriers[1 + CAVE_MAX] = { { 0xFF, 0xFF } }; @@ -119,7 +119,7 @@ void feedSnail(Sprite *spr, SNLIST snq); // defined in SNAIL uint8 Cluster::_map[MAP_ZCNT][MAP_XCNT]; -uint8 &Cluster::cell(void) { +uint8 &Cluster::cell() { return _map[_b][_a]; } @@ -227,15 +227,15 @@ void CGEEngine::loadGame(XFile &file, bool tiny = false) { file.read((uint8 *) &i, sizeof(i)); if (i != SVGCHKSUM) - error("%s", Text->getText(BADSVG_TEXT)); + error("%s", _text->getText(BADSVG_TEXT)); - if (STARTUP::Core < CORE_HIG) + if (Startup::_core < CORE_HIG) _music = false; - if (STARTUP::SoundOk == 1 && STARTUP::Mode == 0) { - SNDDrvInfo.VOL2.D = _volume[0]; - SNDDrvInfo.VOL2.M = _volume[1]; - SNDSetVolume(); + if (Startup::_soundOk == 1 && Startup::_mode == 0) { + _sndDrvInfo.Vol2._d = _volume[0]; + _sndDrvInfo.Vol2._m = _volume[1]; + sndSetVolume(); } if (! tiny) { // load sprites & pocket @@ -252,21 +252,21 @@ void CGEEngine::loadGame(XFile &file, bool tiny = false) { if (spr == NULL) error("No core"); *spr = S; - Vga->SpareQ->Append(spr); + Vga->_spareQ->append(spr); } for (i = 0; i < POCKET_NX; i++) { register int r = _pocref[i]; - _pocket[i] = (r < 0) ? NULL : Vga->SpareQ->Locate(r); + _pocket[i] = (r < 0) ? NULL : Vga->_spareQ->locate(r); } } } static void SaveSound(void) { - CFile cfg(UsrPath(progName(CFG_EXT)), WRI); + CFile cfg(usrPath(progName(CFG_EXT)), WRI); if (!cfg._error) - cfg.write(&SNDDrvInfo, sizeof(SNDDrvInfo) - sizeof(SNDDrvInfo.VOL2)); + cfg.write(&_sndDrvInfo, sizeof(_sndDrvInfo) - sizeof(_sndDrvInfo.Vol2)); } @@ -280,8 +280,8 @@ static void SaveGame(XFile &file) { _pocref[i] = (s) ? s->_ref : -1; } - _volume[0] = SNDDrvInfo.VOL2.D; - _volume[1] = SNDDrvInfo.VOL2.M; + _volume[0] = _sndDrvInfo.Vol2._d; + _volume[1] = _sndDrvInfo.Vol2._m; for (st = _savTab; st->Ptr; st++) { if (file._error) @@ -291,7 +291,7 @@ static void SaveGame(XFile &file) { file.write((uint8 *) & (i = SVGCHKSUM), sizeof(i)); - for (spr = Vga->SpareQ->First(); spr; spr = spr->_next) + for (spr = Vga->_spareQ->first(); spr; spr = spr->_next) if (spr->_ref >= 1000) if (!file._error) file.write((uint8 *)spr, sizeof(*spr)); @@ -303,7 +303,7 @@ static void HeroCover(int cvr) { } -static void Trouble(int seq, int txt) { +static void trouble(int seq, int txt) { Hero->park(); SNPOST(SNWAIT, -1, -1, Hero); SNPOST(SNSEQ, -1, seq, Hero); @@ -313,23 +313,23 @@ static void Trouble(int seq, int txt) { } -static void OffUse(void) { - Trouble(OFF_USE, OFF_USE_TEXT + new_random(OffUseCount)); +static void offUse() { + trouble(OFF_USE, OFF_USE_TEXT + new_random(_offUseCount)); } -static void TooFar(void) { - Trouble(TOO_FAR, TOO_FAR_TEXT); +static void tooFar() { + trouble(TOO_FAR, TOO_FAR_TEXT); } // Used in stubbed function, do not remove! static void noWay() { - Trouble(NO_WAY, NO_WAY_TEXT); + trouble(NO_WAY, NO_WAY_TEXT); } -static void LoadHeroXY(void) { +static void loadHeroXY() { INI_FILE cf(progName(".HXY")); memset(_heroXY, 0, sizeof(_heroXY)); if (!cf._error) @@ -337,7 +337,7 @@ static void LoadHeroXY(void) { } -static void LoadMapping(void) { +static void loadMapping() { if (_now <= CAVE_MAX) { INI_FILE cf(progName(".TAB")); if (!cf._error) { @@ -367,7 +367,7 @@ void WALK::tick() { if (Dir != NO_DIR) { Sprite *spr; Sys->FunTouch(); - for (spr = Vga->ShowQ->First(); spr; spr = spr->_next) { + for (spr = Vga->_showQ->first(); spr; spr = spr->_next) { if (distance(spr) < 2) { if (!spr->_flags._near) { feedSnail(spr, NEAR); @@ -548,7 +548,7 @@ void CGEEngine::setMapBrick(int x, int z) { wtom(z, n + 3, 10, 2); Cluster::_map[z][x] = 1; s->setName(n); - Vga->ShowQ->Insert(s, Vga->ShowQ->First()); + Vga->_showQ->insert(s, Vga->_showQ->first()); } } @@ -584,9 +584,9 @@ void CGEEngine::quit() { SNPOST_(SNKILL, -1, 0, VMENU::Addr); resetQSwitch(); } else { - QuitMenu[0].Text = Text->getText(QUIT_TEXT); - QuitMenu[1].Text = Text->getText(NOQUIT_TEXT); - (new VMENU(this, QuitMenu, -1, -1))->setName(Text->getText(QUIT_TITLE)); + QuitMenu[0].Text = _text->getText(QUIT_TEXT); + QuitMenu[1].Text = _text->getText(NOQUIT_TEXT); + (new VMENU(this, QuitMenu, -1, -1))->setName(_text->getText(QUIT_TITLE)); SNPOST_(SNSEQ, 123, 1, NULL); KeyClick(); } @@ -594,7 +594,7 @@ void CGEEngine::quit() { } -static void AltCtrlDel(void) { +static void AltCtrlDel() { SNPOST_(SNSAY, -1, A_C_D_TEXT, Hero); } @@ -603,8 +603,8 @@ static void miniStep(int stp) { if (stp < 0) _miniCave->_flags._hide = true; else { - &*Mini; - *MiniShp[0] = *MiniShpList[stp]; + &*_mini; + *_miniShp[0] = *_miniShpList[stp]; if (_fx.Current) &*(_fx.Current->EAddr()); @@ -633,13 +633,13 @@ void SYSTEM::SetPal(void) { void SYSTEM::FunTouch(void) { uint16 n = (PAIN) ? HEROFUN1 : HEROFUN0; - if (Talk == NULL || n > FunDel) + if (_talk == NULL || n > FunDel) FunDel = n; } static void ShowBak(int ref) { - Sprite *spr = Vga->SpareQ->Locate(ref); + Sprite *spr = Vga->_spareQ->locate(ref); if (spr) { Bitmap::_pal = VGA::SysPal; spr->expand(); @@ -658,9 +658,9 @@ static void caveUp() { LoadMIDI(_now); ShowBak(BakRef); - LoadMapping(); - Text->Preload(BakRef, BakRef + 1000); - Sprite *spr = Vga->SpareQ->First(); + loadMapping(); + _text->preload(BakRef, BakRef + 1000); + Sprite *spr = Vga->_spareQ->first(); while (spr) { Sprite *n = spr->_next; if (spr->_cave == _now || spr->_cave == 0) @@ -672,7 +672,7 @@ static void caveUp() { } spr = n; } - if (SNDDrvInfo.DDEV) { + if (_sndDrvInfo._dDev) { _sound.Stop(); _fx.Clear(); _fx.Preload(0); @@ -693,21 +693,21 @@ static void caveUp() { Vga->CopyPage(0, 1); selectPocket(-1); if (Hero) - Vga->ShowQ->Insert(Vga->ShowQ->Remove(Hero)); + Vga->_showQ->insert(Vga->_showQ->remove(Hero)); if (_shadow) { - Vga->ShowQ->Remove(_shadow); + Vga->_showQ->remove(_shadow); _shadow->makeXlat(glass(VGA::SysPal, 204, 204, 204)); - Vga->ShowQ->Insert(_shadow, Hero); + Vga->_showQ->insert(_shadow, Hero); _shadow->_z = Hero->_z; } - feedSnail(Vga->ShowQ->Locate(BakRef + 999), TAKE); + feedSnail(Vga->_showQ->locate(BakRef + 999), TAKE); Vga->Show(); Vga->CopyPage(1, 0); Vga->Show(); Vga->Sunrise(VGA::SysPal); _dark = false; - if (! Startup) + if (!_startup) _mouse->On(); _heart->_enable = true; @@ -719,16 +719,16 @@ void CGEEngine::caveDown() { if (!_horzLine->_flags._hide) switchMapping(); - for (spr = Vga->ShowQ->First(); spr;) { + for (spr = Vga->_showQ->first(); spr;) { Sprite *n = spr->_next; if (spr->_ref >= 1000 /*&& spr->_cave*/) { if (spr->_ref % 1000 == 999) feedSnail(spr, TAKE); - Vga->SpareQ->Append(Vga->ShowQ->Remove(spr)); + Vga->_spareQ->append(Vga->_showQ->remove(spr)); } spr = n; } - Text->Clear(1000); + _text->clear(1000); } @@ -742,10 +742,10 @@ void CGEEngine::qGame() { caveDown(); _oldLev = _lev; SaveSound(); - CFile file = CFile(UsrPath(UsrFnam), WRI, RCrypt); + CFile file = CFile(usrPath(_usrFnam), WRI, RCrypt); SaveGame(file); Vga->Sunset(); - Finis = true; + _finis = true; } @@ -765,13 +765,13 @@ void CGEEngine::switchCave(int cav) { Hero->step(0); if (!_isDemo) ///// protection: auto-destruction on! ---------------------- - Vga->SpareQ->Show = STARTUP::Summa * (cav <= CAVE_MAX); + Vga->_spareQ->_show = Startup::_summa * (cav <= CAVE_MAX); /////-------------------------------------------------------- } _cavLight->gotoxy(CAVE_X + ((_now - 1) % CAVE_NX) * CAVE_DX + CAVE_SX, CAVE_Y + ((_now - 1) / CAVE_NX) * CAVE_DY + CAVE_SY); - KillText(); - if (! Startup) + killText(); + if (!_startup) KeyClick(); SNPOST(SNLABEL, -1, 0, NULL); // wait for repaint //TODO Change the SNPOST message send to a special way to send function pointer @@ -795,8 +795,8 @@ void SYSTEM::touch(uint16 mask, int x, int y) { if (mask & KEYB) { int pp0; KeyClick(); - KillText(); - if (Startup == 1) { + killText(); + if (_startup == 1) { SNPOST(SNCLEAR, -1, 0, NULL); return; } @@ -810,7 +810,7 @@ void SYSTEM::touch(uint16 mask, int x, int y) { break; case 'F': if (_keyboard->_key[ALT]) { - Sprite *m = Vga->ShowQ->Locate(17001); + Sprite *m = Vga->_showQ->locate(17001); if (m) { m->step(1); m->_time = 216; // 3s @@ -858,7 +858,7 @@ void SYSTEM::touch(uint16 mask, int x, int y) { break; case 'X': if (_keyboard->_key[ALT]) - Finis = true; + _finis = true; break; case '0': case '1': @@ -891,16 +891,16 @@ void SYSTEM::touch(uint16 mask, int x, int y) { break; case 'W': if (pp == 2) - JBW = !JBW; + _jbw = !_jbw; break; } if (pp == pp0) pp = 0; } else { - if (Startup) + if (_startup) return; int cav = 0; - InfoLine->Update(NULL); + _infoLine->update(NULL); if (y >= WORLD_HIG) { if (x < BUTTON_X) { // select cave? if (y >= CAVE_Y && y < CAVE_Y + CAVE_NY * CAVE_DY && @@ -935,7 +935,7 @@ void SYSTEM::touch(uint16 mask, int x, int y) { } } else { - if (! Talk && _snail->idle() && Hero + if (!_talk && _snail->idle() && Hero && y >= MAP_TOP && y < MAP_TOP + MAP_HIG && !_game) { Hero->findWay(XZ(x, y)); } @@ -946,12 +946,13 @@ void SYSTEM::touch(uint16 mask, int x, int y) { void SYSTEM::Tick(void) { - if (! Startup) if (-- FunDel == 0) { - KillText(); + if (!_startup) + if (--FunDel == 0) { + killText(); if (_snail->idle()) { if (PAIN) HeroCover(9); - else if (STARTUP::Core >= CORE_MID) { + else if (Startup::_core >= CORE_MID) { int n = new_random(100); if (n > 96) HeroCover(6 + (Hero->_x + Hero->_w / 2 < SCR_WID / 2)); @@ -1011,7 +1012,7 @@ static void SwitchMusic(void) { warning("SwitchMusic() - SNPOST"); } } else { - if (STARTUP::Core < CORE_HIG) + if (Startup::_core < CORE_HIG) SNPOST(SNINF, -1, NOMUSIC_TEXT, NULL); else { SNPOST_(SNSEQ, 122, (_music = !_music), NULL); @@ -1035,13 +1036,13 @@ void CGEEngine::takeName() { if (GetText::_ptr) SNPOST_(SNKILL, -1, 0, GetText::_ptr); else { - GetText *tn = new GetText(this, Text->getText(GETNAME_PROMPT), UsrFnam, 8, KeyClick); + GetText *tn = new GetText(this, _text->getText(GETNAME_PROMPT), _usrFnam, 8, KeyClick); if (tn) { - tn->setName(Text->getText(GETNAME_TITLE)); + tn->setName(_text->getText(GETNAME_TITLE)); tn->center(); tn->gotoxy(tn->_x, tn->_y - 10); tn->_z = 126; - Vga->ShowQ->Insert(tn); + Vga->_showQ->insert(tn); } } } @@ -1059,7 +1060,7 @@ void CGEEngine::switchMapping() { } } else { Sprite *s; - for (s = Vga->ShowQ->First(); s; s = s->_next) + for (s = Vga->_showQ->first(); s; s = s->_next) if (s->_w == MAP_XGRID && s->_h == MAP_ZGRID) SNPOST_(SNKILL, -1, 0, s); } @@ -1078,7 +1079,7 @@ static void KillSprite(void) { static void PushSprite(void) { Sprite *spr = _sprite->_prev; if (spr) { - Vga->ShowQ->Insert(Vga->ShowQ->Remove(_sprite), spr); + Vga->_showQ->insert(Vga->_showQ->remove(_sprite), spr); while (_sprite->_z > _sprite->_next->_z) _sprite->_z--; } else @@ -1095,7 +1096,7 @@ static void PullSprite(void) { ok = (!spr->_flags._slav); } if (ok) { - Vga->ShowQ->Insert(Vga->ShowQ->Remove(_sprite), spr); + Vga->_showQ->insert(Vga->_showQ->remove(_sprite), spr); if (_sprite->_prev) while (_sprite->_z < _sprite->_prev->_z) _sprite->_z++; @@ -1148,8 +1149,8 @@ static char DebugText[] = " N=00000 F=000000 X=000 Y=000 FPS=0000\0S=00:00 0 #define SP_F (DebugText + 67) #define SP__ (DebugText + 70) -static void SayDebug(void) { - if (!DebugLine->_flags._hide) { +static void sayDebug() { + if (!_debugLine->_flags._hide) { static long t = -1L; long t1 = timer(); @@ -1169,7 +1170,7 @@ static void SayDebug(void) { // sprite queue size uint16 n = 0; Sprite *spr; - for (spr = Vga->ShowQ->First(); spr; spr = spr->_next) { + for (spr = Vga->_showQ->first(); spr; spr = spr->_next) { ++ n; if (spr == _sprite) { *XSPR = ' '; @@ -1184,13 +1185,13 @@ static void SayDebug(void) { } dwtom(n, SP_S, 10, 2); // *SP__ = (heapcheck() < 0) ? '!' : ' '; - DebugLine->Update(DebugText); + _debugLine->update(DebugText); } } static void SwitchDebug(void) { - DebugLine->_flags._hide = ! DebugLine->_flags._hide; + _debugLine->_flags._hide = !_debugLine->_flags._hide; } @@ -1221,7 +1222,7 @@ void CGEEngine::optionTouch(int opt, uint16 mask) { void Sprite::touch(uint16 mask, int x, int y) { Sys->FunTouch(); if ((mask & ATTN) == 0) { - InfoLine->Update(name()); + _infoLine->update(name()); if (mask & (R_DN | L_DN)) _sprite = this; if (_ref / 10 == 12) { @@ -1235,16 +1236,16 @@ void Sprite::touch(uint16 mask, int x, int y) { mask |= R_UP; } if ((mask & R_UP) && _snail->idle()) { - Sprite *ps = (_pocLight->_seqPtr) ? _pocket[PocPtr] : NULL; + Sprite *ps = (_pocLight->_seqPtr) ? _pocket[_pocPtr] : NULL; if (ps) { if (_flags._kept || Hero->distance(this) < MAX_DISTANCE) { if (works(ps)) { feedSnail(ps, TAKE); } else - OffUse(); + offUse(); selectPocket(-1); } else - TooFar(); + tooFar(); } else { if (_flags._kept) mask |= L_UP; @@ -1262,15 +1263,15 @@ void Sprite::touch(uint16 mask, int x, int y) { } else { if (_takePtr != NO_PTR) { if (snList(TAKE)[_takePtr]._com == SNNEXT) - OffUse(); + offUse(); else feedSnail(this, TAKE); } else - OffUse(); + offUse(); } }/// else - TooFar(); + tooFar(); } } } @@ -1439,7 +1440,7 @@ void CGEEngine::loadSprite(const char *fname, int ref, int cav, int col = 0, int *p = '\0'; _sprite->_shpCnt = shpcnt; - Vga->SpareQ->Append(_sprite); + Vga->_spareQ->append(_sprite); } } @@ -1506,16 +1507,16 @@ void CGEEngine::loadScript(const char *fname) { #define GAME_FRAME_DELAY (1000 / 50) void CGEEngine::mainLoop() { - SayDebug(); + sayDebug(); if (_isDemo) { // static uint32 tc = 0; - if (/* FIXME: TimerCount - tc >= ((182L * 6L) * 5L) && */ Talk == NULL && _snail->idle()) { - if (Text->getText(_demoText)) { + if (/* FIXME: TimerCount - tc >= ((182L * 6L) * 5L) && */ _talk == NULL && _snail->idle()) { + if (_text->getText(_demoText)) { SNPOST(SNSOUND, -1, 4, NULL); // drumla SNPOST(SNINF, -1, _demoText, NULL); SNPOST(SNLABEL, -1, -1, NULL); - if (Text->getText(++_demoText) == NULL) + if (_text->getText(++_demoText) == NULL) _demoText = DEMO_TEXT + 1; } //FIXME: tc = TimerCount; @@ -1541,11 +1542,11 @@ void CGEEngine::mainLoop() { void CGEEngine::loadUser() { // set scene - if (STARTUP::Mode == 0) { // user .SVG file found - CFile cfile = CFile(UsrPath(UsrFnam), REA, RCrypt); + if (Startup::_mode == 0) { // user .SVG file found + CFile cfile = CFile(usrPath(_usrFnam), REA, RCrypt); loadGame(cfile); } else { - if (STARTUP::Mode == 1) { + if (Startup::_mode == 1) { SVG0FILE file = SVG0FILE(SVG0NAME); loadGame(file); } else { @@ -1564,12 +1565,12 @@ void CGEEngine::runGame() { if (_eventManager->_quitFlag) return; - Text->Clear(); - Text->Preload(100, 1000); - LoadHeroXY(); + _text->clear(); + _text->preload(100, 1000); + loadHeroXY(); _cavLight->_flags._tran = true; - Vga->ShowQ->Append(_cavLight); + Vga->_showQ->append(_cavLight); _cavLight->_flags._hide = true; static Seq pocSeq[] = { { 0, 0, 0, 0, 20 }, @@ -1584,7 +1585,7 @@ void CGEEngine::runGame() { _pocLight->_flags._tran = true; _pocLight->_time = 1; _pocLight->_z = 120; - Vga->ShowQ->Append(_pocLight); + Vga->_showQ->append(_pocLight); selectPocket(-1); // FIXME: Allow ScummVM to handle mouse display @@ -1594,24 +1595,24 @@ void CGEEngine::runGame() { loadUser(); // ~~~~~~~~~~~ - if ((_sprite = Vga->SpareQ->Locate(121)) != NULL) + if ((_sprite = Vga->_spareQ->locate(121)) != NULL) SNPOST_(SNSEQ, -1, Vga->Mono, _sprite); - if ((_sprite = Vga->SpareQ->Locate(122)) != NULL) + if ((_sprite = Vga->_spareQ->locate(122)) != NULL) _sprite->step(_music); SNPOST_(SNSEQ, -1, _music, _sprite); if (!_music) KillMIDI(); - if (Mini && INI_FILE::exist("MINI.SPR")) { - uint8 *ptr = (uint8 *) &*Mini; + if (_mini && INI_FILE::exist("MINI.SPR")) { + uint8 *ptr = (uint8 *) &*_mini; if (ptr != NULL) { loadSprite("MINI", -1, 0, MINI_X, MINI_Y); ExpandSprite(_miniCave = _sprite); // NULL is ok if (_miniCave) { _miniCave->_flags._hide = true; _miniCave->moveShapes(ptr); - MiniShp[0] = new Bitmap(*_miniCave->shp()); - MiniShpList = _miniCave->setShapeList(MiniShp); + _miniShp[0] = new Bitmap(*_miniCave->shp()); + _miniShpList = _miniCave->setShapeList(_miniShp); PostMiniStep(-1); } } @@ -1626,28 +1627,28 @@ void CGEEngine::runGame() { _shadow->_ref = 2; _shadow->_flags._tran = true; Hero->_flags._shad = true; - Vga->ShowQ->Insert(Vga->SpareQ->Remove(_shadow), Hero); + Vga->_showQ->insert(Vga->_spareQ->remove(_shadow), Hero); } } } - InfoLine->gotoxy(INFO_X, INFO_Y); - InfoLine->_flags._tran = true; - InfoLine->Update(NULL); - Vga->ShowQ->Insert(InfoLine); + _infoLine->gotoxy(INFO_X, INFO_Y); + _infoLine->_flags._tran = true; + _infoLine->update(NULL); + Vga->_showQ->insert(_infoLine); - DebugLine->_z = 126; - Vga->ShowQ->Insert(DebugLine); + _debugLine->_z = 126; + Vga->_showQ->insert(_debugLine); _horzLine->_y = MAP_TOP - (MAP_TOP > 0); _horzLine->_z = 126; - Vga->ShowQ->Insert(_horzLine); + Vga->_showQ->insert(_horzLine); - _mouse->Busy = Vga->SpareQ->Locate(BUSY_REF); + _mouse->Busy = Vga->_spareQ->locate(BUSY_REF); if (_mouse->Busy) ExpandSprite(_mouse->Busy); - Startup = 0; + _startup = 0; SNPOST(SNLEVEL, -1, _oldLev, &_cavLight); _cavLight->gotoxy(CAVE_X + ((_now - 1) % CAVE_NX) * CAVE_DX + CAVE_SX, @@ -1656,7 +1657,7 @@ void CGEEngine::runGame() { _keyboard->setClient(Sys); // main loop - while (! Finis && !_eventManager->_quitFlag) { + while (!_finis && !_eventManager->_quitFlag) { //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"); @@ -1668,8 +1669,8 @@ void CGEEngine::runGame() { SNPOST(SNCLEAR, -1, 0, NULL); SNPOST_(SNCLEAR, -1, 0, NULL); _mouse->Off(); - Vga->ShowQ->Clear(); - Vga->SpareQ->Clear(); + Vga->_showQ->clear(); + Vga->_spareQ->clear(); Hero = NULL; _shadow = NULL; } @@ -1682,8 +1683,8 @@ void CGEEngine::movie(const char *ext) { const char *fn = progName(ext); if (INI_FILE::exist(fn)) { loadScript(fn); - ExpandSprite(Vga->SpareQ->Locate(999)); - feedSnail(Vga->ShowQ->Locate(999), TAKE); + ExpandSprite(Vga->_spareQ->locate(999)); + feedSnail(Vga->_showQ->locate(999), TAKE); // FIXME: Allow ScummVM to handle mouse display //Vga->ShowQ->Append(Mouse); @@ -1697,8 +1698,8 @@ void CGEEngine::movie(const char *ext) { _heart->_enable = false; SNPOST(SNCLEAR, -1, 0, NULL); SNPOST_(SNCLEAR, -1, 0, NULL); - Vga->ShowQ->Clear(); - Vga->SpareQ->Clear(); + Vga->_showQ->clear(); + Vga->_spareQ->clear(); } } @@ -1718,9 +1719,9 @@ bool CGEEngine::showTitle(const char *name) { D.center(); D.show(2); - if (STARTUP::Mode == 2) { + if (Startup::_mode == 2) { inf(SVG0NAME); - Talk->show(2); + _talk->show(2); } Vga->Sunset(); @@ -1729,10 +1730,10 @@ bool CGEEngine::showTitle(const char *name) { selectPocket(-1); Vga->Sunrise(VGA::SysPal); - if (STARTUP::Mode < 2 && !STARTUP::SoundOk) { + if (Startup::_mode < 2 && !Startup::_soundOk) { Vga->CopyPage(1, 2); Vga->CopyPage(0, 1); - Vga->ShowQ->Append(_mouse); + Vga->_showQ->append(_mouse); _heart->_enable = true; _mouse->On(); for (selectSound(); !_snail->idle() || VMENU::Addr;) { @@ -1743,22 +1744,22 @@ bool CGEEngine::showTitle(const char *name) { _mouse->Off(); _heart->_enable = false; - Vga->ShowQ->Clear(); + Vga->_showQ->clear(); Vga->CopyPage(0, 2); - STARTUP::SoundOk = 2; + Startup::_soundOk = 2; if (_music) LoadMIDI(0); } - if (STARTUP::Mode < 2) { + if (Startup::_mode < 2) { if (_isDemo) { - strcpy(UsrFnam, progName(SVG_EXT)); + strcpy(_usrFnam, progName(SVG_EXT)); usr_ok = true; } else { //----------------------------------------- #ifndef EVA #ifdef CD - STARTUP::Summa |= (0xC0 + (DriveCD(0) << 6)) & 0xFF; + Startup::_summa |= (0xC0 + (DriveCD(0) << 6)) & 0xFF; #else // At this point the game originally read the boot sector to get // the serial number for it's copy protection check @@ -1767,7 +1768,7 @@ bool CGEEngine::showTitle(const char *name) { movie("X00"); // paylist Vga->CopyPage(1, 2); Vga->CopyPage(0, 1); - Vga->ShowQ->Append(_mouse); + Vga->_showQ->append(_mouse); //Mouse.On(); _heart->_enable = true; for (takeName(); GetText::_ptr;) { @@ -1776,33 +1777,33 @@ bool CGEEngine::showTitle(const char *name) { return false; } _heart->_enable = false; - if (_keyboard->last() == Enter && *UsrFnam) + if (_keyboard->last() == Enter && *_usrFnam) usr_ok = true; if (usr_ok) - strcat(UsrFnam, SVG_EXT); + strcat(_usrFnam, SVG_EXT); //Mouse.Off(); - Vga->ShowQ->Clear(); + Vga->_showQ->clear(); Vga->CopyPage(0, 2); #endif } - if (usr_ok && STARTUP::Mode == 0) { - const char *n = UsrPath(UsrFnam); + if (usr_ok && Startup::_mode == 0) { + const char *n = usrPath(_usrFnam); if (CFile::exist(n)) { CFile file = CFile(n, REA, RCrypt); loadGame(file, true); // only system vars Vga->SetColors(VGA::SysPal, 64); Vga->Update(); if (FINIS) { - ++ STARTUP::Mode; + Startup::_mode++; FINIS = false; } } else - ++STARTUP::Mode; + Startup::_mode++; } } - if (STARTUP::Mode < 2) + if (Startup::_mode < 2) movie("X01"); // wink Vga->CopyPage(0, 2); @@ -1810,7 +1811,7 @@ bool CGEEngine::showTitle(const char *name) { if (_isDemo) return true; else - return (STARTUP::Mode == 2 || usr_ok); + return (Startup::_mode == 2 || usr_ok); } @@ -1824,34 +1825,34 @@ void StkDump (void) { void CGEEngine::cge_main(void) { uint16 intStack[STACK_SIZ / 2]; - intStackPtr = intStack; + _intStackPtr = intStack; //Debug( memset((void *) (-K(2)), 0, K(1)); ) //Debug( memset((void *) (-K(4)), 0, K(1)); ) memset(_barriers, 0xFF, sizeof(_barriers)); if (!_mouse->Exist) - error("%s", Text->getText(NO_MOUSE_TEXT)); + error("%s", _text->getText(NO_MOUSE_TEXT)); if (!SVG0FILE::exist(SVG0NAME)) - STARTUP::Mode = 2; + Startup::_mode = 2; - DebugLine->_flags._hide = true; + _debugLine->_flags._hide = true; _horzLine->_flags._hide = true; //srand((uint16) Timer()); Sys = new SYSTEM(this); - if (_music && STARTUP::SoundOk) + if (_music && Startup::_soundOk) LoadMIDI(0); - if (STARTUP::Mode < 2) + if (Startup::_mode < 2) movie(LGO_EXT); if (showTitle("WELCOME")) { - if ((!_isDemo) && (STARTUP::Mode == 1)) + if ((!_isDemo) && (Startup::_mode == 1)) movie("X02"); // intro runGame(); - Startup = 2; + _startup = 2; if (FINIS) movie("X03"); } else diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h index 5e3eb6bf1c..0684a886e5 100644 --- a/engines/cge/cge_main.h +++ b/engines/cge/cge_main.h @@ -170,7 +170,7 @@ extern WALK *Hero; extern VGA *Vga; extern Heart *_heart; extern SYSTEM *Sys; -extern int OffUseCount; +extern int _offUseCount; extern Sprite *_pocLight; extern Keyboard *_keyboard; extern MOUSE *_mouse; @@ -180,9 +180,9 @@ extern Sprite *_sprite; extern Sprite *_miniCave; extern Sprite *_shadow; extern Sprite *_horzLine; -extern INFO_LINE *InfoLine; +extern InfoLine *_infoLine; extern Sprite *_cavLight; -extern INFO_LINE *DebugLine; +extern InfoLine *_debugLine; extern BMP_PTR MB[2]; extern BMP_PTR MB[2]; extern BMP_PTR HL[2]; diff --git a/engines/cge/config.cpp b/engines/cge/config.cpp index 9a8219dd6b..f32c3b7195 100644 --- a/engines/cge/config.cpp +++ b/engines/cge/config.cpp @@ -146,16 +146,16 @@ void CGEEngine::selectSound() { _sound.Close(); if (VMENU::Addr) SNPOST_(SNKILL, -1, 0, VMENU::Addr); - inf(Text->getText(STYPE_TEXT)); - Talk->gotoxy(Talk->_x, FONT_HIG / 2); + inf(_text->getText(STYPE_TEXT)); + _talk->gotoxy(_talk->_x, FONT_HIG / 2); for (i = 0; i < (int)ArrayCount(DevName); i++) - DevMenu[i].Text = Text->getText(DevName[i]); - (new VMENU(this, DevMenu, SCR_WID / 2, Talk->_y + Talk->_h + TEXT_VM + FONT_HIG))->setName(Text->getText(MENU_TEXT)); + DevMenu[i].Text = _text->getText(DevName[i]); + (new VMENU(this, DevMenu, SCR_WID / 2, _talk->_y + _talk->_h + TEXT_VM + FONT_HIG))->setName(_text->getText(MENU_TEXT)); } static void Reset(void) { - SNDDrvInfo.DBASE = SNDDrvInfo.DIRQ = SNDDrvInfo.DDMA = SNDDrvInfo.MBASE = DETECT; + _sndDrvInfo._dBase = _sndDrvInfo._dIrq = _sndDrvInfo._dDma = _sndDrvInfo._mBase = DETECT; } @@ -183,9 +183,9 @@ static CHOICE *Cho; static int Hlp; void CGEEngine::SNSelect() { - inf(Text->getText(Hlp)); - Talk->gotoxy(Talk->_x, FONT_HIG / 2); - (new VMENU(this, Cho, SCR_WID / 2, Talk->_y + Talk->_h + TEXT_VM + FONT_HIG))->setName(Text->getText(MENU_TEXT)); + inf(_text->getText(Hlp)); + _talk->gotoxy(_talk->_x, FONT_HIG / 2); + (new VMENU(this, Cho, SCR_WID / 2, _talk->_y + _talk->_h + TEXT_VM + FONT_HIG))->setName(_text->getText(MENU_TEXT)); } @@ -199,81 +199,81 @@ static void Select(CHOICE *cho, int hlp) { void CGEEngine::NONE() { - SNDDrvInfo.DDEV = DEV_QUIET; - SNDDrvInfo.MDEV = DEV_QUIET; + _sndDrvInfo._dDev = DEV_QUIET; + _sndDrvInfo._mDev = DEV_QUIET; _sound.Open(); } void CGEEngine::SB() { - SNDDrvInfo.DDEV = DEV_SB; - SNDDrvInfo.MDEV = DEV_SB; + _sndDrvInfo._dDev = DEV_SB; + _sndDrvInfo._mDev = DEV_SB; Reset(); Select(DigiPorts, SPORT_TEXT); } void CGEEngine::SBM() { - SNDDrvInfo.DDEV = DEV_SB; - SNDDrvInfo.MDEV = DEV_GM; + _sndDrvInfo._dDev = DEV_SB; + _sndDrvInfo._mDev = DEV_GM; Reset(); Select(DigiPorts, SPORT_TEXT); } void CGEEngine::GUS() { - SNDDrvInfo.DDEV = DEV_GUS; - SNDDrvInfo.MDEV = DEV_GUS; + _sndDrvInfo._dDev = DEV_GUS; + _sndDrvInfo._mDev = DEV_GUS; Reset(); Select(DigiPorts, SPORT_TEXT); } void CGEEngine::GUSM() { - SNDDrvInfo.DDEV = DEV_GUS; - SNDDrvInfo.MDEV = DEV_GM; + _sndDrvInfo._dDev = DEV_GUS; + _sndDrvInfo._mDev = DEV_GM; Reset(); Select(DigiPorts, SPORT_TEXT); } void CGEEngine::MIDI() { - SNDDrvInfo.DDEV = DEV_QUIET; - SNDDrvInfo.MDEV = DEV_GM; - SNDDrvInfo.MBASE = DETECT; + _sndDrvInfo._dDev = DEV_QUIET; + _sndDrvInfo._mDev = DEV_GM; + _sndDrvInfo._mBase = DETECT; Select(MIDIPorts, MPORT_TEXT); } void CGEEngine::AUTO() { - SNDDrvInfo.DDEV = DEV_AUTO; - SNDDrvInfo.MDEV = DEV_AUTO; + _sndDrvInfo._dDev = DEV_AUTO; + _sndDrvInfo._mDev = DEV_AUTO; Reset(); _sound.Open(); } void CGEEngine::setPortD() { - SNDDrvInfo.DBASE = xdeco(DigiPorts[VMENU::Recent].Text); - Select((SNDDrvInfo.DDEV == DEV_SB) ? BlsterIRQ : GravisIRQ, SIRQ_TEXT); + _sndDrvInfo._dBase = xdeco(DigiPorts[VMENU::Recent].Text); + Select((_sndDrvInfo._dDev == DEV_SB) ? BlsterIRQ : GravisIRQ, SIRQ_TEXT); } void CGEEngine::setPortM() { - SNDDrvInfo.MBASE = xdeco(MIDIPorts[VMENU::Recent].Text); + _sndDrvInfo._mBase = xdeco(MIDIPorts[VMENU::Recent].Text); _sound.Open(); } void CGEEngine::setIRQ() { - SNDDrvInfo.DIRQ = ddeco(((SNDDrvInfo.DDEV == DEV_SB) ? BlsterIRQ : GravisIRQ)[VMENU::Recent].Text); - Select((SNDDrvInfo.DDEV == DEV_SB) ? BlsterDMA : GravisDMA, SDMA_TEXT); + _sndDrvInfo._dIrq = ddeco(((_sndDrvInfo._dDev == DEV_SB) ? BlsterIRQ : GravisIRQ)[VMENU::Recent].Text); + Select((_sndDrvInfo._dDev == DEV_SB) ? BlsterDMA : GravisDMA, SDMA_TEXT); } void CGEEngine::setDMA() { - SNDDrvInfo.DDMA = ddeco(((SNDDrvInfo.DDEV == DEV_SB) ? BlsterDMA : GravisDMA)[VMENU::Recent].Text); - if (SNDDrvInfo.MDEV != SNDDrvInfo.DDEV) + _sndDrvInfo._dDma = ddeco(((_sndDrvInfo._dDev == DEV_SB) ? BlsterDMA : GravisDMA)[VMENU::Recent].Text); + if (_sndDrvInfo._mDev != _sndDrvInfo._dDev) Select(MIDIPorts, MPORT_TEXT); else _sound.Open(); diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index e18890625f..97385c3ae1 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -300,7 +300,7 @@ void EventManager::handleEvents(void) { // discard Text if button released if (e._msk & (L_UP | R_UP)) - KillText(); + killText(); } EvtTail = (EvtTail + 1) % EVT_MAX; } diff --git a/engines/cge/events.h b/engines/cge/events.h index 59a62803ba..cfb1023d6b 100644 --- a/engines/cge/events.h +++ b/engines/cge/events.h @@ -80,7 +80,7 @@ public: #define KEYB 0x80 -extern TALK *Talk; +extern Talk *_talk; struct CGEEvent { uint16 _msk; diff --git a/engines/cge/general.cpp b/engines/cge/general.cpp index fe94bd4598..6b0327ff23 100644 --- a/engines/cge/general.cpp +++ b/engines/cge/general.cpp @@ -92,7 +92,7 @@ Dac _stdPal[] = {// R G B { 255, 255, 255}, // 255 }; -DrvInfo SNDDrvInfo; +DrvInfo _sndDrvInfo; void _fqsort(void *base, uint16 nelem, uint16 width, int (*fcmp)(const void *, const void *)) { warning("STUB: _fqsort"); @@ -298,32 +298,32 @@ bool isVga() { return true; } -void SNDInit() { +void sndInit() { warning("STUB: SNDInit"); } -void SNDDone() { +void sndDone() { // FIXME: STUB: SNDDone } -void SNDSetVolume() { +void sndSetVolume() { warning("STUB: SNDSetVolume"); } -void SNDDigiStart(SmpInfo *PSmpInfo) { +void sndDigiStart(SmpInfo *PSmpInfo) { warning("STUB: SNDDigitStart"); } -void SNDDigiStop(SmpInfo *PSmpInfo) { +void sndDigiStop(SmpInfo *PSmpInfo) { warning("STUB: SNDDigiStop"); } -void SNDMIDIStart(uint8 *MIDFile) { +void sndMidiStart(uint8 *MIDFile) { warning("STUB: SNDMIDIStart"); } -void SNDMIDIStop() { - // FIXME: STUB: SNDMIDIStop +void sndMidiStop() { + // FIXME: STUB: sndMIDIStop } DATACK *LoadWave(XFile *file, EMM *emm) { diff --git a/engines/cge/gettext.cpp b/engines/cge/gettext.cpp index c48b281771..508175ccd5 100644 --- a/engines/cge/gettext.cpp +++ b/engines/cge/gettext.cpp @@ -35,19 +35,19 @@ GetText *GetText::_ptr = NULL; GetText::GetText(CGEEngine *vm, const char *info, char *text, int size, void (*click)()) - : TALK(vm), _text(text), _size(min(size, GTMAX)), _len(min(_size, strlen(text))), + : Talk(vm), _text(text), _size(min(size, GTMAX)), _len(min(_size, strlen(text))), _cntr(GTBLINK), _click(click), _oldKeybClient(_keyboard->setClient(this)), _vm(vm) { - int i = 2 * TEXT_HM + _Font->Width(info); + int i = 2 * TEXT_HM + _font->width(info); _ptr = this; - Mode = RECT; - TS[0] = Box((i + 3) & ~3, 2 * TEXT_VM + 2 * FONT_HIG + TEXT_LS); - setShapeList(TS); + _mode = RECT; + _ts[0] = box((i + 3) & ~3, 2 * TEXT_VM + 2 * FONT_HIG + TEXT_LS); + setShapeList(_ts); _flags._bDel = true; _flags._kill = true; memcpy(_buff, text, _len); _buff[_len] = ' '; _buff[_len + 1] = '\0'; - PutLine(0, info); + putLine(0, info); tick(); } @@ -63,7 +63,7 @@ void GetText::tick() { _buff[_len] ^= (' ' ^ '_'); _cntr = 0; } - PutLine(1, _buff); + putLine(1, _buff); _time = GTTIME; } @@ -105,7 +105,7 @@ void GetText::touch(uint16 mask, int x, int y) { if (p) x = ogon[p - bezo]; } - if (_len < _size && 2 * TEXT_HM + _Font->Width(_buff) + _Font->Wid[x] <= _w) { + if (_len < _size && 2 * TEXT_HM + _font->width(_buff) + _font->_wid[x] <= _w) { _buff[_len + 2] = _buff[_len + 1]; _buff[_len + 1] = _buff[_len]; _buff[_len++] = x; diff --git a/engines/cge/gettext.h b/engines/cge/gettext.h index f743d0c66c..d29d11abb7 100644 --- a/engines/cge/gettext.h +++ b/engines/cge/gettext.h @@ -37,7 +37,7 @@ namespace CGE { #define GTBLINK 6 #define GTTIME 6 -class GetText : public TALK { +class GetText : public Talk { char _buff[GTMAX + 2]; char *_text; uint16 _size; diff --git a/engines/cge/mixer.cpp b/engines/cge/mixer.cpp index e3fd2c07ed..a49f7c5c7f 100644 --- a/engines/cge/mixer.cpp +++ b/engines/cge/mixer.cpp @@ -44,7 +44,7 @@ Mixer::Mixer(CGEEngine *vm, int x, int y) : Sprite(vm, NULL), _fall(MIX_FALL), _ _mb[0] = new Bitmap("VOLUME", true); _mb[1] = NULL; setShapeList(_mb); - setName(Text->getText(MIX_NAME)); + setName(_text->getText(MIX_NAME)); _flags._syst = true; _flags._kill = true; _flags._bDel = true; @@ -58,8 +58,8 @@ Mixer::Mixer(CGEEngine *vm, int x, int y) : Sprite(vm, NULL), _fall(MIX_FALL), _ static char fn[] = "V00"; wtom(i, fn + 1, 10, 2); _lb[i] = new Bitmap(fn, true); - _ls[i].Now = _ls[i].Next = i; - _ls[i].Dx = _ls[i].Dy = _ls[i].Dly = 0; + _ls[i]._now = _ls[i]._next = i; + _ls[i]._dx = _ls[i]._dy = _ls[i]._dly = 0; } _lb[i] = NULL; @@ -75,17 +75,17 @@ Mixer::Mixer(CGEEngine *vm, int x, int y) : Sprite(vm, NULL), _fall(MIX_FALL), _ } _led[ArrayCount(_led) - 1]->_flags._bDel = true; - Vga->ShowQ->Insert(this); + Vga->_showQ->insert(this); for (i = 0; i < ArrayCount(_led); i++) - Vga->ShowQ->Insert(_led[i]); + Vga->_showQ->insert(_led[i]); //--- reset balance - i = (SNDDrvInfo.VOL4.ML + SNDDrvInfo.VOL4.MR) / 2; - SNDDrvInfo.VOL4.ML = i; - SNDDrvInfo.VOL4.MR = i; - i = (SNDDrvInfo.VOL4.DL + SNDDrvInfo.VOL4.DR) / 2; - SNDDrvInfo.VOL4.DL = i; - SNDDrvInfo.VOL4.DR = i; + i = (_sndDrvInfo.Vol4._ml + _sndDrvInfo.Vol4._mr) / 2; + _sndDrvInfo.Vol4._ml = i; + _sndDrvInfo.Vol4._mr = i; + i = (_sndDrvInfo.Vol4._dl + _sndDrvInfo.Vol4._dr) / 2; + _sndDrvInfo.Vol4._dl = i; + _sndDrvInfo.Vol4._dr = i; update(); _time = MIX_DELAY; } @@ -99,7 +99,7 @@ Mixer::~Mixer() { void Mixer::touch(uint16 mask, int x, int y) { Sprite::touch(mask, x, y); if (mask & L_UP) { - uint8 *vol = (&SNDDrvInfo.VOL2.D) + (x < _w / 2); + uint8 *vol = (&_sndDrvInfo.Vol2._d) + (x < _w / 2); if (y < MIX_BHIG) { if (*vol < 0xFF) *vol += 0x11; @@ -133,11 +133,11 @@ void Mixer::tick() { void Mixer::update(void) { - _led[0]->step(SNDDrvInfo.VOL4.ML); - _led[1]->step(SNDDrvInfo.VOL4.DL); + _led[0]->step(_sndDrvInfo.Vol4._ml); + _led[1]->step(_sndDrvInfo.Vol4._dl); //TODO Change the SNPOST message send to a special way to send function pointer - //SNPOST_(SNEXEC, -1, 0, (void*)&SNDSetVolume); + //SNPOST_(SNEXEC, -1, 0, (void*)&sndSetVolume); warning("STUB: Mixer::Update"); } diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index 308ffb231c..01be69386f 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -57,10 +57,10 @@ extern Sprite *_pocLight; //------------------------------------------------------------------------- // SPRITE * Pocket[POCKET_NX]={ NULL, NULL, NULL, NULL, // NULL, NULL, NULL, NULL, }; -// int PocPtr = 0; +// int _pocPtr = 0; //------------------------------------------------------------------------- extern Sprite *_pocket[]; -extern int PocPtr; +extern int _pocPtr; static void SNGame(Sprite *spr, int num) { switch (num) { @@ -71,7 +71,7 @@ static void SNGame(Sprite *spr, int num) { int buref = 0; int Stage = 0; - for (dup[0] = Vga->ShowQ->First(); dup[0]; dup[0] = dup[0]->_next) { + for (dup[0] = Vga->_showQ->first(); dup[0]; dup[0] = dup[0]->_next) { buref = dup[0]->_ref; if (buref / 1000 == 16 && buref % 100 == 6) { Stage = (buref / 100) % 10; @@ -79,8 +79,8 @@ static void SNGame(Sprite *spr, int num) { } } if (dup[1] == NULL) { - dup[1] = Vga->ShowQ->Locate(16003); // pan - dup[2] = Vga->ShowQ->Locate(16004); // pani + dup[1] = Vga->_showQ->locate(16003); // pan + dup[2] = Vga->_showQ->locate(16004); // pani } if (_game) { // continue game @@ -163,10 +163,10 @@ static void SNGame(Sprite *spr, int num) { static int count = 0; if (k == NULL) { - k = Vga->ShowQ->Locate(20700); - k1 = Vga->ShowQ->Locate(20701); - k2 = Vga->ShowQ->Locate(20702); - k3 = Vga->ShowQ->Locate(20703); + k = Vga->_showQ->locate(20700); + k1 = Vga->_showQ->locate(20701); + k2 = Vga->_showQ->locate(20702); + k3 = Vga->_showQ->locate(20703); } if (!_game) { // init @@ -273,13 +273,13 @@ static void SNGame(Sprite *spr, int num) { void ExpandSprite(Sprite *spr) { if (spr) - Vga->ShowQ->Insert(Vga->SpareQ->Remove(spr)); + Vga->_showQ->insert(Vga->_spareQ->remove(spr)); } void ContractSprite(Sprite *spr) { if (spr) - Vga->SpareQ->Append(Vga->ShowQ->Remove(spr)); + Vga->_spareQ->append(Vga->_showQ->remove(spr)); } int findPocket(Sprite *spr) { @@ -291,18 +291,18 @@ int findPocket(Sprite *spr) { void selectPocket(int n) { - if (n < 0 || (_pocLight->_seqPtr && PocPtr == n)) { + if (n < 0 || (_pocLight->_seqPtr && _pocPtr == n)) { _pocLight->step(0); n = findPocket(NULL); if (n >= 0) - PocPtr = n; + _pocPtr = n; } else { if (_pocket[n] != NULL) { - PocPtr = n; + _pocPtr = n; _pocLight->step(1); } } - _pocLight->gotoxy(POCKET_X + PocPtr * POCKET_DX + POCKET_SX, POCKET_Y + POCKET_SY); + _pocLight->gotoxy(POCKET_X + _pocPtr * POCKET_DX + POCKET_SX, POCKET_Y + POCKET_SY); } @@ -353,7 +353,7 @@ void feedSnail(Sprite *spr, SNLIST snq) { while (true) { if (c->_com == SNTALK) { if ((_snail->_talkEnable = (c->_val != 0)) == false) - KillText(); + killText(); } if (c->_com == SNNEXT) { Sprite *s = (c->_ref < 0) ? spr : Locate(c->_ref); @@ -441,7 +441,7 @@ void Snail::addCom(SNCOM com, int ref, int val, void *ptr) { snc->_ptr = ptr; if (com == SNCLEAR) { _tail = _head; - KillText(); + killText(); _timerExpiry = 0; } _enable(); @@ -464,7 +464,7 @@ void Snail::insCom(SNCOM com, int ref, int val, void *ptr) { snc->_ptr = ptr; if (com == SNCLEAR) { _tail = _head; - KillText(); + killText(); _timerExpiry = 0; } _enable(); @@ -506,10 +506,10 @@ static void SNZTrim(Sprite *spr) { Sprite *s; _heart->_enable = false; s = (spr->_flags._shad) ? spr->_prev : NULL; - Vga->ShowQ->Insert(Vga->ShowQ->Remove(spr)); + Vga->_showQ->insert(Vga->_showQ->remove(spr)); if (s) { s->_z = spr->_z; - Vga->ShowQ->Insert(Vga->ShowQ->Remove(s), spr); + Vga->_showQ->insert(Vga->_showQ->remove(s), spr); } _heart->_enable = en; } @@ -627,7 +627,7 @@ void SNCover(Sprite *spr, int xref) { xspr->gotoxy(spr->_x, spr->_y); ExpandSprite(xspr); if ((xspr->_flags._shad = spr->_flags._shad) == 1) { - Vga->ShowQ->Insert(Vga->ShowQ->Remove(spr->_prev), xspr); + Vga->_showQ->insert(Vga->_showQ->remove(spr->_prev), xspr); spr->_flags._shad = false; } feedSnail(xspr, NEAR); @@ -641,7 +641,7 @@ void SNUncover(Sprite *spr, Sprite *xspr) { spr->_cave = xspr->_cave; spr->gotoxy(xspr->_x, xspr->_y); if ((spr->_flags._shad = xspr->_flags._shad) == 1) { - Vga->ShowQ->Insert(Vga->ShowQ->Remove(xspr->_prev), spr); + Vga->_showQ->insert(Vga->_showQ->remove(xspr->_prev), spr); xspr->_flags._shad = false; } spr->_z = xspr->_z; @@ -716,7 +716,7 @@ void SNSlave(Sprite *spr, int ref) { SNSend(slv, spr->_cave); slv->_flags._slav = true; slv->_z = spr->_z; - Vga->ShowQ->Insert(Vga->ShowQ->Remove(slv), spr->_next); + Vga->_showQ->insert(Vga->_showQ->remove(slv), spr->_next); } } } @@ -743,13 +743,13 @@ void SNKill(Sprite *spr) { } Sprite *nx = spr->_next; Hide1(spr); - Vga->ShowQ->Remove(spr); + Vga->_showQ->remove(spr); EventManager::ClrEvt(spr); if (spr->_flags._kill) delete spr; else { spr->_cave = -1; - Vga->SpareQ->Append(spr); + Vga->_spareQ->append(spr); } if (nx) { if (nx->_flags._slav) @@ -760,7 +760,7 @@ void SNKill(Sprite *spr) { static void SNSound(Sprite *spr, int wav, int cnt) { - if (SNDDrvInfo.DDEV) { + if (_sndDrvInfo._dDev) { if (wav == -1) _sound.Stop(); else @@ -771,12 +771,12 @@ static void SNSound(Sprite *spr, int wav, int cnt) { void SNKeep(Sprite *spr, int stp) { selectPocket(-1); - if (spr && ! spr->_flags._kept && _pocket[PocPtr] == NULL) { + if (spr && ! spr->_flags._kept && _pocket[_pocPtr] == NULL) { SNSound(spr, 3, 1); - _pocket[PocPtr] = spr; + _pocket[_pocPtr] = spr; spr->_cave = 0; spr->_flags._kept = true; - spr->gotoxy(POCKET_X + POCKET_DX * PocPtr + POCKET_DX / 2 - spr->_w / 2, + spr->gotoxy(POCKET_X + POCKET_DX * _pocPtr + POCKET_DX / 2 - spr->_w / 2, POCKET_Y + POCKET_DY / 2 - spr->_h / 2); if (stp >= 0) spr->step(stp); @@ -817,7 +817,7 @@ static void SNLevel(Sprite *spr, int lev) { #endif while (_lev < lev) { _lev++; - spr = Vga->SpareQ->Locate(100 + _lev); + spr = Vga->_spareQ->locate(100 + _lev); if (spr) { spr->backShow(true); spr->_cave = 0; @@ -919,11 +919,11 @@ void Snail::runCom() { _timerExpiry = 0; } else { if (_textDelay) { - KillText(); + killText(); _textDelay = false; } } - if (Talk && snc->_com != SNPAUSE) + if (_talk && snc->_com != SNPAUSE) break; } @@ -933,7 +933,7 @@ void Snail::runCom() { break; case SNPAUSE : _timerExpiry = g_system->getMillis() + snc->_val * SNAIL_FRAME_DELAY; - if (Talk) + if (_talk) _textDelay = true; break; case SNWAIT : @@ -955,13 +955,13 @@ void Snail::runCom() { if (sprel && _talkEnable) { if (sprel == Hero && sprel->seqTest(-1)) sprel->step(HTALK); - Text->Say(Text->getText(snc->_val), sprel); + _text->say(_text->getText(snc->_val), sprel); Sys->FunDel = HEROFUN0; } break; case SNINF : if (_talkEnable) { - _vm->inf(Text->getText(snc->_val)); + _vm->inf(_text->getText(snc->_val)); Sys->FunDel = HEROFUN0; } break; @@ -969,7 +969,7 @@ void Snail::runCom() { if (sprel && _talkEnable) { if (sprel == Hero && sprel->seqTest(-1)) sprel->step(HTALK); - SayTime(sprel); + sayTime(sprel); } break; case SNCAVE : diff --git a/engines/cge/snddrv.h b/engines/cge/snddrv.h index 78d1434b40..0ea776b784 100644 --- a/engines/cge/snddrv.h +++ b/engines/cge/snddrv.h @@ -57,73 +57,73 @@ enum DEV_TYPE { DEV_AUTO = -1, // auto-detect mode // driver info struct DrvInfo { - DEV_TYPE DDEV; // digi device - DEV_TYPE MDEV; // midi device - uint16 DBASE; // digi base port - uint16 DDMA; // digi dma no - uint16 DIRQ; // digi irq no - uint16 MBASE; // midi base port + DEV_TYPE _dDev; // digi device + DEV_TYPE _mDev; // midi device + uint16 _dBase; // digi base port + uint16 _dDma; // digi dma no + uint16 _dIrq; // digi irq no + uint16 _mBase; // midi base port union { struct { - uint16 DR : 4; - uint16 DL : 4; - uint16 MR : 4; - uint16 ML : 4; - } VOL4; + uint16 _dr : 4; + uint16 _dl : 4; + uint16 _mr : 4; + uint16 _ml : 4; + } Vol4; struct { - uint8 D; // digi volume - uint8 M; // midi volume - } VOL2; + uint8 _d; // digi volume + uint8 _m; // midi volume + } Vol2; }; }; // sample info struct SmpInfo { - uint8 *saddr; // address - uint16 slen; // length - uint16 span; // left/right pan (0-15) - int sflag; // flag + uint8 *_saddr; // address + uint16 _slen; // length + uint16 _span; // left/right pan (0-15) + int _sflag; // flag }; // ****************************************************** // * Data * // ****************************************************** // driver info -extern DrvInfo SNDDrvInfo; +extern DrvInfo _sndDrvInfo; // midi player flag (1 means we are playing) -extern uint16 MIDIPlayFlag; +extern uint16 _midiPlayFlag; // midi song end flag (1 means we have crossed end mark) -extern uint16 MIDIEndFlag; +extern uint16 _midiEndFlag; // ****************************************************** // * Driver Code * // ****************************************************** // Init Digi Device -void SNDInit(); +void sndInit(); // Close Digi Device -void SNDDone(); +void sndDone(); // Set Volume -void SNDSetVolume(); +void sndSetVolume(); // Start Digi -void SNDDigiStart(SmpInfo *PSmpInfo); +void sndDigiStart(SmpInfo *PSmpInfo); // Stop Digi -void SNDDigiStop(SmpInfo *PSmpInfo); +void sndDigiStop(SmpInfo *PSmpInfo); // Start MIDI File -void SNDMIDIStart(uint8 *MIDFile); +void sndMidiStart(uint8 *MIDFile); // Stop MIDI File -void SNDMIDIStop(); +void sndMidiStop(); // Play MIDI File (to be called while interrupting) // WARNING: Uses ALL registers! -void SNDMIDIPlay(); +void sndMidiPlay(); } // End of namespace CGE diff --git a/engines/cge/sound.cpp b/engines/cge/sound.cpp index 60af9f7016..aca4b4d534 100644 --- a/engines/cge/sound.cpp +++ b/engines/cge/sound.cpp @@ -41,7 +41,7 @@ SOUND _sound; SOUND::SOUND(void) { - if (STARTUP::SoundOk) + if (Startup::_soundOk) Open(); } @@ -53,12 +53,12 @@ SOUND::~SOUND(void) { void SOUND::Close(void) { KillMIDI(); - SNDDone(); + sndDone(); } void SOUND::Open(void) { - SNDInit(); + sndInit(); Play(_fx[30000], 8); } @@ -66,17 +66,17 @@ void SOUND::Open(void) { void SOUND::Play(DATACK *wav, int pan, int cnt) { if (wav) { Stop(); - smpinf.saddr = (uint8 *) &*(wav->EAddr()); - smpinf.slen = (uint16)wav->Size(); - smpinf.span = pan; - smpinf.sflag = cnt; - SNDDigiStart(&smpinf); + smpinf._saddr = (uint8 *) &*(wav->EAddr()); + smpinf._slen = (uint16)wav->Size(); + smpinf._span = pan; + smpinf._sflag = cnt; + sndDigiStart(&smpinf); } } void SOUND::Stop(void) { - SNDDigiStop(&smpinf); + sndDigiStop(&smpinf); } @@ -176,7 +176,7 @@ static uint8 *midi = NULL; void KillMIDI(void) { - SNDMIDIStop(); + sndMidiStop(); if (midi) { delete[] midi; midi = NULL; @@ -198,7 +198,7 @@ void LoadMIDI(int ref) { if (mid._error) KillMIDI(); else - SNDMIDIStart(midi); + sndMidiStart(midi); } } } diff --git a/engines/cge/startup.cpp b/engines/cge/startup.cpp index 39a2b66e4b..0dfbc67916 100644 --- a/engines/cge/startup.cpp +++ b/engines/cge/startup.cpp @@ -33,29 +33,28 @@ namespace CGE { -extern char Copr[]; +extern char _copr[]; -#define id (*(Ident*)Copr) +#define id (*(Ident*)_copr) -EMM MiniEmm = MINI_EMM_SIZE; +EMM _miniEmm = MINI_EMM_SIZE; -static STARTUP StartUp; +// static Startup _startUp; +int Startup::_mode = 0; +int Startup::_core; +int Startup::_soundOk = 0; +uint16 Startup::_summa; -int STARTUP::Mode = 0; -int STARTUP::Core; -int STARTUP::SoundOk = 0; -uint16 STARTUP::Summa; - -void quit_now(int ref) { - error("%s", Text->getText(ref)); +void quitNow(int ref) { + error("%s", _text->getText(ref)); } -bool STARTUP::get_parms(void) { - Summa = 0; +bool Startup::getParms() { + _summa = 0; /* int i = _argc; @@ -103,12 +102,12 @@ bool STARTUP::get_parms(void) { if (SNDDrvInfo.MDEV != DEV_GM) SNDDrvInfo.MDEV = SNDDrvInfo.DDEV; return true; */ - warning("STUB: STARTUP::get_parms"); + warning("STUB: Startup::get_parms"); return true; } -STARTUP::STARTUP(void) { +Startup::Startup() { /* uint32 m = farcoreleft() >> 10; if (m < 0x7FFF) @@ -125,21 +124,21 @@ STARTUP::STARTUP(void) { if (! get_parms()) quit_now(BAD_ARG_TEXT); //--- load sound configuration - const char * fn = UsrPath(ProgName(CFG_EXT)); - if (! STARTUP::SoundOk && CFILE::Exist(fn)) { + const char * fn = usrPath(ProgName(CFG_EXT)); + if (!Startup::_soundOk && CFILE::Exist(fn)) { CFILE cfg(fn, REA); if (! cfg.Error) { cfg.Read(&SNDDrvInfo, sizeof(SNDDrvInfo)-sizeof(SNDDrvInfo.VOL2)); if (! cfg.Error) - STARTUP::SoundOk = 1; + Startup::_soundOk = 1; } } */ - warning("STUB: STARTUP::STARTUP"); + warning("STUB: Startup::Startup"); } -const char *UsrPath(const char *nam) { +const char *usrPath(const char *nam) { static char buf[MAXPATH] = ".\\", *p = buf + 2; #if defined(CD) if (DriveCD(0)) { diff --git a/engines/cge/startup.h b/engines/cge/startup.h index a1e44cc4af..96c7388070 100644 --- a/engines/cge/startup.h +++ b/engines/cge/startup.h @@ -59,20 +59,20 @@ namespace CGE { #define CORE_LOW (CORE_MID - 20) -class STARTUP { - static bool get_parms(void); +class Startup { + static bool getParms(); public: - static int Mode; - static int Core; - static int SoundOk; - static uint16 Summa; - STARTUP(void); + static int _mode; + static int _core; + static int _soundOk; + static uint16 _summa; + Startup(); }; -extern EMM MiniEmm; +extern EMM _miniEmm; -const char *UsrPath(const char *nam); +const char *usrPath(const char *nam); } // End of namespace CGE diff --git a/engines/cge/talk.cpp b/engines/cge/talk.cpp index 0abff7752c..7c0f9563a6 100644 --- a/engines/cge/talk.cpp +++ b/engines/cge/talk.cpp @@ -42,106 +42,106 @@ namespace CGE { //uint8 FONT::Map[MAP_SIZ]; -FONT::FONT(const char *name) { - Map = farnew(uint8, MAP_SIZ); - Pos = farnew(uint16, POS_SIZ); - Wid = farnew(uint8, WID_SIZ); - if ((Map == NULL) || (Pos == NULL) || (Wid == NULL)) +Font::Font(const char *name) { + _map = farnew(uint8, MAP_SIZ); + _pos = farnew(uint16, POS_SIZ); + _wid = farnew(uint8, WID_SIZ); + if ((_map == NULL) || (_pos == NULL) || (_wid == NULL)) error("No core"); - mergeExt(Path, name, FONT_EXT); - Load(); + mergeExt(_path, name, FONT_EXT); + load(); } -FONT::~FONT() { - free(Map); - free(Pos); - free(Wid); +Font::~Font() { + free(_map); + free(_pos); + free(_wid); } -void FONT::Load() { - INI_FILE f(Path); +void Font::load() { + INI_FILE f(_path); if (!f._error) { - f.read(Wid, WID_SIZ); + f.read(_wid, WID_SIZ); if (!f._error) { uint16 i, p = 0; for (i = 0; i < POS_SIZ; i++) { - Pos[i] = p; - p += Wid[i]; + _pos[i] = p; + p += _wid[i]; } - f.read(Map, p); + f.read(_map, p); } } } -uint16 FONT::Width(const char *text) { +uint16 Font::width(const char *text) { uint16 w = 0; if (text) while (* text) - w += Wid[(unsigned char)*(text++)]; + w += _wid[(unsigned char)*(text++)]; return w; } /* -void FONT::Save(void) { - CFILE f((const char *) Path, WRI); - if (! f.Error) { - f.Write(Wid, WID_SIZ); - if (! f.Error) - f.Write(Map, Pos[POS_SIZ - 1] + Wid[WID_SIZ - 1]); +void Font::save() { + CFILE f((const char *) _path, WRI); + if (!f._error) { + f.Write(_wid, WID_SIZ); + if (!f._error) + f.Write(_map, _pos[POS_SIZ - 1] + _wid[WID_SIZ - 1]); } } */ -TALK::TALK(CGEEngine *vm, const char *tx, TBOX_STYLE mode) - : Sprite(vm, NULL), Mode(mode), _vm(vm) { - TS[0] = TS[1] = NULL; +Talk::Talk(CGEEngine *vm, const char *tx, TBOX_STYLE mode) + : Sprite(vm, NULL), _mode(mode), _vm(vm) { + _ts[0] = _ts[1] = NULL; _flags._syst = true; - Update(tx); + update(tx); } -TALK::TALK(CGEEngine *vm) - : Sprite(vm, NULL), Mode(PURE), _vm(vm) { - TS[0] = TS[1] = NULL; +Talk::Talk(CGEEngine *vm) + : Sprite(vm, NULL), _mode(PURE), _vm(vm) { + _ts[0] = _ts[1] = NULL; _flags._syst = true; } /* -TALK::~TALK (void) { +Talk::~Talk() { for (uint16 i = 0; i < ShpCnt; i++) { - if (FP_SEG(ShpList[i]) != _DS) { // small model: always false - delete ShpList[i]; + if (FP_SEG(_shpList[i]) != _DS) { // small model: always false + delete _shpList[i]; ShpList[i] = NULL; } } } */ -FONT *TALK::_Font; +Font *Talk::_font; -void TALK::init() { - _Font = new FONT(progName()); +void Talk::init() { + _font = new Font(progName()); } -void TALK::deinit() { - delete _Font; +void Talk::deinit() { + delete _font; } -void TALK::Update(const char *tx) { - uint16 vmarg = (Mode) ? TEXT_VM : 0; - uint16 hmarg = (Mode) ? TEXT_HM : 0; +void Talk::update(const char *tx) { + uint16 vmarg = (_mode) ? TEXT_VM : 0; + uint16 hmarg = (_mode) ? TEXT_HM : 0; uint16 mw = 0, mh, ln = vmarg; const char *p; uint8 *m; - if (!TS[0]) { + if (!_ts[0]) { uint16 k = 2 * hmarg; mh = 2 * vmarg + FONT_HIG; for (p = tx; *p; p++) { @@ -151,21 +151,21 @@ void TALK::Update(const char *tx) { mw = k; k = 2 * hmarg; } else - k += _Font->Wid[(unsigned char)*p]; + k += _font->_wid[(unsigned char)*p]; } if (k > mw) mw = k; - TS[0] = Box(mw, mh); + _ts[0] = box(mw, mh); } - m = TS[0]->_m + ln * mw + hmarg; + m = _ts[0]->_m + ln * mw + hmarg; while (* tx) { if (*tx == '|' || *tx == '\n') - m = TS[0]->_m + (ln += FONT_HIG + TEXT_LS) * mw + hmarg; + m = _ts[0]->_m + (ln += FONT_HIG + TEXT_LS) * mw + hmarg; else { - int cw = _Font->Wid[(unsigned char)*tx], i; - uint8 *f = _Font->Map + _Font->Pos[(unsigned char)*tx]; + int cw = _font->_wid[(unsigned char)*tx], i; + uint8 *f = _font->_map + _font->_pos[(unsigned char)*tx]; for (i = 0; i < cw; i++) { uint8 *pp = m; uint16 n; @@ -181,16 +181,16 @@ void TALK::Update(const char *tx) { } tx++; } - TS[0]->code(); - setShapeList(TS); + _ts[0]->code(); + setShapeList(_ts); } -Bitmap *TALK::Box(uint16 w, uint16 h) { +Bitmap *Talk::box(uint16 w, uint16 h) { uint8 *b, * p, * q; - uint16 n, r = (Mode == ROUND) ? TEXT_RD : 0; + uint16 n, r = (_mode == ROUND) ? TEXT_RD : 0; if (w < 8) w = 8; @@ -201,7 +201,7 @@ Bitmap *TALK::Box(uint16 w, uint16 h) { error("No core"); memset(b, TEXT_BG, n); - if (Mode) { + if (_mode) { p = b; q = b + n - w; memset(p, LGRAY, w); @@ -232,10 +232,11 @@ Bitmap *TALK::Box(uint16 w, uint16 h) { } -void TALK::PutLine(int line, const char *text) { +void Talk::putLine(int line, const char *text) { // Note: (TS[0].W % 4) have to be 0 - uint16 w = TS[0]->_w, h = TS[0]->_h; - uint8 *v = TS[0]->_v, * p; + uint16 w = _ts[0]->_w; + uint16 h = _ts[0]->_h; + uint8 *v = _ts[0]->_v, * p; uint16 dsiz = w >> 2; // data size (1 plane line size) uint16 lsiz = 2 + dsiz + 2; // uint16 for line header, uint16 for gap uint16 psiz = h * lsiz; // - last gap, but + plane trailer @@ -262,8 +263,8 @@ void TALK::PutLine(int line, const char *text) { q = v + size; while (* text) { - uint16 cw = _Font->Wid[(unsigned char)*text], i; - uint8 *fp = _Font->Map + _Font->Pos[(unsigned char)*text]; + uint16 cw = _font->_wid[(unsigned char)*text], i; + uint8 *fp = _font->_map + _font->_pos[(unsigned char)*text]; for (i = 0; i < cw; i++) { register uint16 b = fp[i]; @@ -284,22 +285,23 @@ void TALK::PutLine(int line, const char *text) { } -INFO_LINE::INFO_LINE(CGEEngine *vm, uint16 w) : TALK(vm), OldTxt(NULL), _vm(vm) { - TS[0] = new Bitmap(w, FONT_HIG, TEXT_BG); - setShapeList(TS); +InfoLine::InfoLine(CGEEngine *vm, uint16 w) : Talk(vm), _oldTxt(NULL), _vm(vm) { + _ts[0] = new Bitmap(w, FONT_HIG, TEXT_BG); + setShapeList(_ts); } -void INFO_LINE::Update(const char *tx) { - if (tx != OldTxt) { - uint16 w = TS[0]->_w, h = TS[0]->_h; - uint8 *v = (uint8 *) TS[0]->_v; +void InfoLine::update(const char *tx) { + if (tx != _oldTxt) { + uint16 w = _ts[0]->_w; + uint16 h = _ts[0]->_h; + uint8 *v = (uint8 *) _ts[0]->_v; uint16 dsiz = w >> 2; // data size (1 plane line size) uint16 lsiz = 2 + dsiz + 2; // uint16 for line header, uint16 for gap uint16 psiz = h * lsiz; // - last gape, but + plane trailer uint16 size = 4 * psiz; // whole map size - // claer whole rectangle + // clear whole rectangle memset(v + 2, TEXT_BG, dsiz); // data bytes memcpy(v + lsiz, v, psiz - lsiz); // tricky replicate lines *(uint16 *)(v + psiz - 2) = EOI; // plane trailer uint16 @@ -310,8 +312,8 @@ void INFO_LINE::Update(const char *tx) { uint8 *p = v + 2, * q = p + size; while (*tx) { - uint16 cw = _Font->Wid[(unsigned char)*tx]; - uint8 *fp = _Font->Map + _Font->Pos[(unsigned char)*tx]; + uint16 cw = _font->_wid[(unsigned char)*tx]; + uint8 *fp = _font->_map + _font->_pos[(unsigned char)*tx]; for (uint16 i = 0; i < cw; i++) { register uint16 b = fp[i]; @@ -327,7 +329,7 @@ void INFO_LINE::Update(const char *tx) { tx++; } } - OldTxt = tx; + _oldTxt = tx; } } diff --git a/engines/cge/talk.h b/engines/cge/talk.h index e5e32998cb..2f70471359 100644 --- a/engines/cge/talk.h +++ b/engines/cge/talk.h @@ -48,53 +48,53 @@ namespace CGE { #define MAXPATH 128 -class FONT { - char Path[MAXPATH]; - void Load(void); +class Font { + char _path[MAXPATH]; + void load(); public: -// static uint8 Wid[256]; -// static uint16 Pos[256]; -// static uint8 Map[256*8]; - uint8 *Wid; - uint16 *Pos; - uint8 *Map; - FONT(const char *name); - ~FONT(void); - uint16 Width(const char *text); - void Save(void); +// static uint8 _wid[256]; +// static uint16 _pos[256]; +// static uint8 _map[256*8]; + uint8 *_wid; + uint16 *_pos; + uint8 *_map; + Font(const char *name); + ~Font(); + uint16 width(const char *text); + void save(); }; enum TBOX_STYLE { PURE, RECT, ROUND }; -class TALK : public Sprite { +class Talk : public Sprite { protected: - TBOX_STYLE Mode; - Bitmap *TS[2]; - Bitmap *Box(uint16 w, uint16 h); + TBOX_STYLE _mode; + Bitmap *_ts[2]; + Bitmap *box(uint16 w, uint16 h); public: - TALK(CGEEngine *vm, const char *tx, TBOX_STYLE mode = PURE); - TALK(CGEEngine *vm); - //~TALK (void); + Talk(CGEEngine *vm, const char *tx, TBOX_STYLE mode); + Talk(CGEEngine *vm); + //~TALK(); - static FONT *_Font; + static Font *_font; static void init(); static void deinit(); - virtual void Update(const char *tx); - virtual void Update(void) {} - void PutLine(int line, const char *text); + virtual void update(const char *tx); + virtual void update() {} + void putLine(int line, const char *text); private: CGEEngine *_vm; }; -class INFO_LINE : public TALK { - const char *OldTxt; +class InfoLine : public Talk { + const char *_oldTxt; public: - INFO_LINE(CGEEngine *vm, uint16 wid); - void Update(const char *tx); + InfoLine(CGEEngine *vm, uint16 wid); + void update(const char *tx); private: CGEEngine *_vm; }; diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp index e17688c6ee..f112493278 100644 --- a/engines/cge/text.cpp +++ b/engines/cge/text.cpp @@ -36,57 +36,57 @@ namespace CGE { -TEXT *Text; -TALK *Talk = NULL; - -TEXT::TEXT(CGEEngine *vm, const char *fname, int size) : _vm(vm) { - Cache = new HAN[size]; - mergeExt(FileName, fname, SAY_EXT); - if (!INI_FILE::exist(FileName)) - error("No talk (%s)\n", FileName); - - for (Size = 0; Size < size; Size++) { - Cache[Size].Ref = 0; - Cache[Size].Txt = NULL; +Text *_text; +Talk *_talk = NULL; + +Text::Text(CGEEngine *vm, const char *fname, int size) : _vm(vm) { + _cache = new Han[size]; + mergeExt(_fileName, fname, SAY_EXT); + if (!INI_FILE::exist(_fileName)) + error("No talk (%s)\n", _fileName); + + for (_size = 0; _size < size; _size++) { + _cache[_size]._ref = 0; + _cache[_size]._txt = NULL; } } -TEXT::~TEXT() { - Clear(); - delete[] Cache; +Text::~Text() { + clear(); + delete[] _cache; } -void TEXT::Clear(int from, int upto) { - HAN *p, * q; - for (p = Cache, q = p + Size; p < q; p++) { - if (p->Ref && p->Ref >= from && p->Ref < upto) { - p->Ref = 0; - delete[] p->Txt; - p->Txt = NULL; +void Text::clear(int from, int upto) { + Han *p, * q; + for (p = _cache, q = p + _size; p < q; p++) { + if (p->_ref && p->_ref >= from && p->_ref < upto) { + p->_ref = 0; + delete[] p->_txt; + p->_txt = NULL; } } } -int TEXT::Find(int ref) { - HAN *p, * q; +int Text::find(int ref) { + Han *p, * q; int i = 0; - for (p = Cache, q = p + Size; p < q; p++) { - if (p->Ref == ref) + for (p = _cache, q = p + _size; p < q; p++) { + if (p->_ref == ref) break; else - ++i; + i++; } return i; } -void TEXT::Preload(int from, int upto) { - INI_FILE tf = FileName; +void Text::preload(int from, int upto) { + INI_FILE tf = _fileName; if (!tf._error) { - HAN *CacheLim = Cache + Size; + Han *CacheLim = _cache + _size; char line[LINE_MAX + 1]; int n; @@ -102,33 +102,33 @@ void TEXT::Preload(int from, int upto) { continue; ref = atoi(s); if (ref && ref >= from && ref < upto) { - HAN *p; + Han *p; - p = &Cache[Find(ref)]; + p = &_cache[find(ref)]; if (p < CacheLim) { - delete[] p->Txt; - p->Txt = NULL; + delete[] p->_txt; + p->_txt = NULL; } else - p = &Cache[Find(0)]; + p = &_cache[find(0)]; if (p >= CacheLim) break; s += strlen(s); if (s < line + n) ++s; - if ((p->Txt = new char[strlen(s) + 1]) == NULL) + if ((p->_txt = new char[strlen(s) + 1]) == NULL) break; - p->Ref = ref; - strcpy(p->Txt, s); + p->_ref = ref; + strcpy(p->_txt, s); } } } } -char *TEXT::Load(int idx, int ref) { - INI_FILE tf = FileName; +char *Text::load(int idx, int ref) { + INI_FILE tf = _fileName; if (!tf._error) { - HAN *p = &Cache[idx]; + Han *p = &_cache[idx]; char line[LINE_MAX + 1]; int n; @@ -151,36 +151,36 @@ char *TEXT::Load(int idx, int ref) { s += strlen(s); if (s < line + n) ++s; - p->Ref = ref; - if ((p->Txt = new char[strlen(s) + 1]) == NULL) + p->_ref = ref; + if ((p->_txt = new char[strlen(s) + 1]) == NULL) return NULL; - return strcpy(p->Txt, s); + return strcpy(p->_txt, s); } } return NULL; } -char *TEXT::getText(int ref) { +char *Text::getText(int ref) { int i; - if ((i = Find(ref)) < Size) - return Cache[i].Txt; + if ((i = find(ref)) < _size) + return _cache[i]._txt; - if ((i = Find(0)) >= Size) { - Clear(SYSTXT_MAX); // clear non-system - if ((i = Find(0)) >= Size) { - Clear(); // clear all + if ((i = find(0)) >= _size) { + clear(SYSTXT_MAX); // clear non-system + if ((i = find(0)) >= _size) { + clear(); // clear all i = 0; } } - return Load(i, ref); + return load(i, ref); } -void TEXT::Say(const char *txt, Sprite *spr) { - KillText(); - Talk = new TALK(_vm, txt, ROUND); - if (Talk) { +void Text::say(const char *txt, Sprite *spr) { + killText(); + _talk = new Talk(_vm, txt, ROUND); + if (_talk) { bool east = spr->_flags._east; int x = (east) ? (spr->_x + spr->_w - 2) : (spr->_x + 2); int y = spr->_y + 2; @@ -198,43 +198,43 @@ void TEXT::Say(const char *txt, Sprite *spr) { if (spr->_ref == 1) x += ((east) ? -10 : 10); // Hero - Talk->_flags._kill = true; - Talk->_flags._bDel = true; - Talk->setName(Text->getText(SAY_NAME)); - Talk->gotoxy(x - (Talk->_w - sw) / 2 - 3 + 6 * east, y - spike->_h - Talk->_h + 1); - Talk->_z = 125; - Talk->_ref = SAY_REF; + _talk->_flags._kill = true; + _talk->_flags._bDel = true; + _talk->setName(_text->getText(SAY_NAME)); + _talk->gotoxy(x - (_talk->_w - sw) / 2 - 3 + 6 * east, y - spike->_h - _talk->_h + 1); + _talk->_z = 125; + _talk->_ref = SAY_REF; - spike->gotoxy(x, Talk->_y + Talk->_h - 1); + spike->gotoxy(x, _talk->_y + _talk->_h - 1); spike->_z = 126; spike->_flags._slav = true; spike->_flags._kill = true; - spike->setName(Text->getText(SAY_NAME)); + spike->setName(_text->getText(SAY_NAME)); spike->step(east); spike->_ref = SAY_REF; - Vga->ShowQ->Insert(Talk, Vga->ShowQ->Last()); - Vga->ShowQ->Insert(spike, Vga->ShowQ->Last()); + Vga->_showQ->insert(_talk, Vga->_showQ->last()); + Vga->_showQ->insert(spike, Vga->_showQ->last()); } } void CGEEngine::inf(const char *txt) { - KillText(); - Talk = new TALK(this, txt, RECT); - if (Talk) { - Talk->_flags._kill = true; - Talk->_flags._bDel = true; - Talk->setName(Text->getText(INF_NAME)); - Talk->center(); - Talk->gotoxy(Talk->_x, Talk->_y - 20); - Talk->_z = 126; - Talk->_ref = INF_REF; - Vga->ShowQ->Insert(Talk, Vga->ShowQ->Last()); + killText(); + _talk = new Talk(this, txt, RECT); + if (_talk) { + _talk->_flags._kill = true; + _talk->_flags._bDel = true; + _talk->setName(_text->getText(INF_NAME)); + _talk->center(); + _talk->gotoxy(_talk->_x, _talk->_y - 20); + _talk->_z = 126; + _talk->_ref = INF_REF; + Vga->_showQ->insert(_talk, Vga->_showQ->last()); } } -void SayTime(Sprite *spr) { +void sayTime(Sprite *spr) { /* static char t[] = "00:00"; struct time ti; @@ -243,13 +243,13 @@ void SayTime(Sprite *spr) { wtom(ti.ti_min, t+3, 10, 2); Say((*t == '0') ? (t+1) : t, spr); */ - warning("STUB: SayTime"); + warning("STUB: sayTime"); } -void KillText(void) { - if (Talk) { - SNPOST_(SNKILL, -1, 0, Talk); - Talk = NULL; +void killText() { + if (_talk) { + SNPOST_(SNKILL, -1, 0, _talk); + _talk = NULL; } } diff --git a/engines/cge/text.h b/engines/cge/text.h index 5232084738..cf917ece61 100644 --- a/engines/cge/text.h +++ b/engines/cge/text.h @@ -51,35 +51,33 @@ namespace CGE { #define SAY_REF 302 -class TEXT { - struct HAN { - int Ref; - char *Txt; - } *Cache; - int Size; - char FileName[MAXPATH]; - char *Load(int idx, int ref); - int Find(int ref); +class Text { + struct Han { + int _ref; + char *_txt; + } *_cache; + int _size; + char _fileName[MAXPATH]; + char *load(int idx, int ref); + int find(int ref); public: - TEXT(CGEEngine *vm, const char *fname, int size); - ~TEXT(void); - void Clear(int from = 1, int upto = 0x7FFF); - void Preload(int from = 1, int upto = 0x7FFF); + Text(CGEEngine *vm, const char *fname, int size); + ~Text(); + void clear(int from = 1, int upto = 0x7FFF); + void preload(int from = 1, int upto = 0x7FFF); char *getText(int ref); - void Say(const char *txt, Sprite *spr); + void say(const char *txt, Sprite *spr); private: CGEEngine *_vm; }; +extern Talk *_talk; +extern Text *_text; -extern TALK *Talk; -extern TEXT *Text; - - -void Say(const char *txt, Sprite *spr); -void SayTime(Sprite *spr); -void Inf(const char *txt); -void KillText(void); +void say(const char *txt, Sprite *spr); +void sayTime(Sprite *spr); +void inf(const char *txt); +void killText(); } // End of namespace CGE diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index 35d9688bd3..36661e756e 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -187,17 +187,17 @@ Dac MkDAC(uint8 r, uint8 g, uint8 b) { Rgb MkRGB(uint8 r, uint8 g, uint8 b) { - static TRGB x; - x.dac._r = r; - x.dac._g = g; - x.dac._b = b; - return x.rgb; + static Trgb x; + x._dac._r = r; + x._dac._g = g; + x._dac._b = b; + return x._rgb; } Sprite *Locate(int ref) { - Sprite *spr = Vga->ShowQ->Locate(ref); - return (spr) ? spr : Vga->SpareQ->Locate(ref); + Sprite *spr = Vga->_showQ->locate(ref); + return (spr) ? spr : Vga->_spareQ->locate(ref); } @@ -364,7 +364,7 @@ BMP_PTR Sprite::shp() { register SprExt *e = _ext; if (e) if (e->_seq) { - int i = e->_seq[_seqPtr].Now; + int i = e->_seq[_seqPtr]._now; if (i >= _shpCnt) { //char s[256]; //sprintf(s, "Seq=%p ShpCnt=%d SeqPtr=%d Now=%d Next=%d", @@ -443,7 +443,7 @@ bool Sprite::seqTest(int n) { if (n >= 0) return (_seqPtr == n); if (_ext) - return (_ext->_seq[_seqPtr].Next == _seqPtr); + return (_ext->_seq[_seqPtr]._next == _seqPtr); return true; } @@ -519,23 +519,23 @@ Sprite *Sprite::expand() { if (seq == NULL) error("No core [%s]", fname); Seq *s = &seq[seqcnt++]; - s->Now = atoi(strtok(NULL, " \t,;/")); - if (s->Now > maxnow) - maxnow = s->Now; - s->Next = atoi(strtok(NULL, " \t,;/")); - switch (s->Next) { + s->_now = atoi(strtok(NULL, " \t,;/")); + if (s->_now > maxnow) + maxnow = s->_now; + s->_next = atoi(strtok(NULL, " \t,;/")); + switch (s->_next) { case 0xFF : - s->Next = seqcnt; + s->_next = seqcnt; break; case 0xFE : - s->Next = seqcnt - 1; + s->_next = seqcnt - 1; break; } - if (s->Next > maxnxt) - maxnxt = s->Next; - s->Dx = atoi(strtok(NULL, " \t,;/")); - s->Dy = atoi(strtok(NULL, " \t,;/")); - s->Dly = atoi(strtok(NULL, " \t,;/")); + if (s->_next > maxnxt) + maxnxt = s->_next; + s->_dx = atoi(strtok(NULL, " \t,;/")); + s->_dy = atoi(strtok(NULL, " \t,;/")); + s->_dly = atoi(strtok(NULL, " \t,;/")); break; } case 3 : { // Near @@ -645,11 +645,11 @@ void Sprite::step(int nr) { if (_ext) { Seq *seq; if (nr < 0) - _seqPtr = _ext->_seq[_seqPtr].Next; + _seqPtr = _ext->_seq[_seqPtr]._next; seq = _ext->_seq + _seqPtr; - if (seq->Dly >= 0) { - gotoxy(_x + (seq->Dx), _y + (seq->Dy)); - _time = seq->Dly; + if (seq->_dly >= 0) { + gotoxy(_x + (seq->_dx), _y + (seq->_dy)); + _time = seq->_dly; } } } @@ -781,7 +781,7 @@ BMP_PTR Sprite::ghost() { Sprite *SpriteAt(int x, int y) { - Sprite *spr = NULL, * tail = Vga->ShowQ->Last(); + Sprite *spr = NULL, * tail = Vga->_showQ->last(); if (tail) { for (spr = tail->_prev; spr; spr = spr->_prev) { if (! spr->_flags._hide && ! spr->_flags._tran) { @@ -794,26 +794,26 @@ Sprite *SpriteAt(int x, int y) { } -QUEUE::QUEUE(bool show) : Head(NULL), Tail(NULL), Show(show) { +Queue::Queue(bool show) : _head(NULL), _tail(NULL), _show(show) { } -QUEUE::~QUEUE(void) { - Clear(); +Queue::~Queue() { + clear(); } -void QUEUE::Clear(void) { - while (Head) { - Sprite *s = Remove(Head); +void Queue::clear() { + while (_head) { + Sprite *s = remove(_head); if (s->_flags._kill) delete s; } } -void QUEUE::ForAll(void (*fun)(Sprite *)) { - Sprite *s = Head; +void Queue::forAll(void (*fun)(Sprite *)) { + Sprite *s = _head; while (s) { Sprite *n = s->_next; fun(s); @@ -822,26 +822,26 @@ void QUEUE::ForAll(void (*fun)(Sprite *)) { } -void QUEUE::Append(Sprite *spr) { - if (Tail) { - spr->_prev = Tail; - Tail->_next = spr; +void Queue::append(Sprite *spr) { + if (_tail) { + spr->_prev = _tail; + _tail->_next = spr; } else - Head = spr; - Tail = spr; - if (Show) + _head = spr; + _tail = spr; + if (_show) spr->expand(); else spr->contract(); } -void QUEUE::Insert(Sprite *spr, Sprite *nxt) { - if (nxt == Head) { - spr->_next = Head; - Head = spr; - if (! Tail) - Tail = spr; +void Queue::insert(Sprite *spr, Sprite *nxt) { + if (nxt == _head) { + spr->_next = _head; + _head = spr; + if (!_tail) + _tail = spr; } else { spr->_next = nxt; spr->_prev = nxt->_prev; @@ -850,34 +850,34 @@ void QUEUE::Insert(Sprite *spr, Sprite *nxt) { } if (spr->_next) spr->_next->_prev = spr; - if (Show) + if (_show) spr->expand(); else spr->contract(); } -void QUEUE::Insert(Sprite *spr) { +void Queue::insert(Sprite *spr) { Sprite *s; - for (s = Head; s; s = s->_next) + for (s = _head; s; s = s->_next) if (s->_z > spr->_z) break; if (s) - Insert(spr, s); + insert(spr, s); else - Append(spr); - if (Show) + append(spr); + if (_show) spr->expand(); else spr->contract(); } -Sprite *QUEUE::Remove(Sprite *spr) { - if (spr == Head) - Head = spr->_next; - if (spr == Tail) - Tail = spr->_prev; +Sprite *Queue::remove(Sprite *spr) { + if (spr == _head) + _head = spr->_next; + if (spr == _tail) + _tail = spr->_prev; if (spr->_next) spr->_next->_prev = spr->_prev; if (spr->_prev) @@ -888,9 +888,9 @@ Sprite *QUEUE::Remove(Sprite *spr) { } -Sprite *QUEUE::Locate(int ref) { +Sprite *Queue::locate(int ref) { Sprite *spr; - for (spr = Head; spr; spr = spr->_next) { + for (spr = _head; spr; spr = spr->_next) { if (spr->_ref == ref) return spr; } @@ -925,13 +925,13 @@ VGA::VGA(int mode) Msg(NULL), Nam(NULL), SetPal(false), Mono(0) { OldColors = NULL; NewColors = NULL; - ShowQ = new QUEUE(true); - SpareQ = new QUEUE(false); + _showQ = new Queue(true); + _spareQ = new Queue(false); bool std = true; int i; for (i = 10; i < 20; i++) { - char *txt = Text->getText(i); + char *txt = _text->getText(i); if (txt) { debugN("%s", txt); std = false; @@ -981,8 +981,8 @@ VGA::~VGA(void) { debugN("%s", buffer.c_str()); } - delete ShowQ; - delete SpareQ; + delete _showQ; + delete _spareQ; } @@ -1131,12 +1131,12 @@ void VGA::Sunset(void) { void VGA::Show(void) { - Sprite *spr = ShowQ->First(); + Sprite *spr = _showQ->first(); - for (spr = ShowQ->First(); spr; spr = spr->_next) + for (spr = _showQ->first(); spr; spr = spr->_next) spr->show(); Update(); - for (spr = ShowQ->First(); spr; spr = spr->_next) + for (spr = _showQ->first(); spr; spr = spr->_next) spr->hide(); ++ FrmCnt; diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h index a063e40508..9e49b3d918 100644 --- a/engines/cge/vga13h.h +++ b/engines/cge/vga13h.h @@ -81,32 +81,32 @@ namespace CGE { struct Rgb { - uint16 r : 2; - uint16 R : 6; - uint16 g : 2; - uint16 G : 6; - uint16 b : 2; - uint16 B : 6; + uint16 _r : 2; + uint16 _R : 6; + uint16 _g : 2; + uint16 _G : 6; + uint16 _b : 2; + uint16 _B : 6; }; typedef union { - Dac dac; - Rgb rgb; -} TRGB; + Dac _dac; + Rgb _rgb; +} Trgb; struct VgaRegBlk { - uint8 idx; - uint8 adr; - uint8 clr; - uint8 set; + uint8 _idx; + uint8 _adr; + uint8 _clr; + uint8 _set; }; struct Seq { - uint8 Now; - uint8 Next; - int8 Dx; - int8 Dy; - int Dly; + uint8 _now; + uint8 _next; + int8 _dx; + int8 _dy; + int _dly; }; extern Seq _seq1[]; @@ -236,25 +236,27 @@ private: }; -class QUEUE { - Sprite *Head, * Tail; +class Queue { + Sprite *_head, *_tail; public: - bool Show; - QUEUE(bool show); - ~QUEUE(void); - void Append(Sprite *spr); - void Insert(Sprite *spr, Sprite *nxt); - void Insert(Sprite *spr); - Sprite *Remove(Sprite *spr); - void ForAll(void (*fun)(Sprite *)); - Sprite *First(void) { - return Head; + Queue(bool show); + ~Queue(); + + bool _show; + + void append(Sprite *spr); + void insert(Sprite *spr, Sprite *nxt); + void insert(Sprite *spr); + Sprite *remove(Sprite *spr); + void forAll(void (*fun)(Sprite *)); + Sprite *first() { + return _head; } - Sprite *Last(void) { - return Tail; + Sprite *last() { + return _tail; } - Sprite *Locate(int ref); - void Clear(void); + Sprite *locate(int ref); + void clear(); }; @@ -275,7 +277,8 @@ class VGA { void WaitVR(bool on); public: uint32 FrmCnt; - QUEUE *ShowQ, *SpareQ; + Queue *_showQ; + Queue *_spareQ; int Mono; static Graphics::Surface *Page[4]; static Dac *SysPal; diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp index 8ad3848cdb..7ea32ff023 100644 --- a/engines/cge/vmenu.cpp +++ b/engines/cge/vmenu.cpp @@ -44,7 +44,7 @@ namespace CGE { -MENU_BAR::MENU_BAR(CGEEngine *vm, uint16 w) : TALK(vm), _vm(vm) { +MENU_BAR::MENU_BAR(CGEEngine *vm, uint16 w) : Talk(vm), _vm(vm) { int h = FONT_HIG + 2 * MB_VM, i = (w += 2 * MB_HM) * h; uint8 *p = farnew(uint8, i), * p1, * p2; @@ -59,8 +59,8 @@ MENU_BAR::MENU_BAR(CGEEngine *vm, uint16 w) : TALK(vm), _vm(vm) { p1 += w; p2 -= w; } - TS[0] = new Bitmap(w, h, p); - setShapeList(TS); + _ts[0] = new Bitmap(w, h, p); + setShapeList(_ts); _flags._slav = true; _flags._tran = true; _flags._kill = true; @@ -98,7 +98,7 @@ int VMENU::Recent = -1; VMENU::VMENU(CGEEngine *vm, CHOICE *list, int x, int y) - : TALK(vm, VMGather(list), RECT), Menu(list), Bar(NULL), _vm(vm) { + : Talk(vm, VMGather(list), RECT), Menu(list), Bar(NULL), _vm(vm) { CHOICE *cp; Addr = this; @@ -112,10 +112,10 @@ VMENU::VMENU(CGEEngine *vm, CHOICE *list, int x, int y) center(); else gotoxy(x - _w / 2, y - (TEXT_VM + FONT_HIG / 2)); - Vga->ShowQ->Insert(this, Vga->ShowQ->Last()); + Vga->_showQ->insert(this, Vga->_showQ->last()); Bar = new MENU_BAR(_vm, _w - 2 * TEXT_HM); Bar->gotoxy(_x + TEXT_HM - MB_HM, _y + TEXT_VM - MB_VM); - Vga->ShowQ->Insert(Bar, Vga->ShowQ->Last()); + Vga->_showQ->insert(Bar, Vga->_showQ->last()); } diff --git a/engines/cge/vmenu.h b/engines/cge/vmenu.h index c2fc096e83..88a2766040 100644 --- a/engines/cge/vmenu.h +++ b/engines/cge/vmenu.h @@ -42,7 +42,7 @@ typedef struct { } CHOICE; -class MENU_BAR : public TALK { +class MENU_BAR : public Talk { public: MENU_BAR(CGEEngine *vm, uint16 w); private: @@ -50,7 +50,7 @@ private: }; -class VMENU : public TALK { +class VMENU : public Talk { uint16 Items; CHOICE *Menu; public: -- cgit v1.2.3