From: Ryan C. Gordon <icculus@icculus.org>
Date: Tue, 3 Nov 2009 06:37:38 +0000 (-0500)
Subject: Fixed data loading on PowerPC builds compiled with GCC.
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=9472ba88471ee8b0aabea90ea11f428a87a81921;p=lugaru.git

Fixed data loading on PowerPC builds compiled with GCC.

(sizeof (bool) == 4 here.)
---

diff --git a/Source/Skeleton.cpp b/Source/Skeleton.cpp
index 8b7c18a..1336688 100644
--- a/Source/Skeleton.cpp
+++ b/Source/Skeleton.cpp
@@ -1062,7 +1062,9 @@ void Animation::Load(char *filename, int aheight, int aattack)
 				funpackf(tfile, "Bf", &twist[j][i]);
 			}
 			for(j=0;j<joints;j++){
-				funpackf(tfile, "Bb", &onground[j][i]);
+				unsigned char uch;
+				funpackf(tfile, "Bb", &uch);
+				onground[j][i] = (uch != 0);
 			}
 			funpackf(tfile, "Bf", &speed[i]);
 		}
@@ -1274,21 +1276,21 @@ void Skeleton::Load(char *filename,char *lowfilename,char *clothesfilename, char
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(float);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
@@ -1329,7 +1331,7 @@ void Skeleton::Load(char *filename,char *lowfilename,char *clothesfilename, char
 
 
 			}
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
@@ -1379,21 +1381,21 @@ void Skeleton::Load(char *filename,char *lowfilename,char *clothesfilename, char
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(float);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);
@@ -1432,7 +1434,7 @@ void Skeleton::Load(char *filename,char *lowfilename,char *clothesfilename, char
 					}
 				}
 			}
-			lSize=sizeof(bool);
+			lSize=1;//sizeof(bool);
 			fseek ( tfile, lSize, SEEK_CUR);
 			lSize=sizeof(int);
 			fseek ( tfile, lSize, SEEK_CUR);