[Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.20,1.21 control.cpp,1.56,1.57 intro.cpp,1.37,1.38 sky.cpp,1.113,1.114 text.cpp,1.53,1.54
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Sep 23 23:29:02 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon intern.h,1.19,1.20 res.cpp,1.23,1.24 simon.cpp,1.297,1.298 sound.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.8,1.9 gmchannel.cpp,1.9,1.10 musicbase.cpp,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv9659
Modified Files:
compact.cpp control.cpp intro.cpp sky.cpp text.cpp
Log Message:
Whitespace changes
Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- compact.cpp 19 Sep 2003 21:15:13 -0000 1.20
+++ compact.cpp 24 Sep 2003 06:28:03 -0000 1.21
@@ -58,27 +58,27 @@
uint16 *getGrafixPtr(Compact *cpt) {
uint16 *buf;
switch (cpt->grafixProg.ptrType) {
- case PTR_NULL:
- return NULL;
- case AUTOROUTE:
- if (!cpt->extCompact)
- error("::getGrafixPtr: request for AR pointer, extCompact is NULL, though.");
- return (cpt->extCompact->animScratch + cpt->grafixProg.pos);
- case COMPACT:
- buf = (uint16*)SkyState::fetchCompact(cpt->grafixProg.ptrTarget);
- if (buf == NULL)
- error("::getGrafixPtr: request for cpt %d pointer. It's NULL.", cpt->grafixProg.ptrTarget);
- return (buf + cpt->grafixProg.pos);
- case COMPACTELEM:
- buf = *(uint16 **)SkyCompact::getCompactElem(cpt, cpt->grafixProg.ptrTarget);
- if (buf == NULL)
- 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];
- return buf + cpt->grafixProg.pos;
- default:
- error("::getGrafixPtr: unknown grafixProg type for Compact cpt");
+ case PTR_NULL:
+ return NULL;
+ case AUTOROUTE:
+ if (!cpt->extCompact)
+ error("::getGrafixPtr: request for AR pointer, extCompact is NULL, though.");
+ return (cpt->extCompact->animScratch + cpt->grafixProg.pos);
+ case COMPACT:
+ buf = (uint16*)SkyState::fetchCompact(cpt->grafixProg.ptrTarget);
+ if (buf == NULL)
+ error("::getGrafixPtr: request for cpt %d pointer. It's NULL.", cpt->grafixProg.ptrTarget);
+ return (buf + cpt->grafixProg.pos);
+ case COMPACTELEM:
+ buf = *(uint16 **)SkyCompact::getCompactElem(cpt, cpt->grafixProg.ptrTarget);
+ if (buf == NULL)
+ 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];
+ return buf + cpt->grafixProg.pos;
+ default:
+ error("::getGrafixPtr: unknown grafixProg type for Compact cpt");
}
return NULL; // never reached
}
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- control.cpp 17 Sep 2003 22:41:01 -0000 1.56
+++ control.cpp 24 Sep 2003 06:28:03 -0000 1.57
@@ -502,96 +502,77 @@
char quitDos[] = "Quit to DOS?";
switch(pButton->_onClick) {
- case DO_NOTHING:
- return 0;
-
- case REST_GAME_PANEL:
- if (!loadSaveAllowed())
- return CANCEL_PRESSED; // can't save/restore while choosing
- animClick(pButton);
- return saveRestorePanel(false); // texts can't be edited
-
- case SAVE_GAME_PANEL:
- if (!loadSaveAllowed())
- return CANCEL_PRESSED; // can't save/restore while choosing
- animClick(pButton);
- return saveRestorePanel(true); // texts can be edited
-
- case SAVE_A_GAME:
- animClick(pButton);
- return saveGameToFile();
-
- case RESTORE_A_GAME:
- animClick(pButton);
- return restoreGameFromFile(false);
-
- case RESTORE_AUTO:
- animClick(pButton);
- return restoreGameFromFile(true);
-
- case SP_CANCEL:
- animClick(pButton);
- return CANCEL_PRESSED;
-
- case SHIFT_DOWN_FAST:
- animClick(pButton);
- return shiftDown(FAST);
-
- case SHIFT_DOWN_SLOW:
- animClick(pButton);
- return shiftDown(SLOW);
-
- case SHIFT_UP_FAST:
- animClick(pButton);
- return shiftUp(FAST);
-
- case SHIFT_UP_SLOW:
- animClick(pButton);
- return shiftUp(SLOW);
-
- case SPEED_SLIDE:
- _mouseClicked = true;
- return doSpeedSlide();
-
- case MUSIC_SLIDE:
- _mouseClicked = true;
- return doMusicSlide();
-
- case TOGGLE_FX:
- return toggleFx(pButton);
-
- case TOGGLE_MS:
- animClick(pButton);
- toggleMusic();
- return TOGGLED;
-
- case TOGGLE_TEXT:
- animClick(pButton);
- return toggleText();
-
- case EXIT:
- animClick(pButton);
- return QUIT_PANEL;
-
- case RESTART:
- animClick(pButton);
- if (getYesNo(NULL)) {
- restartGame();
- return GAME_RESTORED;
- } else
- return 0;
-
- case QUIT_TO_DOS:
- animClick(pButton);
- if (getYesNo(quitDos)) {
- showGameQuitMsg(false);
- delay(1500);
- _system->quit();
- }
+ case DO_NOTHING:
+ return 0;
+ case REST_GAME_PANEL:
+ if (!loadSaveAllowed())
+ return CANCEL_PRESSED; // can't save/restore while choosing
+ animClick(pButton);
+ return saveRestorePanel(false); // texts can't be edited
+ case SAVE_GAME_PANEL:
+ if (!loadSaveAllowed())
+ return CANCEL_PRESSED; // can't save/restore while choosing
+ animClick(pButton);
+ return saveRestorePanel(true); // texts can be edited
+ case SAVE_A_GAME:
+ animClick(pButton);
+ return saveGameToFile();
+ case RESTORE_A_GAME:
+ animClick(pButton);
+ return restoreGameFromFile(false);
+ case RESTORE_AUTO:
+ animClick(pButton);
+ return restoreGameFromFile(true);
+ case SP_CANCEL:
+ animClick(pButton);
+ return CANCEL_PRESSED;
+ case SHIFT_DOWN_FAST:
+ animClick(pButton);
+ return shiftDown(FAST);
+ case SHIFT_DOWN_SLOW:
+ animClick(pButton);
+ return shiftDown(SLOW);
+ case SHIFT_UP_FAST:
+ animClick(pButton);
+ return shiftUp(FAST);
+ case SHIFT_UP_SLOW:
+ animClick(pButton);
+ return shiftUp(SLOW);
+ case SPEED_SLIDE:
+ _mouseClicked = true;
+ return doSpeedSlide();
+ case MUSIC_SLIDE:
+ _mouseClicked = true;
+ return doMusicSlide();
+ case TOGGLE_FX:
+ return toggleFx(pButton);
+ case TOGGLE_MS:
+ animClick(pButton);
+ toggleMusic();
+ return TOGGLED;
+ case TOGGLE_TEXT:
+ animClick(pButton);
+ return toggleText();
+ case EXIT:
+ animClick(pButton);
+ return QUIT_PANEL;
+ case RESTART:
+ animClick(pButton);
+ if (getYesNo(NULL)) {
+ restartGame();
+ return GAME_RESTORED;
+ } else
return 0;
-
- default:
- error("SkyControl::handleClick: unknown routine: %X",pButton->_onClick);
+ case QUIT_TO_DOS:
+ animClick(pButton);
+ if (getYesNo(quitDos)) {
+ showGameQuitMsg(false);
+ delay(1500);
+ _system->quit();
+ }
+ return 0;
+ default:
+ error("SkyControl::handleClick: unknown routine: %X",pButton->_onClick);
}
}
@@ -1649,21 +1630,21 @@
uint16 *resetData = lz77decode((uint16 *)_resetData288);
switch (SkyState::_systemVars.gameVersion) {
- case 303:
- applyDiff(resetData, (uint16*)_resetDiff303, 206);
- break;
- case 331:
- applyDiff(resetData, (uint16*)_resetDiff331, 206);
- break;
- case 348:
- applyDiff(resetData, (uint16*)_resetDiff348, 206);
- break;
- case 365:
- case 368:
- case 372:
- applyDiff(resetData, (uint16*)_resetDiffCd, 214);
- default:
- break;
+ case 303:
+ applyDiff(resetData, (uint16*)_resetDiff303, 206);
+ break;
+ case 331:
+ applyDiff(resetData, (uint16*)_resetDiff331, 206);
+ break;
+ case 348:
+ applyDiff(resetData, (uint16*)_resetDiff348, 206);
+ break;
+ case 365:
+ case 368:
+ case 372:
+ applyDiff(resetData, (uint16*)_resetDiffCd, 214);
+ default:
+ break;
}
// ok, we finally have our savedata
@@ -1688,41 +1669,35 @@
do {
while (_system->poll_event(&event)) {
switch (event.event_code) {
- case OSystem::EVENT_KEYDOWN:
- // Make sure backspace works right (this fixes a small issue on OS X)
- if (event.kbd.keycode == 8)
- _keyPressed = 8;
- else
- _keyPressed = (byte)event.kbd.ascii;
- break;
-
- case OSystem::EVENT_MOUSEMOVE:
- _mouseX = event.mouse.x;
- _mouseY = event.mouse.y;
- break;
-
- case OSystem::EVENT_LBUTTONDOWN:
- _mouseClicked = true;
+ case OSystem::EVENT_KEYDOWN:
+ // Make sure backspace works right (this fixes a small issue on OS X)
+ if (event.kbd.keycode == 8)
+ _keyPressed = 8;
+ else
+ _keyPressed = (byte)event.kbd.ascii;
+ break;
+ case OSystem::EVENT_MOUSEMOVE:
+ _mouseX = event.mouse.x;
+ _mouseY = event.mouse.y;
+ break;
+ case OSystem::EVENT_LBUTTONDOWN:
+ _mouseClicked = true;
#ifdef _WIN32_WCE
- _mouseX = event.mouse.x;
- _mouseY = event.mouse.y;
+ _mouseX = event.mouse.x;
+ _mouseY = event.mouse.y;
#endif
- break;
-
- case OSystem::EVENT_LBUTTONUP:
- _mouseClicked = false;
- break;
-
- case OSystem::EVENT_RBUTTONDOWN:
- break;
-
- case OSystem::EVENT_QUIT:
- if (!SkyState::_systemVars.quitting)
- showGameQuitMsg(false);
- break;
-
- default:
- break;
+ break;
+ case OSystem::EVENT_LBUTTONUP:
+ _mouseClicked = false;
+ break;
+ case OSystem::EVENT_RBUTTONDOWN:
+ break;
+ case OSystem::EVENT_QUIT:
+ if (!SkyState::_systemVars.quitting)
+ showGameQuitMsg(false);
+ break;
+ default:
+ break;
}
}
Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- intro.cpp 5 Sep 2003 22:09:56 -0000 1.37
+++ intro.cpp 24 Sep 2003 06:28:03 -0000 1.38
@@ -667,86 +667,86 @@
// return false means cancel intro
uint16 command = *data++;
switch (command) {
- case SHOWSCREEN:
- _skyScreen->showScreen(*data++);
- return true;
- case FADEUP:
- _skyScreen->paletteFadeUp(*data++);
- return true;
- case FADEDOWN:
- _skyScreen->fnFadeDown(0);
- return true;
- case DELAY:
- if (!escDelay(*data++))
+ case SHOWSCREEN:
+ _skyScreen->showScreen(*data++);
+ return true;
+ case FADEUP:
+ _skyScreen->paletteFadeUp(*data++);
+ return true;
+ case FADEDOWN:
+ _skyScreen->fnFadeDown(0);
+ return true;
+ case DELAY:
+ if (!escDelay(*data++))
+ return false;
+ return true;
+ case DOFLIRT:
+ _skyScreen->startSequence(*data++);
+ while (_skyScreen->sequenceRunning())
+ if (!escDelay(50))
return false;
- return true;
- case DOFLIRT:
- _skyScreen->startSequence(*data++);
- while (_skyScreen->sequenceRunning())
- if (!escDelay(50))
- return false;
- return true;
- case SCROLLFLIRT:
- return floppyScrollFlirt();
- case COMMANDFLIRT:
- return commandFlirt(data);
- case STOPFLIRT:
- _skyScreen->stopSequence();
- return true;
- case STARTMUSIC:
- _skyMusic->startMusic(*data++);
- return true;
- case WAITMUSIC:
- while (_skyMusic->musicIsPlaying())
- if (!escDelay(50))
- return false;
- return true;
- case BGFLIRT:
- _skyScreen->startSequence(*data++);
- return true;
- case WAITFLIRT:
- while (_skyScreen->sequenceRunning())
- if (!escDelay(50))
- return false;
- return true;
- case PLAYVOICE:
- if (!escDelay(200))
+ return true;
+ case SCROLLFLIRT:
+ return floppyScrollFlirt();
+ case COMMANDFLIRT:
+ return commandFlirt(data);
+ case STOPFLIRT:
+ _skyScreen->stopSequence();
+ return true;
+ case STARTMUSIC:
+ _skyMusic->startMusic(*data++);
+ return true;
+ case WAITMUSIC:
+ while (_skyMusic->musicIsPlaying())
+ if (!escDelay(50))
return false;
- vData = _skyDisk->loadFile(*data++, NULL);
- // HACK: Fill the header with silence. We should
- // probably use _skySound instead of calling playRaw()
- // directly, but this will have to do for now.
- memset(vData, 127, sizeof(struct dataFileHeader));
- _mixer->playRaw(&_voice, vData, _skyDisk->_lastLoadedFileSize, 11025,
- SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, SOUND_VOICE);
- return true;
- case WAITVOICE:
- while (_voice)
- if (!escDelay(50))
- return false;
- return true;
- case LOADBG:
- _mixer->stopID(SOUND_BG);
- if (_bgBuf)
- free(_bgBuf);
- _bgBuf = _skyDisk->loadFile(*data++, NULL);
- _bgSize = _skyDisk->_lastLoadedFileSize;
- return true;
- case LOOPBG:
- _mixer->stopID(SOUND_BG);
- _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
- SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, SOUND_BG);
- return true;
- case PLAYBG:
- _mixer->stopID(SOUND_BG);
- _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
- SoundMixer::FLAG_UNSIGNED, SOUND_BG);
- return true;
- case STOPBG:
- _mixer->stopID(SOUND_BG);
- return true;
- default:
- error("Unknown intro command %X", command);
+ return true;
+ case BGFLIRT:
+ _skyScreen->startSequence(*data++);
+ return true;
+ case WAITFLIRT:
+ while (_skyScreen->sequenceRunning())
+ if (!escDelay(50))
+ return false;
+ return true;
+ case PLAYVOICE:
+ if (!escDelay(200))
+ return false;
+ vData = _skyDisk->loadFile(*data++, NULL);
+ // HACK: Fill the header with silence. We should
+ // probably use _skySound instead of calling playRaw()
+ // directly, but this will have to do for now.
+ memset(vData, 127, sizeof(struct dataFileHeader));
+ _mixer->playRaw(&_voice, vData, _skyDisk->_lastLoadedFileSize, 11025,
+ SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, SOUND_VOICE);
+ return true;
+ case WAITVOICE:
+ while (_voice)
+ if (!escDelay(50))
+ return false;
+ return true;
+ case LOADBG:
+ _mixer->stopID(SOUND_BG);
+ if (_bgBuf)
+ free(_bgBuf);
+ _bgBuf = _skyDisk->loadFile(*data++, NULL);
+ _bgSize = _skyDisk->_lastLoadedFileSize;
+ return true;
+ case LOOPBG:
+ _mixer->stopID(SOUND_BG);
+ _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
+ SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, SOUND_BG);
+ return true;
+ case PLAYBG:
+ _mixer->stopID(SOUND_BG);
+ _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
+ SoundMixer::FLAG_UNSIGNED, SOUND_BG);
+ return true;
+ case STOPBG:
+ _mixer->stopID(SOUND_BG);
+ return true;
+ default:
+ error("Unknown intro command %X", command);
}
return true;
}
@@ -803,27 +803,27 @@
data++;
uint16 command = *data++;
switch(command) {
- case IC_PREPARE_TEXT:
- _skyText->getText(*data++);
- _skyText->displayText(_textBuf, true, INTRO_TEXT_WIDTH, 255);
- break;
- case IC_SHOW_TEXT:
- ((dataFileHeader*)_textBuf)->s_x = *data++;
- ((dataFileHeader*)_textBuf)->s_y = *data++;
- showTextBuf();
- break;
- case IC_REMOVE_TEXT:
- restoreScreen();
- break;
- case IC_MAKE_SOUND:
- _skySound->playSound(data[0], data[1], 0);
- data += 2;
- break;
- case IC_FX_VOLUME:
- _skySound->playSound(1, *data++, 0);
- break;
- default:
- error("Unknown FLIRT command %X\n", command);
+ case IC_PREPARE_TEXT:
+ _skyText->getText(*data++);
+ _skyText->displayText(_textBuf, true, INTRO_TEXT_WIDTH, 255);
+ break;
+ case IC_SHOW_TEXT:
+ ((dataFileHeader*)_textBuf)->s_x = *data++;
+ ((dataFileHeader*)_textBuf)->s_y = *data++;
+ showTextBuf();
+ break;
+ case IC_REMOVE_TEXT:
+ restoreScreen();
+ break;
+ case IC_MAKE_SOUND:
+ _skySound->playSound(data[0], data[1], 0);
+ data += 2;
+ break;
+ case IC_FX_VOLUME:
+ _skySound->playSound(1, *data++, 0);
+ break;
+ default:
+ error("Unknown FLIRT command %X\n", command);
}
}
if (!escDelay(50)) {
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- sky.cpp 18 Sep 2003 18:23:53 -0000 1.113
+++ sky.cpp 24 Sep 2003 06:28:03 -0000 1.114
@@ -142,24 +142,24 @@
void SkyState::doCheat(uint8 num) {
switch(num) {
- case 1: warning("executed cheat: get jammer");
- SkyLogic::_scriptVariables[258] = 42; // got_jammer
- SkyLogic::_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
- break;
- case 3: warning("executed cheat: get to burke");
- SkyLogic::_scriptVariables[190] = 42; // knows_port
- break;
- case 4: warning("executed cheat: get to reactor section");
- SkyLogic::_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;
- default: warning("unknown cheat: %d", num);
- break;
+ case 1: warning("executed cheat: get jammer");
+ SkyLogic::_scriptVariables[258] = 42; // got_jammer
+ SkyLogic::_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
+ break;
+ case 3: warning("executed cheat: get to burke");
+ SkyLogic::_scriptVariables[190] = 42; // knows_port
+ break;
+ case 4: warning("executed cheat: get to reactor section");
+ SkyLogic::_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;
+ default: warning("unknown cheat: %d", num);
+ break;
}
}
@@ -417,51 +417,46 @@
do {
while (_system->poll_event(&event)) {
switch (event.event_code) {
- case OSystem::EVENT_KEYDOWN:
- if (event.kbd.flags == OSystem::KBD_CTRL) {
- if (event.kbd.keycode == 'f') {
- _fastMode ^= 1;
- break;
- }
- if (event.kbd.keycode == 'g') {
- _fastMode ^= 2;
- break;
- }
+ case OSystem::EVENT_KEYDOWN:
+ if (event.kbd.flags == OSystem::KBD_CTRL) {
+ if (event.kbd.keycode == 'f') {
+ _fastMode ^= 1;
+ break;
}
-
- // Make sure backspace works right (this fixes a small issue on OS X)
- if (event.kbd.keycode == 8)
- _key_pressed = 8;
- else
- _key_pressed = (byte)event.kbd.ascii;
- break;
-
- case OSystem::EVENT_MOUSEMOVE:
- if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) {
- _sdl_mouse_x = event.mouse.x;
- _sdl_mouse_y = event.mouse.y;
+ if (event.kbd.keycode == 'g') {
+ _fastMode ^= 2;
+ break;
}
- break;
+ }
- case OSystem::EVENT_LBUTTONDOWN:
- _skyMouse->buttonPressed(2);
-#ifdef _WIN32_WCE
+ // Make sure backspace works right (this fixes a small issue on OS X)
+ if (event.kbd.keycode == 8)
+ _key_pressed = 8;
+ else
+ _key_pressed = (byte)event.kbd.ascii;
+ break;
+ case OSystem::EVENT_MOUSEMOVE:
+ if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) {
_sdl_mouse_x = event.mouse.x;
_sdl_mouse_y = event.mouse.y;
+ }
+ break;
+ case OSystem::EVENT_LBUTTONDOWN:
+ _skyMouse->buttonPressed(2);
+#ifdef _WIN32_WCE
+ _sdl_mouse_x = event.mouse.x;
+ _sdl_mouse_y = event.mouse.y;
#endif
- break;
-
- case OSystem::EVENT_RBUTTONDOWN:
- _skyMouse->buttonPressed(1);
- break;
-
- case OSystem::EVENT_QUIT:
- if (!SkyState::_systemVars.quitting)
- _skyControl->showGameQuitMsg(); // will call _system->quit()
- break;
-
- default:
- break;
+ break;
+ case OSystem::EVENT_RBUTTONDOWN:
+ _skyMouse->buttonPressed(1);
+ break;
+ case OSystem::EVENT_QUIT:
+ if (!SkyState::_systemVars.quitting)
+ _skyControl->showGameQuitMsg(); // will call _system->quit()
+ break;
+ default:
+ break;
}
}
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- text.cpp 13 Aug 2003 15:29:44 -0000 1.53
+++ text.cpp 24 Sep 2003 06:28:03 -0000 1.54
@@ -222,17 +222,17 @@
struct charSet *newCharSet;
switch (fontNr) {
- case 0:
- newCharSet = &_mainCharacterSet;
- break;
- case 1:
- newCharSet = &_controlCharacterSet;
- break;
- case 2:
- newCharSet = &_linkCharacterSet;
- break;
- default:
- error("Tried to set invalid font (%d)", fontNr);
+ case 0:
+ newCharSet = &_mainCharacterSet;
+ break;
+ case 1:
+ newCharSet = &_controlCharacterSet;
+ break;
+ case 2:
+ newCharSet = &_linkCharacterSet;
+ break;
+ default:
+ error("Tried to set invalid font (%d)", fontNr);
}
_curCharSet = fontNr;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon intern.h,1.19,1.20 res.cpp,1.23,1.24 simon.cpp,1.297,1.298 sound.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.8,1.9 gmchannel.cpp,1.9,1.10 musicbase.cpp,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list