[patch] patch for scrouge-0.5 to compile against gcc 3.4

scourge-gcc34.patch (text/plain), 3.11 KB, created by Stéphane Gimenez on 2004-07-25 10:49:07 UTC

--- scourge-0.5/src/effect.cpp	2004-07-18 22:43:42.000000000 +0100
+++ scourge-0.5.new/src/effect.cpp	2004-07-25 17:42:21.359376984 +0100
@@ -96,7 +96,7 @@
     if(particle[i]) {            
 
 	  //	  float c = (((float)particle[i]->life) / ((float)particle[i]->maxLife));
-	  float c = ((float)abs(particle[i]->z - 8)) / 8.0f;
+	  float c = ((float)abs((int)(particle[i]->z - 8))) / 8.0f;
 	  if(c > 1) c = 1;
       glColor4f(c / 2.0f, c, 1.0f, 0.5);
 
--- scourge-0.5/src/glteleporter.cpp	2004-06-09 19:13:08.000000000 +0100
+++ scourge-0.5.new/src/glteleporter.cpp	2004-07-25 17:43:19.669512496 +0100
@@ -117,7 +117,7 @@
 	float green = (float)((this->color & 0x00ff0000) >> (2 * 8)) / (float)(0xff);
 	float blue = (float)((this->color & 0x0000ff00) >> (1 * 8)) / (float)(0xff);
 	float max = ((float)(height - 1) / DIV) / 2.0f;
-	float dist = 1.5f - abs(max - ring[i]) / max;
+	float dist = 1.5f - abs((int)(max - ring[i])) / max;
 	glColor4f(red, green, blue, dist);
 	
 	glBegin( GL_QUADS );
--- scourge-0.5/src/mainmenu.cpp	2004-05-22 20:54:14.000000000 +0100
+++ scourge-0.5.new/src/mainmenu.cpp	2004-07-25 17:44:30.694715024 +0100
@@ -198,8 +198,8 @@
   glPushMatrix();
   glLoadIdentity();
   glRotatef(logoRot, 0, 0, 1 );
-  glTranslatef( 70, 10 - (abs(logoRot) / 0.25f), 500 );
-  float zoom = (abs(logoRot) / (LOGO_ROT_POS / LOGO_ZOOM)) + 1.0f;
+  glTranslatef( 70, 10 - (abs((int)logoRot) / 0.25f), 500 );
+  float zoom = (abs((int)logoRot) / (LOGO_ROT_POS / LOGO_ZOOM)) + 1.0f;
   glScalef( zoom, zoom, 1 );
   float w = scourge->getShapePalette()->logo->w;
   float h = scourge->getShapePalette()->logo->h;
@@ -242,7 +242,7 @@
 void MainMenu::addLogoSprite() {
   if(logoSpriteCount >= MAX_LOGOS - 1) return;
   logoSprite[logoSpriteCount].x = 70.0f;
-  logoSprite[logoSpriteCount].y = 10 - (abs(logoRot) / 0.25f);
+  logoSprite[logoSpriteCount].y = 10 - (abs((int)logoRot) / 0.25f);
   logoSprite[logoSpriteCount].angle = 1.0f + (88.0f * rand()/RAND_MAX);
   logoSprite[logoSpriteCount].quadrant = (int)(4.0f * rand()/RAND_MAX);
   logoSprite[logoSpriteCount].steps = 0;
--- scourge-0.5/src/map.cpp	2004-07-18 22:43:42.000000000 +0100
+++ scourge-0.5.new/src/map.cpp	2004-07-25 17:46:13.485088512 +0100
@@ -1460,13 +1460,13 @@
 	if(yDiffBigger) {
 	  if(y1 < y2) y += 1.0f;
 	  else y -= 1.0f;
-	  if(x1 < x2) x += 1.0f / abs(m);
-	  else x += -1.0f / abs(m);
+	  if(x1 < x2) x += 1.0f / abs((int)m);
+	  else x += -1.0f / abs((int)m);
 	} else {
 	  if(x1 < x2) x += 1.0f;
 	  else x -= 1.0f;
-	  if(y1 < y2) y += abs(m);
-	  else y += -1.0 * abs(m);
+	  if(y1 < y2) y += abs((int)m);
+	  else y += -1.0 * abs((int)m);
 	}
   }
   //  fprintf(stderr, "wall in between? %s\n", (ret ? "TRUE": "FALSE"));
--- scourge-0.5/src/userconfiguration.cpp	2004-07-23 04:24:49.000000000 +0100
+++ scourge-0.5.new/src/userconfiguration.cpp	2004-07-25 17:48:36.494347800 +0100
@@ -797,7 +797,7 @@
   int err = mkdir( path, S_IRWXU|S_IRGRP|S_IXGRP );
   if(err) {
 	cerr << "Error creating config directory: " << path << endl;
-	cerr << "Error: " << errno << endl;
+	cerr << "Error: " << err << endl;
 	perror("UserConfiguration::createDefaultConfigFile: ");
 	exit(1);
   }