rpms/xgalaxy/devel xgalaxy-2.0.34-fullscreen.patch, 1.1, 1.2 xgalaxy-2.0.34-xgalaxy.patch, 1.1, 1.2 xgalaxy.spec, 1.1, 1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Wed May 31 15:16:41 UTC 2006 

Author: jwrdegoede

Update of /cvs/extras/rpms/xgalaxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4865

Modified Files:
	xgalaxy-2.0.34-fullscreen.patch xgalaxy-2.0.34-xgalaxy.patch 
	xgalaxy.spec 
Log Message:
xgalaxy-2.0.34-3 wip

xgalaxy-2.0.34-fullscreen.patch:

Index: xgalaxy-2.0.34-fullscreen.patch
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-fullscreen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xgalaxy-2.0.34-fullscreen.patch	31 May 2006 14:32:28 -0000	1.1
+++ xgalaxy-2.0.34-fullscreen.patch	31 May 2006 15:16:41 -0000	1.2
@@ -1,5 +1,5 @@
 --- xgalaga-2.0.34/libsprite/struct.h.fs	1998-04-12 08:03:23.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/struct.h	2006-05-22 11:45:35.000000000 +0200
++++ xgalaga-2.0.34/libsprite/struct.h	2006-05-31 16:56:50.000000000 +0200
 @@ -55,6 +55,8 @@
      W_Callback handle_button;
      W_Callback handle_expose;
@@ -9,8 +9,8 @@
  };
  
  struct stringList {
---- xgalaga-2.0.34/libsprite/data.c.fs	2006-05-22 11:45:35.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/data.c	2006-05-22 11:45:35.000000000 +0200
+--- xgalaga-2.0.34/libsprite/data.c.fs	2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/libsprite/data.c	2006-05-31 16:56:50.000000000 +0200
 @@ -158,3 +158,6 @@
  
  int useBuffered = 1;
@@ -19,7 +19,7 @@
 +struct xf86vidmode_data XF86VidModeData = { 1, { 0 }, 0, 0 };
 +#endif
 --- xgalaga-2.0.34/libsprite/Wlib.h.fs	1998-04-12 08:03:22.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/Wlib.h	2006-05-22 11:45:35.000000000 +0200
++++ xgalaga-2.0.34/libsprite/Wlib.h	2006-05-31 16:56:50.000000000 +0200
 @@ -91,6 +91,22 @@
  
  extern int autoPoint, W_KeyDepth, animPointers, useWorkbench;
@@ -44,7 +44,7 @@
  
  #if 0
 --- xgalaga-2.0.34/libsprite/mapwindow.c.fs	1998-04-12 08:03:22.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/mapwindow.c	2006-05-22 11:45:35.000000000 +0200
++++ xgalaga-2.0.34/libsprite/mapwindow.c	2006-05-31 16:56:50.000000000 +0200
 @@ -13,6 +13,8 @@
      if(win->type != WIN_BORDER && win->borderwin) {
        W_MapWindow(win->borderwin);
@@ -90,8 +90,8 @@
  }
  
  void
---- xgalaga-2.0.34/libsprite/init.c.fs	2006-05-22 11:45:35.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/init.c	2006-05-22 11:45:35.000000000 +0200
+--- xgalaga-2.0.34/libsprite/init.c.fs	2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/libsprite/init.c	2006-05-31 16:56:50.000000000 +0200
 @@ -356,6 +356,31 @@
      XFreeModifiermap(m);
  }
@@ -134,8 +134,8 @@
 +#endif
  }
  
---- xgalaga-2.0.34/libsprite/makewindow.c.fs	2006-05-22 11:45:35.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/makewindow.c	2006-05-22 11:45:35.000000000 +0200
+--- xgalaga-2.0.34/libsprite/makewindow.c.fs	2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/libsprite/makewindow.c	2006-05-31 16:56:50.000000000 +0200
 @@ -236,6 +236,10 @@
      neww->type = type;
      neww->mapped = 0;
@@ -380,7 +380,7 @@
 +  }
 +}
 --- xgalaga-2.0.34/libsprite/Wproto.h.fs	1998-04-12 08:03:22.000000000 +0200
-+++ xgalaga-2.0.34/libsprite/Wproto.h	2006-05-22 11:45:35.000000000 +0200
++++ xgalaga-2.0.34/libsprite/Wproto.h	2006-05-31 16:56:50.000000000 +0200
 @@ -63,6 +63,7 @@
  W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
  W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
@@ -389,8 +389,8 @@
  /* point.c */
  void W_DrawPoint(W_Window window, int x, int y, W_Color color);
  void FlushPointCache(Window win, int color);
---- xgalaga-2.0.34/defs.h.fs	2006-05-22 11:45:35.000000000 +0200
-+++ xgalaga-2.0.34/defs.h	2006-05-22 11:45:35.000000000 +0200
+--- xgalaga-2.0.34/defs.h.fs	2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/defs.h	2006-05-31 16:56:50.000000000 +0200
 @@ -26,8 +26,9 @@
  
  #define TORPDELAY 5
@@ -404,7 +404,7 @@
  #define NUMSTARS 30
  
 --- xgalaga-2.0.34/Wlib.h.fs	1998-04-12 08:03:20.000000000 +0200
-+++ xgalaga-2.0.34/Wlib.h	2006-05-22 11:45:35.000000000 +0200
++++ xgalaga-2.0.34/Wlib.h	2006-05-31 16:56:50.000000000 +0200
 @@ -91,6 +91,22 @@
  
  extern int autoPoint, W_KeyDepth, animPointers, useWorkbench;
