X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=c92bcf9a1b65358549da7a6d06e2a0be11fe6e09;hb=10e9ad6032835e48ba044ccfdb8323369ab1551f;hp=853c5ca73494709a566634564dcdf90ed4c1c1e5;hpb=43f08119f2408a487dbefcf670bb6c8f47d4c49b;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 853c5ca..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);
 
@@ -1849,8 +1849,7 @@ void 	Game::Tick()
 				if(newscreenheight>3000)newscreenheight=screenheight;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
-				//ofstream opstream(":Data:config.txt"); 
-				ofstream opstream("./Data/config.txt"); 
+				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
 				opstream << "Screenwidth:\n";
 				opstream << newscreenwidth;
 				opstream << "\nScreenheight:\n";
@@ -2117,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;
 				}
@@ -2150,6 +2150,10 @@ void 	Game::Tick()
 					newscreenwidth=1344;
 					newscreenheight=840;
 				}
+				if(whichres==7){
+					newscreenwidth=1920;
+					newscreenheight=1200;
+				}
 			}
 			if(Button()&&!oldbutton&&selected==1){
 				newdetail++;
@@ -2246,8 +2250,7 @@ void 	Game::Tick()
 				if(newscreenheight<0)newscreenheight=screenheight;
 
 
-				//ofstream opstream(":Data:config.txt"); 
-				ofstream opstream("./Data/config.txt"); 
+				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
 				opstream << "Screenwidth:\n";
 				opstream << newscreenwidth;
 				opstream << "\nScreenheight:\n";
@@ -2992,8 +2995,7 @@ void 	Game::Tick()
 				if(newscreenheight>3000)newscreenheight=screenheight;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
-				//ofstream opstream(":Data:config.txt"); 
-				ofstream opstream("./Data/config.txt"); 
+				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
 				opstream << "Screenwidth:\n";
 				opstream << newscreenwidth;
 				opstream << "\nScreenheight:\n";
@@ -3172,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;
@@ -4518,7 +4526,7 @@ void 	Game::Tick()
 									}
 								}
 
-								ifstream ipstream(mapname);
+								ifstream ipstream(ConvertFileName(mapname));
 								ipstream.ignore(256,':');
 								ipstream >> numdialogueboxes[numdialogues];
 								for(i=0;i<numdialogueboxes[numdialogues];i++){
@@ -4611,7 +4619,7 @@ void 	Game::Tick()
 									}
 								}
 
-								ifstream ipstream(mapname);
+								ifstream ipstream(ConvertFileName(mapname));
 								ipstream.ignore(256,':');
 								ipstream >> numdialogueboxes[whichdi];
 								for(i=0;i<numdialogueboxes[whichdi];i++){
@@ -5631,8 +5639,7 @@ void 	Game::Tick()
 				if(newscreenheight>3000)newscreenheight=screenheight;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
-				//ofstream opstream(":Data:config.txt"); 
-				ofstream opstream("./Data/config.txt"); 
+				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
 				opstream << "Screenwidth:\n";
 				opstream << newscreenwidth;
 				opstream << "\nScreenheight:\n";
@@ -10766,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);
@@ -11346,8 +11354,7 @@ void 	Game::TickOnceAfter(){
 
 								startbonustotal=0;
 
-								//		ifstream ipstream(":Data:Campaigns:main.txt");	
-								ifstream ipstream("./Data/Campaigns/main.txt");	
+								ifstream ipstream(ConvertFileName(":Data:Campaigns:main.txt"));
 								//campaignnumlevels=0;
 								//accountcampaignchoicesmade[accountactive]=0;
 								ipstream.ignore(256,':');