[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.13,1.14 control.h,1.8,1.9 skydefs.h,1.21,1.22 sound.cpp,1.17,1.18
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Thu Jul 3 15:33:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv13225/sky
Modified Files:
control.cpp control.h skydefs.h sound.cpp
Log Message:
fixed showGameQuitMsg() and temporarily disabled sfx looping
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- control.cpp 2 Jul 2003 01:46:24 -0000 1.13
+++ control.cpp 3 Jul 2003 22:32:18 -0000 1.14
@@ -1313,21 +1313,21 @@
uint8 *textBuf1 = (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;
if (useScreen)
screenData = _skyScreen->giveCurrent();
else
screenData = _screenBuf;
switch (SkyState::_systemVars.language) {
- case DE_DEU: vText1 = VIG_DE1; vText2 = VIG_DE2; break;
- case FR_FRA: vText1 = VIG_FR1; vText2 = VIG_FR2; break;
- case IT_ITA: vText1 = VIG_IT1; vText2 = VIG_IT2; break;
- case PT_BRA: vText1 = VIG_PT1; vText2 = VIG_PT2; break;
- default: vText1 = VIG_EN1; vText2 = VIG_EN2; break;
+ case DE_DEU: textNum = 1; break;
+ case FR_FRA: textNum = 2; break;
+ case IT_ITA: textNum = 4; break;
+ case PT_BRA: textNum = 5; break;
+ default: textNum = 0; break;
}
- _skyText->displayText(vText1, textBuf1, true, 320, 255);
- _skyText->displayText(vText2, textBuf2, true, 320, 255);
+ _skyText->displayText(_quitTexts[textNum + 0], textBuf1, true, 320, 255);
+ _skyText->displayText(_quitTexts[textNum + 1], textBuf2, true, 320, 255);
uint8 *curLine1 = textBuf1 + sizeof(dataFileHeader);
uint8 *curLine2 = textBuf2 + sizeof(dataFileHeader);
uint8 *targetLine = screenData + GAME_SCREEN_WIDTH * 80;
@@ -1348,3 +1348,18 @@
delay(1500);
_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"
+};
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- control.h 2 Jul 2003 01:46:24 -0000 1.8
+++ control.h 3 Jul 2003 22:32:18 -0000 1.9
@@ -245,6 +245,8 @@
SkyConResource *_upFastButton, *_upSlowButton, *_quitButton, *_restoreButton;
SkyConResource *_savePanLookList[6], *_restorePanLookList[6];
+
+ static char _quitTexts[12][30];
};
#endif // CONTROL_H
Index: skydefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/skydefs.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- skydefs.h 5 Jun 2003 18:54:26 -0000 1.21
+++ skydefs.h 3 Jul 2003 22:32:18 -0000 1.22
@@ -26,19 +26,6 @@
//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 S_COUNT 0
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- sound.cpp 27 Jun 2003 02:54:05 -0000 1.17
+++ sound.cpp 3 Jul 2003 22:32:18 -0000 1.18
@@ -1086,8 +1086,8 @@
uint16 dataLoop = (_sfxInfo[(sound << 3) | 6] << 8) | _sfxInfo[(sound << 3) | 7];
byte flags = SoundMixer::FLAG_UNSIGNED;
- if (dataSize == dataLoop)
- flags |= SoundMixer::FLAG_LOOP;
+ /*if (dataSize == dataLoop)
+ flags |= SoundMixer::FLAG_LOOP;*/
if (_ingameSound > 0) _mixer->stop(_ingameSound - 1);
_mixer->setVolume(volume);
More information about the Scummvm-git-logs
mailing list