From 56a0763da11661bf7a3ae3347e5e3fcd26550d19 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Thu, 24 Jun 2004 05:18:46 +0000
Subject: [PATCH] version now part of stream; fix VERSION defines

---
 common/game.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/game.h b/common/game.h
index 3745a3812..59fb0fcbb 100644
--- a/common/game.h
+++ b/common/game.h
@@ -30,10 +30,12 @@
 extern "C" {
 #endif
 
-#ifdef FEATURE_TRAY_EDIT
-# define CUR_STREAM_VERS 0x02
-#elif defined XWFEATURE_SEARCHLIMIT
+/* WARNING: the following assumes that FEATURE_TRAY_EDIT is defined if
+   XWFEATURE_SEARCHLIMIT is*/
+#if defined XWFEATURE_SEARCHLIMIT
 # define CUR_STREAM_VERS 0x03
+#elif defined FEATURE_TRAY_EDIT
+# define CUR_STREAM_VERS 0x02
 #else
 # define CUR_STREAM_VERS 0x01
 #endif
@@ -97,8 +99,7 @@ void game_dispose( XWGame* game );
 void gi_initPlayerInfo( MPFORMAL CurGameInfo* gi, XP_UCHAR* nameTemplate );
 void gi_disposePlayerInfo( MPFORMAL CurGameInfo* gi );
 void gi_writeToStream( XWStreamCtxt* stream, CurGameInfo* gi );
-void gi_readFromStream( MPFORMAL XWStreamCtxt* stream, XP_U16 strVersion,
-                        CurGameInfo* gi );
+void gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi );
 void gi_copy( MPFORMAL CurGameInfo* destGI, CurGameInfo* srcGi );
 
 XP_Bool player_hasPasswd( LocalPlayer* player );