r9748 - packages/trunk/biniax2/debian/patches
Miriam Ruiz
miriam at alioth.debian.org
Sat May 16 02:23:23 UTC 2009
Author: miriam
Date: 2009-05-16 02:23:23 +0000 (Sat, 16 May 2009)
New Revision: 9748
Added:
packages/trunk/biniax2/debian/patches/userdir.patch
Modified:
packages/trunk/biniax2/debian/patches/series
packages/trunk/biniax2/debian/patches/warnings.patch
Log:
Fix patches to converge with upstream data format
Modified: packages/trunk/biniax2/debian/patches/series
===================================================================
--- packages/trunk/biniax2/debian/patches/series 2009-05-16 02:20:53 UTC (rev 9747)
+++ packages/trunk/biniax2/debian/patches/series 2009-05-16 02:23:23 UTC (rev 9748)
@@ -1,3 +1,4 @@
datadir.patch
-fixes.patch
+#fixes.patch
+userdir.patch
warnings.patch
Added: packages/trunk/biniax2/debian/patches/userdir.patch
===================================================================
--- packages/trunk/biniax2/debian/patches/userdir.patch (rev 0)
+++ packages/trunk/biniax2/debian/patches/userdir.patch 2009-05-16 02:23:23 UTC (rev 9748)
@@ -0,0 +1,649 @@
+--- biniax2.orig/biniax.c
++++ biniax2/biniax.c
+@@ -51,6 +51,22 @@
+ #include "lev.h"
+ #include "inc.h"
+
++#ifndef _WIN32
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <limits.h>
++#include <pwd.h>
++#include <fcntl.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <stdint.h>
++#endif
++
++#include <errno.h>
++#include <string.h>
++
+ /* Global instance of GAME structure */
+ BNX_GAME Game;
+
+@@ -82,6 +98,9 @@
+ BNX_BOOL loadGame( BNX_GAME *game );
+ BNX_BOOL loadHiScore( BNX_GAME *game );
+
++BNX_BOOL saveOldDebianGame( BNX_GAME *game );
++BNX_BOOL loadOldDebianGame( BNX_GAME *game );
++
+ #define UNREF( A ) (A) = (A)
+ /******************************************************************************
+ PROGRAM START
+@@ -100,13 +119,27 @@
+ cfgInit();
+ hofInit();
+ if ( gfxInit() == BNX_FALSE )
++ {
++ fprintf(stderr, "Error in Graphics Initialization\n");
+ return -1;
++ }
+ if ( sysInit() == BNX_FALSE )
++ {
++ fprintf(stderr, "Error in System Initialization\n");
+ return -2;
++ }
+ if ( inpInit() == BNX_FALSE )
++ {
++ fprintf(stderr, "Error in Input Initialization\n");
+ return -3;
++ }
+ if ( sndInit() == BNX_FALSE )
+- return -4;
++ {
++ fprintf(stderr, "Error in Sound Initialization\n");
++ cfgSetSound(BNX_FALSE);
++ cfgSetMusic(BNX_FALSE);
++ /* return -4; */
++ }
+
+ /******************************************************************
+ SHOW INITIAL WELCOME SCREEN
+@@ -131,6 +164,10 @@
+ case cOptionContinue:
+ if ( loadGame( &Game ) == BNX_FALSE )
+ {
++ if (errno)
++ fprintf(stderr, "Error loading game data: %s\n", strerror(errno));
++ else
++ fprintf(stderr, "Error loading game data\n");
+ enterState = cStateMainMenu;
+ }
+ else
+@@ -1178,13 +1215,70 @@
+ GAME AND HISCORE SAVE / RESTORE
+ ******************************************************************************/
+
++static const char *saveFileName()
++{
++#ifndef _WIN32
++ char filename[PATH_MAX];
++ char *home;
++ struct passwd *passwd;
++ if (!getuid())
++ {
++ fprintf(stderr, "No access to data files for root.\n");
++ return BNX_FALSE;
++ } else {
++ if ((home = getenv("XDG_DATA_HOME")))
++ { /* See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html */
++ if (strlen(home) > PATH_MAX - sizeof("/biniax2/hof"))
++ {
++ fprintf(stderr, "$XDG_DATA_HOME is excessively long.n");
++ return BNX_FALSE;
++ }
++ snprintf(filename, sizeof(filename), "%s/biniax2", home);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ }
++ else if ((home = getenv("HOME")))
++ {
++ passwd = getpwuid (getuid());
++ home=passwd->pw_dir;
++ if (!home)
++ {
++ fprintf(stderr, "$HOME is not defined.\n");
++ return BNX_FALSE;
++ }
++ if (strlen(home) > PATH_MAX - sizeof("/.local/share/biniax2/autosave"))
++ {
++ fprintf(stderr, "$HOME is excessively long.n");
++ return BNX_FALSE;
++ }
++ snprintf(filename, sizeof(filename), "%s/.local", home);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ strncat(filename, "/share", sizeof(filename)-1);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ strncat(filename, "/biniax2", sizeof(filename)-1);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ }
++ else
++ {
++ fprintf(stderr, "Neither $XDG_DATA_HOME nor $HOME are defined.\n");
++ return BNX_FALSE;
++ }
++ }
++ strncat(filename, "/autosave", sizeof(filename)-1);
++ return filename;
++#else
++ return "./autosave.bnx2";
++#endif
++}
++
+ BNX_BOOL saveGame( BNX_GAME *game )
+ {
+ FILE *file;
+ BNX_INT32 i;
+ BNX_INT32 j;
+
+- file = fopen( sysGetFullFileName( csSaveGameName ), "wb" );
++ fprintf(stderr, "Saving game data in \"%s\"\n", saveFileName());
++
++ file = fopen( saveFileName(), "wb" );
+
+ if ( file == (FILE *) NULL )
+ return BNX_FALSE;
+@@ -1242,9 +1336,14 @@
+ BNX_INT32 i;
+ BNX_INT32 j;
+
+- if ( sysGetFileLen( sysGetFullFileName( csSaveGameName ) ) != cSaveFileSize )
++ if (loadOldDebianGame(game) == BNX_TRUE)
++ return BNX_TRUE;
++
++ fprintf(stderr, "Loading game data from \"%s\"\n", saveFileName());
++
++ if ( sysGetFileLen( saveFileName() ) != cSaveFileSize )
+ return BNX_FALSE;
+- file = fopen( sysGetFullFileName( csSaveGameName ), "rb" );
++ file = fopen( saveFileName(), "rb" );
+ if ( file == (FILE *) NULL )
+ return BNX_FALSE;
+
+@@ -1302,3 +1401,124 @@
+ return BNX_TRUE;
+ }
+
++// DEBIAN SPECIFIC STUFF
++
++BNX_BOOL saveOldDebianGame( BNX_GAME *game )
++{
++ FILE *file;
++ int i, j;
++
++ fprintf(stderr, "Saving game data with old format in \"%s\"\n", saveFileName());
++ file = fopen( saveFileName(), "wb" );
++ if ( file == (FILE *) NULL )
++ return BNX_FALSE;
++
++ sysFPut16( 0xB2D1 , file );
++
++ sysFPut32( game->moment , file );
++ sysFPut16( game->mode , file );
++ sysFPut16( game->scroll , file );
++ sysFPut16( game->speed , file );
++ sysFPut16( game->moves , file );
++ sysFPut16( game->clears , file );
++ fputc( game->ingame , file );
++ sysFPut32( game->sounds , file );
++ fputc( game->message , file );
++ sysFPut32( game->lines , file );
++ sysFPut16( game->level , file );
++ sysFPut16( game->level_count , file );
++
++ sysFPut16( cMaxPlayers , file );
++
++ for (i = 0; i < cMaxPlayers; i++)
++ {
++ fputc( game->player[i].x , file );
++ fputc( game->player[i].y , file );
++ fputc( game->player[i].e , file );
++ sysFPut32( game->score[i] , file );
++ sysFPut32( game->wins[i] , file );
++ sysFPut32( game->best[i] , file );
++ }
++
++ sysFPut32( cGridX , file );
++ sysFPut32( cGridY , file );
++
++ for (j = 0; j < cGridY; j++)
++ for (i = 0; i < cGridX; i++)
++ fputc( game->grid[i][j] , file );
++
++ sysFPut16( 0xB2D0 , file );
++
++ fclose( file );
++ return BNX_TRUE;
++}
++
++BNX_BOOL loadOldDebianGame( BNX_GAME *game )
++{
++ FILE *file = NULL;
++ int i, j;
++ uint16_t id, mp;
++ uint32_t mx, my;
++
++ file = fopen( saveFileName(), "rb" );
++ if ( file == (FILE *) NULL )
++ return BNX_FALSE;
++
++ errno = 0;
++
++ id = sysFGet16(file);
++ if (id != 0xB2D1)
++ goto error;
++
++ fprintf(stderr, "Loading game data with old format from \"%s\"\n", saveFileName());
++
++ game->moment = sysFGet32(file);
++ game->mode = sysFGet16(file);
++ game->scroll = sysFGet16(file);
++ game->speed = sysFGet16(file);
++ game->moves = sysFGet16(file);
++ game->clears = sysFGet16(file);
++ game->ingame = fgetc(file);
++ game->sounds = sysFGet32(file);
++ game->message = fgetc(file);
++ game->lines = sysFGet32(file);
++ game->level = sysFGet16(file);
++ game->level_count = sysFGet16(file);
++
++ mp = sysFGet16(file);
++ if (mp != cMaxPlayers)
++ goto error;
++
++ 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] = sysFGet32(file);
++ game->wins[i] = sysFGet32(file);
++ game->best[i] = sysFGet32(file);
++ }
++
++ mx = sysFGet32(file);
++ if (mx != cGridX)
++ goto error;
++ my = sysFGet32(file);
++ if (my != cGridY)
++ goto error;
++
++ for (j = 0; j < cGridY; j++)
++ for (i = 0; i < cGridX; i++)
++ game->grid[i][j] = fgetc(file);
++
++ id = sysFGet16(file);
++ if (id != 0xB2D0)
++ goto error;
++
++ fclose( file );
++ return BNX_TRUE;
++
++error:
++ if (file)
++ fclose( file );
++ return BNX_FALSE;
++}
+--- biniax2.orig/desktop/cfg.c
++++ biniax2/desktop/cfg.c
+@@ -30,6 +30,17 @@
+
+ #include "inc.h"
+
++#ifndef _WIN32
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <limits.h>
++#include <pwd.h>
++#include <fcntl.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++#endif
+
+ /******************************************************************************
+ FUNCTIONS
+@@ -54,14 +65,64 @@
+ char buffer[ _Cfg_Buffer ];
+ int nTemp;
+
++#ifndef _WIN32
++ char filename[PATH_MAX];
++ char *home;
++ struct passwd *passwd;
++ if (!getuid())
++ {
++ fprintf(stderr, "No access to config files for root.\n");
++ return BNX_FALSE;
++ } else {
++ if ((home = getenv("XDG_CONFIG_HOME")))
++ { /* See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html */
++ if (strlen(home) > PATH_MAX - sizeof("/biniax2/config"))
++ {
++ fprintf(stderr, "$XDG_CONFIG_HOME is excessively long.n");
++ return BNX_FALSE;
++ }
++ snprintf(filename, sizeof(filename), "%s/biniax2", home);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ }
++ else if ((home = getenv("HOME")))
++ {
++ passwd = getpwuid (getuid());
++ home=passwd->pw_dir;
++ if (!home)
++ {
++ fprintf(stderr, "$HOME is not defined.\n");
++ return BNX_FALSE;
++ }
++ if (strlen(home) > PATH_MAX - sizeof("/.config/biniax2/config"))
++ {
++ fprintf(stderr, "$HOME is excessively long.n");
++ return BNX_FALSE;
++ }
++ snprintf(filename, sizeof(filename), "%s/.config", home);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ strncat(filename, "/biniax2", sizeof(filename)-1);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ }
++ else
++ {
++ fprintf(stderr, "Neither $XDG_CONFIG_HOME nor $HOME are defined.\n");
++ return BNX_FALSE;
++ }
++ }
++ strncat(filename, "/config", sizeof(filename)-1);
++#else
++ char filename[] = "./config.bnx2";
++#endif
++
+ _Cfg.sound = BNX_TRUE;
+ _Cfg.music = BNX_TRUE;
+ _Cfg.fullscreen = BNX_FALSE;
+ _Cfg.touch = BNX_FALSE;
+
+- f = fopen( sysGetFullFileName( csConfigName ), "rt" );
++ f = fopen( filename, "rt" );
+ if ( f == 0 )
+ {
++ fprintf( stderr,"Configuration file \"%s\" not found\n", filename );
+ return BNX_FALSE;
+ }
+
+@@ -83,6 +144,10 @@
+
+ fclose( f );
+
++ fprintf( stderr, _Cfg.sound ? "Sound On\n" : "Sound Off\n" );
++ fprintf( stderr, _Cfg.music ? "Music On\n" : "Music Off\n" );
++ fprintf( stderr, _Cfg.fullscreen ? "Fullscreen On\n" : "Fullscreen Off\n" );
++
+ return BNX_TRUE;
+ }
+
+--- biniax2.orig/hof.c
++++ biniax2/hof.c
+@@ -31,6 +31,21 @@
+
+ #include "inc.h"
+
++#ifndef _WIN32
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <limits.h>
++#include <pwd.h>
++#include <fcntl.h>
++#include <sys/stat.h>
++#include <sys/types.h>
++#endif
++
++#include <errno.h>
++#include <string.h>
++
+ #define chCursor '_' /* Cursor ON */
+ #define chSpace ' ' /* Cursor OFF*/
+
+@@ -46,6 +61,8 @@
+ void hofBlinkCursor( BNX_INT16 pos, char *name );
+ void hofResetCursor( BNX_INT16 pos, char *name );
+
++BNX_BOOL hofOldDebianInit();
++BNX_BOOL hofOldDebianSave();
+
+ void hofAddLetter( BNX_INT16 pos, char a, char *name )
+ {
+@@ -85,25 +102,81 @@
+ }
+ }
+
++static const char *hofFileName()
++{
++#ifndef _WIN32
++ char filename[PATH_MAX];
++ char *home;
++ struct passwd *passwd;
++ if (!getuid())
++ {
++ fprintf(stderr, "No access to data files for root.\n");
++ return BNX_FALSE;
++ } else {
++ if ((home = getenv("XDG_DATA_HOME")))
++ { /* See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html */
++ if (strlen(home) > PATH_MAX - sizeof("/biniax2/hof"))
++ {
++ fprintf(stderr, "$XDG_DATA_HOME is excessively long.n");
++ return BNX_FALSE;
++ }
++ snprintf(filename, sizeof(filename), "%s/biniax2", home);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ }
++ else if ((home = getenv("HOME")))
++ {
++ passwd = getpwuid (getuid());
++ home=passwd->pw_dir;
++ if (!home)
++ {
++ fprintf(stderr, "$HOME is not defined.\n");
++ return BNX_FALSE;
++ }
++ if (strlen(home) > PATH_MAX - sizeof("/.local/share/biniax2/hof"))
++ {
++ fprintf(stderr, "$HOME is excessively long.n");
++ return BNX_FALSE;
++ }
++ snprintf(filename, sizeof(filename), "%s/.local", home);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ strncat(filename, "/share", sizeof(filename)-1);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ strncat(filename, "/biniax2", sizeof(filename)-1);
++ mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
++ }
++ else
++ {
++ fprintf(stderr, "Neither $XDG_DATA_HOME nor $HOME are defined.\n");
++ return BNX_FALSE;
++ }
++ }
++ strncat(filename, "/hof", sizeof(filename)-1);
++ return filename;
++#else
++ return "./hof.bnx2";
++#endif
++}
+
+ BNX_BOOL hofInit()
+ {
+ FILE *file;
+ BNX_INT16 i, j;
+-
++
++ if (hofOldDebianInit() == BNX_TRUE)
++ return BNX_TRUE;
+
+ for ( i = 0; i < cHofEntries; ++i )
+ {
+- strcpy( Hof.arcade[ i ].name, "JORDAN " );
++ strcpy( Hof.arcade[ i ].name, "DEBIAN " );
+ Hof.arcade[ i ].score = (cHofEntries - i) * cHofInitScore;
+
+- strcpy( Hof.tactic[ i ].name, "JORDAN " );
++ strcpy( Hof.tactic[ i ].name, "DEBIAN " );
+ Hof.tactic[ i ].score = (cHofEntries - i) * cHofInitScore;
+ }
+
+- if ( sysGetFileLen( sysGetFullFileName( csHOFName ) ) != cHOFFileSize )
++ if ( sysGetFileLen( hofFileName() ) != cHOFFileSize )
+ return BNX_FALSE;
+- file = fopen( sysGetFullFileName( csHOFName ), "rb" );
++ file = fopen( hofFileName(), "rb" );
+ if ( file == (FILE *) NULL )
+ return BNX_FALSE;
+
+@@ -137,7 +210,7 @@
+ FILE *file;
+ int i, j;
+
+- file = fopen( sysGetFullFileName( csHOFName ), "wb" );
++ file = fopen( hofFileName(), "wb" );
+
+ if ( file == (FILE *) NULL )
+ return BNX_FALSE;
+@@ -292,4 +365,119 @@
+ BNX_HALL *hofGet()
+ {
+ return (BNX_HALL *) &Hof;
+-}
+\ No newline at end of file
++}
++
++// DEBIAN SPECIFIC
++
++BNX_BOOL hofOldDebianInit()
++{
++ FILE *file = NULL;
++ int i;
++ uint16_t id, me, ml;
++ const char *filename = NULL;
++ char alt_filename[PATH_MAX+3];
++
++ file = fopen( (filename = hofFileName()), "rb" );
++
++ if ( file == (FILE *) NULL ) // Bug in previous version, see if data can be reached
++ {
++ char *ptr;
++ strncpy(alt_filename, filename, PATH_MAX);
++ ptr = strrchr(alt_filename, '/');
++ if (ptr != NULL)
++ {
++ ptr++;
++ filename = alt_filename;
++ strcpy(ptr, "config");
++ file = fopen( filename, "rb" );
++ }
++ }
++
++ if ( file == (FILE *) NULL )
++ {
++ goto error;
++ }
++
++ errno = 0;
++
++ id = sysFGet16(file);
++ if (id != 0xB2F1)
++ goto error;
++
++ fprintf(stderr, "Loading Hall of Fame data with old format from \"%s\"\n", filename);
++
++ ml = sysFGet16(file);
++ if (ml != cHofNameLen)
++ goto error;
++
++ me = sysFGet16(file);
++ if (me != cHofEntries)
++ goto error;
++
++ for ( i = 0; i < cHofEntries; ++i )
++ {
++ fread( Hof.arcade[i].name, 1, cHofNameLen, file );
++ Hof.arcade[i].score = sysFGet32(file);
++ }
++
++ for ( i = 0; i < cHofEntries; ++i )
++ {
++ fread( Hof.tactic[i].name, 1, cHofNameLen, file );
++ Hof.tactic[i].score = sysFGet32(file);
++ }
++
++ id = sysFGet16(file);
++ if (id != 0xB2F0)
++ goto error;
++
++ fclose( file );
++
++ return BNX_TRUE;
++
++error:
++ if (file)
++ fclose( file );
++ return BNX_FALSE;
++}
++
++BNX_BOOL hofOldDebianSave()
++{
++ FILE *file;
++ int i;
++ const char *filename = NULL;
++
++ file = fopen( (filename=hofFileName()), "wb" );
++
++ if ( file == (FILE *) NULL )
++ {
++ if (errno)
++ fprintf(stderr, "Could not save Hall of Fame data with old format in \"%s\": %s\n", filename, strerror(errno));
++ else
++ fprintf(stderr, "Could not save Hall of Fame data with old format in \"%s\"\n", filename);
++ return BNX_FALSE;
++ }
++
++ fprintf(stderr, "Saving Hall of Fame data with old format in \"%s\"\n", filename);
++
++ sysFPut16( 0xB2F1 , file );
++ sysFPut16( cHofNameLen , file );
++ sysFPut16( cHofEntries , file );
++
++ for ( i = 0; i < cHofEntries; ++i )
++ {
++ fwrite( Hof.arcade[i].name, 1, cHofNameLen, file );
++ sysFPut32(Hof.arcade[i].score, file);
++ }
++
++ for ( i = 0; i < cHofEntries; ++i )
++ {
++ fwrite( Hof.tactic[i].name, 1, cHofNameLen, file );
++ sysFPut32(Hof.tactic[i].score, file);
++ }
++
++ sysFPut16( 0xB2F0 , file );
++
++ fclose( file );
++
++ return BNX_TRUE;
++}
+--- biniax2.orig/inc.h
++++ biniax2/inc.h
+@@ -68,5 +68,9 @@
+ #include "symbian/sys.h"
+ #endif
+
++#ifndef _WIN32
++#include <stdint.h>
++#include <stdio.h>
++#endif
+
+ #endif
Modified: packages/trunk/biniax2/debian/patches/warnings.patch
===================================================================
--- packages/trunk/biniax2/debian/patches/warnings.patch 2009-05-16 02:20:53 UTC (rev 9747)
+++ packages/trunk/biniax2/debian/patches/warnings.patch 2009-05-16 02:23:23 UTC (rev 9748)
@@ -52,7 +52,7 @@
gfxNewParticle( pos.x + (cGfxNextPlusX >> 1), pos.y );
--- biniax2.orig/biniax.c
+++ biniax2/biniax.c
-@@ -108,7 +108,6 @@
+@@ -111,7 +111,6 @@
BNX_BOOL bquit = BNX_FALSE;
BNX_INT16 enterState = cStateMainMenu;
BNX_INT16 nmenu = 0;
@@ -60,7 +60,7 @@
UNREF( argc );
UNREF( argv );
-@@ -315,7 +314,7 @@
+@@ -318,7 +317,7 @@
if ( game->grid[ i ][ nearLine ] != 0 )
{
game->player[ cPlayer1 ].e = pairLeft( game->grid[ i ][ nearLine ] );
@@ -69,7 +69,7 @@
break;
}
}
-@@ -327,7 +326,7 @@
+@@ -330,7 +329,7 @@
if ( game->grid[ i ][ nearLine ] != 0 )
{
game->player[ cPlayer2 ].e = pairRight( game->grid[ i ][ nearLine ] );
@@ -78,7 +78,7 @@
break;
}
}
-@@ -529,7 +528,7 @@
+@@ -532,7 +531,7 @@
{
if ( takePair( game, p->x, newY, pIndex ) == BNX_TRUE )
{
@@ -87,7 +87,7 @@
p->y = newY;
return BNX_TRUE;
}
-@@ -547,7 +546,7 @@
+@@ -550,7 +549,7 @@
{
if ( takePair( game, p->x, newY, pIndex ) == BNX_TRUE )
{
@@ -96,7 +96,7 @@
p->y = newY;
return BNX_TRUE;
}
-@@ -565,7 +564,7 @@
+@@ -568,7 +567,7 @@
{
if ( takePair( game, newX, p->y, pIndex ) == BNX_TRUE )
{
@@ -105,7 +105,7 @@
p->x = newX;
return BNX_TRUE;
}
-@@ -583,7 +582,7 @@
+@@ -586,7 +585,7 @@
{
if ( takePair( game, newX, p->y, pIndex ) == BNX_TRUE )
{
@@ -114,7 +114,7 @@
p->x = newX;
return BNX_TRUE;
}
-@@ -641,9 +640,9 @@
+@@ -644,9 +643,9 @@
{
for ( y = 0; y < cGridY; ++y )
{
More information about the Pkg-games-commits
mailing list