rpms/lacewing/devel lacewing-fullscreen.patch, 1.1, 1.2 lacewing.spec, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	lacewing-fullscreen.patch lacewing.spec 
Log Message:
* Wed Mar 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-5
- Change fullscreen patch to not change to window / fullscreen untill
  the menu is left.


lacewing-fullscreen.patch:

Index: lacewing-fullscreen.patch
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/lacewing-fullscreen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lacewing-fullscreen.patch	30 Jan 2006 21:34:11 -0000	1.1
+++ lacewing-fullscreen.patch	22 Mar 2006 19:10:49 -0000	1.2
@@ -1,17 +1,5 @@
-diff -ur lacewing.orig/config.h lacewing/config.h
---- lacewing.orig/config.h	2006-01-21 13:00:59.000000000 +0100
-+++ lacewing/config.h	2006-01-21 11:19:54.000000000 +0100
-@@ -792,6 +792,7 @@
-  int run_vsync; // on or off
-  int sound_volume; // sound fx volume; if 0 sound effects not played
-  int ambience_volume; // if 0 ambience not played
-+ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED
- };
- 
- struct starstruct
-diff -ur lacewing.orig/main.c lacewing/main.c
---- lacewing.orig/main.c	2006-01-21 13:00:59.000000000 +0100
-+++ lacewing/main.c	2006-01-21 11:20:18.000000000 +0100
+--- lacewing-1.10/main.c.fullscreen	2006-02-28 23:01:57.000000000 +0100
++++ lacewing-1.10/main.c	2006-02-28 23:03:21.000000000 +0100
 @@ -245,7 +245,7 @@
  
     set_color_depth(8);
