File void-funcs.diff of Package trackballs

Overview Repositories Revisions Requests Users Attributes Meta

File void-funcs.diff of Package trackballs

--- src/glHelp.cc	2007/07/10 15:15:32	1.1
+++ src/glHelp.cc	2007/07/10 16:23:44
@@ -62,9 +62,7 @@
 void draw2DString(TTF_Font *font,char *string, int x,int y,Uint8 red, Uint8 green, Uint8 blue) {
   int w,h;
   SDL_Color fgColor={255,255,255};
-  SDL_Color bgColor={0,0,0};
   SDL_Surface *text;
-  SDL_Rect rect;
   GLuint texture;
   GLfloat texcoord[4];
   GLfloat texMinX, texMinY;
@@ -516,7 +514,6 @@
 
 void glHelpInit() {  
   char str[256];
-  GLfloat texCoords[4];
 
   qobj = gluNewQuadric();
   gluQuadricDrawStyle(qobj,GLU_FILL);
@@ -612,12 +609,12 @@
 
 #define FRAME 50
 
-int bindTexture(char *name) {
+void bindTexture(char *name) {
   int i;
   for(i=0;i<numTextures;i++)
 	if(strcmp(name,textureNames[i])==0) {
 	  glBindTexture(GL_TEXTURE_2D,textures[i]);
-	  return i;
+	  return;
 	}
   // YP: if the texture is not found, try to load it
   //     and add it in the list
@@ -625,7 +622,7 @@
   if(i >= 0) glBindTexture(GL_TEXTURE_2D,textures[i]);
 }
 
-int resetTextures() {
+void resetTextures() {
   GLfloat texCoord[4];
   char str[256];
   SDL_Surface *surface;
@@ -646,14 +643,13 @@
     }
     if(!surface) {
       printf(_("Warning: Failed to load texture %s\n"),str);
-      return 0;  // error (a valid texture entry)
+      return;  // error is ignored (a valid texture entry)
     } else {
       glDeleteTextures(1, &textures[i] );
       textures[i] = LoadTexture(surface,texCoord, linear, NULL);
       SDL_FreeSurface(surface);
     }
   }  
-  
 }
 
 /* Calculates and displays current framerate */
@@ -944,8 +940,6 @@
     SDL_Surface *source=SDL_ConvertSurface(surface,image->format,SDL_SWSURFACE);
     SDL_LockSurface(source);
     SDL_LockSurface(image);
-    Uint32 *destPixels=(Uint32*)image->pixels;
-    Uint32 *sourcePixels=(Uint32*)source->pixels;
     for(int x=0;x<area.w;x++)
       for(int y=0;y<area.h;y++)
 	*((Uint32*)(((char*)image->pixels)+x*image->format->BytesPerPixel+y*image->pitch)) =
@@ -1009,7 +1003,7 @@
 // YP: draw a spike with TRIANGLE_FAN. less time used by C->GL
 //     copies, and reduction of glBegin/glEnd number.
 void drawSpike(Coord3d a,Coord3d b,Coord3d c, Coord3d d) {
-  Coord3d ab, ac, ad;
+  Coord3d ab, ac, ad = {0,0,0};
   Coord3d normal1, normal2, normal3;
 
   sub(b,a,ab);
--- src/glHelp.h	2007/07/10 15:11:29	1.1
+++ src/glHelp.h	2007/07/10 15:15:28
@@ -76,8 +76,8 @@
 
 SDL_Surface *getSurfaceFromRGB(char *);
 int loadTexture(char *name, Font *font = NULL); // preloads a texture from file and returns position in textures array
-int bindTexture(char *name); // binds texture. Also returns index in textures array used for this.
-int resetTextures(); //Reloads all textures
+void bindTexture(char *name);			// Binds texture
+void resetTextures();				// Reloads all textures
 
 void createForcefieldTextures();     /** Create a set of special textures for forcefields that are animated over time. */
 void resetForcefieldsTextures();
--- share/icons/Makefile.am	2007/07/10 15:34:51	1.1
+++ share/icons/Makefile.am	2007/07/10 15:36:25
@@ -7,7 +7,7 @@
 	echo "Exec=$(bindir)/trackballs" >> trackballs.desktop
 
 
-iconsdir = $(datadir)/icons/hicolor
+iconsdir = $(DESTDIR)$(datadir)/icons/hicolor
 icons_DATA = trackballs-32x32.png trackballs-48x48.png trackballs-64x64.png
 
 EXTRA_DIST = $(desktop_DATA) $(icons_DATA) trackballs.desktop.in

Places

File void-funcs.diff of Package trackballs

Places