diff --git a/src/message.c b/src/message.c index 157511303..6fe776e61 100644 --- a/src/message.c +++ b/src/message.c @@ -466,7 +466,7 @@ bool addToViewDataList(VIEWDATA* psViewData, unsigned int numData) /*load the view data for the messages from the file */ VIEWDATA *loadViewData(const char *pViewMsgData, UDWORD bufferSize) { - UDWORD i, dataInc, seqInc, numFrames, numData, count, count2; + UDWORD i, dataInc, seqInc, dummy, numData, count, count2; VIEWDATA *psViewData, *pData; VIEW_RESEARCH *psViewRes; VIEW_REPLAY *psViewReplay; @@ -570,7 +570,7 @@ VIEWDATA *loadViewData(const char *pViewMsgData, UDWORD bufferSize) string[0] = '\0'; audioName[0] = '\0'; sscanf(pViewMsgData,",%[^','],%[^','],%[^','],%[^','],%d%n", - imdName, imdName2, string, audioName, &numFrames,&cnt); + imdName, imdName2, string, audioName, &dummy, &cnt); pViewMsgData += cnt; psViewRes = (VIEW_RESEARCH *)psViewData->pData; psViewRes->pIMD = (iIMDShape *) resGetData("IMD", imdName); @@ -608,8 +608,6 @@ VIEWDATA *loadViewData(const char *pViewMsgData, UDWORD bufferSize) { psViewRes->pAudio = NULL; } - //this is for the PSX only - psViewRes->numFrames = (UWORD)numFrames; break; case VIEW_RPL: case VIEW_RPLX: @@ -702,13 +700,9 @@ VIEWDATA *loadViewData(const char *pViewMsgData, UDWORD bufferSize) } } //get the audio text string - sscanf(pViewMsgData,",%[^','],%d%n", audioName, &count,&cnt); + sscanf(pViewMsgData,",%[^','],%d%n", audioName, &dummy, &cnt); pViewMsgData += cnt; - ASSERT( count < UWORD_MAX, "loadViewData: numFrames too high for %s", name ); - - psViewReplay->pSeqList[dataInc].numFrames = (UWORD)count; - if (strcmp(audioName, "0")) { //allocate space diff --git a/src/message_parser.y b/src/message_parser.y index 4135d9772..cc9f66174 100644 --- a/src/message_parser.y +++ b/src/message_parser.y @@ -240,7 +240,6 @@ research_message: imd_name ',' imd_name2 ',' sequence_name ',' audio_name ',' $$->pAudio = $7; sstrcpy($$->sequenceName, $5); - $$->numFrames = 0; // Get rid of our tokens ASAP (so that the free() lists on errors become shorter) free($5); diff --git a/src/messagedef.h b/src/messagedef.h index f836bef99..f2077c2b7 100644 --- a/src/messagedef.h +++ b/src/messagedef.h @@ -67,9 +67,6 @@ typedef struct _view_research iIMDShape *pIMD2; //allows base plates and turrets to be drawn as well char sequenceName[MAX_STR_LENGTH]; //which windowed flic to display char *pAudio; /*name of audio track to play (for this seq)*/ - UWORD numFrames; /* On PSX if type is VIEW_RPL then - this is used as a number_of_frames_in_the_stream - count - NOT used on PC*/ } VIEW_RESEARCH; typedef struct _seq_display @@ -81,9 +78,6 @@ typedef struct _seq_display //this sequence const char** ppTextMsg; //Pointer to text messages - if any char *pAudio; /*name of audio track to play (for this seq)*/ - UWORD numFrames; /* On PSX if type is VIEW_RPL then - this is used as a number_of_frames_in_the_stream - count - NOT used on PC*/ } SEQ_DISPLAY; //info required to view a flic in Intelligence Screen