@@ -21,9 +9,8 @@
     {
        set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
        allegro_message("Unable to set 640x480 mode\n%s\n", allegro_error);
-diff -ur lacewing.orig/menu.c lacewing/menu.c
---- lacewing.orig/menu.c	2006-01-21 13:00:59.000000000 +0100
-+++ lacewing/menu.c	2006-01-21 11:54:18.000000000 +0100
+--- lacewing-1.10/menu.c.fullscreen	2006-02-28 23:01:57.000000000 +0100
++++ lacewing-1.10/menu.c	2006-02-28 23:05:23.000000000 +0100
 @@ -61,6 +61,7 @@
  #define KP_WAIT_SHORT 5
  
@@ -32,7 +19,23 @@
  
  enum
  {
-@@ -604,7 +605,7 @@
+@@ -124,6 +125,7 @@
+ int menu_index;
+ int menu_index_max;
+ int menu_index_min;
++int last_main_menu_index;
+ int keypress_wait;
+ int last_key;
+ int check_key(int scode);
+@@ -327,6 +329,7 @@
+  which_menu = MENU_MAIN;
+  menu_index_max = 4;
+  menu_index_min = 0;
++ last_main_menu_index = menu_index = 0;
+  keypress_wait = KP_WAIT_LONG;
+ 
+  do
+@@ -604,7 +610,7 @@
    char ostr [50];
    char istr [10];
  
@@ -41,7 +44,7 @@
    {
  
     col = COLOUR_GREEN6;
-@@ -663,114 +664,121 @@
+@@ -663,114 +669,121 @@
         strcat(ostr, itoa(options.ambience_volume, istr, 10));
       break;
      case 4:
@@ -190,7 +193,7 @@
       strcpy(ostr, "Exit");
       break;
  
-@@ -798,10 +806,10 @@
+@@ -798,10 +811,10 @@
   {
  //  case 5:
  //  case 6:
@@ -204,7 +207,15 @@
     return 1;
   }
  
-@@ -1116,13 +1124,13 @@
+@@ -1076,6 +1089,7 @@
+ 
+ void menu_trigger(void)
+ {
++ static char must_change_video_mode = FALSE;
+ 
+  keypress_wait = KP_WAIT_LONG;
+ 
+@@ -1116,13 +1130,25 @@
     }
     break;
    case MENU_OPTIONS:
@@ -212,6 +223,18 @@
 +   if (menu_index == 32)
     {
      play_sound(WAV_MENU2);
++    if (must_change_video_mode)
++    {
++     if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0)
++     {
++      set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
++      allegro_message("Error switching fullscreen / windowed mode\n%s\n",
++       allegro_error);
++      exit(1);
++     }
++     set_palette(palet);
++     must_change_video_mode = FALSE;
++    }
      change_menu(MENU_MAIN);
      break;
     }
@@ -220,7 +243,7 @@
     {
      switch(menu_index)
      {
-@@ -1148,18 +1156,33 @@
+@@ -1148,18 +1174,26 @@
        play_sound(WAV_MENU1);
        return;
       case 4:
@@ -229,14 +252,7 @@
 +        else
 +         options.windowed = GFX_AUTODETECT_WINDOWED;
 +      play_sound(WAV_MENU1);
-+      if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0)
-+      {
-+       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
-+       allegro_message("Error switching fullscreen / windowed mode\n%s\n",
-+        allegro_error);
-+       exit(1);
-+      }
-+      set_palette(palet);
++      must_change_video_mode = TRUE;
 +      return;
 +     case 5:
        if (options.run_vsync == 1)
@@ -256,7 +272,7 @@
        play_sound(WAV_MENU2);
        jam_keys();
        return;
-@@ -1268,7 +1291,7 @@
+@@ -1268,7 +1302,7 @@
    if (option_index() == -1)
     return;
  
@@ -265,7 +281,7 @@
     player[0].keys [option_index()] = inputted;
      else
       player[1].keys [option_index()] = inputted;
-@@ -1282,35 +1305,35 @@
+@@ -1282,35 +1316,35 @@
  {
    switch(menu_index)
    {
@@ -312,7 +328,25 @@
      return CMD_LINK;
    }
  
-@@ -1391,7 +1414,7 @@
+@@ -1373,6 +1409,8 @@
+ 
+ void change_menu(int to_which)
+ {
++ if (which_menu == MENU_MAIN)
++  last_main_menu_index = menu_index;
+ 
+  which_menu = to_which;
+  keypress_wait = KP_WAIT_LONG;
+@@ -1383,7 +1421,7 @@
+   case MENU_MAIN:
+     game.type = GAME_SINGLE;
+     which_menu = MENU_MAIN;
+-    menu_index = 0;
++    menu_index = last_main_menu_index;
+     menu_index_max = 4;
+     menu_index_min = 0;
+     save_config();
+@@ -1391,7 +1429,7 @@
    case MENU_OPTIONS:
      which_menu = MENU_OPTIONS;
      menu_index = 1;
@@ -321,7 +355,7 @@
      menu_index_min = 1;
      break;
    case MENU_DUEL:
-@@ -2827,6 +2850,7 @@
+@@ -2827,6 +2865,7 @@
   options.run_vsync = get_config_int("Options", "Run_vsync", 0);
   options.sound_volume = get_config_int("Options", "Sound_volume", 100);
   options.ambience_volume = get_config_int("Options", "Ambience_volume", 100);
@@ -329,7 +363,7 @@
  
   for (i = 0; i < NO_CMDS; i ++)
   {
-@@ -2905,6 +2929,7 @@
+@@ -2905,6 +2944,7 @@
   set_config_int("Options", "Run_vsync", options.run_vsync);
   set_config_int("Options", "Sound_volume", options.sound_volume);
   set_config_int("Options", "Ambience_volume", options.ambience_volume);
@@ -337,3 +371,13 @@
  
   for (i = 0; i < NO_CMDS; i ++)
   {
+--- lacewing-1.10/config.h.fullscreen	2006-02-28 23:01:57.000000000 +0100
++++ lacewing-1.10/config.h	2006-02-28 23:01:57.000000000 +0100
+@@ -792,6 +792,7 @@
+  int run_vsync; // on or off
+  int sound_volume; // sound fx volume; if 0 sound effects not played
+  int ambience_volume; // if 0 ambience not played
++ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED
+ };
+ 
+ struct starstruct


Index: lacewing.spec
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lacewing.spec	13 Feb 2006 15:43:42 -0000	1.2
+++ lacewing.spec	22 Mar 2006 19:10:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           lacewing
 Version:        1.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Asteroid like game with many different ships
 Group:          Amusements/Games
 License:        GPL
@@ -36,7 +36,8 @@
 
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+make %{?_smp_mflags} PREFIX=%{_prefix} \
+  CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations"
 
 
 %install
@@ -80,6 +81,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/lacewing.png
 
 %changelog
+* Wed Mar 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-5
+- Change fullscreen patch to not change to window / fullscreen untill
+  the menu is left.
+
 * Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-4
 - Bump release and rebuild for new gcc4.1 and glibc.