[patch] wolfgl-0.93-gcc4.patch

wolfgl-0.93-gcc4.patch (text/plain), 1.84 KB, created by Marcelo Goes (RETIRED) on 2006-01-16 14:21:14 UTC

diff --exclude='*~' -Naur wolfgl-0.93.orig/common/id_ca.c wolfgl-0.93/common/id_ca.c
--- wolfgl-0.93.orig/common/id_ca.c	2006-01-16 16:55:46.000000000 -0200
+++ wolfgl-0.93/common/id_ca.c	2006-01-16 20:08:23.000000000 -0200
@@ -268,13 +268,15 @@
 			if (!count)
 			{
 				// have to insert a word containing the tag byte
-				ch |= *((unsigned char*)inptr)++;
+				ch | *((unsigned char*)inptr);
+				inptr += sizeof (unsigned char);
 				*outptr++ = ch;
 				length--;
 			}
 			else
 			{
-				offset = *((unsigned char*)inptr)++;
+				offset = *((unsigned char*)inptr);
+				inptr += sizeof (unsigned char);
 				copyptr = outptr - offset;
 				length -= count;
 				while (count--)
@@ -287,7 +289,8 @@
 			if (!count)
 			{
 				// have to insert a word containing the tag byte
-				ch |= *((unsigned char*)inptr)++;
+				ch | *((unsigned char*)inptr);
+				inptr += sizeof (unsigned char);
 				*outptr++ = ch;
 				length --;
 			}
@@ -806,7 +809,7 @@
 
 	for (i=0;i<NUMCHUNKS;i++)
 		if (grsegs[i])
-			MM_SetPurge (&(memptr)grsegs[i],3);
+			MM_SetPurge ((memptr)&grsegs[i],3);
 	ca_levelbit<<=1;
 	ca_levelnum++;
 }
@@ -862,7 +865,7 @@
 
 	for (i = 0; i < NUMCHUNKS; i++)
 		if (grsegs[i])
-			MM_SetPurge (&(memptr)grsegs[i],3);
+			MM_SetPurge ((memptr)&grsegs[i],3);
 }
 
 //===========================================================================
diff --exclude='*~' -Naur wolfgl-0.93.orig/common/wl_game.c wolfgl-0.93/common/wl_game.c
--- wolfgl-0.93.orig/common/wl_game.c	2006-01-16 16:55:46.000000000 -0200
+++ wolfgl-0.93/common/wl_game.c	2006-01-16 20:17:58.000000000 -0200
@@ -545,13 +545,13 @@
 			{
 				// solid wall
 				tilemap[x][y] = tile;
-				(unsigned short)actorat[x][y] = tile;
+				actorat[x][y] = tile;
 			}
 			else
 			{
 				// area floor
 				tilemap[x][y] = 0;
-				(unsigned short)actorat[x][y] = 0;
+				actorat[x][y] = 0;
 			}
 		}