A friend class declaration isn't enough to make a class known.

Extra qualification removed.

3 files changed, 31 insertions, 11 deletions

diff --git a/games/xevil/distinfo b/games/xevil/distinfo
index 9b484597cef..bf4bd6676a5 100644
--- a/games/xevil/distinfo
+++ b/games/xevil/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 23:12:04 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/11/07 14:00:54 rillig Exp $
 
 SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc
 RMD160 (xevilsrc2.02r2.zip) = dca82298ac2dfe66e4e92a02731bb6851563b67e
@@ -9,12 +9,12 @@ SHA1 (patch-ac) = 470479cc03cbd3cc35b5c12560868a18845cdf35
 SHA1 (patch-ad) = df17b2c15b3eedaebd62e1de9e08fd01f98c37f0
 SHA1 (patch-ae) = bd4c1811aabf3791563a80c392afe96e0c4ed749
 SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79
-SHA1 (patch-ag) = 5ee9ccf572cb917247143d345a0889f0698d236a
+SHA1 (patch-ag) = e39e51242b77aeb79e40ecf37fdae492d7427aff
 SHA1 (patch-ah) = 4417e17e9e924a8d0c04565b8c731abc78c0bf7b
 SHA1 (patch-ai) = ed5d1660d59835de2b0cae8ebe65432351d0751b
 SHA1 (patch-aj) = e7ec143b757de6f07693bc6e192f6d9e913ce252
 SHA1 (patch-ak) = 48f2a6c563a5e51ff28da4f5715a56276dbd63a7
-SHA1 (patch-al) = b95b608016cb6d43ca3f6d7cbc08e0b09e15ba89
+SHA1 (patch-al) = 2530864b88b66b5c45b0996cb65269899b115e3f
 SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59
 SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237
 SHA1 (patch-ao) = 894c12c2012bfbd2273bfdd82a09b417fd0e9682
diff --git a/games/xevil/patches/patch-ag b/games/xevil/patches/patch-ag
index b23871d7f80..d6489dafed9 100644
--- a/games/xevil/patches/patch-ag
+++ b/games/xevil/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ag,v 1.2 2007/11/07 14:00:54 rillig Exp $
 
---- cmn/utils.cpp.orig	2003-11-22 11:14:12.000000000 -0800
-+++ cmn/utils.cpp	2003-11-22 11:15:38.000000000 -0800
+--- cmn/utils.cpp.orig	2007-11-07 14:55:38.000000000 +0100
++++ cmn/utils.cpp	2007-11-07 14:57:57.000000000 +0100
 @@ -30,18 +30,20 @@
  
  // Include Files
@@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  #ifdef WIN32
  // For file manipulation routines.
  #include <direct.h>
-@@ -475,7 +477,7 @@
+@@ -475,7 +477,7 @@ char* Utils::get_OS_info() {
  #endif
  
  
@@ -38,3 +38,12 @@ $NetBSD: patch-ag,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  
  #ifdef X11
    FILE* fp = popen(UNAME_PATH " -a","r");
+@@ -757,7 +759,7 @@ public:
+ 
+ 
+ private:
+-  Bucket* HashTable::_get(int &index,void* key);
++  Bucket* _get(int &index,void* key);
+   /* MODIFIES: index */
+   /* EFFECTS: Internal helper function.  Return the Bucket containing key
+      or NULL if not found.  Set index to the bucket list for key whether
diff --git a/games/xevil/patches/patch-al b/games/xevil/patches/patch-al
index 10fc7337f2b..ac66809a073 100644
--- a/games/xevil/patches/patch-al
+++ b/games/xevil/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-al,v 1.2 2007/11/07 14:00:54 rillig Exp $
 
---- cmn/locator.h.orig	2003-11-22 11:30:48.000000000 -0800
-+++ cmn/locator.h	2003-11-22 11:31:07.000000000 -0800
-@@ -47,7 +47,8 @@
+--- cmn/locator.h.orig	2003-03-22 20:35:30.000000000 +0100
++++ cmn/locator.h	2007-11-07 14:57:37.000000000 +0100
+@@ -47,7 +47,8 @@ the world. */
  
  
  // Include Files
@@ -12,3 +12,14 @@ $NetBSD: patch-al,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  
  #include "utils.h"
  #include "coord.h"
+@@ -96,6 +97,10 @@ class SoundRequest;
+ #define OL_RECENT_SOUNDS_MAX 30
+ 
+ 
++class OLgridEntry;
++#if X11
++class OLshadowEntry;
++#endif
+ 
+ // An entry for one object in the list of all objects currently in the game.
+ class OLentry {