Commit 912e6a55 authored by anotherguest's avatar anotherguest

Change name of animationsetting to animation

parent 2b983990
...@@ -59,7 +59,7 @@ enum { ...@@ -59,7 +59,7 @@ enum {
ESceneTextLine = 0x5e, ESceneTextLine = 0x5e,
ESceneTextVAdjust = 0x5f, ESceneTextVAdjust = 0x5f,
ESceneAnimationPlayAndContinue = 0xA7, ESceneAnimationPlayAndContinue = 0xA7,
ESceneAnimationSetting = 0xA6, ESceneAnimation = 0xA6,
ESceneTextSetting = 0xb1, ESceneTextSetting = 0xb1,
ESceneTextSomething = 0xd9, ESceneTextSomething = 0xd9,
ESceneTextShadow = 0xdb ESceneTextShadow = 0xdb
......
...@@ -52,6 +52,7 @@ MX ...@@ -52,6 +52,7 @@ MX
ST ST
SL SL
*/ */
enum ANIHeaders enum ANIHeaders
{ {
E11AniHeader = 0x3131, // Background/start image E11AniHeader = 0x3131, // Background/start image
...@@ -238,7 +239,7 @@ void Scene::loadAni (File *f, int dataIndex) { ...@@ -238,7 +239,7 @@ void Scene::loadAni (File *f, int dataIndex) {
case E11AniHeader: //11 case E11AniHeader: //11
// Skip back size header, this is read by the surface reader // Skip back size header, this is read by the surface reader
LOG("PL 11 Background Type", 1); LOG("PL 11 Background Type", 0);
f->seek(-2, false); f->seek(-2, false);
animations->background = f->loadSurface(SW, SH); animations->background = f->loadSurface(SW, SH);
...@@ -249,7 +250,7 @@ void Scene::loadAni (File *f, int dataIndex) { ...@@ -249,7 +250,7 @@ void Scene::loadAni (File *f, int dataIndex) {
break; break;
case E1LAniHeader: { case E1LAniHeader: {
LOG("PL 1L Background Type", 1); LOG("PL 1L Background Type", 0);
unsigned char* pixels; unsigned char* pixels;
pixels = new unsigned char[SW* SH]; pixels = new unsigned char[SW* SH];
memset(pixels, 0, SW*SH); memset(pixels, 0, SW*SH);
...@@ -263,7 +264,8 @@ void Scene::loadAni (File *f, int dataIndex) { ...@@ -263,7 +264,8 @@ void Scene::loadAni (File *f, int dataIndex) {
case EFFAniHeader: case EFFAniHeader:
{ {
//LoadCompacted(size, f);
//LoadCompacted(size, f, (unsigned char*) animations->background->pixels, SW, SH);
} }
break; break;
...@@ -272,7 +274,8 @@ void Scene::loadAni (File *f, int dataIndex) { ...@@ -272,7 +274,8 @@ void Scene::loadAni (File *f, int dataIndex) {
case ERCAniHeader: case ERCAniHeader:
case ERLAniHeader: case ERLAniHeader:
case EMXAniHeader: case EMXAniHeader:
case ERRAniHeader: break;
case ERRAniHeader: // Rotate.. has zero length info
break; break;
...@@ -466,7 +469,7 @@ void Scene::loadScripts (File *f) { ...@@ -466,7 +469,7 @@ void Scene::loadScripts (File *f) {
pages[loop].stopMusic = 1; pages[loop].stopMusic = 1;
LOG("ESceneStopMusic", 1); LOG("ESceneStopMusic", 1);
}break; }break;
case ESceneAnimationSetting: case ESceneAnimation:
{ {
pages[loop].animLoops = f->loadInt(); pages[loop].animLoops = f->loadInt();
pages[loop].animSpeed = f->loadShort(); pages[loop].animSpeed = f->loadShort();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment