Skip to content

O
openjazz
Commit c0129c90 authored by anotherguest's avatar anotherguest
Browse files
Options

Better palette, image parsing, Fade in for screens. 

Missing font colours, spacing is not correct all of the time. ANimations not working.
parent 0b47d4f3
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 222 deletions
src/scene.cpp
View file @ c0129c90
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "io/gfx/video.h" #include "io/gfx/video.h"
#include "io/gfx/font.h" #include "io/gfx/font.h"
#include "io/sound.h" #include "io/sound.h"
#include "io/gfx/paletteeffects.h"
/** /**
* This is the 0sc format * This is the 0sc format
...@@ -74,7 +75,44 @@ enum ...@@ -74,7 +75,44 @@ enum
ESceneTextShadow = 0xdb ESceneTextShadow = 0xdb
}; };
void Scene::ParseAni(File* f) { ImageInfo::ImageInfo() {
image = NULL;
}
ImageInfo::~ImageInfo() {
if(image != NULL) {
SDL_FreeSurface(image);
image = NULL;
}
}
ScriptText::ScriptText() {
x = -1;
y = -1;
textRect.x = -1;
textRect.y = -1;
extraLineHeight = -1;
text = NULL;
}
ScriptText::~ScriptText() {
free(text);
text = NULL;
}
ScriptPage::ScriptPage() {
pageTime = 0;
noScriptTexts = 0;
backgrounds = 0;
musicfile = NULL;
paletteIndex = 0;
}
ScriptPage::~ScriptPage() {
free(musicfile);
musicfile = NULL;
}
void Scene::ParseAni(File* f, int dataIndex) {
unsigned short int aniType = f->loadShort();// should be 0x02 unsigned short int aniType = f->loadShort();// should be 0x02
log("ParseAni DataLen", aniType); log("ParseAni DataLen", aniType);
unsigned short int aniOffset = f->loadShort();// unknown, number of frames? unsigned short int aniOffset = f->loadShort();// unknown, number of frames?
...@@ -103,24 +141,37 @@ void Scene::ParseAni(File* f) { ...@@ -103,24 +141,37 @@ void Scene::ParseAni(File* f) {
// Palette entries are 6-bit // Palette entries are 6-bit
// Shift them upwards to 8-bit, and fill in the lower 2 bits // Shift them upwards to 8-bit, and fill in the lower 2 bits
imageInfo[imageIndex].palette[count].r = (buffer[count * 3] << 2) + (buffer[count * 3] >> 4); paletteInfos[paletteIndex].palette[count].r = (buffer[count * 3] << 2) + (buffer[count * 3] >> 4);
imageInfo[imageIndex].palette[count].g = (buffer[(count * 3) + 1] << 2) + paletteInfos[paletteIndex].palette[count].g = (buffer[(count * 3) + 1] << 2) +
(buffer[(count * 3) + 1] >> 4); (buffer[(count * 3) + 1] >> 4);
imageInfo[imageIndex].palette[count].b = (buffer[(count * 3) + 2] << 2) + paletteInfos[paletteIndex].palette[count].b = (buffer[(count * 3) + 2] << 2) +
(buffer[(count * 3) + 2] >> 4); (buffer[(count * 3) + 2] >> 4);
} }
delete[] buffer; delete[] buffer;
paletteInfos[paletteIndex].dataIndex = dataIndex;
paletteIndex++;
pos = f->tell(); pos = f->tell();
log("PL Read position after", pos); log("PL Read position after", pos);
unsigned short int value = f->loadChar(); unsigned short int value = f->loadShort();
log("PL Read block start", value); log("PL Read block start", value);
imageInfo[imageIndex].image = f->loadSurface(320, 200, true); value = f->loadShort();
imageInfo[imageIndex].dataIndex = -1; log("PL Anim block size", value);
imageIndex++; f->seek(value-5, false);
pos = f->tell(); pos = f->tell();
log("PL Read position after block seek", pos);
//value = f->loadShort();
//log("PL Read block size", value);
//signed int val2 = f->loadInt();
//log("PL Read block value", val2);
//f->seek(1, false);
imageInfos[imageIndex].image = f->loadSurface(320, 200, true);
imageInfos[imageIndex].dataIndex = -1;
//imageIndex++;
pos = f->tell();
log("PL Read position after image", pos);
} }
} }
} }
...@@ -133,19 +184,21 @@ void Scene::ParseData(File *f) { ...@@ -133,19 +184,21 @@ void Scene::ParseData(File *f) {
log("Data dataLen", dataLen); log("Data dataLen", dataLen);
// AN // AN
if(dataLen == 0x4e41) { if(dataLen == 0x4e41) {
log("Data Type:", "ANI"); log("Data Type", "ANI");
ParseAni(f); ParseAni(f, loop);
} }
else { else {
unsigned char type = f->loadChar(); unsigned char type = f->loadChar();
log("Data Type:", type); log("Data Type", type);
switch(type) switch(type)
{ {
case 3: case 3:
case 4: // image case 4: // image
case 5: case 5:
case 6:
{ {
log("Data Type:", "Image"); log("Data Type", "Image");
log("Data Type Image index", loop);
unsigned short int width = f->loadShort(); // get width unsigned short int width = f->loadShort(); // get width
unsigned short int height; unsigned short int height;
if(type == 3) if(type == 3)
...@@ -154,18 +207,20 @@ void Scene::ParseData(File *f) { ...@@ -154,18 +207,20 @@ void Scene::ParseData(File *f) {
height = f->loadShort(); // Get height height = f->loadShort(); // Get height
if(imageIndex<100) { if(imageIndex<100) {
f->seek(-2, false); f->seek(-2, false);
imageInfo[imageIndex].image = f->loadSurface(width, height); imageInfos[imageIndex].image = f->loadSurface(width, height);
imageInfo[imageIndex].dataIndex = loop; imageInfos[imageIndex].dataIndex = loop;
imageIndex++; imageIndex++;
} }
}break; }break;
default: default:
{ {
log("Data Type", "Palette");
log("Data Type Palette index", loop);
f->seek(-3, false); f->seek(-3, false);
f->loadPalette(imageInfo[imageIndex].palette); f->loadPalette(paletteInfos[paletteIndex].palette);
//usePalette(scenePalette[imageIndex]); paletteInfos[paletteIndex].dataIndex = loop;
paletteIndex++;
} }
break; break;
} }
...@@ -177,16 +232,25 @@ void Scene::ParseData(File *f) { ...@@ -177,16 +232,25 @@ void Scene::ParseData(File *f) {
void Scene::ParseScripts(File *f) { void Scene::ParseScripts(File *f) {
int loop; int loop;
char *string; char *string;
int bgIndex = 0;
int textAlignment = 0;
int textFont = 0;
for(loop = 0;loop < scriptItems; loop++) for(loop = 0;loop < scriptItems; loop++)
{ {
log("\nParse Script", loop); log("\nParse Script", loop);
int textPosX = -1;
int textPosY = -1;
int extraheight = -1;
SDL_Rect textRect = {-1,-1,-1,-1};
f->seek(scriptStarts[loop], true); // Seek to data start f->seek(scriptStarts[loop], true); // Seek to data start
if(f->loadChar() == 0x50) { // Script tag if(f->loadChar() == 0x50) { // Script tag
unsigned short int scriptid = f->loadShort(); unsigned short int scriptid = f->loadShort();
log("Script id:", scriptid); log("Script id:", scriptid);
int unknown = f->loadShort(); int palette = f->loadShort();
log("Script unknown", unknown); log("Script default palette", palette);
scriptPages[loop].paletteIndex = palette;
unsigned char type = 0; unsigned char type = 0;
bool breakloop = false; bool breakloop = false;
int pos = f->tell(); int pos = f->tell();
...@@ -213,18 +277,22 @@ void Scene::ParseScripts(File *f) { ...@@ -213,18 +277,22 @@ void Scene::ParseScripts(File *f) {
}break; }break;
case ESceneBackground: case ESceneBackground:
{ {
signed long int something = f->loadInt(); unsigned short int xpos = f->loadShort();
unsigned short int ypos = f->loadShort();
unsigned short bgImageIndex = f->loadShort(); unsigned short bgImageIndex = f->loadShort();
log("ESceneBackground: index", bgImageIndex); log("ESceneBackground: index", bgImageIndex);
log("ESceneBackground: something", something); log("ESceneBackground: xpos", xpos);
scriptPages[loop].bgIndex = bgImageIndex; log("ESceneBackground: ypos", ypos);
scriptPages[loop].bgIndex[scriptPages[loop].backgrounds] = bgImageIndex;
scriptPages[loop].bgPos[scriptPages[loop].backgrounds] = xpos|(ypos<<16);
scriptPages[loop].backgrounds++;
}break; }break;
case ESceneMusic: case ESceneMusic:
{ {
// Music file name // Music file name
string = f->loadString(); string = f->loadString();
log("ESceneMusic: ", string); log("ESceneMusic: ", string);
playMusic(string); scriptPages[loop].musicfile = strdup(string);
delete[] string; delete[] string;
}break; }break;
case ESceneSomethingElse: case ESceneSomethingElse:
...@@ -234,10 +302,10 @@ void Scene::ParseScripts(File *f) { ...@@ -234,10 +302,10 @@ void Scene::ParseScripts(File *f) {
}break; }break;
case ESceneTextRect: // String case ESceneTextRect: // String
{ {
unsigned short x = f->loadShort(); unsigned short x = textRect.x = f->loadShort();
unsigned short y = f->loadShort(); unsigned short y = textRect.y = f->loadShort();
unsigned short w = f->loadShort(); unsigned short w = textRect.w = (f->loadShort()-x);
unsigned short h = f->loadShort(); unsigned short h = textRect.h = (f->loadShort()-y);
log("Text rectangle xpos:", x); log("Text rectangle xpos:", x);
log("Text rectangle ypos:", y); log("Text rectangle ypos:", y);
log("Text rectangle w:", w); log("Text rectangle w:", w);
...@@ -310,6 +378,7 @@ void Scene::ParseScripts(File *f) { ...@@ -310,6 +378,7 @@ void Scene::ParseScripts(File *f) {
{ {
unsigned short value = f->loadShort(); unsigned short value = f->loadShort();
log("ESceneTextVAdjust", value); log("ESceneTextVAdjust", value);
extraheight = value;
} }
break; break;
case ESceneTextSetting: case ESceneTextSetting:
...@@ -349,11 +418,23 @@ void Scene::ParseScripts(File *f) { ...@@ -349,11 +418,23 @@ void Scene::ParseScripts(File *f) {
unsigned char* block = f->loadBlock(datalen); unsigned char* block = f->loadBlock(datalen);
unsigned char pos = 0; unsigned char pos = 0;
unsigned char orgdatalen = datalen; unsigned char orgdatalen = datalen;
char pagebuf[3];
log("Text len=", datalen); log("Text len=", datalen);
// Convert to ascii // Convert to ascii
while(datalen>0) { while(datalen>0) {
if(block[pos]>='a'-70 && block[pos]<='z'-70) { if(block[pos] == 0x8b) {
block[pos]+=70; sprintf(pagebuf, "%2d", loop+1);
memcpy(&block[pos-1], pagebuf,2);
}
else if(block[pos] == 0x8a) {
sprintf(pagebuf, "%2d", scriptItems);
memcpy(&block[pos-1], pagebuf,2);
}
else if(block[pos] == 'C') {
block[pos]=' ';
}
else if(block[pos]>='a'-70 && block[pos]<='z'-70) {
block[pos]+=70;
} }
else if(block[pos]>='A'-64 && block[pos]<='Z'-64) { else if(block[pos]>='A'-64 && block[pos]<='Z'-64) {
block[pos]+=64; block[pos]+=64;
...@@ -397,7 +478,7 @@ void Scene::ParseScripts(File *f) { ...@@ -397,7 +478,7 @@ void Scene::ParseScripts(File *f) {
else if(block[pos] == 't') { else if(block[pos] == 't') {
block[pos]='\''; block[pos]='\'';
} }
pos++; pos++;
datalen--; datalen--;
} }
...@@ -422,6 +503,17 @@ void Scene::ParseScripts(File *f) { ...@@ -422,6 +503,17 @@ void Scene::ParseScripts(File *f) {
textPosX = -1; textPosX = -1;
textPosY = -1; textPosY = -1;
} }
if(textRect.x != -1)
{
scriptPages[loop].scriptTexts[scriptPages[loop].noScriptTexts].textRect = textRect;
textRect.x = -1;
textRect.y = -1;
}
if(extraheight != -1)
{
scriptPages[loop].scriptTexts[scriptPages[loop].noScriptTexts].extraLineHeight = extraheight;
extraheight = -1;
}
scriptPages[loop].noScriptTexts++; scriptPages[loop].noScriptTexts++;
}break; }break;
case ESceneTime: case ESceneTime:
...@@ -455,16 +547,9 @@ void Scene::ParseScripts(File *f) { ...@@ -455,16 +547,9 @@ void Scene::ParseScripts(File *f) {
Scene::Scene (char * fileName) { Scene::Scene (char * fileName) {
File *file; File *file;
char *string;
int type;
int loop; int loop;
noScriptFonts = 0; noScriptFonts = 0;
textAlignment = 0;
textFont = 0;
textPosX = -1;
textPosY = -1;
log("\nScene", fileName); log("\nScene", fileName);
try { try {
...@@ -476,6 +561,7 @@ Scene::Scene (char * fileName) { ...@@ -476,6 +561,7 @@ Scene::Scene (char * fileName) {
} }
imageIndex = 0; imageIndex = 0;
paletteIndex = 0;
file->seek(0x13, true); // Skip Digital Dimensions header file->seek(0x13, true); // Skip Digital Dimensions header
signed long int dataOffset = file->loadInt(); //get offset pointer to first data block signed long int dataOffset = file->loadInt(); //get offset pointer to first data block
...@@ -501,116 +587,7 @@ Scene::Scene (char * fileName) { ...@@ -501,116 +587,7 @@ Scene::Scene (char * fileName) {
ParseData(file); ParseData(file);
ParseScripts(file); ParseScripts(file);
delete []scriptStarts; delete []scriptStarts;
delete []dataOffsets; delete []dataOffsets;
/*
// Skip to files
file->seek(25, true);
file->seek(file->loadChar(), true);
// At this point, next bytes should be 0x50 0x01 0x00 0x00 0x00
// Then, (0x3f 0x02)
// OR (Nothing)
// Then, (0x2a
// Then the length of the music file name
// Then the bytes of the music file name)
// OR (0x3f, then another byte)
// OR (0x4c, not followed by any font stuff)
// OR (0xa6, then 20 bytes?)
// OR (Nothing)
// Then 0x58 0x01 0x00
// Then the length of a font file name
// Then a font file name
// Then 0x58 0x02 0x00
// Then the length of a font file name
// Then a font file name
file->seek(5, false);
type = file->loadChar();
while (type == 0x3f) {
file->seek(1, false);
type = file->loadChar();
}
if (type != 0x4C) {
if (type == 0x2A) {
// Music file name
string = file->loadString();
playMusic(string);
delete[] string;
} else if (type == 0x63) {
file->seek(1, false);
} else if (type == 0xA6) {
file->seek(20, false);
} else file->seek(-1, false); // type should be 58
while (file->loadChar() == 0x58) {
// Font names (file names minus extensions)
file->seek(2, false);
string = file->loadString();
// Do something with this
delete[] string;
}
}
file->seek(-1, false);
while (file->loadChar() == 0x3f) {
file->seek(1, false);
}
file->seek(-1, false);
// Then 0x4c 0x00 0x00 0x00 0x00 0x01 0x00
// Then, (0x46
// Then a small number, e.g. 0x01, 0x02
// Then 0x00 0x4a
// Then (0x02 0x5d)
// OR (0x01 0xdb)
// OR (0x57 0x14...)
// log("Initial search reached", file->tell());
// Skip to the palette
file->seek(23, true);
type = file->loadChar();
file->seek(19, true);
file->skipRLE();
file->seek((type * 4) - 11, false);
// Load the palette
// log("Palette", file->tell());
file->loadPalette(scenePalette);
usePalette(scenePalette);
file->seek(4, false);
// log("Pixels", file->tell());
sceneBGs[0] = file->loadSurface(320, 200);
*/
delete file; delete file;
return; return;
...@@ -619,20 +596,16 @@ Scene::Scene (char * fileName) { ...@@ -619,20 +596,16 @@ Scene::Scene (char * fileName) {
Scene::~Scene () { Scene::~Scene () {
delete []scriptPages;
//SDL_FreeSurface(sceneBGs[0]); // Temporary
return;
} }
ImageInfo* Scene::FindImage(int dataIndex) { ImageInfo* Scene::FindImage(int dataIndex) {
int loop = 0; int loop = 0;
while(loop<imageIndex) while(loop<imageIndex)
{ {
if(imageInfo[loop].dataIndex == dataIndex) if(imageInfos[loop].dataIndex == dataIndex)
{ {
return &imageInfo[loop]; return &imageInfos[loop];
} }
loop++; loop++;
} }
...@@ -643,16 +616,13 @@ int Scene::play () { ...@@ -643,16 +616,13 @@ int Scene::play () {
SDL_Rect dst; SDL_Rect dst;
unsigned int sceneIndex = 0; unsigned int sceneIndex = 0;
ImageInfo* imageInfo = NULL; ImageInfo* imageInfo;
unsigned int pageTime = scriptPages[sceneIndex].pageTime; unsigned int pageTime = scriptPages[sceneIndex].pageTime;
unsigned int lastTicks = globalTicks; unsigned int lastTicks = globalTicks;
if(scriptPages[sceneIndex].bgIndex != -1) int newpage = true;
{ int fadein = false;
imageInfo = FindImage(scriptPages[sceneIndex].bgIndex); SDL_Rect textRect = {0,0,320,200};
}
if(imageInfo != NULL)
usePalette(imageInfo[0].palette);
while (true) { while (true) {
if (loop(NORMAL_LOOP) == E_QUIT) return E_QUIT; if (loop(NORMAL_LOOP) == E_QUIT) return E_QUIT;
...@@ -661,46 +631,80 @@ int Scene::play () { ...@@ -661,46 +631,80 @@ int Scene::play () {
return E_NONE; return E_NONE;
} }
int upOrLeft = (controls.release(C_UP) || controls.release(C_LEFT));
if(controls.release(C_ENTER) || ((globalTicks-lastTicks)>=pageTime*1000 && pageTime != 256 && pageTime != 0)) { if((sceneIndex > 0 && upOrLeft) || controls.release(C_RIGHT) || controls.release(C_DOWN) || controls.release(C_ENTER) ||
sceneIndex++; ((globalTicks-lastTicks)>=pageTime*1000 && pageTime != 256 && pageTime != 0)) {
if(upOrLeft) {
sceneIndex--;
}
else {
sceneIndex++;
}
if(sceneIndex == scriptItems) { if(sceneIndex == scriptItems) {
return E_NONE; return E_NONE;
} }
lastTicks = globalTicks; lastTicks = globalTicks;
// Get bg for this page // Get bg for this page
if(scriptPages[sceneIndex].bgIndex != -1) { newpage = true;
imageInfo = FindImage(scriptPages[sceneIndex].bgIndex);
if(imageInfo != NULL) { pageTime = scriptPages[sceneIndex].pageTime;
usePalette(imageInfo[0].palette); }
} if(newpage) {
else //firstPE = new FadeOutPaletteEffect(250, firstPE);
{
restorePalette(screen); textRect.x = 0;
textRect.y = 0;
textRect.w = 320;
textRect.h = 200;
PaletteInfo* paletteInfo = NULL;
for(int palette = 0;palette<paletteIndex;palette++) {
if(paletteInfos[palette].dataIndex == scriptPages[sceneIndex].paletteIndex) {
paletteInfo = &paletteInfos[palette];
break;
} }
} }
pageTime = scriptPages[sceneIndex].pageTime; if(paletteInfo != NULL) {
} // usePalette(paletteInfo->palette);
currentPalette = paletteInfo->palette;
// Temporary stuff fadein = true;
dst.x = (screenW - 320) >> 1; }
dst.y = (screenH - 200) >> 1; else {
if(imageInfo != NULL) { restorePalette(screen);
SDL_BlitSurface(imageInfo->image, NULL, screen, &dst); }
}
else { newpage = 0;
clearScreen(BLACK); }
// First draw the backgrounds associated with this page
if(scriptPages[sceneIndex].backgrounds > 0) {
for(int bg = 0;bg<scriptPages[sceneIndex].backgrounds;bg++) {
imageInfo = FindImage(scriptPages[sceneIndex].bgIndex[bg]);
if(imageInfo != NULL) {
dst.x = (scriptPages[sceneIndex].bgPos[bg] & 65535)*2+(screenW - 320) >> 1;
dst.y = ((scriptPages[sceneIndex].bgPos[bg] & (~65535))>>16)*2+(screenH - 200) >> 1;
SDL_BlitSurface(imageInfo->image, NULL, screen, &dst);
}
}
} else {
clearScreen(0);
} }
if(fadein)
{
fadein = false;
firstPE = new FadeInPaletteEffect(250, firstPE);
}
// Draw the texts associated with this page
int x = 0; int x = 0;
int y = 0; int y = 0;
int extralineheight = 0;
for(int text = 0;text<scriptPages[sceneIndex].noScriptTexts;text++) { for(int text = 0;text<scriptPages[sceneIndex].noScriptTexts;text++) {
Font* font = NULL; Font* font = NULL;
for(int index = 0; index < noScriptFonts; index++) { for(int index = 0; index < noScriptFonts; index++) {
if( scriptPages[sceneIndex].scriptTexts[text].fontId == scriptFonts[index].fontId) { if( scriptPages[sceneIndex].scriptTexts[text].fontId == scriptFonts[index].fontId) {
switch(scriptFonts[index].fontType) switch(scriptFonts[index].fontType) {
{
case EFONT2Type: case EFONT2Type:
font = font2; font = font2;
break; break;
...@@ -717,32 +721,42 @@ int Scene::play () { ...@@ -717,32 +721,42 @@ int Scene::play () {
font = fontmn2; font = fontmn2;
break; break;
} }
continue; continue;
} }
} }
if(scriptPages[sceneIndex].scriptTexts[text].x != -1) { if(scriptPages[sceneIndex].scriptTexts[text].x != -1) {
x = scriptPages[sceneIndex].scriptTexts[text].x; x = scriptPages[sceneIndex].scriptTexts[text].x;
y = scriptPages[sceneIndex].scriptTexts[text].y; y = scriptPages[sceneIndex].scriptTexts[text].y;
} }
if(scriptPages[sceneIndex].scriptTexts[text].textRect.x != -1) {
textRect = scriptPages[sceneIndex].scriptTexts[text].textRect;
x = 0;
y = 0;
}
if(scriptPages[sceneIndex].scriptTexts[text].extraLineHeight != -1) {
extralineheight = scriptPages[sceneIndex].scriptTexts[text].extraLineHeight;
}
switch(scriptPages[sceneIndex].scriptTexts[text].alignment) switch(scriptPages[sceneIndex].scriptTexts[text].alignment)
{ {
case 0: // left case 0: // left
font->showString(scriptPages[sceneIndex].scriptTexts[text].text, x,y); font->showString(scriptPages[sceneIndex].scriptTexts[text].text, textRect.x+x,textRect.y+y);
break; break;
case 1: // right case 1: // right
int width = font->calcStringWidth(scriptPages[sceneIndex].scriptTexts[text].text); int width = font->calcStringWidth(scriptPages[sceneIndex].scriptTexts[text].text);
font->showString(scriptPages[sceneIndex].scriptTexts[text].text, 320-width, y); font->showString(scriptPages[sceneIndex].scriptTexts[text].text, textRect.x+textRect.w-width, textRect.y+y);
break; break;
case 2: // center case 2: // center
{ {
int width = font->calcStringWidth(scriptPages[sceneIndex].scriptTexts[text].text)/2; int width = font->calcStringWidth(scriptPages[sceneIndex].scriptTexts[text].text)/2;
font->showString(scriptPages[sceneIndex].scriptTexts[text].text, 160-width, y); font->showString(scriptPages[sceneIndex].scriptTexts[text].text, textRect.x+(textRect.w/2)-width,textRect.y+ y);
} }
break; break;
} }
y+=font->fontHeight()/2; y+=(extralineheight+font->fontHeight()/2);
} }
SDL_Delay(T_FRAME); SDL_Delay(T_FRAME);
......
src/scene.h
View file @ c0129c90
...@@ -48,57 +48,66 @@ public: ...@@ -48,57 +48,66 @@ public:
class ScriptText class ScriptText
{ {
public: public:
ScriptText() ScriptText();
{ ~ScriptText();
x = -1;
y = -1;
}
char* text; char* text;
int alignment; int alignment;
int fontId; int fontId;
int x; int x;
int y; int y;
SDL_Rect textRect;
int extraLineHeight;
}; };
// Class // Class
class ScriptPage class ScriptPage
{ {
public: public:
ScriptPage() ScriptPage();
{ ~ScriptPage();
bgIndex = -1; int backgrounds;
pageTime = 0; int bgIndex[30];
noScriptTexts = 0; unsigned int bgPos[30];
}
int bgIndex;
// Length of the scene in seconds, or if zero = anim complete, or 256 = user interaction // Length of the scene in seconds, or if zero = anim complete, or 256 = user interaction
int pageTime; int pageTime;
ScriptText scriptTexts[100]; ScriptText scriptTexts[100];
int noScriptTexts; int noScriptTexts;
char* musicfile;
int paletteIndex;
}; };
class ImageInfo class ImageInfo
{ {
public: public:
ImageInfo();
~ImageInfo();
// SDL_Surface with the image // SDL_Surface with the image
SDL_Surface *image; SDL_Surface *image;
// data index of the image (not the palette) to compare with scripts
int dataIndex;
};
class PaletteInfo
{
public:
// Palette associated with the image // Palette associated with the image
SDL_Color palette[256]; SDL_Color palette[256];
// data index of the image (not the palette) to compare with scripts // data index of the image (not the palette) to compare with scripts
int dataIndex; int dataIndex;
}; };
class Scene { class Scene {
private: private:
ImageInfo imageInfo[100]; ImageInfo imageInfos[100];
PaletteInfo paletteInfos[100];
unsigned short int scriptItems; unsigned short int scriptItems;
unsigned short int dataItems; unsigned short int dataItems;
signed long int* scriptStarts; signed long int* scriptStarts;
signed long int* dataOffsets; signed long int* dataOffsets;
int imageIndex; int imageIndex;
int bgIndex; int paletteIndex;
// Scripts all information needed to render script pages, text etc // Scripts all information needed to render script pages, text etc
ScriptPage* scriptPages; ScriptPage* scriptPages;
ImageInfo* FindImage(int dataIndex); ImageInfo* FindImage(int dataIndex);
...@@ -106,18 +115,14 @@ class Scene { ...@@ -106,18 +115,14 @@ class Scene {
protected: protected:
void ParseScripts(File *f); void ParseScripts(File *f);
void ParseData(File *f); void ParseData(File *f);
void ParseAni(File* f); void ParseAni(File* f, int dataIndex);
public: public:
Scene (char * fileName); Scene (char * fileName);
~Scene (); ~Scene ();
int play (); int play ();
ScriptFont scriptFonts[5]; ScriptFont scriptFonts[5];
int noScriptFonts; int noScriptFonts;
int textAlignment;
int textFont;
int textPosX;
int textPosY;
}; };
#endif #endif
......
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