[Pkg-nethack-devel] nethack/debian/patches 12_lisp_windowing.dpatch,1.2,1.3 90_enh_hpmon.dpatch,1.1,1.2

[Joshua Kwan]

Update of /cvsroot/pkg-nethack/nethack/debian/patches
In directory quantz:/tmp/cvs-serv25869/patches

Modified Files:
	12_lisp_windowing.dpatch 90_enh_hpmon.dpatch 
Log Message:
Tweak some patches to suppress warnings. The lisp changes are going to mlang.


Index: 12_lisp_windowing.dpatch
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/patches/12_lisp_windowing.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 12_lisp_windowing.dpatch	15 Oct 2003 14:18:11 -0000	1.2
+++ 12_lisp_windowing.dpatch	18 Nov 2003 05:08:07 -0000	1.3
@@ -456,7 +456,7 @@
 +	function.
 --- /dev/null	2003-05-01 12:00:27.000000000 -0700
 +++ nethack/win/lisp/winlisp.c	2003-09-13 12:38:18.000000000 -0700
-@@ -0,0 +1,1876 @@
+@@ -0,0 +1,1871 @@
 +/* Copyright (c) Shawn Betts, Ryan Yeske, 2001                    */
 +/* NetHack may be freely redistributed.  See license for details. */
 +
@@ -1364,9 +1364,6 @@
 +	     lisp_string (plname););
 +  if (Upolyd) 
 +    {
-+      char mbot[BUFSZ];
-+      int k = 0;
-+
 +      lisp_list (lisp_string ("rank");
 +		 lisp_nil);
 +      lisp_list (lisp_string ("monster");
@@ -1621,7 +1618,6 @@
 +  char *list;
 +  char *token;
 +  int size = 0;
-+  int toggle;
 +
 +  lisp_cmd ("select-menu",
 +	    lisp_int (window);
@@ -2248,7 +2244,6 @@
 +    int glyph;
 +{
 +    int ch;
-+    boolean reverse_on = FALSE;
 +    int	    color;
 +    unsigned special;
 +

Index: 90_enh_hpmon.dpatch
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/patches/90_enh_hpmon.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 90_enh_hpmon.dpatch	13 Oct 2003 01:05:52 -0000	1.1
+++ 90_enh_hpmon.dpatch	18 Nov 2003 05:08:07 -0000	1.2
@@ -20,11 +20,19 @@
 
 --- nh342orig/src/botl.c	2003-08-30 03:07:27.000000000 +0300
 +++ nh342hpmon/src/botl.c	2003-09-05 18:17:09.000000000 +0300
+@@ -3,6 +3,7 @@
+ /* NetHack may be freely redistributed.  See license for details. */
+ 
+ #include "hack.h"
++#include "wintty.h"
+ 
+ #ifdef OVL0
+ extern const char *hu_stat[];  /* defined in eat.c */
 @@ -248,6 +248,9 @@
  	char  newbot2[MAXCO];
  	register char *nb;
  	int hp, hpmax;
-+#ifdef HPMON
++#if defined(HPMON) && !defined(LISP_GRAPHICS)
 +	int hpcolor, hpattr;
 +#endif
  	int cap = near_capacity();