hax?

Author: hmaon

src/Engine/Flc.cpp

@@ -114,7 +114,7 @@ int FlcCheckHeader(const char *filename)
   printf("flc.HeaderWidth: %d\n", flc.HeaderWidth);
   printf("flc.HeaderHeight: %d\n", flc.HeaderHeight);
   printf("flc.HeaderDepth: %d\n", flc.HeaderDepth);
-  printf("flc.HeaderSpeed: %d\n", flc.HeaderSpeed);
+  printf("flc.HeaderSpeed: %lf\n", flc.HeaderSpeed);
 #endif
 
   if((flc.HeaderCheck==0x0AF12) || (flc.HeaderCheck==0x0AF11)) { 
@@ -123,9 +123,7 @@ int FlcCheckHeader(const char *filename)
 	Log(LOG_INFO) << "Playing flx, " << flc.screen_w << "x" << flc.screen_h << ", " << flc.HeaderFrames << " frames";
     flc.screen_depth=8;
     if(flc.HeaderCheck==0x0AF11) {
-      flc.HeaderSpeed*=1000/70;
-	  // gross hack, let's set the framespeed to something not expressed in 1s/70 "jiffies"
-	  flc.HeaderSpeed = 1000/10; // 10FPS makes the end of the intro sync up perfectly! shame about the middle though?
+      flc.HeaderSpeed*=1000.0/70.0;
     }
     return(0);
   }
@@ -137,18 +135,22 @@ int FlcCheckFrame()
   ReadU32(&flc.FrameSize, flc.pFrame+0);
   ReadU16(&flc.FrameCheck, flc.pFrame+4);
   ReadU16(&flc.FrameChunks, flc.pFrame+6);
+  ReadU16(&flc.DelayOverride, flc.pFrame+8); // not actually used in UFOINT.FLI, it turns out
 
 #ifdef DEBUG
   printf("flc.FrameSize: %d\n", flc.FrameSize);
   printf("flc.FrameCheck: %d\n", flc.FrameCheck);
   printf("flc.FrameChunks: %d\n", flc.FrameChunks);
+  printf("flc.DelayOverride: %d\n", flc.DelayOverride);
 #endif
 
   flc.pFrame+=16;
   if(flc.FrameCheck==0x0f1fa) { 
     return(0);
   }
 
+  flc.DelayOverride = 0; // not FRAME_TYPE means the value we read wasn't a delay at all
+
   if(flc.FrameCheck==0x0f100) { 
 #ifdef DEBUG
     printf("Ani info!!!\n");
@@ -377,13 +379,15 @@ void FlcDoOneFrame()
   flc.pChunk=flc.pMembuf;
   if ( SDL_LockSurface(flc.mainscreen) < 0 )
     return;
+  // if (!ChunkCount) printf("Empty frame! %d\n", flc.FrameCount); // this is normal and used for delays
   while(ChunkCount--) {
     ReadU32(&flc.ChunkSize, flc.pChunk+0);
     ReadU16(&flc.ChunkType, flc.pChunk+4);
 
 #ifdef DEBUG
     printf("flc.ChunkSize: %d\n", flc.ChunkSize);
-    printf("flc.ChunkType: %d\n", flc.ChunkType);
+    printf("flc.ChunkType: %d aka %x\n", flc.ChunkType, flc.ChunkType);
+	if (flc.DelayOverride) printf("DelayOverride: %d\n", flc.DelayOverride);
 #endif
 
     switch(flc.ChunkType) {
@@ -422,20 +426,22 @@ void FlcDoOneFrame()
 } /* FlcDoOneFrame */
 
 void SDLWaitFrame(void)
-{ static Uint32 oldTick=0.0;
+{ static double oldTick=0.0;
   Uint32 currentTick;
-  int waitTicks;
+  double waitTicks;
+  double delay = flc.DelayOverride ? flc.DelayOverride : flc.HeaderSpeed;
 
 	if (oldTick == 0.0) oldTick = SDL_GetTicks();
 
 	currentTick=SDL_GetTicks(); 
-	waitTicks=(oldTick+=(flc.HeaderSpeed))-currentTick;
+	waitTicks=(oldTick+=(delay))-currentTick;
 
 
 	do {
-		waitTicks = (oldTick + flc.HeaderSpeed - SDL_GetTicks());
+		waitTicks = (oldTick + delay - SDL_GetTicks());
 
 		if(waitTicks > 0.0) {
+			//SDL_Delay(floor(waitTicks + 0.5)); // biased rounding? mehhh?
 			SDL_Delay(1);
 		}
 	} while (waitTicks > 0.0); 
@@ -536,14 +542,16 @@ void FlcMain(void (*frameCallBack)())
   }
 } /* FlcMain */
 
+
+#if 0
 void FlxplayHelp()
 { printf("FLX player (%s) with SDL output (jasper@il.fontys.nl)\n", version);
   printf("View readme file for more information\n\n");
   printf("flxplay [-l] [filename]\n");
   exit(1);
 } /* FlxplayHelp */
 
-#if 0
+
 main(int argc, char **argv)
 { int c;
 

src/Engine/Flc.h

@@ -45,14 +45,18 @@ struct Flc_t {
   Uint16 HeaderWidth;   /* Fli width */
   Uint16 HeaderHeight;  /* Fli heigth */
   Uint16 HeaderDepth;   /* Color depth */
-  Uint32 HeaderSpeed;   /* Number of video ticks between frame */
+  double HeaderSpeed;   /* Number of video ticks between frame */
   Uint32 FrameSize;     /* Frame size in bytes */
   Uint16 FrameCheck;    /* Frame check */
   Uint16 FrameChunks;   /* Number of chunks in frame */
   Uint32 ChunkSize;     /* Size of chunk */
   Uint16 ChunkType;     /* Type of chunk */
   /*
   */
+  // FRAME_TYPE extension, see http://www.compuphase.com/flic.htm
+  Uint16 DelayOverride;
+  //
+
   SDL_Surface *mainscreen;
   Screen *realscreen;
   SDL_Color colors[256];

src/Engine/Screen.cpp

@@ -155,7 +155,7 @@ void Screen::flip()
 	{
 		if (_screen->format->BitsPerPixel == 8 && SDL_SetColors(_screen, &(deferredPalette[_firstColor]), _firstColor, _numColors) == 0)
 		{
-			Log(LOG_ERROR) << "Display palette doesn't match requested palette";
+			Log(LOG_DEBUG) << "Display palette doesn't match requested palette";
 		}
 		_numColors = 0;
 		_pushPalette = false;

src/Menu/StartState.cpp

@@ -312,17 +312,21 @@ static struct AudioSequence
 		switch(Flc::flc.FrameCount)
 		{
 		case 0:
+			Log(LOG_DEBUG) << "Playing gmintro1";
 			m = rp->getMusic("GMINTRO1");
 			m->play();
 			break;
 		case 180:
+			Log(LOG_DEBUG) << "Playing gmintro2";
 			m = rp->getMusic("GMINTRO2");
 			m->play();
 			break;
 		case 382:
+			Log(LOG_DEBUG) << "Playing gmintro3";
 			m = rp->getMusic("GMINTRO3");
 			m->play();
 			Mix_HookMusicFinished(musicDone);
+			Flc::flc.HeaderSpeed = 1000/10; // last part only syncs well at this fps or something; it is a mystery so far
 			break;
 		}		
 

src/OpenXcom.2010.vcxproj

@@ -720,4 +720,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>