thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed showGameQuitMsg() and temporarily disabled sfx looping

Browse source 
svn-id: r8728
This commit is contained in:
Robert Göffringmann 2003-07-03 22:32:18 +00:00
parent 3ed9aae095
commit 396c34d44b
4 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
sky/control.cpp
View file

@ -1313,21 +1313,21 @@ void SkyControl::showGameQuitMsg(bool useScreen) {
uint8 *textBuf1 = (uint8*)malloc(GAME_SCREEN_WIDTH * 14 + sizeof(dataFileHeader)); uint8 *textBuf1 = (uint8*)malloc(GAME_SCREEN_WIDTH * 14 + sizeof(dataFileHeader));
uint8 *textBuf2 = (uint8*)malloc(GAME_SCREEN_WIDTH * 14 + sizeof(dataFileHeader)); uint8 *textBuf2 = (uint8*)malloc(GAME_SCREEN_WIDTH * 14 + sizeof(dataFileHeader));
char *vText1, *vText2; uint8 textNum;
uint8 *screenData; uint8 *screenData;
if (useScreen) if (useScreen)
screenData = _skyScreen->giveCurrent(); screenData = _skyScreen->giveCurrent();
else else
screenData = _screenBuf; screenData = _screenBuf;
switch (SkyState::_systemVars.language) { switch (SkyState::_systemVars.language) {
case DE_DEU: vText1 = VIG_DE1; vText2 = VIG_DE2; break; case DE_DEU: textNum = 1; break;
case FR_FRA: vText1 = VIG_FR1; vText2 = VIG_FR2; break; case FR_FRA: textNum = 2; break;
case IT_ITA: vText1 = VIG_IT1; vText2 = VIG_IT2; break; case IT_ITA: textNum = 4; break;
case PT_BRA: vText1 = VIG_PT1; vText2 = VIG_PT2; break; case PT_BRA: textNum = 5; break;
default: vText1 = VIG_EN1; vText2 = VIG_EN2; break; default: textNum = 0; break;
} }
_skyText->displayText(vText1, textBuf1, true, 320, 255); _skyText->displayText(_quitTexts[textNum + 0], textBuf1, true, 320, 255);
_skyText->displayText(vText2, textBuf2, true, 320, 255); _skyText->displayText(_quitTexts[textNum + 1], textBuf2, true, 320, 255);
uint8 *curLine1 = textBuf1 + sizeof(dataFileHeader); uint8 *curLine1 = textBuf1 + sizeof(dataFileHeader);
uint8 *curLine2 = textBuf2 + sizeof(dataFileHeader); uint8 *curLine2 = textBuf2 + sizeof(dataFileHeader);
uint8 *targetLine = screenData + GAME_SCREEN_WIDTH * 80; uint8 *targetLine = screenData + GAME_SCREEN_WIDTH * 80;
@ -1348,3 +1348,18 @@ void SkyControl::showGameQuitMsg(bool useScreen) {
delay(1500); delay(1500);
_system->quit(); _system->quit();
} }
char SkyControl::_quitTexts[12][30] = {
"Game over player one",
"BE VIGILANT",
"Das Spiel ist aus.",
"SEI WACHSAM",
"Game over joueur 1",
"SOYEZ VIGILANTS",
"Spelet r slut, Agent 1.",
"VAR VAKSAM",
"Game over giocatore 1",
"SIATE VIGILANTI",
"Fim de jogo para o jogador um",
"BE VIGILANT"
};

2
sky/control.h
View file

@ -245,6 +245,8 @@ private:
SkyConResource *_upFastButton, *_upSlowButton, *_quitButton, *_restoreButton; SkyConResource *_upFastButton, *_upSlowButton, *_quitButton, *_restoreButton;
SkyConResource *_savePanLookList[6], *_restorePanLookList[6]; SkyConResource *_savePanLookList[6], *_restorePanLookList[6];
static char _quitTexts[12][30];
}; };
#endif // CONTROL_H #endif // CONTROL_H

13
sky/skydefs.h
View file

@ -26,19 +26,6 @@
//This file is incomplete, several flags still missing. //This file is incomplete, several flags still missing.
#define VIG_EN1 "Game over player one"
#define VIG_EN2 "BE VIGILANT"
#define VIG_DE1 "Das Spiel ist aus."
#define VIG_DE2 "SEI WACHSAM"
#define VIG_FR1 "Game over joueur 1"
#define VIG_FR2 "SOYEZ VIGILANTS"
#define VIG_SE1 "Spelet r slut, Agent 1."
#define VIG_SE2 "VAR VAKSAM"
#define VIG_IT1 "Game over giocatore 1"
#define VIG_IT2 "SIATE VIGILANTI"
#define VIG_PT1 "Fim de jogo para o jogador um"
#define VIG_PT2 "BE VIGILANT"
#define ST_COLLISION_BIT 5 #define ST_COLLISION_BIT 5
#define S_COUNT 0 #define S_COUNT 0

4
sky/sound.cpp
View file

@ -1086,8 +1086,8 @@ void SkySound::playSound(uint16 sound, uint16 volume) {
uint16 dataLoop = (_sfxInfo[(sound << 3) | 6] << 8) | _sfxInfo[(sound << 3) | 7]; uint16 dataLoop = (_sfxInfo[(sound << 3) | 6] << 8) | _sfxInfo[(sound << 3) | 7];
byte flags = SoundMixer::FLAG_UNSIGNED; byte flags = SoundMixer::FLAG_UNSIGNED;
if (dataSize == dataLoop) /*if (dataSize == dataLoop)
flags |= SoundMixer::FLAG_LOOP; flags |= SoundMixer::FLAG_LOOP;*/
if (_ingameSound > 0) _mixer->stop(_ingameSound - 1); if (_ingameSound > 0) _mixer->stop(_ingameSound - 1);
_mixer->setVolume(volume); _mixer->setVolume(volume);