Skip to content

Commit 8fbac7e

Browse files
committed
ensure intro movie is centered on linux
revert atlimit8's commit from feef4e8 I attempted to reach him/her about the reasoning for this commit but did not get a reply. tested on Gentoo Linux with sdl-1.2.15, sdl-gfx-2.0.24 with: displayWidth: 1920 displayHeight: 1200 baseXResolution: 640 baseYResolution: 400 see: OpenXcom@feef4e8 OpenXcom#678 OpenXcom#675 http://openxcom.org/bugs/openxcom/issues/294
1 parent 0af0dd6 commit 8fbac7e

1 file changed

Lines changed: 2 additions & 15 deletions

File tree

src/Engine/Flc.cpp

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -507,22 +507,15 @@ void FlcMain(void (*frameCallBack)())
507507
{ flc.quit=false;
508508
SDL_Event event;
509509

510-
//#ifndef __NO_FLC
511510
FlcInitFirstFrame();
512-
#ifdef _WIN32
513511
flc.offset = flc.dy * flc.mainscreen->pitch + flc.mainscreen->format->BytesPerPixel * flc.dx;
514-
#else
515-
SDL_Rect dstRect = {(Sint16)flc.dx, (Sint16)flc.dy, (Uint16)flc.screen_w, (Uint16)flc.screen_h};
516-
flc.offset = 0;
517-
#endif
518512
while(!flc.quit) {
519513
if (frameCallBack) (*frameCallBack)();
520514
flc.FrameCount++;
521515
if(FlcCheckFrame()) {
522516
if (flc.FrameCount<=flc.HeaderFrames) {
523-
//printf("Frame failure -- corrupt file?\n");
524517
Log(LOG_ERROR) << "Frame failure -- corrupt file?";
525-
return;
518+
return;
526519
} else {
527520
if(flc.loop)
528521
FlcInitFirstFrame();
@@ -542,13 +535,7 @@ void FlcMain(void (*frameCallBack)())
542535
/* TODO: Track which rectangles have really changed */
543536
//SDL_UpdateRect(flc.mainscreen, 0, 0, 0, 0);
544537
if (flc.mainscreen != flc.realscreen->getSurface()->getSurface())
545-
SDL_BlitSurface(flc.mainscreen, 0, flc.realscreen->getSurface()->getSurface(),
546-
#ifdef _WIN32
547-
0
548-
#else
549-
&dstRect
550-
#endif
551-
);
538+
SDL_BlitSurface(flc.mainscreen, 0, flc.realscreen->getSurface()->getSurface(), 0);
552539
flc.realscreen->flip();
553540
}
554541

0 commit comments

Comments
 (0)