@@ -428,8 +428,8 @@
  #endif	/* AMIGA */
  
  #if 0
---- xgalaga-2.0.34/main.c.fs	2006-05-22 11:45:36.000000000 +0200
-+++ xgalaga-2.0.34/main.c	2006-05-22 11:45:35.000000000 +0200
+--- xgalaga-2.0.34/main.c.fs	2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/main.c	2006-05-31 16:56:50.000000000 +0200
 @@ -32,6 +32,7 @@
  static int attacking = 0, maxattacking, entering=0;
  static int maxetorps = 5, numetorps=0;
@@ -532,7 +532,7 @@
      /*    W_AutoRepeatOff();*/
  
 --- xgalaga-2.0.34/Wproto.h.fs	1998-04-12 08:03:20.000000000 +0200
-+++ xgalaga-2.0.34/Wproto.h	2006-05-22 11:45:35.000000000 +0200
++++ xgalaga-2.0.34/Wproto.h	2006-05-31 16:56:50.000000000 +0200
 @@ -63,6 +63,7 @@
  W_Window W_MakeTextWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
  W_Window W_MakeScrollingWindow(char *name, int x, int y, int width, int height, W_Window parent, char *cursname, int border);
@@ -541,3 +541,51 @@
  /* point.c */
  void W_DrawPoint(W_Window window, int x, int y, W_Color color);
  void FlushPointCache(Window win, int color);
+--- xgalaga-2.0.34/xgal.6x.fs	2006-05-31 16:56:50.000000000 +0200
++++ xgalaga-2.0.34/xgal.6x	2006-05-31 16:56:50.000000000 +0200
+@@ -4,11 +4,11 @@
+ .SH SYNOPSIS
+ .B xgalaga
+ [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
+-[-noclipmask] [-nouseor] [-nostars]
++[-noclipmask] [-nouseor] [-nostars] [-window]
+ .P
+ .B xgalaga-hyperspace
+ [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
+-[-noclipmask] [-nouseor] [-nostars]
++[-noclipmask] [-nouseor] [-nostars] [-window]
+ .SH INSTRUCTIONS
+ .LP
+ It's Galaga, you know how to play Galaga, stop bothering me.
+@@ -35,6 +35,9 @@
+ .B \-nosound
+ Turn sound OFF
+ .TP 8
++.B \-window
++Run in a window, not full screen. Full screen is the default.
++.TP 8
+ .B \-b
+ Turn buffered mode off, use this if it runs too slowly.  Will cause 
+ flicker, maybe lots, maybe only a little.
+@@ -68,6 +71,8 @@
+ k - Use keyboard control
+ .TP 8
+ x - use your shields (xgalaga-hyperspace only)
++.TP 8
++alt-enter - Toggle full screen node.
+ .SH "SEE ALSO"
+ Xgalaga home page
+ .RI < http://rumsey.org/xgal.html >
+--- xgalaga-2.0.34/pathfile.c.fs	2006-05-31 17:08:48.000000000 +0200
++++ xgalaga-2.0.34/pathfile.c	2006-05-31 17:09:37.000000000 +0200
+@@ -387,8 +387,8 @@
+ 
+ void get_xy(int anum, int* x, int* y)
+ {
+-    *x = pathinfo[al_paths[anum]].startx;
+-    *y = pathinfo[al_paths[anum]].starty;
++    *x = (WINWIDTH  * pathinfo[al_paths[anum]].startx) / 400;
++    *y = (WINHEIGHT * pathinfo[al_paths[anum]].starty) / 500;
+ }
+ 
+ int get_delay(int anum)

xgalaxy-2.0.34-xgalaxy.patch:

Index: xgalaxy-2.0.34-xgalaxy.patch
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy-2.0.34-xgalaxy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xgalaxy-2.0.34-xgalaxy.patch	31 May 2006 14:32:28 -0000	1.1
+++ xgalaxy-2.0.34-xgalaxy.patch	31 May 2006 15:16:41 -0000	1.2
@@ -34,7 +34,7 @@
  .B xgalaxy
  [-scores] [-display display] [-mouse] [-keyboard] [-nosound] [-b]
 @@ -11,9 +11,9 @@
- [-noclipmask] [-nouseor] [-nostars]
+ [-noclipmask] [-nouseor] [-nostars] [-window]
  .SH INSTRUCTIONS
  .LP
 -It's Galaga, you know how to play Galaga, stop bothering me.
@@ -46,9 +46,9 @@
  .P
  The xgalaxy-hyperspace version features some new weapons and different
  gameplay.
-@@ -69,7 +69,7 @@
+@@ -71,7 +71,7 @@
  .TP 8
- x - use your shields (xgalaxy-hyperspace only)
+ alt-enter - Toggle full screen node.
  .SH "SEE ALSO"
 -Xgalaga home page
 +XGalaxy home page


Index: xgalaxy.spec
===================================================================
RCS file: /cvs/extras/rpms/xgalaxy/devel/xgalaxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xgalaxy.spec	31 May 2006 14:32:28 -0000	1.1
+++ xgalaxy.spec	31 May 2006 15:16:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           xgalaxy
 Version:        2.0.34
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Galaxian / Galaga like game with powerups
 Group:          Amusements/Games
 License:        GPL
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Mon May 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-3
+- Documented the new -window switch in the manpage.
+
 * Mon May 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.34-2
 - Change name to xgalaxy because upstreams name has already been used for a
   game much like this one in the past, upstreams use of this name thus legally

More information about the fedora-extras-commits mailing list