Hi,
compile.patch:
The changes I had to make to compile rev 465.
bintree_stuff.patch:
Replaced the 2 occurrences of a strange macro with its definition
openal_filesize.patch:
lib/sound/openal_track.c:// FIXME Ugly hack because PhysFS doesn't
support reporting the filesize, nor seeking to the end
Well, it does support reporting the filesize, so I replaced the hack
with PHYSFS_fileLength
- Gerard
Index: lib/sound/openal_track.c
===================================================================
--- lib/sound/openal_track.c (revision 445)
+++ lib/sound/openal_track.c (working copy)
@@ -387,10 +387,8 @@
if (f == NULL) return FALSE;
- // FIXME Ugly hack because PhysFS doesn't support reporting the
filesize, nor seeking to the end
- while( PHYSFS_read( f, seekbuf, 1, 1 ) );
- size = PHYSFS_tell( f );
- PHYSFS_seek( f, 0 );
+ size = PHYSFS_fileLength(f);
+ assert( size > -1 );
if (size > buffer_size) {
if (buffer != NULL) free(buffer);
Index: lib/ivis_common/bspimd.h
===================================================================
--- lib/ivis_common/bspimd.h (revision 449)
+++ lib/ivis_common/bspimd.h (working copy)
@@ -48,13 +48,9 @@
#define LEFT 1
#define RIGHT 0
-
-#define BINTREE_STUFF(x) struct x *link[2]
-
-
typedef struct BNODE
{
- BINTREE_STUFF(BNODE);
+ struct BNODE *link[2];
}
BNODE, *PSBNODE;
/***************************************************************************/
@@ -110,7 +106,7 @@
typedef struct BSPTREENODE
{
- BINTREE_STUFF( BSPTREENODE );
+ struct BSPTREENODE *link[2];
PLANE Plane;
// points to first polygon in the BSP tree entry ... BSP_NextPoly in
the iIMDPoly structure will point to the next entry
Index: src/game.c
===================================================================
--- src/game.c (revision 465)
+++ src/game.c (working copy)
@@ -5922,8 +5922,8 @@
}
else
{
- endian_uword(&psSaveDroid->turretRotation);
- endian_uword(&psSaveDroid->turretPitch);
+ endian_uword(&psSaveDroid->turretRotation[0]);
+ endian_uword(&psSaveDroid->turretPitch[0]);
}
endian_sdword(&psSaveDroid->order);
endian_uword(&psSaveDroid->orderX);
Index: src/projectile.c
===================================================================
--- src/projectile.c (revision 465)
+++ src/projectile.c (working copy)
@@ -1837,7 +1837,7 @@
//if(psObj->psWStats->weaponSubClass == WSC_ROCKET OR
psObj->psWStats->weaponSubClass == WSC_MISSILE OR
//psObj->psWStats->weaponSubClass == WSC_SLOWROCKET OR
psObj->psWStats->weaponSubClass == WSC_SLOWMISSILE)
//{
- projGetNaybors((BASE_OBJECT *)psObj);
+ projGetNaybors((PROJ_OBJECT *)psObj);
//}
switch (psObj->state)
_______________________________________________
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev
