r6636 - in packages/trunk/biniax2/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2008-04-18 10:20:57 +0000 (Fri, 18 Apr 2008)
New Revision: 6636

Modified:
   packages/trunk/biniax2/debian/patches/endianess.patch
   packages/trunk/biniax2/debian/patches/series
   packages/trunk/biniax2/debian/rules
Log:
Load and save games in a endianess/word length independent way
Fixed warnings



Modified: packages/trunk/biniax2/debian/patches/endianess.patch
===================================================================
--- packages/trunk/biniax2/debian/patches/endianess.patch	2008-04-18 07:46:01 UTC (rev 6635)
+++ packages/trunk/biniax2/debian/patches/endianess.patch	2008-04-18 10:20:57 UTC (rev 6636)
@@ -3,8 +3,8 @@
 
 Index: biniax2/biniax.c
 ===================================================================
---- biniax2.orig/biniax.c	2008-04-17 16:13:52.000000000 +0000
-+++ biniax2/biniax.c	2008-04-17 16:14:11.000000000 +0000
+--- biniax2.orig/biniax.c	2008-04-18 10:00:58.000000000 +0000
++++ biniax2/biniax.c	2008-04-18 10:02:19.000000000 +0000
 @@ -61,6 +61,7 @@
  #include <fcntl.h>
  #include <sys/stat.h>
@@ -13,7 +13,7 @@
  #endif
  
  /* Global instance of GAME structure */
-@@ -1219,6 +1220,117 @@
+@@ -1219,6 +1220,148 @@
  #endif
  }
  
@@ -51,26 +51,26 @@
 +BNX_BOOL saveGame( BNX_GAME *game )
 +{
 +	FILE		*file;
-+	int i, j;
++	int		i, j;
 +
 +	file = fopen( saveFileName(), "wb" );
 +	if ( file == (FILE *) NULL )
 +		return BNX_FALSE;
 +
-+	PutInt16( 0xB201                 , file );
++	PutInt16( 0xB201 , file );
 +
-+	PutInt32( game->moment           , file );
-+	PutInt16( game->mode             , file );
-+	PutInt16( game->scroll           , file );
-+	PutInt16( game->speed            , file );
-+	PutInt16( game->moves            , file );
-+	PutInt16( game->clears           , file );
-+	fputc(    game->ingame           , file );
-+	PutInt32( game->sounds           , file );
-+	fputc(    game->message          , file );
-+	PutInt32( game->lines            , file );
-+	PutInt16( game->level            , file );
-+	PutInt16( game->level_count      , file );
++	PutInt32( game->moment      , file );
++	PutInt16( game->mode        , file );
++	PutInt16( game->scroll      , file );
++	PutInt16( game->speed       , file );
++	PutInt16( game->moves       , file );
++	PutInt16( game->clears      , file );
++	fputc(    game->ingame      , file );
++	PutInt32( game->sounds      , file );
++	fputc(    game->message     , file );
++	PutInt32( game->lines       , file );
++	PutInt16( game->level       , file );
++	PutInt16( game->level_count , file );
 +
 +	PutInt16( cMaxPlayers , file );
 +
@@ -91,6 +91,8 @@
 +		for (i = 0; i < cGridX; i++)
 +			fputc( game->grid[i][j] , file );
 +
++	PutInt16( 0xB200 , file );
++
 +	fclose( file );
 +	return BNX_TRUE;
 +}
@@ -98,6 +100,7 @@
 +BNX_BOOL loadGame( BNX_GAME *game )
 +{
 +	FILE		*file;
++	int		i, j;
 +	uint16_t	id, mp;
 +	uint32_t	mx, my;
 +
@@ -108,6 +111,7 @@
 +	id = GetInt16(file);
 +	if (id != 0xB201)
 +		return BNX_FALSE;
++
 +	game->moment = GetInt32(file);
 +	game->mode = GetInt16(file);
 +	game->scroll = GetInt16(file);
@@ -121,8 +125,35 @@
 +	game->level = GetInt16(file);
 +	game->level_count = GetInt16(file);
 +
-+//	fread( game, 1, sizeof( BNX_GAME ), file );
++	mp = GetInt16(file);
++	if (mp != cMaxPlayers)
++		return BNX_FALSE;
 +
++	for (i = 0; i < cMaxPlayers; i++)
++	{
++		game->player[i].x = fgetc(file);
++		game->player[i].y = fgetc(file);
++		game->player[i].e = fgetc(file);
++		game->score[i] = GetInt32(file);
++		game->wins[i] = GetInt32(file);
++		game->best[i] = GetInt32(file);
++	}
++
++	mx = GetInt32(file);
++	if (mx != cGridX)
++		return BNX_FALSE;
++	my = GetInt32(file);
++	if (my != cGridY)
++		return BNX_FALSE;
++
++	for (j = 0; j < cGridY; j++)
++		for (i = 0; i < cGridX; i++)
++			game->grid[i][j] = fgetc(file);
++
++	id = GetInt16(file);
++	if (id != 0xB200)
++		return BNX_FALSE;
++
 +	fclose( file );
 +	return BNX_TRUE;
 +}
@@ -131,7 +162,7 @@
  BNX_BOOL saveGame( BNX_GAME *game )
  {
  	FILE		*file;
-@@ -1250,6 +1362,7 @@
+@@ -1250,6 +1393,7 @@
  
  	return BNX_TRUE;
  }
@@ -139,7 +170,7 @@
  
  BNX_BOOL loadHiScore( BNX_GAME *game )
  {
-@@ -1257,4 +1370,3 @@
+@@ -1257,4 +1401,3 @@
  	game->best[ cModeTurn ] = hofGet()->tactic[ 0 ].score;
  	return BNX_TRUE;
  }

Modified: packages/trunk/biniax2/debian/patches/series
===================================================================
--- packages/trunk/biniax2/debian/patches/series	2008-04-18 07:46:01 UTC (rev 6635)
+++ packages/trunk/biniax2/debian/patches/series	2008-04-18 10:20:57 UTC (rev 6636)
@@ -1,3 +1,4 @@
 datadir.patch
 fixes.patch
 endianess.patch
+warnings.patch

Modified: packages/trunk/biniax2/debian/rules
===================================================================
--- packages/trunk/biniax2/debian/rules	2008-04-18 07:46:01 UTC (rev 6635)
+++ packages/trunk/biniax2/debian/rules	2008-04-18 10:20:57 UTC (rev 6636)
@@ -24,7 +24,6 @@
 build-stamp: configure-stamp 
 	dh_testdir
 	$(MAKE) FLAGS="$(CFLAGS)" DATADIR="/usr/share/games/biniax2"
-	#docbook-to-man debian/biniax2.sgml > biniax2.1
 	touch $@
 
 clean: