diff --git a/source/frontend/frontend.cpp b/source/frontend/frontend.cpp index ca4302dd1..6dfaa1c9e 100644 --- a/source/frontend/frontend.cpp +++ b/source/frontend/frontend.cpp @@ -249,7 +249,7 @@ void CFrontEndScene::renderLogo() fh=m_sprites->getFrameHeader(FRM__SBLOGO); // m_sprites->printRotatedScaledSprite(fh,256,LOGO_CENTRE_Y,rsx,rsy,rsr,20); - m_sprites->printFT4(fh,256-(fh->W/2),LOGO_CENTRE_Y-(fh->H/2),0,0,20); + m_sprites->printFT4(fh,256-(fh->W/2),LOGO_CENTRE_Y-(fh->H/2),0,0,FE_OT__LOGO); m_font->setColour(GAME_TITLE_TEXT_R,GAME_TITLE_TEXT_G,GAME_TITLE_TEXT_B); m_font->print(256,GAME_TITLE_TEXT_CENTRE_Y,STR__FRONTEND__GAME_TITLE); m_font->setColour(0,0,0); diff --git a/source/frontend/frontend.h b/source/frontend/frontend.h index 4b864ab92..5f6d69c00 100644 --- a/source/frontend/frontend.h +++ b/source/frontend/frontend.h @@ -30,6 +30,13 @@ Tyepdefs && Defines ------------------- */ +enum +{ + FE_OT__LOGO=2, + FE_OT__SEAPOS=10, +}; + + /*---------------------------------------------------------------------- Structure defintions -------------------- */ diff --git a/source/frontend/maintitl.cpp b/source/frontend/maintitl.cpp index 914024425..aac2d3b46 100644 --- a/source/frontend/maintitl.cpp +++ b/source/frontend/maintitl.cpp @@ -62,6 +62,10 @@ #include "sound\sound.h" #endif +#ifndef __FRONTEND_FRONTEND_H__ +#include "frontend\frontend.h" +#endif + /* Std Lib ------- */ @@ -119,6 +123,7 @@ void CFrontEndMainTitles::init() m_smallFont=new ("MainTitle SmallFont") FontBank(); m_smallFont->initialise(&standardFont); m_smallFont->setJustification(FontBank::JUST_CENTRE); + m_smallFont->setOt(5); // Create the main menu ( START GAME/OPTIONS/CREDITS ) m_mainMenu=new ("Main Menu GUI") CGUIControlFrame(); @@ -194,16 +199,6 @@ void CFrontEndMainTitles::unselect() MemFree(s_image); s_image=NULL; } - -// PKG - This is messy... can be fixed when the final art is in -/* -typedef struct -{ - int x,y; -}xy; -xy pos[10]={{0,0},{3,0},{-3,0},{0,2},{0,-2}}; -int posnum=5; -*/ /*---------------------------------------------------------------------- Function: Purpose: @@ -225,58 +220,9 @@ void CFrontEndMainTitles::render() // The island fh=m_sprites->getFrameHeader(FRM__ISLAND); - m_sprites->printFT4(fh,ISLAND_LEFT_X,ISLAND_BOTTOM_Y-(fh->H),0,0,201); - - // Sky -/* -// POLY_FT4 *CFrontEndMainTitles::prepareSeaPortionFT4(sFrameHdr *_fh,int _x,int _y,int _w,int _h,int _rgb) -if(xstep&&ystep) -{ - int x,y,f; - sFrameHdr *fh; - POLY_FT4 *ft4; - - fh=m_sprites->getFrameHeader(FRM_SKY); - for(x=0;x<512;x+=xstep) - { - for(y=0;y<128;y+=ystep) - { - for(f=0;f>2,y<<1,xstep>>2,ystep<<1,128); - setXYWH(ft4,x+pos[f].x,y+pos[f].y,xstep,ystep); - if(f) - { - setSemiTrans(ft4,true); - } - AddPrimToList(ft4,1000-f); - } - } - } -} -else -{ - POLY_G4 *g4; - g4=GetPrimG4(); - setXYWH(g4,0,0,512,256); - setRGB0(g4,99,50,50); - setRGB1(g4,50,50,99); - setRGB2(g4,50,99,50); - setRGB3(g4,99,50,99); - AddPrimToList(g4,1001); -} -*/ - /* - fh=m_sprites->getFrameHeader(FRM_SKY); - for(int i=0;iprintFT4(fh,0,0,0,0,1020-i); - setXYWH(ft4,pos[i].x,pos[i].y,512,HORIZON_LEVEL); - if(i) - setSemiTrans(ft4,true); - } - */ + m_sprites->printFT4(fh,ISLAND_LEFT_X,ISLAND_BOTTOM_Y-(fh->H),0,0,FE_OT__SEAPOS); + // Sea renderSeaSection(m_sprites->getFrameHeader(FRM__ISLAND),isx,HORIZON_LEVEL+isy,isw,ish); renderSeaSection(m_sprites->getFrameHeader(FRM_SKY),0,HORIZON_LEVEL,512,256-HORIZON_LEVEL+SEA_OVERLAP); @@ -522,19 +468,19 @@ void CFrontEndMainTitles::renderSeaSection(sFrameHdr *_fh,int _x,int _y,int _w,i ft4->y3=grid[xloop+1][yloop+1].y; ft4->x2=grid[xloop ][yloop+1].x; ft4->y2=grid[xloop ][yloop+1].y; - AddPrimToList(ft4,202); + AddPrimToList(ft4,FE_OT__SEAPOS); x+=xstep; } y+=ystep; } - //////////////////////// bg - POLY_F4 *f4; - f4=GetPrimF4(); - setXYWH(f4,0,HORIZON_LEVEL,512,256-HORIZON_LEVEL); - setRGB0(f4,80,70,60); - AddPrimToList(f4,203); - //////////////////////// bg +// //////////////////////// bg +// POLY_F4 *f4; +// f4=GetPrimF4(); +// setXYWH(f4,0,HORIZON_LEVEL,512,256-HORIZON_LEVEL); +// setRGB0(f4,80,70,60); +// AddPrimToList(f4,FE_OT__SEAPOS); +// //////////////////////// bg } diff --git a/source/gui/gui.h b/source/gui/gui.h index 6f1b0ec06..66857aa92 100644 --- a/source/gui/gui.h +++ b/source/gui/gui.h @@ -56,7 +56,7 @@ public: enum { - INITIAL_OT=200, + INITIAL_OT=5, BORDERWIDTH=8, BORDERHEIGHT=5, };