Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15568/10.4-transitional/unstable/main/finkinfo/games
Modified Files:
xdigger.info xdigger.patch
Log Message:
Patch out the nested functions.
Index: xdigger.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/xdigger.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xdigger.info 6 Dec 2005 03:27:49 -0000 1.2
+++ xdigger.info 6 Dec 2005 05:58:53 -0000 1.3
@@ -1,13 +1,13 @@
Package: xdigger
Version: 1.0.10
-Revision: 13
+Revision: 14
Maintainer: None <fink-devel@lists.sourceforge.net>
-BuildDepends: x11-dev, gcc3.3
+BuildDepends: x11-dev
Depends: x11, passwd
Source: mirror:sourceforge:fink/direct_download/source/%n-%v.tgz
Source-MD5: 74959b5c3f0ba47d1f25f515438c86ab
PatchScript: sed 's|@prefix@|%p|g' <%a/%n.patch | patch -p1
-CompileScript: xmkmf; make CC=/usr/bin/gcc-3.3
+CompileScript: xmkmf; make CC=/usr/bin/gcc
InstallScript: <<
mkdir -p %i/bin
mkdir -p %i/share/xdigger
Index: xdigger.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/xdigger.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xdigger.patch 27 Apr 2005 03:25:40 -0000 1.1
+++ xdigger.patch 6 Dec 2005 05:58:53 -0000 1.2
@@ -1,5 +1,7 @@
---- xdigger-1.0.10/configure.h Sun Jul 4 09:50:04 1999
-+++ xdigger-1.0.10-patched/configure.h Mon Mar 18 23:03:05 2002
+Only in xdigger-1.0.10.patched: Makefile
+diff -ur xdigger-1.0.10/configure.h xdigger-1.0.10.patched/configure.h
+--- xdigger-1.0.10/configure.h 1999-07-04 05:50:04.000000000 -0400
++++ xdigger-1.0.10.patched/configure.h 2005-12-06 00:36:42.000000000 -0500
@@ -19,8 +19,8 @@
#define _CONFIGURE_H
@@ -11,8 +13,9 @@
#define SOUND_DSP_AUDIO
---- xdigger-1.0.10/drawpixmaps.c Sun Jul 4 09:50:44 1999
-+++ xdigger-1.0.10-patched/drawpixmaps.c Mon Mar 18 23:04:20 2002
+diff -ur xdigger-1.0.10/drawpixmaps.c xdigger-1.0.10.patched/drawpixmaps.c
+--- xdigger-1.0.10/drawpixmaps.c 1999-07-04 05:50:44.000000000 -0400
++++ xdigger-1.0.10.patched/drawpixmaps.c 2005-12-06 00:36:42.000000000
-0500
@@ -14,7 +14,7 @@
along with this program; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
@@ -22,3 +25,205 @@
#include <stdio.h>
#include <string.h>
#include <X11/Xlib.h>
+diff -ur xdigger-1.0.10/runlevels.c xdigger-1.0.10.patched/runlevels.c
+--- xdigger-1.0.10/runlevels.c 1999-07-04 05:52:18.000000000 -0400
++++ xdigger-1.0.10.patched/runlevels.c 2005-12-06 00:43:18.000000000 -0500
+@@ -672,6 +672,20 @@
+ }
+ } /* DiggerHalfStep() */
+
++typedef struct
++{
++ unsigned char x, y, id, type;
++} TMerk;
++
++void Merke(unsigned char type, int x, int y, int *merkidx, TMerk *merk)
++{
++ merk[*merkidx].x = x;
++ merk[*merkidx].y = y;
++ merk[*merkidx].id = field[x][y].id & 7;
++ merk[*merkidx].type = type;
++ *merkidx++;
++}
++
+ void StoneDiamondStep()
+ {
+
+@@ -680,24 +694,10 @@
+ #define SF_LEFTDOWN 2
+ #define SF_CHANGER 3
+
+- typedef struct
+- {
+- unsigned char x, y, id, type;
+- } TMerk;
+-
+ TMerk merk[140], ghosts_todie[17];
+ int i, x, y, dx, dy, merkidx, ghosts_todie_idx;
+ Bool digger_todie = False;
+-
+- void Merke(unsigned char type)
+- {
+- merk[merkidx].x = x;
+- merk[merkidx].y = y;
+- merk[merkidx].id = field[x][y].id & 7;
+- merk[merkidx].type = type;
+- merkidx++;
+- }
+-
++
+ /* Schritt 1 (nur markieren) : */
+ merkidx = 0; ghosts_todie_idx = 0;
+
+@@ -708,19 +708,19 @@
+ (field[x][y].id == ID_IVDIAMOND))
+ {
+ if (field[x][y+1].id == ID_NOTHING)
+- Merke(SF_DOWN);
++ Merke(SF_DOWN, x, y, &merkidx, merk);
+ else
+ if ((field[x][y+1].id == ID_STONE) ||
+ (field[x][y+1].id == ID_DIAMOND))
+ {
+ if ((field[x-1][y].id == ID_NOTHING) &&
+ (field[x-1][y+1].id == ID_NOTHING))
+- Merke(SF_LEFTDOWN);
++ Merke(SF_LEFTDOWN, x, y, &merkidx, merk);
+ else
+ if ((field[x+1][y].id == ID_NOTHING) &&
+ (field[x+1][y+1].id == ID_NOTHING))
+ {
+- Merke(SF_RIGHTDOWN);
++ Merke(SF_RIGHTDOWN, x, y, &merkidx, &merk);
+ field[x+1][y+1].id = ID_FSTODMD;
+ }
+ }
+@@ -729,7 +729,7 @@
+ (field[x][y].id == ID_IVSTONE)) &&
+ (field[x][y+1].id == ID_CHANGER) &&
+ (field[x][y+2].id == ID_NOTHING))
+- Merke(SF_CHANGER);
++ Merke(SF_CHANGER, x, y, &merkidx, &merk);
+ }
+ merk[merkidx].x = 0;
+ merk[merkidx].y = 0;
+@@ -1573,6 +1573,50 @@
+
+
/*---------------------------------------------------------------------------*/
+
++void Save_Ghost(int flags, int *id, int *d, unsigned char *file_daten)
++{
++ switch (flags & F_GHOST_TYPEMASK)
++ {
++ case F_GHOST_TYPE180:
++ *id = 3;
++ break;
++ case F_GHOST_TYPEL:
++ *id = 7;
++ break;
++ case F_GHOST_TYPER:
++ *id = 15;
++ break;
++ case F_GHOST_TYPELR:
++ *id = 11;
++ break;
++ }
++ switch (flags & F_GHOST_MOVEMASK)
++ {
++ case F_GHOST_DOWN:
++ *d = 0;
++ break;
++ case F_GHOST_UP:
++ *d = 1;
++ break;
++ case F_GHOST_RIGHT:
++ *d = 2;
++ break;
++ case F_GHOST_LEFT:
++ *d = 3;
++ break;
++ }
++ if (number_ghosts < MAX_GHOSTS)
++ {
++ if (number_ghosts & 1)
++ file_daten[0x94 + number_ghosts/2] =
++ (file_daten[0x94 + number_ghosts/2] & 0xf0) | (*d);
++ else
++ file_daten[0x94 + number_ghosts/2] =
++ (file_daten[0x94 + number_ghosts/2] & 0x0f) | (*d << 4);
++ number_ghosts++;
++ }
++}
++
+ void Edit_SaveLevel(int level_number)
+ {
+ /* char filename[256]; */
+@@ -1580,50 +1624,6 @@
+ int x, y, id, flags, i, d;
+ FILE *filehandle;
+
+- void Save_Ghost()
+- {
+- switch (flags & F_GHOST_TYPEMASK)
+- {
+- case F_GHOST_TYPE180:
+- id = 3;
+- break;
+- case F_GHOST_TYPEL:
+- id = 7;
+- break;
+- case F_GHOST_TYPER:
+- id = 15;
+- break;
+- case F_GHOST_TYPELR:
+- id = 11;
+- break;
+- }
+- switch (flags & F_GHOST_MOVEMASK)
+- {
+- case F_GHOST_DOWN:
+- d = 0;
+- break;
+- case F_GHOST_UP:
+- d = 1;
+- break;
+- case F_GHOST_RIGHT:
+- d = 2;
+- break;
+- case F_GHOST_LEFT:
+- d = 3;
+- break;
+- }
+- if (number_ghosts < MAX_GHOSTS)
+- {
+- if (number_ghosts & 1)
+- file_daten[0x94 + number_ghosts/2] =
+- (file_daten[0x94 + number_ghosts/2] & 0xf0) | (d);
+- else
+- file_daten[0x94 + number_ghosts/2] =
+- (file_daten[0x94 + number_ghosts/2] & 0x0f) | (d << 4);
+- number_ghosts++;
+- }
+- }
+-
+ bzero(file_daten, sizeof(file_daten));
+ number_ghosts = 0;
+ c = file_daten;
+@@ -1637,7 +1637,7 @@
+ diggerposy = y;
+ }
+ if (id == ID_GHOST)
+- Save_Ghost();
++ Save_Ghost(flags, &id, &d, file_daten);
+ *c = (*c & 0x0f) | (id << 4);
+
+ /* ------------------------------------------------------------------ */
+@@ -1650,7 +1650,7 @@
+ diggerposy = y;
+ }
+ if (id == ID_GHOST)
+- Save_Ghost();
++ Save_Ghost(flags, &id, &d, file_daten);
+ *c = (*c & 0xf0) | id;
+ }
+ c += 3;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
