2007-03-07 Krzysztof Kosciuszkiewicz <[email protected]>

	* V151
	* endgame.c (Load_LenFlag): US and USSR bugs differed.
	* Other small fixes.

ChangeLog

@@ -1,3 +1,11 @@
+2007-03-07  Krzysztof Kosciuszkiewicz <[email protected]>
+
+	* V151
+
+	* endgame.c (Load_LenFlag): US and USSR bugs differed.
+
+	* Other small fixes.
+
 2007-03-02  Krzysztof Kosciuszkiewicz <[email protected]>
 
 	* V150

TODO

@@ -4,8 +4,6 @@ BUGS
 These should be fixed as soon as possible as they crash the binary or
 seriously affect gameplay.
 
- * [5] records.c(RecChange): segfault.
- * [5] endgame.c(EndPict): segfault.
  * [5] news video is not clipped, green band appears (pace, linux).
  * [3] aipur.c(RDafford):562, class == 2 && MaxRD == 80 && Safety == 90 (???).
 

endgame.c

@@ -354,7 +354,8 @@ void Load_LenFlag(char win)
  fseek(in,(poff)*(sizeof P),SEEK_CUR);
  fread(&P,sizeof P,1,in);
 	SwapPatchHdr(&P);
-	P.w++; /* BUGFIX as everywhere */
+	if (win!=1)
+		P.w++; /* BUGFIX as everywhere */
  fseek(in,P.offset,SEEK_SET);
  GV(&local,P.w,P.h); GV(&local2,P.w,P.h);
  gxClearVirtual(&local2,0);
@@ -363,7 +364,7 @@ void Load_LenFlag(char win)
  fclose(in);
  for (j=0;j<P.size;j++)
 	/* now fix the strip */
-	if ((j+1) % P.w != 0)
+	if (win == 1 || ((j+1) % P.w != 0))
 		local2.vptr[j]=local.vptr[j]+coff;
 
  gxPutImage(&local2,gxSET,Off_X,Off_Y,0);

m4/theora.m4

@@ -20,7 +20,7 @@ AC_ARG_WITH(theora,
     )
 if test "x$theora_prefix" = "x"; then
     if test "x$prefix" = "xNONE"; then
-        theora_prefix="/usr/local"
+        theora_prefix="/usr"
     else
         theora_prefix="$prefix"
     fi

options.h

@@ -1,5 +1,5 @@
-#ifndef _ENVIRONMENT_H
-#define _ENVIRONMENT_H
+#ifndef _OPTIONS_H
+#define _OPTIONS_H
 
 typedef struct {
     char *dir_savegame;
@@ -12,4 +12,4 @@ typedef struct {
 extern game_options options;
 extern int setup_options(int argc, char ** argv);
 
-#endif /* _ENVIRONMENT_H */
+#endif /* _OPTIONS_H */

vab.c

@@ -25,6 +25,7 @@
 //
 // Vehicle Assembly Building
 
+#include "gamedata.h"
 #include "Buzz_inc.h"
 #include "externs.h"
 #include "utils.h"
@@ -136,14 +137,12 @@ void DispVAB(char plr,char pad)
 
   fp = sOpen("VAB.IMG","rb",0);
   fread(pal,768,1,fp);
-  fread(&image_len,sizeof(image_len), 1, fp);
+  fread_uint16_t(&image_len, 1, fp);
   if (plr==1) {
-	Swap16bit(image_len);
 		fseek(fp,image_len,SEEK_CUR);
 		fread(pal,768,1,fp);
-		fread(&image_len,sizeof(image_len), 1, fp);
+		fread_uint16_t(&image_len, 1, fp);
   }
-  Swap16bit(image_len);
   fread((char *)screen,image_len,1,fp);
   fclose(fp);
 

version.c

@@ -1,2 +1,2 @@
-150
+151