ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdl: fix build errors introduced by recent tasedit commits

This commit is contained in:
punkrockguy318 2011-09-25 17:04:08 +00:00
parent ab4e68da8c
commit 68f4cb85ef
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/boards/SConscript
View File

@ -48,7 +48,6 @@ bmc64in1nr.cpp
bmc70in1.cpp bmc70in1.cpp
bonza.cpp bonza.cpp
bs-5.cpp bs-5.cpp
copyfami_mmc3.cpp
datalatch.cpp datalatch.cpp
deirom.cpp deirom.cpp
dream.cpp dream.cpp

16
src/movie.cpp
View File

@ -48,7 +48,9 @@ using namespace std;
extern char FileBase[]; extern char FileBase[];
extern bool AutoSS; //Declared in fceu.cpp, keeps track if a auto-savestate has been made extern bool AutoSS; //Declared in fceu.cpp, keeps track if a auto-savestate has been made
#ifdef WIN32
extern int TASEdit_greenzone_capacity; extern int TASEdit_greenzone_capacity;
#endif
std::vector<int> subtitleFrames; //Frame numbers for subtitle messages std::vector<int> subtitleFrames; //Frame numbers for subtitle messages
std::vector<string> subtitleMessages; //Messages of subtitles std::vector<string> subtitleMessages; //Messages of subtitles
@ -150,13 +152,20 @@ void MovieData::TryDumpIncremental()
void MovieData::ClearGreenzoneTail() void MovieData::ClearGreenzoneTail()
{ {
#ifdef WIN32
int tail_frame = currMovieData.greenZoneCount-1 - TASEdit_greenzone_capacity; int tail_frame = currMovieData.greenZoneCount-1 - TASEdit_greenzone_capacity;
#else
int tail_frame = currMovieData.greenZoneCount-1;
#endif
if (tail_frame >= currFrameCounter) tail_frame = currFrameCounter - 1; if (tail_frame >= currFrameCounter) tail_frame = currFrameCounter - 1;
for (;tail_frame >= 0; tail_frame--) for (;tail_frame >= 0; tail_frame--)
{ {
if (currMovieData.savestates[tail_frame].empty()) break; if (currMovieData.savestates[tail_frame].empty()) break;
ClearSavestate(tail_frame); ClearSavestate(tail_frame);
RedrawRow(tail_frame); #ifdef WIN32
RedrawRow(tail_frame);
#endif
} }
} }
void MovieData::ClearSavestate(int index) void MovieData::ClearSavestate(int index)
@ -575,7 +584,12 @@ bool MovieData::loadGreenzone(EMUFILE *is)
savestates.resize(greenZoneCount); savestates.resize(greenZoneCount);
frames_flags.resize(greenZoneCount); frames_flags.resize(greenZoneCount);
savestates.resize(greenZoneCount); savestates.resize(greenZoneCount);
#ifdef WIN32
int greenzone_tail_frame = greenZoneCount-1 - TASEdit_greenzone_capacity; int greenzone_tail_frame = greenZoneCount-1 - TASEdit_greenzone_capacity;
#else
int greenzone_tail_frame = greenZoneCount-1;
#endif
if (read32le((uint32 *)&frame, is)) if (read32le((uint32 *)&frame, is))
{ {
currFrameCounter = frame; currFrameCounter = frame;

8
src/video.cpp
View File

@ -215,9 +215,9 @@ void FCEU_PutImage(void)
ReallySnap(); ReallySnap();
dosnapsave=0; dosnapsave=0;
} }
#ifdef WIN32
if (!FCEUI_AviEnableHUDrecording()) snapAVI(); if (!FCEUI_AviEnableHUDrecording()) snapAVI();
#endif
if(GameInfo->type==GIT_VSUNI) if(GameInfo->type==GIT_VSUNI)
FCEU_VSUniDraw(XBuf); FCEU_VSUniDraw(XBuf);
@ -410,7 +410,7 @@ void FCEU_PutImage(void)
} }
} }
} }
#ifdef WIN32
if (FCEUI_AviEnableHUDrecording()) if (FCEUI_AviEnableHUDrecording())
{ {
if (FCEUI_AviDisableMovieMessages()) if (FCEUI_AviDisableMovieMessages())
@ -423,7 +423,7 @@ void FCEU_PutImage(void)
snapAVI(); snapAVI();
} }
} else DrawMessage(false); } else DrawMessage(false);
#endif
} }
void snapAVI() void snapAVI()
{ {