[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.23,1.24 autoroute.h,1.9,1.10 compact.cpp,1.24,1.25 control.cpp,1.62,1.63 control.h,1.29,1.30 debug.cpp,1.8,1.9 debug.h,1.3,1.4 disk.cpp,1.53,1.54 disk.h,1.13,1.14 grid.cpp,1.14,1.15 grid.h,1.6,1.7 hufftext.cpp,1.4,1.5 intro.cpp,1.43,1.44 intro.h,1.3,1.4 logic.cpp,1.140,1.141 logic.h,1.35,1.36 mouse.cpp,1.28,1.29 mouse.h,1.22,1.23 screen.cpp,1.54,1.55 screen.h,1.17,1.18 sky.cpp,1.136,1.137 sky.h,1.56,1.57 sound.cpp,1.44,1.45 sound.h,1.23,1.24 talks.h,1.3,1.4 text.cpp,1.58,1.59 text.h,1.30,1.31
Max Horn
fingolfin at users.sourceforge.net
Sat Jan 3 08:03:48 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.14,1.15 adlibchannel.h,1.8,1.9 adlibmusic.cpp,1.17,1.18 adlibmusic.h,1.8,1.9 gmchannel.cpp,1.14,1.15 gmchannel.h,1.8,1.9 gmmusic.cpp,1.16,1.17 gmmusic.h,1.9,1.10 mt32music.cpp,1.16,1.17 mt32music.h,1.7,1.8 musicbase.cpp,1.17,1.18 musicbase.h,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.95,1.96
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv28653
Modified Files:
autoroute.cpp autoroute.h compact.cpp control.cpp control.h
debug.cpp debug.h disk.cpp disk.h grid.cpp grid.h hufftext.cpp
intro.cpp intro.h logic.cpp logic.h mouse.cpp mouse.h
screen.cpp screen.h sky.cpp sky.h sound.cpp sound.h talks.h
text.cpp text.h
Log Message:
remove 'Sky' name prefix for most stuff (not needed anymore since we are in namespace 'Sky' now)
Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- autoroute.cpp 3 Jan 2004 01:58:57 -0000 1.23
+++ autoroute.cpp 3 Jan 2004 15:57:56 -0000 1.24
@@ -34,23 +34,23 @@
#define ROUTE_GRID_SIZE (ROUTE_GRID_WIDTH*ROUTE_GRID_HEIGHT*2)
#define WALK_JUMP 8 // walk in blocks of 8
-const int16 SkyAutoRoute::_routeDirections[4] = { -1, 1, -ROUTE_GRID_WIDTH, ROUTE_GRID_WIDTH };
-const uint16 SkyAutoRoute::_logicCommands[4] = { RIGHTY, LEFTY, DOWNY, UPY };
+const int16 AutoRoute::_routeDirections[4] = { -1, 1, -ROUTE_GRID_WIDTH, ROUTE_GRID_WIDTH };
+const uint16 AutoRoute::_logicCommands[4] = { RIGHTY, LEFTY, DOWNY, UPY };
-SkyAutoRoute::SkyAutoRoute(SkyGrid *pGrid) {
+AutoRoute::AutoRoute(Grid *pGrid) {
_grid = pGrid;
_routeGrid = (uint16 *)malloc(ROUTE_GRID_SIZE);
_routeBuf = (uint16 *)malloc(ROUTE_SPACE);
}
-SkyAutoRoute::~SkyAutoRoute(void) {
+AutoRoute::~AutoRoute(void) {
free(_routeGrid);
free(_routeBuf);
}
-uint16 SkyAutoRoute::checkBlock(uint16 *blockPos) {
+uint16 AutoRoute::checkBlock(uint16 *blockPos) {
uint16 retVal = 0xFFFF;
@@ -62,7 +62,7 @@
return retVal;
}
-void SkyAutoRoute::clipCoordX(uint16 x, uint8 &blkX, int16 &initX) {
+void AutoRoute::clipCoordX(uint16 x, uint8 &blkX, int16 &initX) {
if (x < TOP_LEFT_X) {
blkX = 0;
initX = x - TOP_LEFT_X;
@@ -75,7 +75,7 @@
}
}
-void SkyAutoRoute::clipCoordY(uint16 y, uint8 &blkY, int16 &initY) {
+void AutoRoute::clipCoordY(uint16 y, uint8 &blkY, int16 &initY) {
if (y < TOP_LEFT_Y) {
blkY = 0;
initY = y - TOP_LEFT_Y;
@@ -88,7 +88,7 @@
}
}
-void SkyAutoRoute::initWalkGrid(uint8 screen, uint8 width) {
+void AutoRoute::initWalkGrid(uint8 screen, uint8 width) {
uint16 *wGridPos;
uint8 stretch = 0;
@@ -121,7 +121,7 @@
}
}
-bool SkyAutoRoute::calcWalkGrid(uint8 startX, uint8 startY, uint8 destX, uint8 destY) {
+bool AutoRoute::calcWalkGrid(uint8 startX, uint8 startY, uint8 destX, uint8 destY) {
int16 directionX, directionY;
uint8 roiX, roiY; // Rectangle Of Interest in the walk grid
@@ -187,7 +187,7 @@
return foundRoute;
}
-uint16 *SkyAutoRoute::makeRouteData(uint8 startX, uint8 startY, uint8 destX, uint8 destY) {
+uint16 *AutoRoute::makeRouteData(uint8 startX, uint8 startY, uint8 destX, uint8 destY) {
memset(_routeBuf, 0, ROUTE_SPACE);
@@ -217,7 +217,7 @@
return dataTrg;
}
-uint16 *SkyAutoRoute::checkInitMove(uint16 *data, int16 initStaX) {
+uint16 *AutoRoute::checkInitMove(uint16 *data, int16 initStaX) {
if (initStaX < 0) {
data -= 2;
*(data + 1) = RIGHTY;
@@ -230,7 +230,7 @@
return data;
}
-uint16 SkyAutoRoute::autoRoute(Compact *cpt) {
+uint16 AutoRoute::autoRoute(Compact *cpt) {
uint8 cptScreen = (uint8)cpt->screen;
uint8 cptWidth = (uint8)SkyCompact::getMegaSet(cpt, cpt->extCompact->megaSet)->gridWidth;
Index: autoroute.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- autoroute.h 3 Jan 2004 01:58:57 -0000 1.9
+++ autoroute.h 3 Jan 2004 15:57:56 -0000 1.10
@@ -28,12 +28,12 @@
namespace Sky {
struct Compact;
-class SkyGrid;
+class Grid;
-class SkyAutoRoute {
+class AutoRoute {
public:
- SkyAutoRoute(SkyGrid *pGrid);
- ~SkyAutoRoute(void);
+ AutoRoute(Grid *pGrid);
+ ~AutoRoute(void);
uint16 autoRoute(Compact *cpt);
private:
uint16 checkBlock(uint16 *blockPos);
@@ -43,7 +43,7 @@
bool calcWalkGrid(uint8 startX, uint8 startY, uint8 destX, uint8 destY);
uint16 *makeRouteData(uint8 startX, uint8 startY, uint8 destX, uint8 destY);
uint16 *checkInitMove(uint16 *data, int16 initStaX);
- SkyGrid *_grid;
+ Grid *_grid;
uint16 *_routeGrid;
uint16 *_routeBuf;
static const int16 _routeDirections[4];
Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- compact.cpp 3 Jan 2004 01:58:57 -0000 1.24
+++ compact.cpp 3 Jan 2004 15:57:56 -0000 1.25
@@ -50,7 +50,7 @@
#define MK32_A5(type, item) MK32(type, item[0]), MK32(type, item[1]), \
MK32(type, item[2]), MK32(type, item[3]), MK32(type, item[4])
-namespace SkyTalkAnims {
+namespace TalkAnims {
extern bool animTalkTableIsPointer[];
extern uint16 animTalkTableVal[];
extern void *animTalkTablePtr[];
@@ -78,7 +78,7 @@
error("::getGrafixPtr: request for elem ptr %d. It's NULL.", cpt->grafixProg.ptrTarget);
return buf + cpt->grafixProg.pos;
case TALKTABLE:
- buf = (uint16 *)SkyTalkAnims::animTalkTablePtr[cpt->grafixProg.ptrTarget];
+ buf = (uint16 *)TalkAnims::animTalkTablePtr[cpt->grafixProg.ptrTarget];
return buf + cpt->grafixProg.pos;
default:
error("::getGrafixPtr: unknown grafixProg type for Compact cpt");
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- control.cpp 3 Jan 2004 01:58:57 -0000 1.62
+++ control.cpp 3 Jan 2004 15:57:56 -0000 1.63
@@ -42,7 +42,7 @@
namespace Sky {
-SkyConResource::SkyConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) {
+ConResource::ConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) {
_spriteData = (dataFileHeader *)pSpData;
_numSprites = pNSprites;
@@ -55,7 +55,7 @@
_screen = screen;
}
-bool SkyConResource::isMouseOver(uint32 mouseX, uint32 mouseY) {
+bool ConResource::isMouseOver(uint32 mouseX, uint32 mouseY) {
if ((mouseX >= _x) && (mouseY >= _y) && ((uint16)mouseX <= _x + _spriteData->s_width) && ((uint16)mouseY <= _y + _spriteData->s_height))
return true;
@@ -63,7 +63,7 @@
return false;
}
-void SkyConResource::drawToScreen(bool doMask) {
+void ConResource::drawToScreen(bool doMask) {
uint8 *screenPos = _y * GAME_SCREEN_WIDTH + _x + _screen;
uint8 *updatePos = screenPos;
@@ -89,18 +89,18 @@
_system->copy_rect(updatePos, GAME_SCREEN_WIDTH, _x, _y, _spriteData->s_width, _spriteData->s_height);
}
-SkyTextResource::SkyTextResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) :
- SkyConResource(pSpData, pNSprites, pCurSprite, pX, pY, pText, pOnClick, system, screen) {
+TextResource::TextResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) :
+ ConResource(pSpData, pNSprites, pCurSprite, pX, pY, pText, pOnClick, system, screen) {
_oldScreen = (uint8 *)malloc(PAN_CHAR_HEIGHT * 3 * PAN_LINE_WIDTH);
_oldY = 0;
_oldX = GAME_SCREEN_WIDTH;
}
-SkyTextResource::~SkyTextResource(void) {
+TextResource::~TextResource(void) {
free(_oldScreen);
}
-void SkyTextResource::flushForRedraw(void) {
+void TextResource::flushForRedraw(void) {
if (_oldX < GAME_SCREEN_WIDTH) {
uint16 cpWidth = (PAN_LINE_WIDTH > (GAME_SCREEN_WIDTH - _oldX))?(GAME_SCREEN_WIDTH - _oldX):(PAN_LINE_WIDTH);
@@ -110,7 +110,7 @@
_oldX = GAME_SCREEN_WIDTH;
}
-void SkyTextResource::drawToScreen(bool doMask) {
+void TextResource::drawToScreen(bool doMask) {
doMask = true;
uint16 cnty, cntx, cpWidth, cpHeight;
@@ -152,21 +152,21 @@
_system->copy_rect(_screen + _y * GAME_SCREEN_WIDTH + _x, GAME_SCREEN_WIDTH, _x, _y, cpWidth, cpHeight);
}
-SkyControlStatus::SkyControlStatus(SkyText *skyText, OSystem *system, uint8 *scrBuf) {
+ControlStatus::ControlStatus(Text *skyText, OSystem *system, uint8 *scrBuf) {
_skyText = skyText;
_system = system;
_screenBuf = scrBuf;
_textData = NULL;
- _statusText = new SkyTextResource(NULL, 2, 1, 64, 163, 0, DO_NOTHING, _system, _screenBuf);
+ _statusText = new TextResource(NULL, 2, 1, 64, 163, 0, DO_NOTHING, _system, _screenBuf);
}
-SkyControlStatus::~SkyControlStatus(void) {
+ControlStatus::~ControlStatus(void) {
if (_textData)
free(_textData);
delete _statusText;
}
-void SkyControlStatus::setToText(const char *newText) {
+void ControlStatus::setToText(const char *newText) {
char tmpLine[256];
strcpy(tmpLine, newText);
if (_textData) {
@@ -179,7 +179,7 @@
_statusText->drawToScreen(WITH_MASK);
}
-void SkyControlStatus::setToText(uint16 textNum) {
+void ControlStatus::setToText(uint16 textNum) {
_skyText->getText(textNum);
if (_textData)
free(_textData);
@@ -189,12 +189,12 @@
_statusText->drawToScreen(WITH_MASK);
}
-void SkyControlStatus::drawToScreen(void) {
+void ControlStatus::drawToScreen(void) {
_statusText->flushForRedraw();
_statusText->drawToScreen(WITH_MASK);
}
-SkyControl::SkyControl(SkyScreen *screen, SkyDisk *disk, SkyMouse *mouse, SkyText *text, SkyMusicBase *music, SkyLogic *logic, SkySound *sound, OSystem *system, const char *savePath) {
+Control::Control(Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, OSystem *system, const char *savePath) {
_skyScreen = screen;
_skyDisk = disk;
@@ -208,7 +208,7 @@
_memListRoot = NULL;
}
-SkyConResource *SkyControl::createResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, int16 pX, int16 pY, uint32 pText, uint8 pOnClick, uint8 panelType) {
+ConResource *Control::createResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, int16 pX, int16 pY, uint32 pText, uint8 pOnClick, uint8 panelType) {
if (pText) pText += 0x7000;
if (panelType == MAINPANEL) {
@@ -218,10 +218,10 @@
pX += SPNL_X;
pY += SPNL_Y;
}
- return new SkyConResource(pSpData, pNSprites, pCurSprite, pX, pY, pText, pOnClick, _system, _screenBuf);
+ return new ConResource(pSpData, pNSprites, pCurSprite, pX, pY, pText, pOnClick, _system, _screenBuf);
}
-void SkyControl::removePanel(void) {
+void Control::removePanel(void) {
free(_screenBuf);
free(_sprites.controlPanel); free(_sprites.button);
@@ -239,7 +239,7 @@
delete _statusBar;
}
-void SkyControl::initPanel(void) {
+void Control::initPanel(void) {
_screenBuf = (uint8 *)malloc(GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
@@ -285,7 +285,7 @@
_bodge = createResource( _sprites.musicBodge, 2, 1, 98, 115, 0, DO_NOTHING, MAINPANEL);
_yesNo = createResource( _sprites.yesNo, 1, 0, -2, 40, 0, DO_NOTHING, MAINPANEL);
- _text = new SkyTextResource(NULL, 1, 0, 15, 137, 0, DO_NOTHING, _system, _screenBuf);
+ _text = new TextResource(NULL, 1, 0, 15, 137, 0, DO_NOTHING, _system, _screenBuf);
_controlPanLookList[0] = _exitButton;
_controlPanLookList[1] = _restorePanButton;
_controlPanLookList[2] = _savePanButton;
@@ -316,10 +316,10 @@
_restorePanLookList[5] = _savePanLookList[5] = _quitButton;
_restorePanLookList[6] = _autoSaveButton;
- _statusBar = new SkyControlStatus(_skyText, _system, _screenBuf);
+ _statusBar = new ControlStatus(_skyText, _system, _screenBuf);
}
-void SkyControl::buttonControl(SkyConResource *pButton) {
+void Control::buttonControl(ConResource *pButton) {
char autoSave[] = "Restore Autosave";
if (pButton == NULL) {
@@ -348,7 +348,7 @@
_text->setXY(_mouseX + 12, _mouseY - 16);
}
-void SkyControl::drawTextCross(uint32 flags) {
+void Control::drawTextCross(uint32 flags) {
_bodge->drawToScreen(NO_MASK);
if (!(flags & SF_ALLOW_SPEECH))
@@ -357,7 +357,7 @@
drawCross(173, 124);
}
-void SkyControl::drawCross(uint16 x, uint16 y) {
+void Control::drawCross(uint16 x, uint16 y) {
_text->flushForRedraw();
uint8 *bufPos, *crossPos;
@@ -375,7 +375,7 @@
_text->drawToScreen(WITH_MASK);
}
-void SkyControl::animClick(SkyConResource *pButton) {
+void Control::animClick(ConResource *pButton) {
if (pButton->_curSprite != pButton->_numSprites -1) {
pButton->_curSprite++;
@@ -392,7 +392,7 @@
}
}
-void SkyControl::drawMainPanel(void) {
+void Control::drawMainPanel(void) {
memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
_system->copy_rect(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
@@ -413,7 +413,7 @@
_statusBar->drawToScreen();
}
-void SkyControl::doLoadSavePanel(void) {
+void Control::doLoadSavePanel(void) {
if (SkyEngine::isDemo())
return; // I don't think this can even happen
initPanel();
@@ -443,7 +443,7 @@
_skyText->fnSetFont(_savedCharSet);
}
-void SkyControl::doControlPanel(void) {
+void Control::doControlPanel(void) {
if (SkyEngine::isDemo()) {
return ;
@@ -509,7 +509,7 @@
_skyText->fnSetFont(_savedCharSet);
}
-uint16 SkyControl::handleClick(SkyConResource *pButton) {
+uint16 Control::handleClick(ConResource *pButton) {
char quitDos[] = "Quit to DOS?";
@@ -584,11 +584,11 @@
}
return 0;
default:
- error("SkyControl::handleClick: unknown routine: %X",pButton->_onClick);
+ error("Control::handleClick: unknown routine: %X",pButton->_onClick);
}
}
-bool SkyControl::getYesNo(char *text) {
+bool Control::getYesNo(char *text) {
bool retVal = false;
bool quitPanel = false;
@@ -605,7 +605,7 @@
} else
dlgTextDat = NULL;
- SkyTextResource *dlgText = new SkyTextResource(dlgTextDat, 1, 0, MPNL_X+2, textY, 0, DO_NOTHING, _system, _screenBuf);
+ TextResource *dlgText = new TextResource(dlgTextDat, 1, 0, MPNL_X+2, textY, 0, DO_NOTHING, _system, _screenBuf);
dlgText->drawToScreen(WITH_MASK);
while (!quitPanel) {
@@ -640,7 +640,7 @@
return retVal;
}
-uint16 SkyControl::doMusicSlide(void) {
+uint16 Control::doMusicSlide(void) {
int ofsY = _slide2->_y - _mouseY;
uint8 volume;
@@ -666,7 +666,7 @@
return 0;
}
-uint16 SkyControl::doSpeedSlide(void) {
+uint16 Control::doSpeedSlide(void) {
int ofsY = _slide->_y - _mouseY;
uint16 speedDelay = _slide->_y - (MPNL_Y + 93);
@@ -695,7 +695,7 @@
return SPEED_CHANGED;
}
-uint16 SkyControl::toggleFx(SkyConResource *pButton) {
+uint16 Control::toggleFx(ConResource *pButton) {
SkyEngine::_systemVars.systemFlags ^= SF_FX_OFF;
if (SkyEngine::_systemVars.systemFlags & SF_FX_OFF) {
@@ -713,7 +713,7 @@
return TOGGLED;
}
-uint16 SkyControl::toggleText(void) {
+uint16 Control::toggleText(void) {
uint32 flags = SkyEngine::_systemVars.systemFlags & TEXT_FLAG_MASK;
SkyEngine::_systemVars.systemFlags &= ~TEXT_FLAG_MASK;
@@ -737,7 +737,7 @@
return TOGGLED;
}
-void SkyControl::toggleMusic(void) {
+void Control::toggleMusic(void) {
if (SkyEngine::_systemVars.systemFlags & SF_MUS_OFF) {
SkyEngine::_systemVars.systemFlags &= ~SF_MUS_OFF;
@@ -750,7 +750,7 @@
}
}
-uint16 SkyControl::shiftDown(uint8 speed) {
+uint16 Control::shiftDown(uint8 speed) {
if (speed == SLOW) {
if (_firstText >= MAX_SAVE_GAMES - MAX_ON_SCREEN) return 0;
@@ -765,7 +765,7 @@
return SHIFTED;
}
-uint16 SkyControl::shiftUp(uint8 speed) {
+uint16 Control::shiftUp(uint8 speed) {
if (speed == SLOW) {
if (_firstText > 0) _firstText--;
@@ -778,7 +778,7 @@
return SHIFTED;
}
-bool SkyControl::autoSaveExists(void) {
+bool Control::autoSaveExists(void) {
bool test = false;
SaveFile *f;
@@ -797,13 +797,13 @@
return test;
}
-uint16 SkyControl::saveRestorePanel(bool allowSave) {
+uint16 Control::saveRestorePanel(bool allowSave) {
_keyPressed = 0;
buttonControl(NULL);
_text->drawToScreen(WITH_MASK); // flush text restore buffer
- SkyConResource **lookList;
+ ConResource **lookList;
uint16 cnt;
uint8 lookListLen;
if (allowSave) {
@@ -926,14 +926,14 @@
return clickRes;
}
-bool SkyControl::checkKeyList(uint8 key) {
+bool Control::checkKeyList(uint8 key) {
static const uint8 charList[14] = " ,().='-&+!?\"";
for (uint chCnt = 0; chCnt < ARRAYSIZE(charList); chCnt++)
if (charList[chCnt] == key) return true;
return false;
}
-void SkyControl::handleKeyPress(uint8 key, uint8 *textBuf) {
+void Control::handleKeyPress(uint8 key, uint8 *textBuf) {
if (key == 8) { // backspace
for (uint8 cnt = 0; cnt < 6; cnt++)
@@ -960,7 +960,7 @@
}
}
-void SkyControl::setUpGameSprites(uint8 *nameBuf, dataFileHeader **nameSprites, uint16 firstNum, uint16 selectedGame) {
+void Control::setUpGameSprites(uint8 *nameBuf, dataFileHeader **nameSprites, uint16 firstNum, uint16 selectedGame) {
char cursorChar[2] = "-";
nameBuf += firstNum * MAX_TEXT_LEN;
@@ -984,9 +984,9 @@
}
}
-void SkyControl::showSprites(dataFileHeader **nameSprites, bool allowSave) {
+void Control::showSprites(dataFileHeader **nameSprites, bool allowSave) {
- SkyConResource *drawResource = new SkyConResource(NULL, 1, 0, 0, 0, 0, 0, _system, _screenBuf);
+ ConResource *drawResource = new ConResource(NULL, 1, 0, 0, 0, 0, 0, _system, _screenBuf);
for (uint16 cnt = 0; cnt < MAX_ON_SCREEN; cnt++) {
drawResource->setSprite(nameSprites[cnt]);
drawResource->setXY(GAME_NAME_X, GAME_NAME_Y + cnt * PAN_CHAR_HEIGHT);
@@ -1006,7 +1006,7 @@
delete drawResource;
}
-void SkyControl::loadDescriptions(uint8 *destBuf) {
+void Control::loadDescriptions(uint8 *destBuf) {
memset(destBuf, 0, MAX_SAVE_GAMES * MAX_TEXT_LEN);
@@ -1038,21 +1038,21 @@
delete mgr;
}
-bool SkyControl::loadSaveAllowed(void) {
+bool Control::loadSaveAllowed(void) {
if (SkyEngine::_systemVars.systemFlags & SF_CHOOSING)
return false; // texts get lost during load/save, so don't allow it during choosing
- if (SkyLogic::_scriptVariables[SCREEN] >= 101)
+ if (Logic::_scriptVariables[SCREEN] >= 101)
return false; // same problem with LINC terminals
- if ((SkyLogic::_scriptVariables[SCREEN] >= 82) &&
- (SkyLogic::_scriptVariables[SCREEN] != 85) &&
- (SkyLogic::_scriptVariables[SCREEN] < 90))
+ if ((Logic::_scriptVariables[SCREEN] >= 82) &&
+ (Logic::_scriptVariables[SCREEN] != 85) &&
+ (Logic::_scriptVariables[SCREEN] < 90))
return false; // don't allow saving in final rooms
return true;
}
-void SkyControl::saveDescriptions(uint8 *srcBuf) {
+void Control::saveDescriptions(uint8 *srcBuf) {
uint8 *tmpBuf = (uint8 *)malloc(MAX_SAVE_GAMES * MAX_TEXT_LEN);
uint8 *tmpPos = tmpBuf;
@@ -1081,7 +1081,7 @@
free(tmpBuf);
}
-void SkyControl::doAutoSave(void) {
+void Control::doAutoSave(void) {
char fName[20];
if (SkyEngine::isCDVersion())
strcpy(fName, "SKY-VM-CD.ASD");
@@ -1105,7 +1105,7 @@
free(saveData);
}
-uint16 SkyControl::saveGameToFile(void) {
+uint16 Control::saveGameToFile(void) {
char fName[20];
sprintf(fName,"SKY-VM.%03d", _selectedGame);
@@ -1135,7 +1135,7 @@
#define STOSD(ptr, val) { *(uint32 *)(ptr) = TO_LE_32(val); (ptr) += 4; }
#define STOSW(ptr, val) { *(uint16 *)(ptr) = TO_LE_16(val); (ptr) += 2; }
-void SkyControl::stosMegaSet(uint8 **destPos, MegaSet *mega) {
+void Control::stosMegaSet(uint8 **destPos, MegaSet *mega) {
STOSW(*destPos, mega->gridWidth);
STOSW(*destPos, mega->colOffset);
STOSW(*destPos, mega->colWidth);
@@ -1143,7 +1143,7 @@
// anims, stands, turnTable
}
-void SkyControl::stosStr(uint8 **destPos, Compact *cpt, uint16 type) {
+void Control::stosStr(uint8 **destPos, Compact *cpt, uint16 type) {
uint16 strLen = 0;
if (type & SAVE_GRAFX) {
STOSW(*destPos, cpt->grafixProg.ptrType);
@@ -1163,7 +1163,7 @@
}
}
-void SkyControl::stosCompact(uint8 **destPos, Compact *cpt) {
+void Control::stosCompact(uint8 **destPos, Compact *cpt) {
uint16 saveType = 0;
if (cpt->extCompact) {
saveType |= SAVE_EXT;
@@ -1246,7 +1246,7 @@
}
}
-uint32 SkyControl::prepareSaveData(uint8 *destBuf) {
+uint32 Control::prepareSaveData(uint8 *destBuf) {
uint32 cnt;
memset(destBuf, 0, 4); // space for data size
@@ -1262,7 +1262,7 @@
STOSD(destPos, _savedMouse);
STOSD(destPos, SkyEngine::_systemVars.currentPalette);
for (cnt = 0; cnt < 838; cnt++)
- STOSD(destPos, SkyLogic::_scriptVariables[cnt]);
+ STOSD(destPos, Logic::_scriptVariables[cnt]);
uint32 *loadedFilesList = _skyDisk->giveLoadedFilesList();
for (cnt = 0; cnt < 60; cnt++)
@@ -1289,14 +1289,14 @@
#undef STOSD
#undef STOSW
-void SkyControl::appendMemList(uint16 *pMem) {
+void Control::appendMemList(uint16 *pMem) {
AllocedMem *newMem = new AllocedMem;
newMem->mem = pMem;
newMem->next = _memListRoot;
_memListRoot = newMem;
}
-void SkyControl::freeMemList(void) {
+void Control::freeMemList(void) {
AllocedMem *block = _memListRoot;
AllocedMem *temp;
while (block) {
@@ -1312,7 +1312,7 @@
#define LODSD(strPtr, val) { val = READ_LE_UINT32(strPtr); (strPtr) += 4; }
#define LODSW(strPtr, val) { val = READ_LE_UINT16(strPtr); (strPtr) += 2; }
-void SkyControl::lodsMegaSet(uint8 **srcPos, MegaSet *mega) {
+void Control::lodsMegaSet(uint8 **srcPos, MegaSet *mega) {
LODSW(*srcPos, mega->gridWidth);
LODSW(*srcPos, mega->colOffset);
LODSW(*srcPos, mega->colWidth);
@@ -1320,7 +1320,7 @@
// anims, stands, turnTable
}
-void SkyControl::lodsCompact(uint8 **srcPos, Compact *cpt) {
+void Control::lodsCompact(uint8 **srcPos, Compact *cpt) {
uint16 saveType, cnt;
LODSW(*srcPos, saveType);
@@ -1423,10 +1423,10 @@
}
}
-uint16 SkyControl::parseSaveData(uint8 *srcBuf) {
+uint16 Control::parseSaveData(uint8 *srcBuf) {
uint32 reloadList[60];
- uint32 oldSection = SkyLogic::_scriptVariables[CUR_SECTION];
+ uint32 oldSection = Logic::_scriptVariables[CUR_SECTION];
uint32 cnt;
uint8 *srcPos = srcBuf;
@@ -1465,7 +1465,7 @@
LODSD(srcPos, palette);
for (cnt = 0; cnt < 838; cnt++)
- LODSD(srcPos, SkyLogic::_scriptVariables[cnt]);
+ LODSD(srcPos, Logic::_scriptVariables[cnt]);
for (cnt = 0; cnt < 60; cnt++)
LODSD(srcPos, reloadList[cnt]);
@@ -1490,7 +1490,7 @@
SkyEngine::_systemVars.systemFlags |= SF_GAME_RESTORED;
if (!SkyEngine::isDemo()) {
_skyLogic->fnLeaveSection(oldSection, 0, 0);
- _skyLogic->fnEnterSection(SkyLogic::_scriptVariables[CUR_SECTION], 0, 0);
+ _skyLogic->fnEnterSection(Logic::_scriptVariables[CUR_SECTION], 0, 0);
}
_skyDisk->refreshFilesList(reloadList);
SkyEngine::_systemVars.currentMusic = (uint16)music;
@@ -1505,7 +1505,7 @@
#undef LODSD
#undef LODSW
-uint16 SkyControl::restoreGameFromFile(bool autoSave) {
+uint16 Control::restoreGameFromFile(bool autoSave) {
char fName[20];
if (autoSave) {
@@ -1545,7 +1545,7 @@
return res;
}
-uint16 SkyControl::quickXRestore(uint16 slot) {
+uint16 Control::quickXRestore(uint16 slot) {
uint16 result;
initPanel();
_mouseClicked = false;
@@ -1589,7 +1589,7 @@
return result;
}
-uint16 *SkyControl::lz77decode(uint16 *data) {
+uint16 *Control::lz77decode(uint16 *data) {
uint32 size = READ_LE_UINT32(data);
data += 2;
uint16 *outBuf = (uint16*)malloc(size << 1);
@@ -1625,7 +1625,7 @@
return outBuf;
}
-void SkyControl::applyDiff(uint16 *data, uint16 *diffData, uint16 len) {
+void Control::applyDiff(uint16 *data, uint16 *diffData, uint16 len) {
for (uint16 cnt = 0; cnt < len; cnt++) {
data += READ_LE_UINT16(diffData);
diffData++;
@@ -1635,7 +1635,7 @@
}
}
-void SkyControl::restartGame(void) {
+void Control::restartGame(void) {
if (SkyEngine::_systemVars.gameVersion <= 267)
return; // no restart for floppy demo
@@ -1669,7 +1669,7 @@
SkyEngine::_systemVars.pastIntro = true;
}
-void SkyControl::delay(unsigned int amount) {
+void Control::delay(unsigned int amount) {
OSystem::Event event;
@@ -1725,7 +1725,7 @@
} while (cur < start + amount);
}
-void SkyControl::showGameQuitMsg(bool useScreen) {
+void Control::showGameQuitMsg(bool useScreen) {
SkyEngine::_systemVars.quitting = true;
_skyText->fnSetFont(0);
@@ -1762,7 +1762,7 @@
_system->quit();
}
-char SkyControl::_quitTexts[16][35] = {
+char Control::_quitTexts[16][35] = {
"Game over player one",
"BE VIGILANT",
"Das Spiel ist aus.",
@@ -1781,7 +1781,7 @@
"BE VIGILANT",
};
-uint8 SkyControl::_crossImg[594] = {
+uint8 Control::_crossImg[594] = {
0xFF, 0xFF, 0xFF, 0xFF, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x4D, 0x61,
0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- control.h 3 Jan 2004 01:58:57 -0000 1.29
+++ control.h 3 Jan 2004 15:57:56 -0000 1.30
@@ -29,13 +29,13 @@
namespace Sky {
-class SkyDisk;
-class SkyScreen;
-class SkyLogic;
-class SkyMouse;
-class SkyText;
-class SkyMusicBase;
-class SkySound;
+class Disk;
+class Screen;
+class Logic;
+class Mouse;
+class Text;
+class MusicBase;
+class Sound;
struct Compact;
struct dataFileHeader;
struct MegaSet;
@@ -126,10 +126,10 @@
AllocedMem *next;
};
-class SkyConResource {
+class ConResource {
public:
- SkyConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen);
- virtual ~SkyConResource(void) {};
+ ConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen);
+ virtual ~ConResource(void) {};
void setSprite(void *pSpData) { _spriteData = (dataFileHeader*)pSpData; };
void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; };
void setXY(uint16 x, uint16 y) { _x = x; _y = y; };
@@ -146,10 +146,10 @@
private:
};
-class SkyTextResource : public SkyConResource {
+class TextResource : public ConResource {
public:
- SkyTextResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen);
- virtual ~SkyTextResource(void);
+ TextResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen);
+ virtual ~TextResource(void);
virtual void drawToScreen(bool doMask);
void flushForRedraw(void);
private:
@@ -157,24 +157,24 @@
uint8 *_oldScreen;
};
-class SkyControlStatus {
+class ControlStatus {
public:
- SkyControlStatus(SkyText *skyText, OSystem *system, uint8 *scrBuf);
- ~SkyControlStatus(void);
+ ControlStatus(Text *skyText, OSystem *system, uint8 *scrBuf);
+ ~ControlStatus(void);
void setToText(const char *newText);
void setToText(uint16 textNum);
void drawToScreen(void);
private:
- SkyTextResource *_statusText;
+ TextResource *_statusText;
dataFileHeader *_textData;
- SkyText *_skyText;
+ Text *_skyText;
OSystem *_system;
uint8 *_screenBuf;
};
-class SkyControl {
+class Control {
public:
- SkyControl(SkyScreen *screen, SkyDisk *disk, SkyMouse *mouse, SkyText *text, SkyMusicBase *music, SkyLogic *logic, SkySound *sound, OSystem *system, const char *savePath);
+ Control(Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, OSystem *system, const char *savePath);
void doControlPanel(void);
void doLoadSavePanel(void);
void restartGame(void);
@@ -191,13 +191,13 @@
void delay(unsigned int amount);
- void animClick(SkyConResource *pButton);
+ void animClick(ConResource *pButton);
bool getYesNo(char *text);
- void buttonControl(SkyConResource *pButton);
- uint16 handleClick(SkyConResource *pButton);
+ void buttonControl(ConResource *pButton);
+ uint16 handleClick(ConResource *pButton);
uint16 doMusicSlide(void);
uint16 doSpeedSlide(void);
- uint16 toggleFx(SkyConResource *pButton);
+ uint16 toggleFx(ConResource *pButton);
uint16 toggleText(void);
void toggleMusic(void);
uint16 shiftDown(uint8 speed);
@@ -242,13 +242,13 @@
void appendMemList(uint16 *pMem);
void freeMemList(void);
- SkyScreen *_skyScreen;
- SkyDisk *_skyDisk;
- SkyMouse *_skyMouse;
- SkyText *_skyText;
- SkyMusicBase *_skyMusic;
- SkyLogic *_skyLogic;
- SkySound *_skySound;
+ Screen *_skyScreen;
+ Disk *_skyDisk;
+ Mouse *_skyMouse;
+ Text *_skyText;
+ MusicBase *_skyMusic;
+ Logic *_skyLogic;
+ Sound *_skySound;
OSystem *_system;
int _mouseX, _mouseY;
bool _mouseClicked;
@@ -275,25 +275,25 @@
uint32 _savedCharSet;
uint16 _enteredTextWidth;
- SkyConResource *createResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, int16 pX, int16 pY, uint32 pText, uint8 pOnClick, uint8 panelType);
+ ConResource *createResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, int16 pX, int16 pY, uint32 pText, uint8 pOnClick, uint8 panelType);
dataFileHeader *_textSprite;
- SkyTextResource *_text;
+ TextResource *_text;
- SkyConResource *_controlPanel, *_exitButton, *_slide, *_slide2, *_slode;
- SkyConResource *_restorePanButton, *_savePanButton, *_dosPanButton, *_restartPanButton, *_fxPanButton, *_musicPanButton;
- SkyConResource *_bodge, *_yesNo;
- SkyConResource *_controlPanLookList[9];
+ ConResource *_controlPanel, *_exitButton, *_slide, *_slide2, *_slode;
+ ConResource *_restorePanButton, *_savePanButton, *_dosPanButton, *_restartPanButton, *_fxPanButton, *_musicPanButton;
+ ConResource *_bodge, *_yesNo;
+ ConResource *_controlPanLookList[9];
//- Save/restore panel
- SkyConResource *_savePanel;
- SkyConResource *_saveButton, *_downFastButton, *_downSlowButton;
- SkyConResource *_upFastButton, *_upSlowButton, *_quitButton, *_restoreButton;
- SkyConResource *_autoSaveButton;
+ ConResource *_savePanel;
+ ConResource *_saveButton, *_downFastButton, *_downSlowButton;
+ ConResource *_upFastButton, *_upSlowButton, *_quitButton, *_restoreButton;
+ ConResource *_autoSaveButton;
- SkyConResource *_savePanLookList[6], *_restorePanLookList[7];
+ ConResource *_savePanLookList[6], *_restorePanLookList[7];
- SkyControlStatus *_statusBar;
+ ControlStatus *_statusBar;
static char _quitTexts[16][35];
static uint8 _crossImg[594];
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debug.cpp 3 Jan 2004 01:58:57 -0000 1.8
+++ debug.cpp 3 Jan 2004 15:57:56 -0000 1.9
@@ -210,22 +210,22 @@
static const char *logic_table_names[] = {
"return",
- "SkyLogic::script",
- "SkyLogic::auto_route",
- "SkyLogic::ar_anim",
- "SkyLogic::ar_turn",
- "SkyLogic::alt",
- "SkyLogic::anim",
- "SkyLogic::turn",
- "SkyLogic::cursor",
- "SkyLogic::talk",
- "SkyLogic::listen",
- "SkyLogic::stopped",
- "SkyLogic::choose",
- "SkyLogic::frames",
- "SkyLogic::pause",
- "SkyLogic::wait_sync",
- "SkyLogic::simple_anim",
+ "Logic::script",
+ "Logic::auto_route",
+ "Logic::ar_anim",
+ "Logic::ar_turn",
+ "Logic::alt",
+ "Logic::anim",
+ "Logic::turn",
+ "Logic::cursor",
+ "Logic::talk",
+ "Logic::listen",
+ "Logic::stopped",
+ "Logic::choose",
+ "Logic::frames",
+ "Logic::pause",
+ "Logic::wait_sync",
+ "Logic::simple_anim",
};
static const char opcode_par[] = {
@@ -1234,7 +1234,7 @@
"man_loc3",
};
-void SkyDebug::fetchCompact(uint32 a) {
+void Debug::fetchCompact(uint32 a) {
uint32 sectionNum = (a & 0xf000) >> 12;
uint32 compactNum = (a & 0x0fff);
@@ -1244,11 +1244,11 @@
debug(8, "Loading Compact %d from section %d", compactNum, sectionNum);
}
-void SkyDebug::logic(uint32 logic) {
+void Debug::logic(uint32 logic) {
debug(6, "LOGIC: %s", logic_table_names[logic]);
}
-void SkyDebug::script(uint32 command, uint16 *scriptData) {
+void Debug::script(uint32 command, uint16 *scriptData) {
debug(6, "SCRIPT: %s", opcodes[command]);
if (command == 0 || command == 6)
debug(6, " %s", scriptVars[READ_LE_UINT16(scriptData)/4]);
@@ -1261,7 +1261,7 @@
debug(6, "");
}
-void SkyDebug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) {
+void Debug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) {
debug(6, "MCODE: %s(%d, %d, %d)", mcodes[mcode], a, b, c);
}
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- debug.h 3 Jan 2004 01:58:57 -0000 1.3
+++ debug.h 3 Jan 2004 15:57:56 -0000 1.4
@@ -27,7 +27,7 @@
namespace Sky {
-class SkyDebug {
+class Debug {
public:
static void fetchCompact(uint32 a);
static void logic(uint32 logic);
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- disk.cpp 3 Jan 2004 01:58:57 -0000 1.53
+++ disk.cpp 3 Jan 2004 15:57:56 -0000 1.54
@@ -33,7 +33,7 @@
static const char *dataFilename = "sky.dsk";
static const char *dinnerFilename = "sky.dnr";
-SkyDisk::SkyDisk(const Common::String &gameDataPath) {
+Disk::Disk(const Common::String &gameDataPath) {
_prefRoot = NULL;
_dataDiskHandle = new File();
@@ -64,7 +64,7 @@
memset(_loadedFilesList, 0, 60 * 4);
}
-SkyDisk::~SkyDisk(void) {
+Disk::~Disk(void) {
PrefFile *fEntry = _prefRoot;
while (fEntry) {
@@ -79,7 +79,7 @@
delete _dataDiskHandle;
}
-void SkyDisk::flushPrefetched(void) {
+void Disk::flushPrefetched(void) {
PrefFile *fEntry = _prefRoot;
while (fEntry) {
@@ -91,14 +91,14 @@
_prefRoot = NULL;
}
-bool SkyDisk::fileExists(uint16 fileNr) {
+bool Disk::fileExists(uint16 fileNr) {
return (getFileInfo(fileNr) != NULL);
}
//load in file file_nr to address dest
//if dest == NULL, then allocate memory for this file
-uint8 *SkyDisk::loadFile(uint16 fileNr, uint8 *dest) {
+uint8 *Disk::loadFile(uint16 fileNr, uint8 *dest) {
uint8 cflag;
int32 bytesRead;
@@ -233,7 +233,7 @@
return _compDest;
}
-void SkyDisk::prefetchFile(uint16 fileNr) {
+void Disk::prefetchFile(uint16 fileNr) {
PrefFile **fEntry = &_prefRoot;
bool found = false;
@@ -242,7 +242,7 @@
fEntry = &((*fEntry)->next);
}
if (found) {
- debug(1,"SkyDisk::prefetchFile: File %d was already prefetched",fileNr);
+ debug(1,"Disk::prefetchFile: File %d was already prefetched",fileNr);
return ;
}
uint8 *temp = loadFile(fileNr, NULL);
@@ -253,7 +253,7 @@
(*fEntry)->next = NULL;
}
-uint8 *SkyDisk::givePrefetched(uint16 fileNr, uint32 *fSize) {
+uint8 *Disk::givePrefetched(uint16 fileNr, uint32 *fSize) {
PrefFile **fEntry = &_prefRoot;
bool found = false;
@@ -273,7 +273,7 @@
return retPtr;
}
-uint8 *SkyDisk::getFileInfo(uint16 fileNr) {
+uint8 *Disk::getFileInfo(uint16 fileNr) {
uint16 i;
uint16 *dnrTbl16Ptr = (uint16 *)_dinnerTableArea;
@@ -290,7 +290,7 @@
return 0;
}
-void SkyDisk::fnCacheChip(uint32 list) {
+void Disk::fnCacheChip(uint32 list) {
// fnCacheChip is called after fnCacheFast
uint16 cnt = 0;
@@ -304,7 +304,7 @@
fnCacheFiles();
}
-void SkyDisk::fnCacheFast(uint32 list) {
+void Disk::fnCacheFast(uint32 list) {
if (list == 0) return;
uint8 cnt = 0;
@@ -315,7 +315,7 @@
} while (fList[cnt-1]);
}
-void SkyDisk::fnCacheFiles(void) {
+void Disk::fnCacheFiles(void) {
uint16 lCnt, bCnt, targCnt;
targCnt = lCnt = 0;
@@ -360,13 +360,13 @@
_loadedFilesList[targCnt] = 0;
SkyEngine::_itemList[_buildList[bCnt] & 2047] = (void**)loadFile(_buildList[bCnt] & 0x7FFF, NULL);
if (!SkyEngine::_itemList[_buildList[bCnt] & 2047])
- warning("fnCacheFiles: SkyDisk::loadFile() returned NULL for file %d",_buildList[bCnt] & 0x7FFF);
+ warning("fnCacheFiles: Disk::loadFile() returned NULL for file %d",_buildList[bCnt] & 0x7FFF);
bCnt++;
}
_buildList[0] = 0;
}
-void SkyDisk::refreshFilesList(uint32 *list) {
+void Disk::refreshFilesList(uint32 *list) {
uint8 cnt = 0;
while (_loadedFilesList[cnt]) {
@@ -384,7 +384,7 @@
_loadedFilesList[cnt] = 0;
}
-void SkyDisk::fnMiniLoad(uint16 fileNum) {
+void Disk::fnMiniLoad(uint16 fileNum) {
uint16 cnt = 0;
while (_loadedFilesList[cnt]) {
@@ -396,7 +396,7 @@
SkyEngine::_itemList[fileNum & 2047] = (void**)loadFile(fileNum, NULL);
}
-void SkyDisk::fnFlushBuffers(void) {
+void Disk::fnFlushBuffers(void) {
// dump all loaded sprites
uint8 lCnt = 0;
@@ -408,7 +408,7 @@
_loadedFilesList[0] = 0;
}
-void SkyDisk::dumpFile(uint16 fileNr) {
+void Disk::dumpFile(uint16 fileNr) {
char buf[128];
File out;
byte* filePtr;
@@ -427,7 +427,7 @@
free(filePtr);
}
-uint32 SkyDisk::determineGameVersion() {
+uint32 Disk::determineGameVersion() {
//determine game version based on number of entries in dinner table
switch (_dinnerTableEntries) {
case 243:
Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- disk.h 3 Jan 2004 01:58:57 -0000 1.13
+++ disk.h 3 Jan 2004 15:57:56 -0000 1.14
@@ -39,10 +39,10 @@
PrefFile *next;
};
-class SkyDisk {
+class Disk {
public:
- SkyDisk(const Common::String &gameDataPath);
- ~SkyDisk(void);
+ Disk(const Common::String &gameDataPath);
+ ~Disk(void);
uint8 *loadFile(uint16 fileNr, uint8 *dest);
bool fileExists(uint16 fileNr);
Index: grid.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- grid.cpp 3 Jan 2004 01:58:57 -0000 1.14
+++ grid.cpp 3 Jan 2004 15:57:56 -0000 1.15
@@ -28,7 +28,7 @@
#define GRID_FILE_START 60000
-int8 SkyGrid::_gridConvertTable[] = {
+int8 Grid::_gridConvertTable[] = {
0, //0
1, //1
@@ -129,18 +129,18 @@
69, //96
};
-SkyGrid::SkyGrid(SkyDisk *pDisk) {
+Grid::Grid(Disk *pDisk) {
_gameGrids = (uint8 *)malloc(TOT_NO_GRIDS * GRID_SIZE);
_skyDisk = pDisk;
}
-SkyGrid::~SkyGrid(void) {
+Grid::~Grid(void) {
free(_gameGrids);
}
-void SkyGrid::loadGrids(void) {
+void Grid::loadGrids(void) {
// no endian conversion necessary as I'm using uint8* instead of uint32*
for (uint8 cnt = 0; cnt < TOT_NO_GRIDS; cnt++)
@@ -148,18 +148,18 @@
if (!SkyEngine::isDemo()) { // single disk demos never get that far
// Reloading the grids can sometimes cause problems eg when reichs door is
// open the door grid bit gets replaced so you can't get back in (or out)
- if (SkyLogic::_scriptVariables[REICH_DOOR_FLAG])
+ if (Logic::_scriptVariables[REICH_DOOR_FLAG])
removeGrid(256, 280, 1, &SkyCompact::reich_door_20);
}
}
-bool SkyGrid::getGridValues(Compact *cpt, uint32 *resBitNum, uint32 *resWidth) {
+bool Grid::getGridValues(Compact *cpt, uint32 *resBitNum, uint32 *resWidth) {
uint16 width = SkyCompact::getMegaSet(cpt, cpt->extCompact->megaSet)->gridWidth;
return getGridValues(cpt->xcood, cpt->ycood, width, cpt, resBitNum, resWidth);
}
-bool SkyGrid::getGridValues(uint32 x, uint32 y, uint32 width, Compact *cpt, uint32 *resBitNum, uint32 *resWidth) {
+bool Grid::getGridValues(uint32 x, uint32 y, uint32 width, Compact *cpt, uint32 *resBitNum, uint32 *resWidth) {
uint32 bitPos;
if (y < TOP_LEFT_Y) return false; // off screen
@@ -194,14 +194,14 @@
return true;
}
-void SkyGrid::removeObjectFromWalk(Compact *cpt) {
+void Grid::removeObjectFromWalk(Compact *cpt) {
uint32 bitNum, width;
if (getGridValues(cpt, &bitNum, &width))
removeObjectFromWalk(bitNum, width);
}
-void SkyGrid::removeObjectFromWalk(uint32 bitNum, uint32 width) {
+void Grid::removeObjectFromWalk(uint32 bitNum, uint32 width) {
for (uint32 cnt = 0; cnt < width; cnt++) {
_gameGrids[bitNum >> 3] &= ~(1 << (bitNum & 0x7));
@@ -211,14 +211,14 @@
}
}
-void SkyGrid::objectToWalk(Compact *cpt) {
+void Grid::objectToWalk(Compact *cpt) {
uint32 bitNum, width;
if (getGridValues(cpt, &bitNum, &width))
objectToWalk(bitNum, width);
}
-void SkyGrid::objectToWalk(uint32 bitNum, uint32 width) {
+void Grid::objectToWalk(uint32 bitNum, uint32 width) {
for (uint32 cnt = 0; cnt < width; cnt++) {
_gameGrids[bitNum >> 3] |= (1 << (bitNum & 0x7));
@@ -228,21 +228,21 @@
}
}
-void SkyGrid::plotGrid(uint32 x, uint32 y, uint32 width, Compact *cpt) {
+void Grid::plotGrid(uint32 x, uint32 y, uint32 width, Compact *cpt) {
uint32 resBitPos, resWidth;
if (getGridValues(x, y, width-1, cpt, &resBitPos, &resWidth))
objectToWalk(resBitPos, resWidth);
}
-void SkyGrid::removeGrid(uint32 x, uint32 y, uint32 width, Compact *cpt) {
+void Grid::removeGrid(uint32 x, uint32 y, uint32 width, Compact *cpt) {
uint32 resBitPos, resWidth;
if (getGridValues(x, y, width, cpt, &resBitPos, &resWidth))
removeObjectFromWalk(resBitPos, resWidth);
}
-uint8 *SkyGrid::giveGrid(uint32 pScreen)
+uint8 *Grid::giveGrid(uint32 pScreen)
{
return _gameGrids + GRID_SIZE * _gridConvertTable[pScreen];
}
Index: grid.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- grid.h 3 Jan 2004 01:58:57 -0000 1.6
+++ grid.h 3 Jan 2004 15:57:56 -0000 1.7
@@ -28,12 +28,12 @@
namespace Sky {
struct Compact;
-class SkyDisk;
+class Disk;
-class SkyGrid {
+class Grid {
public:
- SkyGrid(SkyDisk *pDisk);
- ~SkyGrid(void);
+ Grid(Disk *pDisk);
+ ~Grid(void);
// grid.asm routines
void loadGrids(void);
@@ -56,7 +56,7 @@
private:
static int8 _gridConvertTable[];
uint8 *_gameGrids;
- SkyDisk *_skyDisk;
+ Disk *_skyDisk;
};
} // End of namespace Sky
Index: hufftext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/hufftext.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hufftext.cpp 3 Jan 2004 01:58:57 -0000 1.4
+++ hufftext.cpp 3 Jan 2004 15:57:56 -0000 1.5
@@ -23,7 +23,7 @@
namespace Sky {
-const HuffTree SkyText::_huffTree_00109[] = {
+const HuffTree Text::_huffTree_00109[] = {
{ 1, 22, 0 },
{ 2, 9, 0 },
{ 3, 6, 0 },
@@ -193,7 +193,7 @@
{ 0, 0, 0x7C }
};
-const HuffTree SkyText::_huffTree_00267[] = {
+const HuffTree Text::_huffTree_00267[] = {
{ 1, 20, 0 },
{ 2, 7, 0 },
{ 3, 6, 0 },
@@ -383,7 +383,7 @@
{ 0, 0, 0x7c },
};
-const HuffTree SkyText::_huffTree_00288[] = {
+const HuffTree Text::_huffTree_00288[] = {
{ 1, 20, 0 },
{ 2, 7, 0 },
{ 3, 4, 0 },
@@ -575,7 +575,7 @@
{ 0, 0, 0x7c },
};
-const HuffTree SkyText::_huffTree_00303[] = {
+const HuffTree Text::_huffTree_00303[] = {
{ 1, 22, 0 },
{ 2, 9, 0 },
{ 3, 6, 0 },
@@ -777,7 +777,7 @@
{ 0, 0, 0x7c },
};
-const HuffTree SkyText::_huffTree_00331[] = {
+const HuffTree Text::_huffTree_00331[] = {
{ 1, 20, 0 },
{ 2, 7, 0 },
{ 3, 4, 0 },
@@ -1009,7 +1009,7 @@
{ 0, 0, 0x7c },
};
-const HuffTree SkyText::_huffTree_00348[] = {
+const HuffTree Text::_huffTree_00348[] = {
{ 1, 20, 0 },
{ 2, 7, 0 },
{ 3, 4, 0 },
@@ -1257,7 +1257,7 @@
{ 0, 0, 0x7C },
};
-const HuffTree SkyText::_huffTree_00365[] = {
+const HuffTree Text::_huffTree_00365[] = {
{ 1, 20, 0 },
{ 2, 7, 0 },
{ 3, 4, 0 },
@@ -1505,7 +1505,7 @@
{ 0, 0, 0x7C },
};
-const HuffTree SkyText::_huffTree_00368[] = {
+const HuffTree Text::_huffTree_00368[] = {
{ 1, 20, 0 },
{ 2, 7, 0 },
{ 3, 4, 0 },
@@ -1753,7 +1753,7 @@
{ 0, 0, 0x7C },
};
-const HuffTree SkyText::_huffTree_00372[] = {
+const HuffTree Text::_huffTree_00372[] = {
{ 1, 20, 0 },
{ 2, 7, 0 },
{ 3, 4, 0 },
Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- intro.cpp 3 Jan 2004 01:58:57 -0000 1.43
+++ intro.cpp 3 Jan 2004 15:57:56 -0000 1.44
@@ -229,7 +229,7 @@
#define CD_105 60098
-uint16 SkyIntro::_mainIntroSeq[] = {
+uint16 Intro::_mainIntroSeq[] = {
DELAY, 3000, // keep virgin screen up
FADEDOWN,
SHOWSCREEN, 60112, // revo screen + palette
@@ -243,7 +243,7 @@
SEQEND
};
-uint16 SkyIntro::_cdIntroSeq[] = {
+uint16 Intro::_cdIntroSeq[] = {
PLAYVOICE, 59500,
LOADBG, 59499,
LOOPBG,
@@ -549,7 +549,7 @@
SEQEND
};
-uint16 SkyIntro::_floppyIntroSeq[] = {
+uint16 Intro::_floppyIntroSeq[] = {
SHOWSCREEN, 60081,
FADEUP, 60080,
DOFLIRT, 60082,
@@ -610,7 +610,7 @@
SEQEND
};
-SkyIntro::SkyIntro(SkyDisk *disk, SkyScreen *screen, SkyMusicBase *music, SkySound *sound, SkyText *text, SoundMixer *mixer, OSystem *system) {
+Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *text, SoundMixer *mixer, OSystem *system) {
_skyDisk = disk;
_skyScreen = screen;
@@ -625,7 +625,7 @@
_quitProg = false;
}
-SkyIntro::~SkyIntro(void) {
+Intro::~Intro(void) {
_mixer->stopAll();
_skyDisk->flushPrefetched();
@@ -638,7 +638,7 @@
free(_bgBuf);
}
-bool SkyIntro::doIntro(bool floppyIntro) {
+bool Intro::doIntro(bool floppyIntro) {
if (!SkyEngine::isCDVersion())
floppyIntro = true;
@@ -670,7 +670,7 @@
return true;
}
-bool SkyIntro::nextPart(uint16 *&data) {
+bool Intro::nextPart(uint16 *&data) {
uint8 *vData = NULL;
// return false means cancel intro
@@ -760,7 +760,7 @@
return true;
}
-bool SkyIntro::floppyScrollFlirt(void) {
+bool Intro::floppyScrollFlirt(void) {
uint8 *scrollScreen = (uint8*)malloc(FRAME_SIZE * 2);
memset(scrollScreen, 0, FRAME_SIZE);
@@ -804,7 +804,7 @@
return doContinue;
}
-bool SkyIntro::commandFlirt(uint16 *&data) {
+bool Intro::commandFlirt(uint16 *&data) {
_skyScreen->startSequence(*data++);
while ((*data != COMMANDEND) || _skyScreen->sequenceRunning()) {
@@ -844,7 +844,7 @@
return true;
}
-void SkyIntro::showTextBuf(void) {
+void Intro::showTextBuf(void) {
uint16 x = ((dataFileHeader*)_textBuf)->s_x;
uint16 y = ((dataFileHeader*)_textBuf)->s_y;
@@ -867,7 +867,7 @@
_system->copy_rect(screenBuf, GAME_SCREEN_WIDTH, x, y, width, height);
}
-void SkyIntro::restoreScreen(void) {
+void Intro::restoreScreen(void) {
uint16 x = ((dataFileHeader*)_saveBuf)->s_x;
uint16 y = ((dataFileHeader*)_saveBuf)->s_y;
@@ -883,7 +883,7 @@
_system->copy_rect(_saveBuf + sizeof(dataFileHeader), width, x, y, width, height);
}
-bool SkyIntro::escDelay(uint32 msecs) {
+bool Intro::escDelay(uint32 msecs) {
OSystem::Event event;
do {
Index: intro.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- intro.h 3 Jan 2004 01:58:57 -0000 1.3
+++ intro.h 3 Jan 2004 15:57:56 -0000 1.4
@@ -28,16 +28,16 @@
namespace Sky {
-class SkyDisk;
-class SkyScreen;
-class SkyMusicBase;
-class SkySound;
-class SkyText;
+class Disk;
+class Screen;
+class MusicBase;
+class Sound;
+class Text;
-class SkyIntro {
+class Intro {
public:
- SkyIntro(SkyDisk *disk, SkyScreen *screen, SkyMusicBase *music, SkySound *sound, SkyText *text, SoundMixer *mixer, OSystem *system);
- ~SkyIntro(void);
+ Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *text, SoundMixer *mixer, OSystem *system);
+ ~Intro(void);
bool doIntro(bool floppyIntro);
bool _quitProg;
private:
@@ -45,11 +45,11 @@
static uint16 _floppyIntroSeq[];
static uint16 _cdIntroSeq[];
- SkyDisk *_skyDisk;
- SkyScreen *_skyScreen;
- SkyMusicBase *_skyMusic;
- SkySound *_skySound;
- SkyText *_skyText;
+ Disk *_skyDisk;
+ Screen *_skyScreen;
+ MusicBase *_skyMusic;
+ Sound *_skySound;
+ Text *_skyText;
OSystem *_system;
SoundMixer *_mixer;
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- logic.cpp 3 Jan 2004 01:58:57 -0000 1.140
+++ logic.cpp 3 Jan 2004 15:57:56 -0000 1.141
@@ -42,38 +42,38 @@
namespace Sky {
-uint32 SkyLogic::_scriptVariables[838];
+uint32 Logic::_scriptVariables[838];
-typedef void (SkyLogic::*LogicTable) ();
+typedef void (Logic::*LogicTable) ();
static const LogicTable logicTable[] = {
- &SkyLogic::nop,
- &SkyLogic::logicScript, // 1 script processor
[...1436 lines suppressed...]
uint16 *animPtr;
animNum += target->extCompact->megaSet / NEXT_MEGA_SET;
animNum &= 0xFF;
- if (SkyTalkAnims::animTalkTableIsPointer[animNum]) { //is it a pointer?
- //animPtr = (uint16 *)SkyTalkAnims::animTalkTablePtr[animNum];
+ if (TalkAnims::animTalkTableIsPointer[animNum]) { //is it a pointer?
+ //animPtr = (uint16 *)TalkAnims::animTalkTablePtr[animNum];
target->grafixProg.ptrType = TALKTABLE;
target->grafixProg.ptrTarget = animNum;
} else { //then it must be a value
- //animPtr = (uint16 *)SkyEngine::fetchCompact(SkyTalkAnims::animTalkTableVal[animNum]);
+ //animPtr = (uint16 *)SkyEngine::fetchCompact(TalkAnims::animTalkTableVal[animNum]);
target->grafixProg.ptrType = COMPACT;
- target->grafixProg.ptrTarget = SkyTalkAnims::animTalkTableVal[animNum];
+ target->grafixProg.ptrTarget = TalkAnims::animTalkTableVal[animNum];
}
target->grafixProg.pos = 0;
animPtr = SkyCompact::getGrafixPtr(target);
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- logic.h 3 Jan 2004 01:58:57 -0000 1.35
+++ logic.h 3 Jan 2004 15:57:56 -0000 1.36
@@ -80,28 +80,28 @@
LINC_DIGIT_9 = 655
};
-class SkyAutoRoute;
-class SkyControl;
-class SkyDisk;
-class SkyGrid;
-class SkyMouse;
-class SkyMusicBase;
-class SkyScreen;
-class SkySound;
-class SkyText;
+class AutoRoute;
+class Control;
+class Disk;
+class Grid;
+class Mouse;
+class MusicBase;
+class Screen;
+class Sound;
+class Text;
-class SkyLogic {
+class Logic {
public:
- SkyLogic(
- SkyScreen *skyScreen,
- SkyDisk *skyDisk,
- SkyText *skyText,
- SkyMusicBase *skyMusic,
- SkyMouse *skyMouse,
- SkySound *skySound);
+ Logic(
+ Screen *skyScreen,
+ Disk *skyDisk,
+ Text *skyText,
+ MusicBase *skyMusic,
+ Mouse *skyMouse,
+ Sound *skySound);
void engine();
bool checkProtection(void);
- void useControlInstance(SkyControl *control) { _skyControl = control; };
+ void useControlInstance(Control *control) { _skyControl = control; };
void nop();
void logicScript();
@@ -242,7 +242,7 @@
void stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32 base);
static uint32 _scriptVariables[838];
- SkyGrid *_skyGrid;
+ Grid *_skyGrid;
protected:
void push(uint32);
@@ -266,14 +266,14 @@
Common::RandomSource _rnd;
- SkyScreen *_skyScreen;
- SkyDisk *_skyDisk;
- SkyText *_skyText;
- SkyMusicBase *_skyMusic;
- SkySound *_skySound;
- SkyAutoRoute *_skyAutoRoute;
- SkyMouse *_skyMouse;
- SkyControl *_skyControl;
+ Screen *_skyScreen;
+ Disk *_skyDisk;
+ Text *_skyText;
+ MusicBase *_skyMusic;
+ Sound *_skySound;
+ AutoRoute *_skyAutoRoute;
+ Mouse *_skyMouse;
+ Control *_skyControl;
};
} // End of namespace Sky
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mouse.cpp 3 Jan 2004 01:58:57 -0000 1.28
+++ mouse.cpp 3 Jan 2004 15:57:56 -0000 1.29
@@ -34,7 +34,7 @@
#define NO_MAIN_OBJECTS 24
#define NO_LINC_OBJECTS 21
-uint32 SkyMouse::_mouseMainObjects[24] = {
+uint32 Mouse::_mouseMainObjects[24] = {
65,
9,
66,
@@ -61,7 +61,7 @@
38
};
-uint32 SkyMouse::_mouseLincObjects[21] = {
+uint32 Mouse::_mouseLincObjects[21] = {
24625,
24649,
24827,
@@ -85,7 +85,7 @@
24829
};
-SkyMouse::SkyMouse(OSystem *system, SkyDisk *skyDisk) {
+Mouse::Mouse(OSystem *system, Disk *skyDisk) {
_skyDisk = skyDisk;
_system = system;
@@ -100,22 +100,22 @@
fixMouseTransparency(_objectMouseData, _skyDisk->_lastLoadedFileSize);
}
-SkyMouse::~SkyMouse( ){
+Mouse::~Mouse( ){
free (_miceData);
free (_objectMouseData);
}
-void SkyMouse::replaceMouseCursors(uint16 fileNo) {
+void Mouse::replaceMouseCursors(uint16 fileNo) {
_skyDisk->loadFile(fileNo, _objectMouseData);
fixMouseTransparency(_objectMouseData, _skyDisk->_lastLoadedFileSize);
}
-bool SkyMouse::fnAddHuman(void) {
+bool Mouse::fnAddHuman(void) {
//reintroduce the mouse so that the human can control the player
//could still be switched out at high-level
- if (!SkyLogic::_scriptVariables[MOUSE_STOP]) {
- SkyLogic::_scriptVariables[MOUSE_STATUS] |= 6; //cursor & mouse
+ if (!Logic::_scriptVariables[MOUSE_STOP]) {
+ Logic::_scriptVariables[MOUSE_STATUS] |= 6; //cursor & mouse
if (_mouseY < 2) //stop mouse activating top line
_mouseY = 2;
@@ -129,41 +129,41 @@
//get off may contain script to remove mouse pointer text
//surely this script should be run just in case
//I am going to try it anyway
- if (SkyLogic::_scriptVariables[GET_OFF])
- _skyLogic->script((uint16)SkyLogic::_scriptVariables[GET_OFF],(uint16)(SkyLogic::_scriptVariables[GET_OFF] >> 16));
+ if (Logic::_scriptVariables[GET_OFF])
+ _skyLogic->script((uint16)Logic::_scriptVariables[GET_OFF],(uint16)(Logic::_scriptVariables[GET_OFF] >> 16));
- SkyLogic::_scriptVariables[SPECIAL_ITEM] = 0xFFFFFFFF;
- SkyLogic::_scriptVariables[GET_OFF] = RESET_MOUSE;
+ Logic::_scriptVariables[SPECIAL_ITEM] = 0xFFFFFFFF;
+ Logic::_scriptVariables[GET_OFF] = RESET_MOUSE;
}
return true;
}
-void SkyMouse::fnSaveCoods(void) {
- SkyLogic::_scriptVariables[SAFEX] = _mouseX + TOP_LEFT_X;
- SkyLogic::_scriptVariables[SAFEY] = _mouseY + TOP_LEFT_Y;
+void Mouse::fnSaveCoods(void) {
+ Logic::_scriptVariables[SAFEX] = _mouseX + TOP_LEFT_X;
+ Logic::_scriptVariables[SAFEY] = _mouseY + TOP_LEFT_Y;
}
-void SkyMouse::lockMouse(void) {
+void Mouse::lockMouse(void) {
SkyEngine::_systemVars.systemFlags |= SF_MOUSE_LOCKED;
}
-void SkyMouse::unlockMouse(void) {
+void Mouse::unlockMouse(void) {
SkyEngine::_systemVars.systemFlags &= ~SF_MOUSE_LOCKED;
}
-void SkyMouse::restoreMouseData(uint16 frameNum) {
- warning("Stub: SkyMouse::restoreMouseData");
+void Mouse::restoreMouseData(uint16 frameNum) {
+ warning("Stub: Mouse::restoreMouseData");
}
-void SkyMouse::drawNewMouse() {
- warning("Stub: SkyMouse::drawNewMouse");
+void Mouse::drawNewMouse() {
+ warning("Stub: Mouse::drawNewMouse");
//calculateMouseValues();
//saveMouseData();
//drawMouse();
}
-void SkyMouse::waitMouseNotPressed(void) {
+void Mouse::waitMouseNotPressed(void) {
bool mousePressed = true;
OSystem::Event event;
@@ -179,7 +179,7 @@
//original sky uses different colors for transparency than our backends do,
//so we simply swap our "transparent"-white with another one.
-void SkyMouse::fixMouseTransparency(byte *mouseData, uint32 size) {
+void Mouse::fixMouseTransparency(byte *mouseData, uint32 size) {
uint32 curPos = sizeof(struct dataFileHeader);
uint32 cursorSize = ((struct dataFileHeader *)mouseData)->s_sp_size;
@@ -196,7 +196,7 @@
}
}
-void SkyMouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) {
+void Mouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) {
_currentCursor = frameNum;
@@ -212,24 +212,24 @@
else _system->show_mouse(true);
}
-void SkyMouse::mouseEngine(uint16 mouseX, uint16 mouseY) {
+void Mouse::mouseEngine(uint16 mouseX, uint16 mouseY) {
_mouseX = mouseX;
_mouseY = mouseY;
- _logicClick = (_mouseB > 0); // click signal is available for SkyLogic for one gamecycle
+ _logicClick = (_mouseB > 0); // click signal is available for Logic for one gamecycle
- if (!SkyLogic::_scriptVariables[MOUSE_STOP]) {
- if (SkyLogic::_scriptVariables[MOUSE_STATUS] & (1 << 1)) {
+ if (!Logic::_scriptVariables[MOUSE_STOP]) {
+ if (Logic::_scriptVariables[MOUSE_STATUS] & (1 << 1)) {
pointerEngine(mouseX + TOP_LEFT_X, mouseY + TOP_LEFT_Y);
- if (SkyLogic::_scriptVariables[MOUSE_STATUS] & (1 << 2)) //buttons enabled?
+ if (Logic::_scriptVariables[MOUSE_STATUS] & (1 << 2)) //buttons enabled?
buttonEngine1();
}
}
_mouseB = 0; //don't save up buttons
}
-void SkyMouse::pointerEngine(uint16 xPos, uint16 yPos) {
- uint32 currentListNum = SkyLogic::_scriptVariables[MOUSE_LIST_NO];
+void Mouse::pointerEngine(uint16 xPos, uint16 yPos) {
+ uint32 currentListNum = Logic::_scriptVariables[MOUSE_LIST_NO];
uint16 *currentList;
do {
currentList = (uint16 *)SkyEngine::fetchCompact(currentListNum);
@@ -237,18 +237,18 @@
uint16 itemNum = *currentList;
Compact *itemData = SkyEngine::fetchCompact(itemNum);
currentList++;
- if ((itemData->screen == SkyLogic::_scriptVariables[SCREEN]) && (itemData->status & 16)) {
+ if ((itemData->screen == Logic::_scriptVariables[SCREEN]) && (itemData->status & 16)) {
if (itemData->xcood + ((int16)itemData->mouseRelX) > xPos) continue;
if (itemData->xcood + ((int16)itemData->mouseRelX) + itemData->mouseSizeX < xPos) continue;
if (itemData->ycood + ((int16)itemData->mouseRelY) > yPos) continue;
if (itemData->ycood + ((int16)itemData->mouseRelY) + itemData->mouseSizeY < yPos) continue;
// we've hit the item
- if (SkyLogic::_scriptVariables[SPECIAL_ITEM] == itemNum)
+ if (Logic::_scriptVariables[SPECIAL_ITEM] == itemNum)
return;
- SkyLogic::_scriptVariables[SPECIAL_ITEM] = itemNum;
- if (SkyLogic::_scriptVariables[GET_OFF])
- _skyLogic->mouseScript(SkyLogic::_scriptVariables[GET_OFF], itemData);
- SkyLogic::_scriptVariables[GET_OFF] = itemData->mouseOff;
+ Logic::_scriptVariables[SPECIAL_ITEM] = itemNum;
+ if (Logic::_scriptVariables[GET_OFF])
+ _skyLogic->mouseScript(Logic::_scriptVariables[GET_OFF], itemData);
+ Logic::_scriptVariables[GET_OFF] = itemData->mouseOff;
if (itemData->mouseOn)
_skyLogic->mouseScript(itemData->mouseOn, itemData);
return;
@@ -257,35 +257,35 @@
if (*currentList == 0xFFFF) currentListNum = currentList[1];
} while (*currentList != 0);
- if (SkyLogic::_scriptVariables[SPECIAL_ITEM] != 0) {
- SkyLogic::_scriptVariables[SPECIAL_ITEM] = 0;
+ if (Logic::_scriptVariables[SPECIAL_ITEM] != 0) {
+ Logic::_scriptVariables[SPECIAL_ITEM] = 0;
- if (SkyLogic::_scriptVariables[GET_OFF])
- _skyLogic->script((uint16)SkyLogic::_scriptVariables[GET_OFF],(uint16)(SkyLogic::_scriptVariables[GET_OFF] >> 16));
- SkyLogic::_scriptVariables[GET_OFF] = 0;
+ if (Logic::_scriptVariables[GET_OFF])
+ _skyLogic->script((uint16)Logic::_scriptVariables[GET_OFF],(uint16)(Logic::_scriptVariables[GET_OFF] >> 16));
+ Logic::_scriptVariables[GET_OFF] = 0;
}
}
-void SkyMouse::buttonPressed(uint8 button) {
+void Mouse::buttonPressed(uint8 button) {
_mouseB = button;
}
-void SkyMouse::buttonEngine1(void) {
+void Mouse::buttonEngine1(void) {
//checks for clicking on special item
//"compare the size of this routine to S1 mouse_button"
if (_mouseB) { //anything pressed?
- SkyLogic::_scriptVariables[BUTTON] = _mouseB;
- if (SkyLogic::_scriptVariables[SPECIAL_ITEM]) { //over anything?
- Compact *item = SkyEngine::fetchCompact(SkyLogic::_scriptVariables[SPECIAL_ITEM]);
+ Logic::_scriptVariables[BUTTON] = _mouseB;
+ if (Logic::_scriptVariables[SPECIAL_ITEM]) { //over anything?
+ Compact *item = SkyEngine::fetchCompact(Logic::_scriptVariables[SPECIAL_ITEM]);
if (item->mouseClick)
_skyLogic->mouseScript(item->mouseClick, item);
}
}
}
-uint16 SkyMouse::findMouseCursor(uint32 itemNum) {
+uint16 Mouse::findMouseCursor(uint32 itemNum) {
uint8 cnt;
for (cnt = 0; cnt < NO_MAIN_OBJECTS; cnt++) {
@@ -301,13 +301,13 @@
return 0;
}
-void SkyMouse::fnOpenCloseHand(bool open) {
+void Mouse::fnOpenCloseHand(bool open) {
- if ((!open) && (!SkyLogic::_scriptVariables[OBJECT_HELD])) {
+ if ((!open) && (!Logic::_scriptVariables[OBJECT_HELD])) {
spriteMouse(1, 0, 0);
return;
}
- uint16 cursor = findMouseCursor(SkyLogic::_scriptVariables[OBJECT_HELD]) << 1;
+ uint16 cursor = findMouseCursor(Logic::_scriptVariables[OBJECT_HELD]) << 1;
if (open)
cursor++;
@@ -321,7 +321,7 @@
spriteMouse(0, 5, 5);
}
-bool SkyMouse::wasClicked(void) {
+bool Mouse::wasClicked(void) {
if (_logicClick) {
_logicClick = false;
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mouse.h 3 Jan 2004 01:58:57 -0000 1.22
+++ mouse.h 3 Jan 2004 15:57:56 -0000 1.23
@@ -29,15 +29,15 @@
namespace Sky {
-class SkyDisk;
-class SkyLogic;
+class Disk;
+class Logic;
-class SkyMouse {
+class Mouse {
public:
- SkyMouse(OSystem *system, SkyDisk *skyDisk);
- ~SkyMouse(void);
+ Mouse(OSystem *system, Disk *skyDisk);
+ ~Mouse(void);
void mouseEngine(uint16 mouseX, uint16 mouseY);
void replaceMouseCursors(uint16 fileNo);
@@ -50,7 +50,7 @@
void restoreMouseData(uint16 frameNum);
void drawNewMouse(void);
void spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY);
- void useLogicInstance(SkyLogic *skyLogic) { _skyLogic = skyLogic; };
+ void useLogicInstance(Logic *skyLogic) { _skyLogic = skyLogic; };
void buttonPressed(uint8 button);
void waitMouseNotPressed(void);
uint16 giveMouseX(void) { return _mouseX; };
@@ -80,8 +80,8 @@
static uint32 _mouseLincObjects[21];
OSystem *_system;
- SkyDisk *_skyDisk;
- SkyLogic *_skyLogic;
+ Disk *_skyDisk;
+ Logic *_skyLogic;
};
} // End of namespace Sky
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- screen.cpp 3 Jan 2004 01:58:57 -0000 1.54
+++ screen.cpp 3 Jan 2004 15:57:56 -0000 1.55
@@ -30,7 +30,7 @@
namespace Sky {
-uint8 SkyScreen::_top16Colours[16*3] = {
+uint8 Screen::_top16Colours[16*3] = {
0, 0, 0,
38, 38, 38,
63, 63, 63,
@@ -49,7 +49,7 @@
63, 63, 63
};
-SkyScreen::SkyScreen(OSystem *pSystem, SkyDisk *pDisk) {
+Screen::Screen(OSystem *pSystem, Disk *pDisk) {
_system = pSystem;
_skyDisk = pDisk;
@@ -84,13 +84,13 @@
_seqInfo.running = false;
}
-SkyScreen::~SkyScreen(void) {
+Screen::~Screen(void) {
free(_gameGrid);
if (_currentScreen) free(_currentScreen);
}
-void SkyScreen::clearScreen(void) {
+void Screen::clearScreen(void) {
memset(_currentScreen, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
_system->copy_rect(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
@@ -98,14 +98,14 @@
}
//set a new palette, pal is a pointer to dos vga rgb components 0..63
-void SkyScreen::setPalette(uint8 *pal) {
+void Screen::setPalette(uint8 *pal) {
convertPalette(pal, _palette);
_system->set_palette(_palette, 0, GAME_COLOURS);
_system->update_screen();
}
-void SkyScreen::setPaletteEndian(uint8 *pal) {
+void Screen::setPaletteEndian(uint8 *pal) {
#ifdef SCUMM_BIG_ENDIAN
uint8 endPalette[256 * 3];
@@ -119,7 +119,7 @@
_system->update_screen();
}
-void SkyScreen::halvePalette(void) {
+void Screen::halvePalette(void) {
uint8 halfPalette[1024];
for (uint8 cnt = 0; cnt < GAME_COLOURS; cnt++) {
@@ -131,31 +131,31 @@
_system->set_palette(halfPalette, 0, GAME_COLOURS);
}
-void SkyScreen::setPalette(uint16 fileNum) {
+void Screen::setPalette(uint16 fileNum) {
uint8 *tmpPal = _skyDisk->loadFile(fileNum, NULL);
if (tmpPal) {
setPalette(tmpPal);
free(tmpPal);
- } else warning("SkyScreen::setPalette: can't load file nr. %d",fileNum);
+ } else warning("Screen::setPalette: can't load file nr. %d",fileNum);
}
-void SkyScreen::showScreen(uint16 fileNum) {
+void Screen::showScreen(uint16 fileNum) {
if (_currentScreen) free(_currentScreen);
_currentScreen = _skyDisk->loadFile(fileNum, NULL);
if (_currentScreen) showScreen(_currentScreen);
- else warning("SkyScreen::showScreen: can't load file nr. %d",fileNum);
+ else warning("Screen::showScreen: can't load file nr. %d",fileNum);
}
-void SkyScreen::showScreen(uint8 *pScreen) {
+void Screen::showScreen(uint8 *pScreen) {
_system->copy_rect(pScreen, 320, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
_system->update_screen();
}
-void SkyScreen::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0..63 rgb to 4byte 0..255 rgbx
+void Screen::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0..63 rgb to 4byte 0..255 rgbx
int i;
@@ -167,14 +167,14 @@
}
}
-void SkyScreen::recreate(void) {
+void Screen::recreate(void) {
// check the game grid for changed blocks
- if (!SkyLogic::_scriptVariables[LAYER_0_ID]) return ;
+ if (!Logic::_scriptVariables[LAYER_0_ID]) return ;
uint8 *gridPos = _gameGrid;
- uint8 *screenData = (uint8 *)SkyEngine::fetchItem(SkyLogic::_scriptVariables[LAYER_0_ID]);
+ uint8 *screenData = (uint8 *)SkyEngine::fetchItem(Logic::_scriptVariables[LAYER_0_ID]);
if (!screenData) {
- error("SkyScreen::recreate():\nSkyEngine::fetchItem(SkyLogic::_scriptVariables[LAYER_0_ID](%X)) returned NULL",SkyLogic::_scriptVariables[LAYER_0_ID]);
+ error("Screen::recreate():\nSkyEngine::fetchItem(Logic::_scriptVariables[LAYER_0_ID](%X)) returned NULL",Logic::_scriptVariables[LAYER_0_ID]);
}
uint8 *screenPos = _currentScreen;
@@ -200,7 +200,7 @@
}
}
-void SkyScreen::flip(bool doUpdate) {
+void Screen::flip(bool doUpdate) {
uint32 copyX, copyWidth;
copyX = copyWidth = 0;
@@ -224,7 +224,7 @@
_system->update_screen();
}
-void SkyScreen::fnDrawScreen(uint32 palette, uint32 scroll) {
+void Screen::fnDrawScreen(uint32 palette, uint32 scroll) {
// set up the new screen
fnFadeDown(scroll);
@@ -235,7 +235,7 @@
fnFadeUp(palette, scroll);
}
-void SkyScreen::fnFadeDown(uint32 scroll) {
+void Screen::fnFadeDown(uint32 scroll) {
if (scroll && (!(SkyEngine::_systemVars.systemFlags & SF_NO_SCROLL))) {
// scrolling is performed by fnFadeUp. It's just prepared here
@@ -254,7 +254,7 @@
}
}
-void SkyScreen::palette_fadedown_helper(uint32 *pal, uint num) {
+void Screen::palette_fadedown_helper(uint32 *pal, uint num) {
byte *p = (byte *)pal;
do {
@@ -274,16 +274,16 @@
} while (--num);
}
-void SkyScreen::paletteFadeUp(uint16 fileNr) {
+void Screen::paletteFadeUp(uint16 fileNr) {
uint8 *pal = _skyDisk->loadFile(fileNr, NULL);
if (pal) {
paletteFadeUp(pal);
free(pal);
- } else warning("SkyScreen::paletteFadeUp: Can't load palette #%d",fileNr);
+ } else warning("Screen::paletteFadeUp: Can't load palette #%d",fileNr);
}
-void SkyScreen::paletteFadeUp(uint8 *pal) {
+void Screen::paletteFadeUp(uint8 *pal) {
byte tmpPal[1024];
@@ -301,7 +301,7 @@
}
}
-void SkyScreen::fnFadeUp(uint32 palNum, uint32 scroll) {
+void Screen::fnFadeUp(uint32 palNum, uint32 scroll) {
//_currentScreen points to new screen,
//_scrollScreen points to graphic showing old room
@@ -312,7 +312,7 @@
if ((scroll == 0) || (SkyEngine::_systemVars.systemFlags & SF_NO_SCROLL)) {
uint8 *palette = (uint8 *)SkyEngine::fetchCompact(palNum);
if (palette == NULL)
- error("SkyScreen::fnFadeUp: can't fetch compact %X", palNum);
+ error("Screen::fnFadeUp: can't fetch compact %X", palNum);
#ifdef SCUMM_BIG_ENDIAN
byte tmpPal[256 * 3];
for (uint16 cnt = 0; cnt < 256*3; cnt++)
@@ -323,8 +323,8 @@
#endif
} else if (scroll == 123) {
// scroll left (going right)
- if (!_currentScreen) error("SkyScreen::fnFadeUp[Scroll L]: _currentScreen is NULL");
- if (!_scrollScreen) error("SkyScreen::fnFadeUp[Scroll L]: _scrollScreen is NULL");
+ if (!_currentScreen) error("Screen::fnFadeUp[Scroll L]: _currentScreen is NULL");
+ if (!_scrollScreen) error("Screen::fnFadeUp[Scroll L]: _scrollScreen is NULL");
uint8 *scrNewPtr, *scrOldPtr;
for (uint8 scrollCnt = 0; scrollCnt < (GAME_SCREEN_WIDTH / SCROLL_JUMP) - 1; scrollCnt++) {
scrNewPtr = _currentScreen + scrollCnt * SCROLL_JUMP;
@@ -342,8 +342,8 @@
free(_scrollScreen);
} else if (scroll == 321) {
// scroll right (going left)
- if (!_currentScreen) error("SkyScreen::fnFadeUp[Scroll R]: _currentScreen is NULL");
- if (!_scrollScreen) error("SkyScreen::fnFadeUp[Scroll R]: _scrollScreen is NULL");
+ if (!_currentScreen) error("Screen::fnFadeUp[Scroll R]: _currentScreen is NULL");
+ if (!_scrollScreen) error("Screen::fnFadeUp[Scroll R]: _scrollScreen is NULL");
uint8 *scrNewPtr, *scrOldPtr;
for (uint8 scrollCnt = 0; scrollCnt < (GAME_SCREEN_WIDTH / SCROLL_JUMP) - 1; scrollCnt++) {
scrNewPtr = _currentScreen + GAME_SCREEN_WIDTH - (scrollCnt + 1) * SCROLL_JUMP;
@@ -362,7 +362,7 @@
}
}
-void SkyScreen::waitForTimer(void) {
+void Screen::waitForTimer(void) {
_gotTick = false;
while (!_gotTick) {
@@ -373,7 +373,7 @@
}
}
-void SkyScreen::waitForSequence(void) {
+void Screen::waitForSequence(void) {
while (_seqInfo.running) {
OSystem::Event event;
@@ -382,14 +382,14 @@
}
}
-void SkyScreen::handleTimer(void) {
+void Screen::handleTimer(void) {
_gotTick = true;
if (_seqInfo.running)
processSequence();
}
-void SkyScreen::startSequence(uint16 fileNum) {
+void Screen::startSequence(uint16 fileNum) {
_seqInfo.seqData = _skyDisk->loadFile(fileNum, NULL);
_seqInfo.framesLeft = _seqInfo.seqData[0];
@@ -399,7 +399,7 @@
_seqInfo.runningItem = false;
}
-void SkyScreen::startSequenceItem(uint16 itemNum) {
+void Screen::startSequenceItem(uint16 itemNum) {
_seqInfo.seqData = (uint8 *)SkyEngine::fetchItem(itemNum);
_seqInfo.framesLeft = _seqInfo.seqData[0] - 1;
@@ -409,7 +409,7 @@
_seqInfo.runningItem = true;
}
-void SkyScreen::stopSequence() {
+void Screen::stopSequence() {
_seqInfo.running = false;
waitForTimer();
@@ -419,7 +419,7 @@
_seqInfo.seqData = _seqInfo.seqDataPos = NULL;
}
-void SkyScreen::processSequence(void) {
+void Screen::processSequence(void) {
uint32 screenPos = 0;
@@ -495,24 +495,24 @@
//- sprites.asm routines
-void SkyScreen::spriteEngine(void) {
+void Screen::spriteEngine(void) {
doSprites(BACK);
sortSprites();
doSprites(FORE);
}
-void SkyScreen::sortSprites(void) {
+void Screen::sortSprites(void) {
StSortList sortList[30];
uint32 currDrawList = DRAW_LIST_NO;
uint32 loadDrawList;
bool nextDrawList = false;
- while (SkyLogic::_scriptVariables[currDrawList]) {
+ while (Logic::_scriptVariables[currDrawList]) {
// big_sort_loop
uint32 spriteCnt = 0;
- loadDrawList = SkyLogic::_scriptVariables[currDrawList];
+ loadDrawList = Logic::_scriptVariables[currDrawList];
currDrawList++;
do { // a_new_draw_list:
@@ -526,7 +526,7 @@
// process_this_id:
Compact *spriteComp = SkyEngine::fetchCompact(drawListData[0]);
if ((spriteComp->status & 4) && // is it sortable playfield?(!?!)
- (spriteComp->screen == SkyLogic::_scriptVariables[SCREEN])) { // on current screen
+ (spriteComp->screen == Logic::_scriptVariables[SCREEN])) { // on current screen
dataFileHeader *spriteData =
(dataFileHeader *)SkyEngine::fetchItem(spriteComp->frame >> 6);
if (!spriteData) {
@@ -569,13 +569,13 @@
}
}
-void SkyScreen::doSprites(uint8 layer) {
+void Screen::doSprites(uint8 layer) {
uint16 drawListNum = DRAW_LIST_NO;
uint32 idNum;
uint16* drawList;
- while (SkyLogic::_scriptVariables[drawListNum]) { // std sp loop
- idNum = SkyLogic::_scriptVariables[drawListNum];
+ while (Logic::_scriptVariables[drawListNum]) { // std sp loop
+ idNum = Logic::_scriptVariables[drawListNum];
drawListNum++;
drawList = (uint16 *)SkyEngine::fetchCompact(idNum);
@@ -587,7 +587,7 @@
Compact *spriteData = SkyEngine::fetchCompact(drawList[0]);
drawList++;
if ((spriteData->status & (1 << layer)) &&
- (spriteData->screen == SkyLogic::_scriptVariables[SCREEN])) {
+ (spriteData->screen == Logic::_scriptVariables[SCREEN])) {
uint8 *toBeDrawn = (uint8 *)SkyEngine::fetchItem(spriteData->frame >> 6);
if (!toBeDrawn) {
debug(9, "Spritedata %d not loaded", spriteData->frame >> 6);
@@ -606,10 +606,10 @@
}
}
-void SkyScreen::drawSprite(uint8 *spriteInfo, Compact *sprCompact) {
+void Screen::drawSprite(uint8 *spriteInfo, Compact *sprCompact) {
if (spriteInfo == NULL) {
- warning("SkyScreen::drawSprite Can't draw sprite. Data %d was not loaded", sprCompact->frame >> 6);
+ warning("Screen::drawSprite Can't draw sprite. Data %d was not loaded", sprCompact->frame >> 6);
sprCompact->status = 0;
return ;
}
@@ -670,7 +670,7 @@
return;
}
if ((_sprX + _sprWidth > 320) || (_sprY + _sprHeight > 192)) {
- warning("SkyScreen::drawSprite fatal error: got x = %d, y = %d, w = %d, h = %d",_sprX, _sprY, _sprWidth, _sprHeight);
+ warning("Screen::drawSprite fatal error: got x = %d, y = %d, w = %d, h = %d",_sprX, _sprY, _sprWidth, _sprHeight);
_sprWidth = 0;
return ;
}
@@ -694,7 +694,7 @@
_sprHeight -= _sprY;
}
-void SkyScreen::vectorToGame(uint8 gridVal) {
+void Screen::vectorToGame(uint8 gridVal) {
if (_sprWidth == 0) return ;
uint8 *trgGrid = _gameGrid + _sprY * GRID_X +_sprX;
@@ -705,14 +705,14 @@
}
}
-void SkyScreen::vertMaskSub(uint16 *grid, uint32 gridOfs, uint8 *screenPtr, uint32 layerId) {
+void Screen::vertMaskSub(uint16 *grid, uint32 gridOfs, uint8 *screenPtr, uint32 layerId) {
for (uint32 cntx = 0; cntx < _sprHeight; cntx++) { // start_x | block_loop
if (grid[gridOfs]) {
if (!(FROM_LE_16(grid[gridOfs]) & 0x8000)) {
uint32 gridVal = FROM_LE_16(grid[gridOfs]) - 1;
gridVal *= GRID_W * GRID_H;
- uint8 *dataSrc = (uint8 *)SkyEngine::fetchItem(SkyLogic::_scriptVariables[layerId]) + gridVal;
+ uint8 *dataSrc = (uint8 *)SkyEngine::fetchItem(Logic::_scriptVariables[layerId]) + gridVal;
uint8 *dataTrg = screenPtr;
for (uint32 grdCntY = 0; grdCntY < GRID_H; grdCntY++) {
for (uint32 grdCntX = 0; grdCntX < GRID_W; grdCntX++)
@@ -727,7 +727,7 @@
} // next_x
}
-void SkyScreen::verticalMask(void) {
+void Screen::verticalMask(void) {
if (_sprWidth == 0) return ;
uint32 startGridOfs = (_sprY + _sprHeight - 1) * GRID_X + _sprX;
@@ -738,9 +738,9 @@
uint8 *screenPtr = startScreenPtr;
for (uint32 widCnt = 0; widCnt < _sprWidth; widCnt++) { // x_loop
uint32 nLayerCnt = layerCnt;
- while (SkyLogic::_scriptVariables[nLayerCnt + 3]) {
+ while (Logic::_scriptVariables[nLayerCnt + 3]) {
uint16 *scrGrid;
- scrGrid = (uint16 *)SkyEngine::fetchItem(SkyLogic::_scriptVariables[layerCnt + 3]);
+ scrGrid = (uint16 *)SkyEngine::fetchItem(Logic::_scriptVariables[layerCnt + 3]);
if (scrGrid[gridOfs]) {
vertMaskSub(scrGrid, gridOfs, screenPtr, layerCnt);
break;
@@ -753,7 +753,7 @@
}
}
-void SkyScreen::paintBox(uint16 x, uint16 y) {
+void Screen::paintBox(uint16 x, uint16 y) {
uint8 *screenPos = _currentScreen + y * GAME_SCREEN_WIDTH + x;
memset(screenPos, 255, 8);
@@ -764,7 +764,7 @@
memset(screenPos + 7 * GAME_SCREEN_WIDTH, 255, 7);
}
-void SkyScreen::showGrid(uint8 *gridBuf) {
+void Screen::showGrid(uint8 *gridBuf) {
uint32 gridData = 0;
uint8 bitsLeft = 0;
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- screen.h 3 Jan 2004 01:58:57 -0000 1.17
+++ screen.h 3 Jan 2004 15:57:56 -0000 1.18
@@ -30,7 +30,7 @@
namespace Sky {
-class SkyDisk;
+class Disk;
class SkyEngine;
struct Compact;
struct dataFileHeader;
@@ -49,10 +49,10 @@
dataFileHeader *sprite;
} StSortList;
-class SkyScreen {
+class Screen {
public:
- SkyScreen(OSystem *pSystem, SkyDisk *pDisk);
- ~SkyScreen(void);
+ Screen(OSystem *pSystem, Disk *pDisk);
+ ~Screen(void);
void setPalette(uint8 *pal);
void setPaletteEndian(uint8 *pal);
void setPalette(uint16 fileNum);
@@ -89,7 +89,7 @@
private:
OSystem *_system;
- SkyDisk *_skyDisk;
+ Disk *_skyDisk;
static uint8 _top16Colours[16*3];
uint8 _palette[1024];
uint32 _currentPalette;
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- sky.cpp 3 Jan 2004 01:58:57 -0000 1.136
+++ sky.cpp 3 Jan 2004 15:57:56 -0000 1.137
@@ -157,18 +157,18 @@
switch(num) {
case 1: warning("executed cheat: get jammer");
- SkyLogic::_scriptVariables[258] = 42; // got_jammer
- SkyLogic::_scriptVariables[240] = 69; // got_sponsor
+ Logic::_scriptVariables[258] = 42; // got_jammer
+ Logic::_scriptVariables[240] = 69; // got_sponsor
break;
case 2: warning("executed cheat: computer room");
- SkyLogic::_scriptVariables[479] = 2; // card_status
- SkyLogic::_scriptVariables[480] = 1; // card_fix
+ Logic::_scriptVariables[479] = 2; // card_status
+ Logic::_scriptVariables[480] = 1; // card_fix
break;
case 3: warning("executed cheat: get to burke");
- SkyLogic::_scriptVariables[190] = 42; // knows_port
+ Logic::_scriptVariables[190] = 42; // knows_port
break;
case 4: warning("executed cheat: get to reactor section");
- SkyLogic::_scriptVariables[451] = 42; // foreman_friend
+ Logic::_scriptVariables[451] = 42; // foreman_friend
_skyLogic->fnSendSync(8484, 1, 0); // send sync to RAD suit (put in locker)
_skyLogic->fnKillId(ID_ANITA_SPY, 0, 0); // stop anita from getting to you
break;
@@ -208,7 +208,7 @@
bool introSkipped = false;
if (!_quickLaunch) {
if (_systemVars.gameVersion > 267) {// don't do intro for floppydemos
- _skyIntro = new SkyIntro(_skyDisk, _skyScreen, _skyMusic, _skySound, _skyText, _mixer, _system);
+ _skyIntro = new Intro(_skyDisk, _skyScreen, _skyMusic, _skySound, _skyText, _mixer, _system);
introSkipped = !_skyIntro->doIntro(_floppyIntro);
if (_skyIntro->_quitProg) {
delete _skyIntro;
@@ -253,21 +253,21 @@
}
void SkyEngine::initialise(void) {
- _skyDisk = new SkyDisk(_gameDataPath);
- _skySound = new SkySound(_mixer, _skyDisk, ConfMan.getInt("sfx_volume"));
+ _skyDisk = new Disk(_gameDataPath);
+ _skySound = new Sound(_mixer, _skyDisk, ConfMan.getInt("sfx_volume"));
_systemVars.gameVersion = _skyDisk->determineGameVersion();
int midiDriver = GameDetector::detectMusicDriver(MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE);
if (midiDriver == MD_ADLIB) {
_systemVars.systemFlags |= SF_SBLASTER;
- _skyMusic = new SkyAdlibMusic(_mixer, _skyDisk, _system);
+ _skyMusic = new AdlibMusic(_mixer, _skyDisk, _system);
} else {
_systemVars.systemFlags |= SF_ROLAND;
if (ConfMan.getBool("native_mt32"))
- _skyMusic = new SkyMT32Music(GameDetector::createMidi(midiDriver), _skyDisk, _system);
+ _skyMusic = new MT32Music(GameDetector::createMidi(midiDriver), _skyDisk, _system);
else
- _skyMusic = new SkyGmMusic(GameDetector::createMidi(midiDriver), _skyDisk, _system);
+ _skyMusic = new GmMusic(GameDetector::createMidi(midiDriver), _skyDisk, _system);
}
if (isCDVersion()) {
@@ -286,20 +286,20 @@
_systemVars.systemFlags |= SF_PLAY_VOCS;
_systemVars.gameSpeed = 50;
- _skyText = new SkyText(_skyDisk);
- _skyMouse = new SkyMouse(_system, _skyDisk);
- _skyScreen = new SkyScreen(_system, _skyDisk);
+ _skyText = new Text(_skyDisk);
+ _skyMouse = new Mouse(_system, _skyDisk);
+ _skyScreen = new Screen(_system, _skyDisk);
initVirgin();
initItemList();
loadFixedItems();
- _skyLogic = new SkyLogic(_skyScreen, _skyDisk, _skyText, _skyMusic, _skyMouse, _skySound);
+ _skyLogic = new Logic(_skyScreen, _skyDisk, _skyText, _skyMusic, _skyMouse, _skySound);
_skyMouse->useLogicInstance(_skyLogic);
// initialize timer *after* _skyScreen has been initialized.
_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
- _skyControl = new SkyControl(_skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _skySound, _system, getSavePath());
+ _skyControl = new Control(_skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _skySound, _system, getSavePath());
_skyLogic->useControlInstance(_skyControl);
if (_systemVars.gameVersion == 288)
@@ -427,7 +427,7 @@
}
Compact *SkyEngine::fetchCompact(uint32 a) {
- SkyDebug::fetchCompact(a);
+ Debug::fetchCompact(a);
uint32 sectionNum = (a & 0xf000) >> 12;
uint32 compactNum = (a & 0x0fff);
Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sky.h 3 Jan 2004 01:58:57 -0000 1.56
+++ sky.h 3 Jan 2004 15:57:56 -0000 1.57
@@ -42,15 +42,15 @@
};
struct Compact;
-class SkySound;
-class SkyDisk;
-class SkyText;
-class SkyLogic;
-class SkyMouse;
-class SkyScreen;
-class SkyControl;
-class SkyMusicBase;
-class SkyIntro;
+class Sound;
+class Disk;
+class Text;
+class Logic;
+class Mouse;
+class Screen;
+class Control;
+class MusicBase;
+class Intro;
class SkyEngine : public Engine {
void errorString(const char *buf_input, char *buf_output);
@@ -69,16 +69,16 @@
int _sdl_mouse_x, _sdl_mouse_y;
- SkySound *_skySound;
- SkyDisk *_skyDisk;
- SkyText *_skyText;
- SkyLogic *_skyLogic;
- SkyMouse *_skyMouse;
- SkyScreen *_skyScreen;
- SkyControl *_skyControl;
+ Sound *_skySound;
+ Disk *_skyDisk;
+ Text *_skyText;
+ Logic *_skyLogic;
+ Mouse *_skyMouse;
+ Screen *_skyScreen;
+ Control *_skyControl;
- SkyMusicBase *_skyMusic;
- SkyIntro *_skyIntro;
+ MusicBase *_skyMusic;
+ Intro *_skyIntro;
public:
SkyEngine(GameDetector *detector, OSystem *syst);
@@ -105,7 +105,7 @@
uint32 _lastSaveTime;
- SkyText *getSkyText();
+ Text *getText();
void initialise();
void initItemList();
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- sound.cpp 3 Jan 2004 01:58:57 -0000 1.44
+++ sound.cpp 3 Jan 2004 15:57:56 -0000 1.45
@@ -54,7 +54,7 @@
#pragma END_PACK_STRUCTS
#endif
-uint16 SkySound::_speechConvertTable[8] = {
+uint16 Sound::_speechConvertTable[8] = {
0, //;Text numbers to file numbers
600, //; 553 lines in section 0
600+500, //; 488 lines in section 1
@@ -1010,14 +1010,14 @@
&fx_25_weld // 394 my anchor weld bodge
};
-SfxQueue SkySound::_sfxQueue[MAX_QUEUED_FX] = {
+SfxQueue Sound::_sfxQueue[MAX_QUEUED_FX] = {
{ 0, 0, 0, 0},
{ 0, 0, 0, 0},
{ 0, 0, 0, 0},
{ 0, 0, 0, 0}
};
-SkySound::SkySound(SoundMixer *mixer, SkyDisk *pDisk, uint8 pVolume) {
+Sound::Sound(SoundMixer *mixer, Disk *pDisk, uint8 pVolume) {
_skyDisk = pDisk;
_soundData = NULL;
_mixer = mixer;
@@ -1025,13 +1025,13 @@
_mainSfxVolume = pVolume;
}
-SkySound::~SkySound(void) {
+Sound::~Sound(void) {
_mixer->stopAll();
if (_soundData) free(_soundData);
}
-void SkySound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle) {
+void Sound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle) {
byte flags = 0;
flags |= SoundMixer::FLAG_UNSIGNED|SoundMixer::FLAG_AUTOFREE;
@@ -1043,7 +1043,7 @@
_mixer->playRaw(handle, buffer, size, 11025, flags, id);
}
-void SkySound::loadSection(uint8 pSection) {
+void Sound::loadSection(uint8 pSection) {
fnStopFx();
_mixer->stopAll();
@@ -1076,7 +1076,7 @@
_sfxQueue[cnt].count = 0;
}
-void SkySound::playSound(uint16 sound, uint16 volume, uint8 channel) {
+void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) {
if (channel == 0)
_mixer->stopID(SOUND_CH0);
@@ -1084,12 +1084,12 @@
_mixer->stopID(SOUND_CH1);
if (!_soundData) {
- warning("SkySound::playSound(%04X, %04X) called with a section having been loaded", sound, volume);
+ warning("Sound::playSound(%04X, %04X) called with a section having been loaded", sound, volume);
return;
}
if (sound > _soundsTotal) {
- debug(5, "SkySound::playSound %d ignored, only %d sfx in file", sound, _soundsTotal);
+ debug(5, "Sound::playSound %d ignored, only %d sfx in file", sound, _soundsTotal);
return ;
}
@@ -1120,13 +1120,13 @@
_mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH1, volume, 0, loopSta, loopEnd);
}
-void SkySound::fnStartFx(uint32 sound, uint8 channel) {
+void Sound::fnStartFx(uint32 sound, uint8 channel) {
_saveSounds[channel] = 0xFFFF;
if (sound < 256 || sound > MAX_FX_NUMBER || (SkyEngine::_systemVars.systemFlags & SF_FX_OFF))
return;
- uint8 screen = (uint8)(SkyLogic::_scriptVariables[SCREEN] & 0xff);
+ uint8 screen = (uint8)(Logic::_scriptVariables[SCREEN] & 0xff);
if (sound == 278 && screen == 25) // is this weld in room 25
sound= 394;
@@ -1173,7 +1173,7 @@
playSound(sfx->soundNo, volume, channel);
}
-void SkySound::checkFxQueue(void) {
+void Sound::checkFxQueue(void) {
for (uint8 cnt = 0; cnt < MAX_QUEUED_FX; cnt++) {
if (_sfxQueue[cnt].count) {
_sfxQueue[cnt].count--;
@@ -1183,7 +1183,7 @@
}
}
-void SkySound::restoreSfx(void) {
+void Sound::restoreSfx(void) {
// queue sfx, so they will be started when the player exits the control panel
memset(_sfxQueue, 0, sizeof(_sfxQueue));
@@ -1203,17 +1203,17 @@
}
}
-void SkySound::fnStopFx(void) {
+void Sound::fnStopFx(void) {
_mixer->stopID(SOUND_CH0);
_mixer->stopID(SOUND_CH1);
_saveSounds[0] = _saveSounds[1] = 0xFFFF;
}
-void SkySound::stopSpeech(void) {
+void Sound::stopSpeech(void) {
_mixer->stopID(SOUND_SPEECH);
}
-bool SkySound::startSpeech(uint16 textNum) {
+bool Sound::startSpeech(uint16 textNum) {
if (!(SkyEngine::_systemVars.systemFlags & SF_ALLOW_SPEECH))
return false;
@@ -1236,13 +1236,13 @@
return true;
}
-void SkySound::fnPauseFx(void) {
+void Sound::fnPauseFx(void) {
_mixer->pauseID(SOUND_CH0, true);
_mixer->pauseID(SOUND_CH1, true);
}
-void SkySound::fnUnPauseFx(void) {
+void Sound::fnUnPauseFx(void) {
_mixer->pauseID(SOUND_CH0, false);
_mixer->pauseID(SOUND_CH1, false);
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sound.h 3 Jan 2004 01:58:57 -0000 1.23
+++ sound.h 3 Jan 2004 15:57:56 -0000 1.24
@@ -28,7 +28,7 @@
namespace Sky {
-class SkyDisk;
+class Disk;
enum {
SOUND_CH0 = 0,
@@ -44,7 +44,7 @@
#define MAX_QUEUED_FX 4
-class SkySound {
+class Sound {
protected:
public:
@@ -62,8 +62,8 @@
void playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle *handle);
public:
- SkySound(SoundMixer *mixer, SkyDisk *pDisk, uint8 pVolume);
- ~SkySound(void);
+ Sound(SoundMixer *mixer, Disk *pDisk, uint8 pVolume);
+ ~Sound(void);
void loadSection(uint8 pSection);
void playSound(uint16 sound, uint16 volume, uint8 channel);
@@ -79,7 +79,7 @@
uint8 _soundsTotal;
private:
- SkyDisk *_skyDisk;
+ Disk *_skyDisk;
uint16 _sfxBaseOfs;
uint8 *_soundData;
uint8 *_sampleRates, *_sfxInfo;
Index: talks.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/talks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- talks.h 3 Jan 2004 01:58:57 -0000 1.3
+++ talks.h 3 Jan 2004 15:57:56 -0000 1.4
@@ -24,7 +24,7 @@
namespace Sky {
-namespace SkyTalkAnims {
+namespace TalkAnims {
uint16 show_mag[] = {
68*64,
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- text.cpp 3 Jan 2004 01:58:57 -0000 1.58
+++ text.cpp 3 Jan 2004 15:57:56 -0000 1.59
@@ -36,7 +36,7 @@
#define CHAR_SET_HEADER 128
#define MAX_NO_LINES 10
-SkyText::SkyText(SkyDisk *skyDisk) {
+Text::Text(Disk *skyDisk) {
_skyDisk = skyDisk;
initHuffTree();
@@ -68,14 +68,14 @@
_preAfterTableArea = NULL;
}
-SkyText::~SkyText(void) {
+Text::~Text(void) {
if (_controlCharacterSet.addr) free(_controlCharacterSet.addr);
if (_linkCharacterSet.addr) free(_linkCharacterSet.addr);
if (_preAfterTableArea) free(_preAfterTableArea);
}
-void SkyText::patchChar(byte *charSetPtr, int width, int height, int c, const uint16 *data) {
+void Text::patchChar(byte *charSetPtr, int width, int height, int c, const uint16 *data) {
byte *ptr = charSetPtr + (CHAR_SET_HEADER + (height << 2) * c);
charSetPtr[c] = width;
@@ -88,7 +88,7 @@
}
}
-void SkyText::patchLINCCharset() {
+void Text::patchLINCCharset() {
// The LINC terminal charset looks strange in some cases. This
// function attempts to patch up the worst blemishes.
@@ -220,7 +220,7 @@
}
}
-void SkyText::fnSetFont(uint32 fontNr) {
+void Text::fnSetFont(uint32 fontNr) {
struct charSet *newCharSet;
@@ -244,19 +244,19 @@
_dtCharSpacing = newCharSet->charSpacing;
}
-void SkyText::fnTextModule(uint32 textInfoId, uint32 textNo) {
+void Text::fnTextModule(uint32 textInfoId, uint32 textNo) {
fnSetFont(1);
uint16* msgData = (uint16 *)SkyEngine::fetchCompact(textInfoId);
lowTextManager_t textId = lowTextManager(textNo, msgData[1], msgData[2], 209, false);
- SkyLogic::_scriptVariables[RESULT] = textId.compactNum;
+ Logic::_scriptVariables[RESULT] = textId.compactNum;
Compact *textCompact = SkyEngine::fetchCompact(textId.compactNum);
textCompact->xcood = msgData[3];
textCompact->ycood = msgData[4];
fnSetFont(0);
}
-void SkyText::getText(uint32 textNr) { //load text #"textNr" into textBuffer
+void Text::getText(uint32 textNr) { //load text #"textNr" into textBuffer
if (patchMessage(textNr))
return ;
@@ -329,12 +329,12 @@
} while(textChar);
}
-void SkyText::fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY) {
+void Text::fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY) {
Compact *ptrComp = SkyEngine::fetchCompact(pointedId);
lowTextManager_t text = lowTextManager(ptrComp->cursorText, TEXT_MOUSE_WIDTH, L_CURSOR, 242, false);
- SkyLogic::_scriptVariables[CURSOR_ID] = text.compactNum;
- if (SkyLogic::_scriptVariables[MENU]) {
+ Logic::_scriptVariables[CURSOR_ID] = text.compactNum;
+ if (Logic::_scriptVariables[MENU]) {
_mouseOfsY = TOP_LEFT_Y - 2;
if (mouseX < 150) _mouseOfsX = TOP_LEFT_X + 24;
else _mouseOfsX = TOP_LEFT_X - 8 - _lowTextWidth;
@@ -347,14 +347,14 @@
logicCursor(textCompact, mouseX, mouseY);
}
-void SkyText::logicCursor(Compact *textCompact, uint16 mouseX, uint16 mouseY) {
+void Text::logicCursor(Compact *textCompact, uint16 mouseX, uint16 mouseY) {
textCompact->xcood = (uint16)(mouseX + _mouseOfsX);
textCompact->ycood = (uint16)(mouseY + _mouseOfsY);
if (textCompact->ycood < TOP_LEFT_Y) textCompact->ycood = TOP_LEFT_Y;
}
-bool SkyText::getTBit() {
+bool Text::getTBit() {
if (_shiftBits) {
(_shiftBits)--;
@@ -366,12 +366,12 @@
return (bool)(((_inputValue) >> (_shiftBits)) & 1);
}
-displayText_t SkyText::displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
+displayText_t Text::displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
//Render text in _textBuffer in buffer *dest
return displayText(this->_textBuffer, dest, centre, pixelWidth, color);
}
-displayText_t SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
+displayText_t Text::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
//Render text pointed to by *textPtr in buffer *dest
@@ -489,7 +489,7 @@
return ret;
}
-void SkyText::makeGameCharacter(uint8 textChar, uint8 *charSetPtr, uint8 *&dest, uint8 color) {
+void Text::makeGameCharacter(uint8 textChar, uint8 *charSetPtr, uint8 *&dest, uint8 color) {
bool maskBit, dataBit;
uint8 charWidth = (uint8)((*(charSetPtr + textChar)) + 1 - _dtCharSpacing);
@@ -533,7 +533,7 @@
}
-lowTextManager_t SkyText::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre) {
+lowTextManager_t Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre) {
getText(textNum);
@@ -561,7 +561,7 @@
cpt->logic = logicNum;
cpt->status = ST_LOGIC | ST_FOREGROUND | ST_RECREATE;
- cpt->screen = (uint16) SkyLogic::_scriptVariables[SCREEN];
+ cpt->screen = (uint16) Logic::_scriptVariables[SCREEN];
struct lowTextManager_t ret;
ret.textData = _dtData;
@@ -570,7 +570,7 @@
return ret;
}
-void SkyText::changeTextSpriteColour(uint8 *sprData, uint8 newCol) {
+void Text::changeTextSpriteColour(uint8 *sprData, uint8 newCol) {
dataFileHeader *header = (dataFileHeader *)sprData;
sprData += sizeof(dataFileHeader);
@@ -578,7 +578,7 @@
if (sprData[cnt] >= 241) sprData[cnt] = newCol;
}
-void SkyText::initHuffTree() {
+void Text::initHuffTree() {
switch (SkyEngine::_systemVars.gameVersion) {
case 109:
_huffTree = _huffTree_00109;
@@ -612,7 +612,7 @@
}
}
-char SkyText::getTextChar() {
+char Text::getTextChar() {
int pos = 0;
for (;;) {
if (getTBit() == 0)
@@ -625,7 +625,7 @@
}
}
-bool SkyText::patchMessage(uint32 textNum) {
+bool Text::patchMessage(uint32 textNum) {
uint16 patchIdx = _patchLangIdx[SkyEngine::_systemVars.language];
uint16 patchNum = _patchLangNum[SkyEngine::_systemVars.language];
@@ -638,7 +638,7 @@
return false;
}
-const PatchMessage SkyText::_patchedMessages[NUM_PATCH_MSG] = {
+const PatchMessage Text::_patchedMessages[NUM_PATCH_MSG] = {
{ 28724, "Testo e Parlato" }, // - italian
{ 28707, "Solo Testo" },
{ 28693, "Solo Parlato" },
@@ -648,7 +648,7 @@
{ 28686, "Musikvolym" }
};
-const uint16 SkyText::_patchLangIdx[8] = {
+const uint16 Text::_patchLangIdx[8] = {
0xFFFF, // SKY_ENGLISH
0xFFFF, // SKY_GERMAN
0xFFFF, // SKY_FRENCH
@@ -659,7 +659,7 @@
0xFFFF // SKY_SPANISH
};
-const uint16 SkyText::_patchLangNum[8] = {
+const uint16 Text::_patchLangNum[8] = {
0, // SKY_ENGLISH
0, // SKY_GERMAN
0, // SKY_FRENCH
Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- text.h 3 Jan 2004 01:58:57 -0000 1.30
+++ text.h 3 Jan 2004 15:57:56 -0000 1.31
@@ -28,7 +28,7 @@
namespace Sky {
struct Compact;
-class SkyDisk;
+class Disk;
struct HuffTree {
unsigned char lChild;
@@ -43,10 +43,10 @@
char text[100];
};
-class SkyText {
+class Text {
public:
- SkyText(SkyDisk *skyDisk);
- ~SkyText(void);
+ Text(Disk *skyDisk);
+ ~Text(void);
void getText(uint32 textNr);
struct displayText_t displayText(uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
struct displayText_t displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
@@ -67,7 +67,7 @@
void patchLINCCharset();
bool patchMessage(uint32 textNum);
- SkyDisk *_skyDisk;
+ Disk *_skyDisk;
uint8 _inputValue;
uint8 _shiftBits;
uint8 *_textItemPtr;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.14,1.15 adlibchannel.h,1.8,1.9 adlibmusic.cpp,1.17,1.18 adlibmusic.h,1.8,1.9 gmchannel.cpp,1.14,1.15 gmchannel.h,1.8,1.9 gmmusic.cpp,1.16,1.17 gmmusic.h,1.9,1.10 mt32music.cpp,1.16,1.17 mt32music.h,1.7,1.8 musicbase.cpp,1.17,1.18 musicbase.h,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.95,1.96
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list