trackballs/trackballs.patch

   1 --- trackballs-1.1.4.orig/src/mmad.cc
   2 +++ trackballs-1.1.4/src/mmad.cc
   3 @@ -255,7 +255,7 @@
   4    }
   5
   6    /* Initialize SDL */
   7 -  if((SDL_Init(SDL_INIT_VIDEO|audio|SDL_INIT_JOYSTICK)==-1)) {
   8 +  if((SDL_Init(SDL_INIT_NOPARACHUTE|SDL_INIT_VIDEO|audio|SDL_INIT_JOYSTICK)==-1)) {
   9         printf(_("Could not initialize libSDL.\nError message: '%s'\n"), SDL_GetError());
  10         exit(-1);
  11    }
  12
  13 --- trackballs-1.1.4.orig/share/icons/Makefile.in
  14 +++ trackballs-1.1.4/share/icons/Makefile.in
  15 @@ -374,12 +374,12 @@
  16         echo "Exec=$(bindir)/trackballs" >> trackballs.desktop
  17
  18  install-iconsDATA:
  19 -       $(mkinstalldirs) $(iconsdir)/32x32/apps
  20 -       $(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(iconsdir)/32x32/apps/trackballs.png
  21 -       $(mkinstalldirs) $(iconsdir)/48x48/apps
  22 -       $(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(iconsdir)/48x48/apps/trackballs.png
  23 -       $(mkinstalldirs) $(iconsdir)/64x64/apps
  24 -       $(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(iconsdir)/64x64/apps/trackballs.png
  25 +       $(mkinstalldirs) $(DESTDIR)$(iconsdir)/32x32/apps
  26 +       $(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png
  27 +       $(mkinstalldirs) $(DESTDIR)$(iconsdir)/48x48/apps
  28 +       $(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png
  29 +       $(mkinstalldirs) $(DESTDIR)$(iconsdir)/64x64/apps
  30 +       $(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png
  31
  32  uninstall-iconsDATA:
  33         -rm -f $(iconsdir)/32x32/apps/trackballs.png
  34
  35 diff -up trackballs-1.1.4/src/map.cc~ trackballs-1.1.4/src/map.cc
  36 --- trackballs-1.1.4/src/map.cc~        2008-01-03 14:31:28.000000000 +0100
  37 +++ trackballs-1.1.4/src/map.cc 2008-01-03 14:31:28.000000000 +0100
  38 @@ -479,7 +479,7 @@ double smoothSemiRand(int x,int y,double
  39  void Map::drawCell(int birdsEye,int stage,int x,int y) {
  40    Coord3d normal,normal1;
  41    Real texScale = 0.25;
  42 -  int i,draw;
  43 +  int i;
  44    int gfx_details = Settings::settings->gfx_details;
  45    double txOffset=0.0,tyOffset=0.0;
  46    Cell& c = cell(x,y);
  47 @@ -615,7 +615,7 @@ void Map::drawCell(int birdsEye,int stag
  48
  49    /* Draw south side of cell */
  50    {
  51 -       Cell& c2 = cell(x,y-1); draw=0;
  52 +       Cell& c2 = cell(x,y-1);
  53         int southTransparent=c.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 ||
  54           c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95;
  55         if((southTransparent && stage==1) || (!southTransparent && stage==0) || !isTransparent)
  56 @@ -624,11 +624,10 @@ void Map::drawCell(int birdsEye,int stag
  57                 if(c2.heights[Cell::NORTH+Cell::WEST] < c.heights[Cell::SOUTH+Cell::WEST] ||
  58                    c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::EAST]) {
  59                   glNormal3f(0.0,-1.0,0.0);
  60 -                 draw=1;
  61                 } else
  62                   glNormal3f(0.0,+1.0,0.0);
  63
  64 -               if(birdsEye || draw) {
  65 +               {
  66                   glBegin(GL_TRIANGLE_STRIP);
  67                   glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::NORTH+Cell::EAST]);
  68                   glVertex3f(x+1.01,y,c2.heights[Cell::NORTH+Cell::EAST]);
  69 @@ -645,7 +644,7 @@ void Map::drawCell(int birdsEye,int stag
  70
  71    /* Draw west side of cell */
  72    {
  73 -       Cell& c2 = cell(x-1,y); draw=0;
  74 +       Cell& c2 = cell(x-1,y);
  75         int westTransparent=c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 || c.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95 ||
  76           c2.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95;
  77         if((westTransparent && stage==1) || (!westTransparent && stage==0) || !isTransparent)
  78 @@ -654,11 +653,10 @@ void Map::drawCell(int birdsEye,int stag
  79                 if(c2.heights[Cell::SOUTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::WEST] ||
  80                    c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::NORTH+Cell::WEST]) {
  81                   glNormal3f(-1.0,0.0,0.0);
  82 -                 draw=1;
  83                 } else
  84                   glNormal3f(+1.0,0.0,0.0);
  85
  86 -               if(birdsEye || draw) {
  87 +               {
  88                   glColor4f(0.0,0.0,0.0,1.0);
  89                   glBegin(GL_TRIANGLE_STRIP);
  90                   glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::SOUTH+Cell::EAST]);