aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/lab/engine.cpp62
-rw-r--r--engines/lab/graphics.cpp12
-rw-r--r--engines/lab/interface.cpp4
-rw-r--r--engines/lab/intro.cpp2
-rw-r--r--engines/lab/lab.h12
-rw-r--r--engines/lab/map.cpp6
-rw-r--r--engines/lab/mouse.cpp6
-rw-r--r--engines/lab/music.cpp2
-rw-r--r--engines/lab/processroom.cpp6
-rw-r--r--engines/lab/readdiff.cpp8
-rw-r--r--engines/lab/special.cpp10
-rw-r--r--engines/lab/vga.cpp26
12 files changed, 78 insertions, 78 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 7d67241513..b7970ae171 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -516,7 +516,7 @@ bool LabEngine::doUse(uint16 CurInv) {
CurFileName = " ";
CPtr = NULL;
doMap(_roomNum);
- VGASetPal(initcolors, 8);
+ setPalette(initcolors, 8);
drawMessage(NULL);
drawPanel();
} else if (CurInv == JOURNALNUM) { /* LAB: Labyrinth specific */
@@ -623,7 +623,7 @@ void LabEngine::mainGameLoop() {
bool forceDraw = false, GotMessage = true;
- VGASetPal(initcolors, 8);
+ setPalette(initcolors, 8);
CPtr = NULL;
_roomNum = 1;
@@ -648,7 +648,7 @@ void LabEngine::mainGameLoop() {
/* Set up initial picture. */
while (1) {
- WSDL_ProcessInput(1);
+ processInput(true);
if (GotMessage) {
if (QuitLab || g_engine->shouldQuit()) {
@@ -663,7 +663,7 @@ void LabEngine::mainGameLoop() {
CPtr = NULL;
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
}
/* Sets the current picture properly on the screen */
@@ -699,7 +699,7 @@ void LabEngine::mainGameLoop() {
forceDraw = false;
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
if (!_followingCrumbs)
eatMessages();
@@ -708,7 +708,7 @@ void LabEngine::mainGameLoop() {
if (forceDraw) {
drawRoomMessage(curInv, CPtr);
forceDraw = false;
- WSDL_UpdateScreen();
+ screenUpdate();
}
}
@@ -736,14 +736,14 @@ void LabEngine::mainGameLoop() {
GotMessage = true;
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
if (!from_crumbs(GADGETUP, code, 0, WSDL_GetMousePos(), curInv, curMsg, forceDraw, code, actionMode))
break;
}
}
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else {
GotMessage = true;
@@ -803,7 +803,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
_numCrumbs = 0;
_droppingCrumbs = true;
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (code == 'f' || code == 'F' ||
code == 'r' || code == 'R') { /* Follow bread crumbs */
if (_droppingCrumbs) {
@@ -824,7 +824,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
interfaceOn(); /* Sets the correct gadget list */
drawPanel();
drawRoomMessage(curInv, CPtr);
- WSDL_UpdateScreen();
+ screenUpdate();
}
} else {
_breadCrumbs[0]._roomNum = 0;
@@ -832,7 +832,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
// Need to hide indicator!!!!
mayShowCrumbIndicatorOff();
- WSDL_UpdateScreen();
+ screenUpdate();
}
}
} else if ((code == 315) || (code == 'x') || (code == 'X')
@@ -889,7 +889,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
DoNotDrawMessage = false;
drawPanel();
drawRoomMessage(curInv, CPtr);
- WSDL_UpdateScreen();
+ screenUpdate();
}
} else if ((msgClass == GADGETUP) && !Alternate) {
if (gadgetId <= 5) {
@@ -900,7 +900,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
HCPtr = NULL;
CPtr = NULL;
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (gadgetId == 5) {
eatMessages();
@@ -921,7 +921,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
drawRoomMessage(curInv, CPtr);
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else {
Old = actionMode;
actionMode = gadgetId;
@@ -942,13 +942,13 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
else if (gadgetId == 4)
drawStaticMessage(kTextLookWhat);
- WSDL_UpdateScreen();
+ screenUpdate();
}
} else if (gadgetId == 9) {
doUse(MAPNUM);
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (gadgetId >= 6) { /* Arrow Gadgets */
CPtr = NULL;
HCPtr = NULL;
@@ -971,7 +971,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
forceDraw = true;
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (gadgetId == 7) {
OldRoomNum = _roomNum;
@@ -1035,7 +1035,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
}
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
}
}
} else if ((msgClass == GADGETUP) && Alternate) {
@@ -1052,7 +1052,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
drawPanel();
drawRoomMessage(curInv, CPtr);
- WSDL_UpdateScreen();
+ screenUpdate();
}
gadgetId--;
@@ -1076,13 +1076,13 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
if (doit) {
drawMessage("Disk operation failed.");
- VGASetPal(initcolors, 8);
+ setPalette(initcolors, 8);
- WSDL_UpdateScreen();
+ screenUpdate();
g_system->delayMillis(1000);
} else {
- WSDL_UpdateScreen();
+ screenUpdate();
}
} else if (gadgetId == 1) {
if (!doUse(curInv)) {
@@ -1095,7 +1095,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
drawStaticMessage(kTextUseOnWhat);
MainDisplay = true;
- WSDL_UpdateScreen();
+ screenUpdate();
}
} else if (gadgetId == 2) {
MainDisplay = !MainDisplay;
@@ -1111,27 +1111,27 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
Inventory[curInv].BInvName)
Test = getInvName(curInv);
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (gadgetId == 3) { /* Left gadget */
decIncInv(&curInv, true);
LastInv = curInv;
DoNotDrawMessage = false;
drawRoomMessage(curInv, CPtr);
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (gadgetId == 4) { /* Right gadget */
decIncInv(&curInv, false);
LastInv = curInv;
DoNotDrawMessage = false;
drawRoomMessage(curInv, CPtr);
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (gadgetId == 5) { /* bread crumbs */
_breadCrumbs[0]._roomNum = 0;
_numCrumbs = 0;
_droppingCrumbs = true;
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (gadgetId == 6) { /* follow crumbs */
if (_droppingCrumbs) {
if (_numCrumbs > 0) {
@@ -1150,14 +1150,14 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
interfaceOn(); /* Sets the correct gadget list */
drawPanel();
drawRoomMessage(curInv, CPtr);
- WSDL_UpdateScreen();
+ screenUpdate();
} else {
_breadCrumbs[0]._roomNum = 0;
_droppingCrumbs = false;
// Need to hide indicator!!!!
mayShowCrumbIndicatorOff();
- WSDL_UpdateScreen();
+ screenUpdate();
}
}
}
@@ -1230,7 +1230,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
}
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
} else if (msgClass == DELTAMOVE) {
VPtr = getViewData(_roomNum, Direction);
OldCPtr = VPtr->closeUps;
@@ -1278,7 +1278,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
drawRoomMessage(curInv, CPtr);
mayShowCrumbIndicator();
- WSDL_UpdateScreen();
+ screenUpdate();
}
return true;
}
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp
index 54bf8809d1..460d4d5864 100644
--- a/engines/lab/graphics.cpp
+++ b/engines/lab/graphics.cpp
@@ -465,7 +465,7 @@ void LabEngine::doScrollBlack() {
g_lab->setAPen(0);
g_lab->rectFill(0, nheight, width - 1, nheight + by - 1);
- g_lab->WSDL_UpdateScreen();
+ g_lab->screenUpdate();
if (!_isHiRes) {
if (nheight <= (height / 8))
@@ -530,7 +530,7 @@ void LabEngine::doScrollWipe(char *filename) {
IsBM = true;
readPict(filename, true);
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
IsBM = false;
mem = RawDiffBM.Planes[0];
@@ -552,7 +552,7 @@ void LabEngine::doScrollWipe(char *filename) {
copyPage(width, height, nheight, startline, mem);
- g_lab->WSDL_UpdateScreen();
+ g_lab->screenUpdate();
if (!nheight)
startline += by;
@@ -601,7 +601,7 @@ void LabEngine::doScrollBounce() {
startline -= newby[i];
copyPage(width, height, 0, startline, mem);
- g_lab->WSDL_UpdateScreen();
+ g_lab->screenUpdate();
g_lab->waitTOF();
}
@@ -610,7 +610,7 @@ void LabEngine::doScrollBounce() {
startline += newby1[i - 1];
copyPage(width, height, 0, startline, mem);
- g_lab->WSDL_UpdateScreen();
+ g_lab->screenUpdate();
g_lab->waitTOF();
}
@@ -675,7 +675,7 @@ void LabEngine::doTransWipe(CloseDataPtr *CPtr, char *filename) {
CurFileName = getPictName(CPtr);
byte *BitMapMem = readPictToMem(CurFileName, g_lab->_screenWidth, LastY + 5);
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
if (BitMapMem) {
ImSource.Width = g_lab->_screenWidth;
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index d9ea4595e8..a31e2894a8 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -155,8 +155,8 @@ Gadget *LabEngine::checkNumGadgetHit(Gadget *gadlist, uint16 key) {
/* Checks whether or not a key has been pressed. */
/*****************************************************************************/
static bool keyPress(uint16 *KeyCode) {
- if (g_lab->WSDL_HasNextChar()) {
- *KeyCode = g_lab->WSDL_GetNextChar();
+ if (g_lab->haveNextChar()) {
+ *KeyCode = g_lab->getNextChar();
return true;
}
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 7660b29a58..b556501b17 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -400,7 +400,7 @@ void Intro::introSequence() {
g_lab->_music->updateMusic();
g_lab->waitTOF();
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
g_lab-> waitTOF();
g_lab->waitTOF();
}
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index f403e4596d..7cca82512f 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -139,19 +139,19 @@ public:
void writeColorRegs(byte *buf, uint16 first, uint16 numreg);
byte *getVGABaseAddr();
void readScreenImage(Image *Im, uint16 x, uint16 y);
- void WSDL_UpdateScreen();
+ void screenUpdate();
void rectFill(uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void scrollDisplayX(int16 dx, uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void ghoastRect(uint16 pencolor, uint16 x1, uint16 y1, uint16 x2, uint16 y2);
void bltBitMap(Image *ImSource, uint16 xs, uint16 ys, Image *ImDest, uint16 xd, uint16 yd, uint16 width, uint16 height);
- void VGASetPal(void *cmap, uint16 numcolors);
+ void setPalette(void *cmap, uint16 numcolors);
void drawHLine(uint16 x, uint16 y1, uint16 y2);
void drawVLine(uint16 x1, uint16 y, uint16 x2);
void drawImage(Image *Im, uint16 x, uint16 y);
- bool WSDL_HasNextChar();
- uint16 WSDL_GetNextChar();
- void WSDL_ProcessInput(bool can_delay);
+ bool haveNextChar();
+ uint16 getNextChar();
+ void processInput(bool can_delay = false);
void writeColorReg(byte *buf, uint16 regnum);
void writeColorRegsSmooth(byte *buf, uint16 first, uint16 numreg);
@@ -192,7 +192,7 @@ private:
void drawMaskImage(Image *Im, uint16 x, uint16 y);
Common::Point WSDL_GetMousePos();
void changeVolume(int delta);
- void WSDL_SetColors(byte *buf, uint16 first, uint16 numreg, uint16 slow);
+ void applyPalette(byte *buf, uint16 first, uint16 numreg, uint16 slow);
// engine.cpp
bool setUpScreens();
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 859d1ffa2f..2db36103b5 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -820,7 +820,7 @@ void LabEngine::processMap(uint16 CurRoom) {
}
}
- WSDL_UpdateScreen();
+ screenUpdate();
}
}
}
@@ -848,7 +848,7 @@ void LabEngine::doMap(uint16 CurRoom) {
drawMap(CurRoom, CurRoom, Maps[CurRoom].PageNumber, false, true);
_event->mouseShow();
_event->attachGadgetList(MapGadgetList);
- WSDL_UpdateScreen();
+ screenUpdate();
processMap(CurRoom);
_event->attachGadgetList(NULL);
fade(false, 0);
@@ -859,7 +859,7 @@ void LabEngine::doMap(uint16 CurRoom) {
freeMapData();
blackAllScreen();
_event->mouseShow();
- WSDL_UpdateScreen();
+ screenUpdate();
}
} // End of namespace Lab
diff --git a/engines/lab/mouse.cpp b/engines/lab/mouse.cpp
index eeae317f22..a7e62968ec 100644
--- a/engines/lab/mouse.cpp
+++ b/engines/lab/mouse.cpp
@@ -150,7 +150,7 @@ void EventManager::updateMouse() {
}
if (doUpdateDisplay)
- _vm->WSDL_UpdateScreen();
+ _vm->screenUpdate();
}
@@ -173,7 +173,7 @@ void EventManager::mouseShow() {
NumHidden--;
if ((NumHidden == 0) && MouseHidden) {
- _vm->WSDL_ProcessInput(0);
+ _vm->processInput();
MouseHidden = false;
}
@@ -215,7 +215,7 @@ void EventManager::setMousePos(Common::Point pos) {
g_system->warpMouse(pos.x * 2, pos.y);
if (!MouseHidden)
- _vm->WSDL_ProcessInput(0);
+ _vm->processInput();
}
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 1f99a687be..b6587ebf1b 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -69,7 +69,7 @@ Music::Music(LabEngine *vm) : _vm(vm) {
/* it from the Audio device. */
/*****************************************************************************/
void Music::updateMusic() {
- _vm->WSDL_ProcessInput(0);
+ _vm->processInput();
_vm->_event->updateMouse();
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 8453fe65bb..87a56b0be3 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -482,7 +482,7 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
case WAITSECS:
g_lab->addCurTime(APtr->Param1, 0, &StartSecs, &StartMicros);
- g_lab->WSDL_UpdateScreen();
+ g_lab->screenUpdate();
while (1) {
g_lab->_music->updateMusic();
@@ -566,7 +566,7 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
diffcmap[idx] = 255 - diffcmap[idx];
g_lab->waitTOF();
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
g_lab->waitTOF();
g_lab->waitTOF();
} else if (APtr->Param1 == 4) { /* white the palette */
@@ -575,7 +575,7 @@ static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
g_lab->waitTOF();
} else if (APtr->Param1 == 6) { /* Restore the palette */
g_lab->waitTOF();
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
g_lab->waitTOF();
g_lab->waitTOF();
} else if (APtr->Param1 == 7) { /* Quick pause */
diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp
index bfe574a378..9e87ad9526 100644
--- a/engines/lab/readdiff.cpp
+++ b/engines/lab/readdiff.cpp
@@ -140,7 +140,7 @@ void LabEngine::diffNextFrame() {
}
if (IsPal && !nopalchange) {
- VGASetPal(diffcmap, 256);
+ setPalette(diffcmap, 256);
IsPal = false;
}
@@ -148,7 +148,7 @@ void LabEngine::diffNextFrame() {
}
if (IsPal && !nopalchange && !IsBM && !donepal) {
- VGASetPal(diffcmap, 256);
+ setPalette(diffcmap, 256);
IsPal = false;
}
@@ -163,7 +163,7 @@ void LabEngine::diffNextFrame() {
CurBit = 0;
if (DispBitMap->Flags & BITMAPF_VIDEO)
- WSDL_UpdateScreen();
+ screenUpdate();
return; /* done with the next frame. */
}
@@ -268,7 +268,7 @@ void LabEngine::diffNextFrame() {
_event->mouseShow();
if (!didTOF)
- WSDL_UpdateScreen();
+ screenUpdate();
return;
}
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index e3d1541814..f350a5cea0 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -162,7 +162,7 @@ void showCombination(const char *filename) {
doCombination();
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
}
@@ -313,7 +313,7 @@ void showTile(const char *filename, bool showsolution) {
doTile(showsolution);
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
}
static void scrollRaster(int16 dx, int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
@@ -471,7 +471,7 @@ void doNotes() {
flowText(BigMsgFont, -2 + SVGACord(1), 0, 0, false, false, true, true, VGAScaleX(25) + SVGACord(15), VGAScaleY(50), VGAScaleX(295) - SVGACord(15), VGAScaleY(148), ntext);
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
freeAllStolenMem();
}
@@ -533,7 +533,7 @@ void doWestPaper() {
CharsPrinted = flowText(BigMsgFont, -4, 0, 0, false, false, false, true, VGAScaleX(162), VGAScaleY(y), VGAScaleX(275), VGAScaleY(148), ntext);
- g_lab->VGASetPal(diffcmap, 256);
+ g_lab->setPalette(diffcmap, 256);
freeAllStolenMem();
}
@@ -841,7 +841,7 @@ bool saveRestoreGame() {
}
}
- g_lab->WSDL_UpdateScreen();
+ g_lab->screenUpdate();
return isOK;
}
diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp
index d3071649c4..bb313e18b4 100644
--- a/engines/lab/vga.cpp
+++ b/engines/lab/vga.cpp
@@ -63,10 +63,10 @@ void LabEngine::changeVolume(int delta) {
warning("STUB: changeVolume()");
}
-uint16 LabEngine::WSDL_GetNextChar() {
+uint16 LabEngine::getNextChar() {
uint16 c = 0;
- WSDL_ProcessInput(0);
+ processInput();
if (_nextKeyIn != _nextKeyOut) {
c = _keyBuf[_nextKeyOut];
_nextKeyOut = ((((unsigned int)((_nextKeyOut + 1) >> 31) >> 26) + (byte)_nextKeyOut + 1) & 0x3F)
@@ -76,12 +76,12 @@ uint16 LabEngine::WSDL_GetNextChar() {
return c;
}
-bool LabEngine::WSDL_HasNextChar() {
- WSDL_ProcessInput(0);
+bool LabEngine::haveNextChar() {
+ processInput();
return _nextKeyIn != _nextKeyOut;
}
-void LabEngine::WSDL_ProcessInput(bool can_delay) {
+void LabEngine::processInput(bool can_delay) {
Common::Event event;
if (1 /*!g_IgnoreProcessInput*/) {
@@ -167,7 +167,7 @@ void LabEngine::WSDL_ProcessInput(bool can_delay) {
}
Common::Point LabEngine::WSDL_GetMousePos() {
- WSDL_ProcessInput(0);
+ processInput();
return _mousePos;
}
@@ -176,7 +176,7 @@ void LabEngine::waitTOF() {
g_system->copyRectToScreen(_displayBuffer, _screenWidth, 0, 0, _screenWidth, _screenHeight);
g_system->updateScreen();
- WSDL_ProcessInput(0);
+ processInput();
uint32 now;
@@ -186,7 +186,7 @@ void LabEngine::waitTOF() {
_lastWaitTOFTicks = now;
}
-void LabEngine::WSDL_SetColors(byte *buf, uint16 first, uint16 numreg, uint16 slow) {
+void LabEngine::applyPalette(byte *buf, uint16 first, uint16 numreg, uint16 slow) {
byte tmp[256 * 3];
for (int i = 0; i < 256 * 3; i++) {
@@ -211,12 +211,12 @@ void LabEngine::WSDL_SetColors(byte *buf, uint16 first, uint16 numreg, uint16 sl
/* selected. */
/*****************************************************************************/
void LabEngine::writeColorRegs(byte *buf, uint16 first, uint16 numreg) {
- WSDL_SetColors(buf, first, numreg, 0);
+ applyPalette(buf, first, numreg, 0);
memcpy(&(_curvgapal[first * 3]), buf, numreg * 3);
}
void LabEngine::writeColorRegsSmooth(byte *buf, uint16 first, uint16 numreg) {
- WSDL_SetColors(buf, first, numreg, 1);
+ applyPalette(buf, first, numreg, 1);
memcpy(&(_curvgapal[first * 3]), buf, numreg * 3);
}
@@ -229,16 +229,16 @@ void LabEngine::writeColorReg(byte *buf, uint16 regnum) {
writeColorRegs(buf, regnum, 1);
}
-void LabEngine::VGASetPal(void *cmap, uint16 numcolors) {
+void LabEngine::setPalette(void *cmap, uint16 numcolors) {
if (memcmp(cmap, _curvgapal, numcolors * 3) != 0)
writeColorRegs((byte *)cmap, 0, numcolors);
}
-void LabEngine::WSDL_UpdateScreen() {
+void LabEngine::screenUpdate() {
g_system->copyRectToScreen(_displayBuffer, _screenWidth, 0, 0, _screenWidth, _screenHeight);
g_system->updateScreen();
- WSDL_ProcessInput(0);
+ processInput();
}
/*****************************************************************************/