X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=a0f164ad2bde461e6907cd4131e7d5aed820de6e;hb=2cd28eb24fc1b4011511b6c3ed8c025bfc74de4d;hp=f87d6eef92349de6e5c7fadf3c98e55f6a86a7f6;hpb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index f87d6ee..a0f164a 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -101,8 +101,6 @@ void LOG(const std::string &fmt, ...)
 
 void Game::Dispose()
 {
-	int i,j;
-
 	LOGFUNC;
 
 	if(endgame==2){
@@ -122,7 +120,7 @@ void Game::Dispose()
 //  later in the shutdown process.  --ryan.
 #if !PLATFORM_LINUX
 
-	for (i=0; i < sounds_count; ++i)
+	for (int i=0; i < sounds_count; ++i)
 	{
 		OPENAL_Sample_Free(samp[i]);
 	}
@@ -366,7 +364,7 @@ GLvoid Game::ReSizeGLScene(float fov, float pnear)
 
 void Game::LoadingScreen()
 {
-	static float loadprogress,minprogress,maxprogress;
+	static float loadprogress;
 	static AbsoluteTime time = {0,0};
 	static AbsoluteTime frametime = {0,0};
 	AbsoluteTime currTime = UpTime ();
@@ -383,7 +381,6 @@ void Game::LoadingScreen()
 	if(multiplier>.05){
 		frametime = currTime;	// reset for next time interval
 
-		float size=1;
 		glLoadIdentity();
 		//Clear to black
 		glClearColor(0,0,0,1);
@@ -538,15 +535,6 @@ void Game::LoadingScreen()
 		glDepthMask(1);
 
 		//Text
-		/*
-		glEnable(GL_TEXTURE_2D);
-		static char string[256]="";
-		sprintf (string, "LOADING... %d%",(int)loadprogress);
-		glColor4f(1,1,1,.2);
-		text.glPrint(280-280*loadprogress/100/2/4,125-125*loadprogress/100/2/4,string,1,1+loadprogress/100,640,480);
-		glColor4f(1.2-loadprogress/100,1.2-loadprogress/100,1.2-loadprogress/100,1);
-		text.glPrint(280,125,string,1,1,640,480);
-		*/
 
 		if(flashamount>0){
 			if(flashamount>1)flashamount=1;
@@ -591,9 +579,8 @@ void Game::LoadingScreen()
 
 void Game::FadeLoadingScreen(float howmuch)
 {
-	static float loadprogress,minprogress,maxprogress;
+	static float loadprogress;
 
-	float size=1;
 	glLoadIdentity();
 	//Clear to black
 	glClearColor(0,0,0,1);
@@ -647,15 +634,6 @@ void Game::FadeLoadingScreen(float howmuch)
 	glDisable(GL_BLEND);
 	glDepthMask(1);
 	//Text
-	/*
-	glEnable(GL_TEXTURE_2D);
-	static char string[256]="";
-	sprintf (string, "LOADING... %d%",(int)loadprogress);
-	glColor4f(1,1,1,.2);
-	text.glPrint(280-280*loadprogress/100/2/4,125-125*loadprogress/100/2/4,string,1,1+loadprogress/100,640,480);
-	glColor4f(1.2-loadprogress/100,1.2-loadprogress/100,1.2-loadprogress/100,1);
-	text.glPrint(280,125,string,1,1,640,480);
-	*/
 	swap_gl_buffers();
 }
 
@@ -686,8 +664,6 @@ void Game::InitGame()
 
 	autocam=0;
 
-	int i,j;
-
 	numchallengelevels=14;
 
 	accountactive=Account::loadFile(":Data:Users");
@@ -839,7 +815,7 @@ void Game::InitGame()
 	loadAllSounds();
 
 	if(musictoggle)
-	  emit_stream_np(stream_music3);
+	  emit_stream_np(stream_menutheme);
 
 	LoadTexture(":Data:Textures:Cursor.png",&cursortexture,0,1);
 
@@ -858,9 +834,6 @@ void Game::InitGame()
 	//LoadTexture(":Data:Textures:Eye.jpg",&Mainmenuitems[5],0,1);
 	texdetail=temptexdetail;
 
-	loaddistrib=0;
-	anim=0;
-
 	FadeLoadingScreen(95);
 
 
@@ -897,7 +870,7 @@ void Game::LoadStuff()
 {
 	static float temptexdetail;
 	static float viewdistdetail;
-	static int i,j,texsize;
+	static int i,j;
 	float megascale =1;
 
 	LOGFUNC;
@@ -1192,13 +1165,7 @@ void Game::LoadStuff()
 			animation[swordsneakattackedanim].position[i][j]+=moveamount;
 		}
 	}
-	/*
-	for(i=0;i<player[0].skeleton.num_joints;i++){
-	for(j=0;j<animation[sleepanim].numframes;j++){
-	animation[sleepanim].position[i][j]=DoRotation(animation[sleepanim].position[i][j],0,180,0);
-	}
-	}
-	*/
+	
 	LoadingScreen();
 	temptexdetail=texdetail;
 	texdetail=1;