rpms/prboom/devel prboom-2.3.1-gamedir.patch,1.1,1.2

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	prboom-2.3.1-gamedir.patch 
Log Message:
Add freedoom to the in-game list of wads (Options -> Features -> Load Wad)



prboom-2.3.1-gamedir.patch:

Index: prboom-2.3.1-gamedir.patch
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom-2.3.1-gamedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prboom-2.3.1-gamedir.patch	14 Mar 2006 19:30:09 -0000	1.1
+++ prboom-2.3.1-gamedir.patch	20 Mar 2006 02:56:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur prboom-2.3.1/configure prboom-2.3.1.new/configure
---- prboom-2.3.1/configure	2004-09-15 12:11:41.000000000 -0700
-+++ prboom-2.3.1.new/configure	2006-03-13 15:42:56.000000000 -0800
+--- prboom-2.3.1/configure	2006-03-19 18:45:36.000000000 -0800
++++ prboom-2.3.1.new/configure	2006-03-18 08:59:30.000000000 -0800
 @@ -1853,9 +1853,9 @@
  
  
@@ -13,10 +13,9 @@
  fi
  cat >>confdefs.h <<_ACEOF
  #define DOOMWADDIR "$DOOMWADDIR"
- 
 diff -Naur prboom-2.3.1/src/d_main.c prboom-2.3.1.new/src/d_main.c
---- prboom-2.3.1/src/d_main.c	2006-03-08 18:41:07.000000000 -0800
-+++ prboom-2.3.1.new/src/d_main.c	2006-03-13 15:31:16.000000000 -0800
+--- prboom-2.3.1/src/d_main.c	2006-03-19 18:45:36.000000000 -0800
++++ prboom-2.3.1.new/src/d_main.c	2006-03-18 08:59:35.000000000 -0800
 @@ -158,6 +158,7 @@
    "doom.wad",
    "doom1.wad",
@@ -25,3 +24,14 @@
  };
  static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
  
+diff -Naur prboom-2.3.1/src/mn_menus.c prboom-2.3.1.new/src/mn_menus.c
+--- prboom-2.3.1/src/mn_menus.c	2004-09-15 12:09:48.000000000 -0700
++++ prboom-2.3.1.new/src/mn_menus.c	2006-03-19 18:53:42.000000000 -0800
+@@ -425,6 +425,7 @@
+     {it_title,     FC_GOLD "load wad",    NULL,                   "M_WAD"},
+     {it_gap},
+     {it_info,      FC_GOLD "select iwad"},
++    {it_runcmd,    "Freedoom",               "mn_iwad freedoom"},
+     {it_runcmd,    "Doom Shareware",         "mn_iwad doom1"},
+     {it_runcmd,    "Doom",                   "mn_iwad doom"},
+     {it_runcmd,    "Ultimate Doom",          "mn_iwad doomu"},