X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=c92bcf9a1b65358549da7a6d06e2a0be11fe6e09;hb=bb193e1b764dfdbfcf604886d85e5cbc3664a408;hp=de6c79ecf1ed1fd9d0bb80db9ad413ab61351ecd;hpb=c26c5303fbc3fcc607681b848bc4fd0641320691;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index de6c79e..c92bcf9 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -203,7 +203,7 @@ extern float accountcampaigntime[10];
 extern int accountcampaignchoicesmade[10];
 extern int accountcampaignchoices[10][5000];
 /********************> Tick() <*****/
-extern FSOUND_STREAM * strm[10];
+extern FSOUND_STREAM * strm[20];
 extern "C" 	void PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
 extern "C" void PlayStreamEx(int chan, FSOUND_STREAM *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
 
@@ -2116,8 +2116,9 @@ void 	Game::Tick()
 				if(newscreenwidth==840&&newscreenheight==524)whichres=5;
 				if(newscreenwidth==1024&&newscreenheight==640)whichres=6;
 				if(newscreenwidth==1344&&newscreenheight==840)whichres=7;
+				if(newscreenwidth==1920&&newscreenheight==1200)whichres=8;
 
-				if(whichres==-1||whichres==7){
+				if(whichres==-1||whichres==8){
 					newscreenwidth=640;
 					newscreenheight=480;
 				}
@@ -2149,6 +2150,10 @@ void 	Game::Tick()
 					newscreenwidth=1344;
 					newscreenheight=840;
 				}
+				if(whichres==7){
+					newscreenwidth=1920;
+					newscreenheight=1200;
+				}
 			}
 			if(Button()&&!oldbutton&&selected==1){
 				newdetail++;
@@ -3169,7 +3174,13 @@ void 	Game::Tick()
 							if(displaychars[0]){
 								char serialstring[256];
 								char tempstring[256];
+								#if defined(__APPLE__)
+								sprintf (tempstring, "%s", registrationname);
+								#elif defined(_MSC_VER) || defined(__linux__)
 								sprintf (tempstring, "%s-windows", registrationname);
+								#else
+								#error Please make sure you have the right registration key stuff here!
+								#endif
 								long num1;
 								long num2;
 								long num3;
@@ -10762,6 +10773,7 @@ void 	Game::Tick()
 									oldtemp2=temp2;
 									if(tutorialstage>=51)
 										if(findDistancefast(&temp,&player[0].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[0].coords)<4){
+		                                    FSOUND_StopSound(FSOUND_ALL);  // hack...OpenAL renderer isn't stopping music after tutorial goes to level menu...
 											FSOUND_SetFrequency(FSOUND_ALL, 0.001);
 
 											PlayStreamEx( stream_music3, strm[stream_music3], NULL, TRUE);