Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Initialise aHardPath at compile time to "sequences/" (the only value it was ever set to) 

* Get rid of bCDPath and bHardPath which guarded the initialisation of aHardPath
 * Remove seq_SetVideoPath which performed the initialisation of aHardPath

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6113 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-10-04 19:28:41 +00:00
parent df801f1b08
commit d8e0d93a5d
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/seqdisp.c
View File

@ -89,10 +89,8 @@ typedef struct
static BOOL bBackDropWasAlreadyUp;
static BOOL bAudioPlaying = false;
static BOOL bHoldSeqForAudio = false;
static BOOL bCDPath = false;
static BOOL bHardPath = false;
static BOOL bSeqSubtitles = true;
static char aHardPath[MAX_STR_LENGTH];
static const char aHardPath[] = "sequences/";
static char aVideoName[MAX_STR_LENGTH];
static SEQLIST aSeqList[MAX_SEQ_LIST];
static SDWORD currentSeq = -1;
@ -107,7 +105,6 @@ static unsigned int time_started = 0;
*/
/***************************************************************************/
static void seq_SetVideoPath(void);
static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioName);
/***************************************************************************/
@ -131,16 +128,6 @@ BOOL seq_RenderVideoToBuffer(iSurface* pSurface, const char* sequenceName, int t
return true;
}
static void seq_SetVideoPath(void)
{
// now set up the hard disc path /
if (!bHardPath)
{
sstrcpy(aHardPath, "sequences/");
bHardPath=true; //yes, always true, as it should be on windows ALSO.
}
}
//full screenvideo functions
static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioName)
{
@ -148,11 +135,6 @@ static BOOL seq_StartFullScreenVideo(const char* videoName, const char* audioNam
int chars_printed;
bHoldSeqForAudio = false;
//set a valid video path if there is one
if(!bCDPath && !bHardPath)
{
seq_SetVideoPath();
}
chars_printed = ssprintf(aVideoName, "%s%s", aHardPath, videoName);
ASSERT(chars_printed < sizeof(aVideoName), "sequence path + name greater than max string");