X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=083af9d86f8f8aa06c964e1b498749d29ec881e7;hb=963584c62f5a1ec1f2b505f5c64672b7d4bc7547;hp=c3b087de033646d6b605735ed70ef03bb254fe71;hpb=1a0ad4362ed618c1a25508530dfeeb4a0f6ef345;p=lugaru.git

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index c3b087d..083af9d 100644
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -567,29 +567,6 @@ int Game::DrawGLScene(StereoSide side)
 		}
 		glPopMatrix();
 
-		//if(cellophane){
-		/*glEnable(GL_CULL_FACE);
-		glCullFace(GL_FRONT);
-		glDepthMask(1);
-		for(k=0;k<numplayers;k++){
-		glEnable(GL_BLEND);
-		glEnable(GL_LIGHTING);
-		terrainlight=terrain.getLighting(player[k].coords.x,player[k].coords.z);
-		distance=findDistancefast(&viewer,&player[k].coords);
-		distance=(viewdistance*viewdistance-(distance-(viewdistance*viewdistance*fadestart))*(1/(1-fadestart)))/viewdistance/viewdistance;
-		glColor4f(terrainlight.x,terrainlight.y,terrainlight.z,distance);
-		if(distance>=1)glDisable(GL_BLEND);
-		if(distance>0){
-		checkpoint=DoRotation(player[k].skeleton.joints[abs(Random()%player[k].skeleton.num_joints)].position,0,player[k].rotation,0)*player[k].scale+player[k].coords;
-		checkpoint.y+=1;
-		if(checkcollide(viewer,checkpoint)){
-		player[k].occluded+=1;
-		}
-		else player[k].occluded=0;
-		if(player[k].occluded<25)player[k].DrawSkeleton();
-		}
-		}*/
-
 		glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_CULL_FACE);
 		glCullFace(GL_FRONT);
@@ -2522,7 +2499,7 @@ int Game::DrawGLScene(StereoSide side)
 			glMatrixMode(GL_MODELVIEW);							// Select The Modelview Matrix
 
 			if(mainmenu==3){			
-				nummenuitems=13;
+				nummenuitems=14;
 				if((float)newscreenwidth>(float)newscreenheight*1.61||(float)newscreenwidth<(float)newscreenheight*1.59)sprintf (menustring[0], "Resolution: %d*%d",(int)newscreenwidth,(int)newscreenheight);
 				else sprintf (menustring[0], "Resolution: %d*%d (widescreen)",(int)newscreenwidth,(int)newscreenheight);
 				startx[0]=10+20;
@@ -2608,15 +2585,23 @@ int Game::DrawGLScene(StereoSide side)
 				
 				sprintf (menustring[11], "Volume: %d%%", (int)(volume*100));
 				startx[11]=10+60;
-				starty[11]=155;
+				starty[11]=160;
 				endx[11]=startx[11]+strlen(menustring[11])*10;
 				endy[11]=starty[11]+20;
 				movex[11]=0;
 				movey[11]=0;
 				
+				sprintf (menustring[13], "Damage Bar: %s",(showdamagebar?"on":"off"));
+				startx[13]=30;
+				starty[13]=125;
+				endx[13]=startx[13]+strlen(menustring[13])*10;
+				endy[13]=starty[13]+20;
+				movex[13]=0;
+				movey[13]=0;
+				
 				sprintf (menustring[7], "-Configure Controls-");
 				startx[7]=10+15;
-				starty[7]=100;
+				starty[7]=90;
 				endx[7]=startx[7]+strlen(menustring[7])*10;
 				endy[7]=starty[7]+20;
 				movex[7]=0;
@@ -2624,7 +2609,7 @@ int Game::DrawGLScene(StereoSide side)
 
 				sprintf (menustring[12], "-Configure Stereo -");
 				startx[12]=10+15;
-				starty[12]=60;
+				starty[12]=55;
 				endx[12]=startx[12]+strlen(menustring[7])*10;
 				endy[12]=starty[12]+20;
 				movex[12]=0;
@@ -2925,7 +2910,8 @@ int Game::DrawGLScene(StereoSide side)
 				movex[0]=0;
 				movey[0]=0;
 
-				if(entername)startx[0]+=10;
+				if(entername)
+					startx[0]+=10;
 
 
 				num=1;
@@ -3590,29 +3576,20 @@ int Game::DrawGLScene(StereoSide side)
 											//if(1-((float)i)/10-(1-selectedlong[j])>0){
 											glMatrixMode(GL_MODELVIEW);							// Select The Modelview Matrix
 											glPushMatrix();
-												if(mainmenu!=7||j!=0||!entername)text.glPrint(startx[j],starty[j],menustring[j],0,1,640,480);
+												if(mainmenu!=7||j!=0||!entername)
+													text.glPrint(startx[j],starty[j],menustring[j],0,1,640,480);
 												else
 												{
 													if(displayblink){
 														sprintf (string, "_");
 														text.glPrint(startx[j]+(float)(displayselected)*10,starty[j],string,0,1,640,480);
 													}
-													k=0;
-													for(l=0;l<displaychars[k];l++){
-														if(l<displaychars[k]){
-															sprintf (string, "%c",displaytext[k][l]);
-															text.glPrint(startx[j]+l*10,starty[j],string,0,1,640,480);
-														}
+													for(l=0;l<displaychars[0];l++){
+														sprintf (string, "%c",displaytext[0][l]);
+														text.glPrint(startx[j]+l*10,starty[j],string,0,1,640,480);
 													}
 												}
 											glPopMatrix();
-											/*}
-											else{
-											glPushMatrix();
-											sprintf (string, "Hooo!");
-											text.glPrint(startx[0],starty[0],string,0,1,640,480);
-											glPopMatrix();
-											}*/
 											glEnable(GL_BLEND);
 											glBlendFunc(GL_SRC_ALPHA,GL_ONE);
 											for(i=0;i<15;i++)
@@ -3626,7 +3603,7 @@ int Game::DrawGLScene(StereoSide side)
 													if(mainmenu==4)text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4/*-((((float)i)/70)*strlen(menustring[j]))*3*/,starty[j]/*-i*1/2*/+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
 													if(mainmenu==5)text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4/*-((((float)i)/70)*strlen(menustring[j]))*3*/,starty[j]/*-i*1/2*/+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
 													if(mainmenu==6)text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4/*-((((float)i)/70)*strlen(menustring[j]))*3*/,starty[j]/*-i*1/2*/+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
-													if(mainmenu==7&&(j!=0||!entername))text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4/*-((((float)i)/70)*strlen(menustring[j]))*3*/,starty[j]/*-i*1/2*/+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
+													if(mainmenu==7&&(j!=0||!entername)) text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4,starty[j]+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
 													if(mainmenu==8)text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4/*-((((float)i)/70)*strlen(menustring[j]))*3*/,starty[j]/*-i*1/2*/+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
 													if(mainmenu==9)text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4/*-((((float)i)/70)*strlen(menustring[j]))*3*/,starty[j]/*-i*1/2*/+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
 													if(mainmenu==11)text.glPrint(startx[j]-((float)i)+offsetx[j]*((float)i)/4/*-((((float)i)/70)*strlen(menustring[j]))*3*/,starty[j]/*-i*1/2*/+offsety[j]*((float)i)/4,menustring[j],0,1+((float)i)/70,640,480);
@@ -3936,7 +3913,6 @@ int Game::DrawGLScene(StereoSide side)
 		multiplier=0;
 	}
 
-
 	//glFlush();
 	if ( side == stereoRight || side == stereoCenter ) {
 		if(drawmode!=motionblurmode||mainmenu){