fix to zapper movies and minor fix to movie loading

This commit is contained in:
zeromus 2008-06-19 16:19:48 +00:00
parent 0d6820d922
commit 0883fdd050
2 changed files with 3 additions and 1 deletions

View File

@ -145,6 +145,7 @@ static void UpdateZapper(int w, void *data, int arg)
static void LogZapper(int w, MovieRecord* mr)
{
uint32 *ptr=(uint32 *)data;
mr->zappers[w].x = ZD[w].mzx;
mr->zappers[w].y = ZD[w].mzy;
mr->zappers[w].b = ZD[w].mzb;

View File

@ -405,11 +405,12 @@ static void LoadFM2(MovieData& movieData, std::istream* fp, int size=INT_MAX, bo
bail:
bail = true;
if(state == VALUE) goto commit;
goto done;
commit:
movieData.installValue(key,value);
state = NEWLINE;
if(bail) break;
done: ;
if(bail) break;
}
}