X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=79d8bd150578f9ff49b39d31471464c6d35f86b9;hb=483f57f7df7e65f1aacbee8dbcef320ede069a95;hp=e4f2e394035b428aa6e0714e6a75069e580120db;hpb=8dda34d525dcb410195a05592fa72cef1954777b;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index e4f2e39..79d8bd1 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -39,7 +39,6 @@ extern Terrain terrain;
 extern int kTextureSize;
 extern float texdetail;
 extern float realtexdetail;
-extern float terraindetail;
 extern float volume;
 extern Objects objects;
 extern int detail;
@@ -62,7 +61,6 @@ extern long dirID;
 extern int mainmenu;
 extern int oldmainmenu;
 extern bool visibleloading;
-extern int loadscreencolor;
 extern float flashamount,flashr,flashg,flashb;
 extern int flashdelay;
 extern int whichjointstartarray[26];
@@ -419,14 +417,6 @@ void Game::LoadingScreen()
 		glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 		glDisable(GL_BLEND);
 		glColor4f(loadprogress/100,loadprogress/100,loadprogress/100,1);
-		//glColor4f(1,1,1,1);
-		/*if(loadscreencolor==0)glColor4f(1,1,1,1);
-		if(loadscreencolor==1)glColor4f(1,0,0,1);
-		if(loadscreencolor==2)glColor4f(0,1,0,1);
-		if(loadscreencolor==3)glColor4f(0,0,1,1);
-		if(loadscreencolor==4)glColor4f(1,1,0,1);
-		if(loadscreencolor==5)glColor4f(1,0,1,1);
-		*/
 		glPushMatrix();
 		//glScalef(.25,.25,.25);
 		glBegin(GL_QUADS);
@@ -483,13 +473,6 @@ void Game::LoadingScreen()
 		glEnable(GL_BLEND);
 		//glColor4f(loadprogress/100,loadprogress/100,loadprogress/100,1);
 		glColor4f(loadprogress/100,loadprogress/100,loadprogress/100,1);
-		/*if(loadscreencolor==0)glColor4f(1,1,1,1);
-		if(loadscreencolor==1)glColor4f(1,0,0,1);
-		if(loadscreencolor==2)glColor4f(0,1,0,1);
-		if(loadscreencolor==3)glColor4f(0,0,1,1);
-		if(loadscreencolor==4)glColor4f(1,1,0,1);
-		if(loadscreencolor==5)glColor4f(1,0,1,1);
-		*/
 		glPushMatrix();
 		//glScalef(.25,.25,.25);
 		glBegin(GL_QUADS);
@@ -601,7 +584,6 @@ void Game::LoadingScreen()
 		}
 
 		swap_gl_buffers();
-		loadscreencolor=0;
 	}
 }
 
@@ -642,13 +624,6 @@ void Game::FadeLoadingScreen(float howmuch)
 	glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 	glDisable(GL_BLEND);
 	glColor4f(loadprogress/100,0,0,1);
-	/*if(loadscreencolor==0)glColor4f(1,1,1,1);
-	if(loadscreencolor==1)glColor4f(1,0,0,1);
-	if(loadscreencolor==2)glColor4f(0,1,0,1);
-	if(loadscreencolor==3)glColor4f(0,0,1,1);
-	if(loadscreencolor==4)glColor4f(1,1,0,1);
-	if(loadscreencolor==5)glColor4f(1,0,1,1);
-	*/
 	glPushMatrix();
 	//glScalef(.25,.25,.25);
 	glBegin(GL_QUADS);
@@ -680,7 +655,6 @@ void Game::FadeLoadingScreen(float howmuch)
 	text.glPrint(280,125,string,1,1,640,480);
 	*/
 	swap_gl_buffers();
-	loadscreencolor=0;
 }
 
 
@@ -814,16 +788,12 @@ void Game::InitGame()
 
 	if(detail==2){
 		texdetail=1;
-		terraindetail=1;
 	}
 	if(detail==1){
 		texdetail=2;
-		terraindetail=1;
 	}
 	if(detail==0){
 		texdetail=4;
-		terraindetail=1;
-		//terraindetail=2;
 	}
 
 	LOG("Initializing sound system...");
@@ -954,16 +924,12 @@ void Game::LoadStuff()
 
 	if(detail==2){
 		texdetail=1;
-		terraindetail=1;
 	}
 	if(detail==1){
 		texdetail=2;
-		terraindetail=1;
 	}
 	if(detail==0){
 		texdetail=4;
-		terraindetail=1;
-		//terraindetail=2;
 	}
 
 	realtexdetail=texdetail;
@@ -1111,7 +1077,7 @@ void Game::LoadStuff()
 	gravity=-10;
 
 	texscale=.2/megascale/viewdistdetail;
-	terrain.scale=3*megascale*terraindetail*viewdistdetail;
+	terrain.scale=3*megascale*viewdistdetail;
 
 	viewer.x=terrain.size/2*terrain.scale;
 	viewer.z=terrain.size/2*terrain.scale;
@@ -1165,7 +1131,6 @@ void Game::LoadStuff()
 		}
 	}
 
-	loadscreencolor=4;
 	LoadingScreen();
 
 	for(i=0;i<player[0].skeleton.num_joints;i++){
@@ -1174,7 +1139,6 @@ void Game::LoadStuff()
 		}
 	}
 
-	loadscreencolor=4;
 	LoadingScreen();
 
 	for(i=0;i<player[0].skeleton.num_joints;i++){
@@ -1198,13 +1162,11 @@ void Game::LoadStuff()
 			animation[swordsneakattackanim].position[i][j]+=moveamount;
 		}
 	}
-	loadscreencolor=4;
 	LoadingScreen();
 	for(j=0;j<animation[swordsneakattackanim].numframes;j++){
 		animation[swordsneakattackanim].weapontarget[j]+=moveamount;
 	}
 
-	loadscreencolor=4;
 	LoadingScreen();
 
 	for(i=0;i<player[0].skeleton.num_joints;i++){
@@ -1219,13 +1181,11 @@ void Game::LoadStuff()
 	}
 	}
 	*/
-	loadscreencolor=4;
 	LoadingScreen();
 	temptexdetail=texdetail;
 	texdetail=1;
 	texdetail=temptexdetail;
 
-	loadscreencolor=4;
 	LoadingScreen();
 
 	//if(ismotionblur){