fix to zapper movies and minor fix to movie loading
This commit is contained in:
parent
0d6820d922
commit
0883fdd050
|
@ -145,6 +145,7 @@ static void UpdateZapper(int w, void *data, int arg)
|
||||||
|
|
||||||
static void LogZapper(int w, MovieRecord* mr)
|
static void LogZapper(int w, MovieRecord* mr)
|
||||||
{
|
{
|
||||||
|
uint32 *ptr=(uint32 *)data;
|
||||||
mr->zappers[w].x = ZD[w].mzx;
|
mr->zappers[w].x = ZD[w].mzx;
|
||||||
mr->zappers[w].y = ZD[w].mzy;
|
mr->zappers[w].y = ZD[w].mzy;
|
||||||
mr->zappers[w].b = ZD[w].mzb;
|
mr->zappers[w].b = ZD[w].mzb;
|
||||||
|
|
|
@ -405,11 +405,12 @@ static void LoadFM2(MovieData& movieData, std::istream* fp, int size=INT_MAX, bo
|
||||||
bail:
|
bail:
|
||||||
bail = true;
|
bail = true;
|
||||||
if(state == VALUE) goto commit;
|
if(state == VALUE) goto commit;
|
||||||
|
goto done;
|
||||||
commit:
|
commit:
|
||||||
movieData.installValue(key,value);
|
movieData.installValue(key,value);
|
||||||
state = NEWLINE;
|
state = NEWLINE;
|
||||||
if(bail) break;
|
|
||||||
done: ;
|
done: ;
|
||||||
|
if(bail) break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue