aboutsummaryrefslogtreecommitdiff
path: root/engines/lab
diff options
context:
space:
mode:
authorFilippos Karapetis2015-10-12 00:43:45 +0300
committerWillem Jan Palenstijn2015-12-23 21:33:40 +0100
commit9676165436e1e3e7ee4db16c2cb905e0b2aeb1ff (patch)
treeba6fadf527a371f93ea25dde59910fe8349b4bcb /engines/lab
parentb033b7e539d356b5e94987dfa8d3be68c2acf4ab (diff)
downloadscummvm-rg350-9676165436e1e3e7ee4db16c2cb905e0b2aeb1ff.tar.gz
scummvm-rg350-9676165436e1e3e7ee4db16c2cb905e0b2aeb1ff.tar.bz2
scummvm-rg350-9676165436e1e3e7ee4db16c2cb905e0b2aeb1ff.zip
LAB: Remove unused code for the demo version
The two places where the game stops in the demo versions should already be handled by the current code
Diffstat (limited to 'engines/lab')
-rw-r--r--engines/lab/processroom.cpp17
-rw-r--r--engines/lab/special.cpp56
2 files changed, 0 insertions, 73 deletions
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 19e958825d..03fedaa87e 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -440,23 +440,6 @@ static void doActions(ActionPtr APtr, CloseDataPtr *LCPtr) {
break;
case SETPOSITION:
-#if defined(LABDEMO)
-
- // if teleporting to room 45 or 49
- if (APtr->Param1 == 45 || APtr->Param1 == 49) {
- extern void doTrialBlock();
-
- // Time to pay up!
- doTrialBlock();
-
- CurFileName = getPictName(LCPtr);
- readPict(CurFileName, true);
-
- APtr = NULL;
- continue;
- }
-
-#endif
if (APtr->Param1 & 0x8000) {
// This is a Wyrmkeep Windows trial version, thus stop at this
// point, since we can't check for game payment status
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index b7f14729a9..2c0a488003 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -415,10 +415,6 @@ static void changeTile(uint16 col, uint16 row) {
if (scrolltype != -1) {
doTileScroll(col, row, scrolltype);
-#if defined(LABDEMO)
- return;
-#endif
-
if (g_lab->getFeatures() & GF_WINDOWS_TRIAL) {
GUI::MessageDialog trialMessage("This puzzle is not available in the trial version of the game");
trialMessage.runModal();
@@ -1102,56 +1098,4 @@ void doMonitor(char *background, char *textfile, bool isinteractive, uint16 x1,
blackAllScreen();
}
-#if defined(LABDEMO)
-void doTrialBlock() {
- IntuiMessage *Msg;
-
- uint32 Class;
- uint16 Qualifier, MouseX, MouseY, Code, Temp;
- int i;
-
- loadBackPict("P:Warning", false);
- mouseShow();
-
- VGASetPal(diffcmap, 256);
- memcpy(g_CommonPalette, diffcmap, 3 * 256);
-
- while (1) {
- g_music->updateMusic(); /* Make sure we check the music at least after every message */
- Msg = getMsg();
-
- if (Msg == NULL) {
- g_music->updateMusic();
- } else {
- Class = Msg->Class;
- Qualifier = Msg->Qualifier;
- MouseX = Msg->MouseX;
- MouseY = Msg->MouseY;
- Code = Msg->Code;
-
- if (((Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) ||
- ((Class == RAWKEY) && (Code == 27)))
- return;
-
- if ((Class == MOUSEBUTTONS) && (IEQUALIFIER_LEFTBUTTON & Qualifier)) {
- if (MouseY > 399) {
- // click on control panel, exit
- break;
- }
-
- if (MouseX >= 0 && MouseX <= 319 && MouseY >= 0 && MouseY <= 399) {
- extern void getItNow();
- getItNow();
- } else if (MouseX >= 320 && MouseX <= 639 && MouseY >= 0 && MouseY <= 399) {
- break;
- }
- }
- }
- }
-
- eatMessages();
- mouseHide();
-}
-#endif
-
} // End of namespace Lab