This commit is contained in:
Paul
parent
d1cd9b0665
commit
4e4724e222
9 changed files with 324 additions and 110 deletions
|
|
@ -185,20 +185,20 @@ void CGUIObject::render()
|
|||
ot=getOt();
|
||||
r=g=b=200;
|
||||
|
||||
DrawLine(x ,y ,x+w,y ,r,g,b,ot);
|
||||
DrawLine(x ,y ,x ,y+h,r,g,b,ot);
|
||||
DrawLine(x+w,y ,x+w,y+h,r,g,b,ot);
|
||||
DrawLine(x ,y+h,x+w,y+h,r,g,b,ot);
|
||||
DrawLine(x ,y ,x+w,y ,r,g,b,0);
|
||||
DrawLine(x ,y ,x ,y+h,r,g,b,0);
|
||||
DrawLine(x+w,y ,x+w,y+h,r,g,b,0);
|
||||
DrawLine(x ,y+h,x+w,y+h,r,g,b,0);
|
||||
x+=1;y+=1;w-=2;h-=2;
|
||||
DrawLine(x ,y ,x+w,y ,r,g,b,ot);
|
||||
DrawLine(x ,y ,x ,y+h,r,g,b,ot);
|
||||
DrawLine(x+w,y ,x+w,y+h,r,g,b,ot);
|
||||
DrawLine(x ,y+h,x+w,y+h,r,g,b,ot);
|
||||
DrawLine(x ,y ,x+w,y ,r,g,b,0);
|
||||
DrawLine(x ,y ,x ,y+h,r,g,b,0);
|
||||
DrawLine(x+w,y ,x+w,y+h,r,g,b,0);
|
||||
DrawLine(x ,y+h,x+w,y+h,r,g,b,0);
|
||||
x+=1;y+=1;w+=1;h+=1;
|
||||
DrawLine(x ,y ,x+w,y ,0,0,0,ot);
|
||||
DrawLine(x ,y ,x ,y+h,0,0,0,ot);
|
||||
DrawLine(x+w,y ,x+w,y+h,0,0,0,ot);
|
||||
DrawLine(x ,y+h,x+w,y+h,0,0,0,ot);
|
||||
DrawLine(x ,y ,x+w,y ,0,0,0,0);
|
||||
DrawLine(x ,y ,x ,y+h,0,0,0,0);
|
||||
DrawLine(x+w,y ,x+w,y+h,0,0,0,0);
|
||||
DrawLine(x ,y+h,x+w,y+h,0,0,0,0);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -463,6 +463,14 @@ void drawBambooBorder(int _x,int _y,int _w,int _h,int _ot)
|
|||
y1+=step;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
x1=_x-(vbam->W/2);
|
||||
x2=x1+_w;
|
||||
y1=1+(_y+(corner->H/2)+(vbam->H/2)-(vbam->H/2)+vbam->H-vbam->H-1);
|
||||
s_uiSpriteBank->printFT4(vbam,x1,y1,0,0,_ot);
|
||||
s_uiSpriteBank->printFT4(vbam,x2,y1,0,0,_ot);
|
||||
}
|
||||
|
||||
// Draw Corners
|
||||
corner=s_uiSpriteBank->getFrameHeader(FRM__BAMBOOTOPLEFT);
|
||||
|
|
@ -496,13 +504,6 @@ _sbb sbb=
|
|||
};
|
||||
void drawSpeechBubbleBorder(int _x,int _y,int _w,int _h,int _ot,int _faceFrame)
|
||||
{
|
||||
/*
|
||||
DrawLine(_x ,_y ,_x+_w,_y ,255,0,255,0);
|
||||
DrawLine(_x+_w,_y ,_x+_w,_y+_h,255,0,255,0);
|
||||
DrawLine(_x+_w,_y+_h,_x ,_y+_h,255,0,255,0);
|
||||
DrawLine(_x ,_y+_h,_x ,_y ,255,0,255,0);
|
||||
*/
|
||||
|
||||
sFrameHdr *cornerFh;
|
||||
POLY_FT4 *ft4;
|
||||
LINE_F2 *f2;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,10 @@
|
|||
#include "fma\fma.h"
|
||||
#endif
|
||||
|
||||
#ifndef __SHOP_SHOP_H__
|
||||
#include "shop\shop.h"
|
||||
#endif
|
||||
|
||||
#ifndef __BACKEND_GAMEOVER_H__
|
||||
#include "backend\gameover.h"
|
||||
#endif
|
||||
|
|
@ -94,6 +98,7 @@ CScene *CSceneSelector::s_sceneList[]=
|
|||
&GameCompletedScene,
|
||||
&FmaScene,
|
||||
&MapScene,
|
||||
&ShopScene,
|
||||
};
|
||||
int CSceneSelector::s_sceneCount=sizeof(s_sceneList)/sizeof(CScene*);
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,18 @@
|
|||
#include "game\game.h"
|
||||
#endif
|
||||
|
||||
#ifndef __GUI_GFRAME_H__
|
||||
#include "gui\gframe.h"
|
||||
#endif
|
||||
|
||||
#ifndef __GUI_GFACTORY_H__
|
||||
#include "gui\gfactory.h"
|
||||
#endif
|
||||
|
||||
#ifndef __GUI_GTEXTBOX_H__
|
||||
#include "gui\gtextbox.h"
|
||||
#endif
|
||||
|
||||
|
||||
/* Std Lib
|
||||
------- */
|
||||
|
|
@ -111,6 +123,10 @@ CShopScene ShopScene;
|
|||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
int fx=48;
|
||||
int fy=155;
|
||||
int fw=416;
|
||||
int fh=64;
|
||||
void CShopScene::init()
|
||||
{
|
||||
m_image=CFileIO::loadFile(BACKDROP_SHOP_GFX);
|
||||
|
|
@ -125,6 +141,14 @@ void CShopScene::init()
|
|||
m_spriteBank=new ("shop sprites") SpriteBank();
|
||||
m_spriteBank->load(SHOP_SHOP_SPR);
|
||||
|
||||
// GUI Frame
|
||||
CGUITextBox *tb;
|
||||
m_guiFrame=new ("Token Count Frame") CGUIGroupFrame();
|
||||
m_guiFrame->init(0);
|
||||
m_guiFrame->setOt(0);
|
||||
m_guiFrame->setFlags(CGUIObject::FLAG_DRAWBORDER);
|
||||
m_guiFrame->setObjectXYWH(fx,fy,fw,fh);
|
||||
|
||||
m_readyToExit=false;
|
||||
CFader::setFadingIn(CFader::BLACK_FADE);
|
||||
|
||||
|
|
@ -141,6 +165,8 @@ void CShopScene::init()
|
|||
---------------------------------------------------------------------- */
|
||||
void CShopScene::shutdown()
|
||||
{
|
||||
m_guiFrame->shutdown();
|
||||
|
||||
m_spriteBank->dump(); delete m_spriteBank;
|
||||
m_font->dump(); delete m_font;
|
||||
|
||||
|
|
@ -157,7 +183,7 @@ void CShopScene::shutdown()
|
|||
int shopx=180;
|
||||
int shopy=38;
|
||||
int shopw=512-(180*2);
|
||||
int shopygap=50;
|
||||
int shopygap=51;
|
||||
int shopitemsperrow=4;
|
||||
int shopflashspeed=200;
|
||||
int shopflashbase=128;
|
||||
|
|
@ -184,7 +210,7 @@ void CShopScene::render()
|
|||
{
|
||||
SpriteBank *sb=CGameScene::getSpriteBank();
|
||||
sFrameHdr *fh=sb->getFrameHeader(FRM__MAPPOINTER);
|
||||
sb->printFT4(fh,x-fh->W,y+25,0,0,0);
|
||||
sb->printFT4(fh,x-fh->W,y+30,0,0,0);
|
||||
|
||||
// Flash selected item
|
||||
int rgb=((msin(m_flashSin)*shopflashrange)>>12)+shopflashbase;
|
||||
|
|
@ -208,6 +234,8 @@ void CShopScene::render()
|
|||
x+=gap;
|
||||
}
|
||||
}
|
||||
|
||||
renderUi();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -241,8 +269,9 @@ void CShopScene::think(int _frames)
|
|||
m_flashSin=0;
|
||||
}
|
||||
|
||||
|
||||
m_flashSin=(m_flashSin+(_frames*shopflashspeed))&4095;
|
||||
|
||||
m_guiFrame->think(_frames);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -258,6 +287,102 @@ int CShopScene::readyToShutdown()
|
|||
}
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
Function:
|
||||
Purpose:
|
||||
Params:
|
||||
Returns:
|
||||
---------------------------------------------------------------------- */
|
||||
typedef struct
|
||||
{
|
||||
int
|
||||
tokenx,tokeny,
|
||||
pricex,pricey,
|
||||
gaptoreadout,
|
||||
instructionsx,instructionsy,
|
||||
instructionsygap,
|
||||
instructionsbuttonyoffset,
|
||||
instructionsbuttonspace,
|
||||
instructionsbuttongap,
|
||||
|
||||
|
||||
end;
|
||||
} shopdata;
|
||||
|
||||
shopdata shop=
|
||||
{
|
||||
10,10, // tokenx,tokeny,
|
||||
40,10, // pricex,pricey,
|
||||
5, // gaptoreadout
|
||||
250,7, // instructionsx,instructionsy,
|
||||
16, // instructionsygap,
|
||||
3, // instructionsbuttonyoffset,
|
||||
10, // instructionsbuttonspace,
|
||||
5, // instructionsbuttongap,
|
||||
};
|
||||
|
||||
void CShopScene::renderUi()
|
||||
{
|
||||
int xbase,ybase;
|
||||
SpriteBank *sb;
|
||||
sFrameHdr *fh1,*fh2;
|
||||
int x,y;
|
||||
char buf[10];
|
||||
|
||||
xbase=fx;
|
||||
ybase=fy;
|
||||
sb=CGameScene::getSpriteBank();
|
||||
|
||||
m_font->setJustification(FontBank::JUST_LEFT);
|
||||
|
||||
// Token count
|
||||
fh1=sb->getFrameHeader(FRM__TOKEN);
|
||||
x=xbase+shop.tokenx;
|
||||
y=ybase+shop.tokeny;
|
||||
sb->printFT4(fh1,x,y,0,0,0);
|
||||
sprintf(buf,"x%d",99);
|
||||
// x+=fh1->W+shop.gaptoreadout;
|
||||
// y+=fh1->H+m_font->getStringHeight(buf);
|
||||
PAUL_DBGMSG("%d,%d",fh1->H,m_font->getStringHeight(buf));
|
||||
m_font->print(x,y,buf);
|
||||
|
||||
|
||||
// Item price
|
||||
m_font->print(xbase+shop.pricex,ybase+shop.pricey,STR__SHOP_SCREEN__PRICE);
|
||||
|
||||
|
||||
// Instructions
|
||||
x=xbase+shop.instructionsx;
|
||||
y=ybase+shop.instructionsy;
|
||||
m_font->print(x,y,STR__SHOP_SCREEN__LEFT_RIGHT_TO_SELECT_ITEM);
|
||||
fh1=sb->getFrameHeader(FRM__BUTL);
|
||||
fh2=sb->getFrameHeader(FRM__BUTR);
|
||||
x-=shop.instructionsbuttonspace+fh2->W;
|
||||
y+=shop.instructionsbuttonyoffset;
|
||||
sb->printFT4(fh2,x,y,0,0,0);
|
||||
x-=shop.instructionsbuttongap+fh1->W;
|
||||
sb->printFT4(fh1,x,y,0,0,0);
|
||||
|
||||
x=xbase+shop.instructionsx;
|
||||
y=ybase+shop.instructionsy+shop.instructionsygap;
|
||||
m_font->print(x,y,STR__SHOP_SCREEN__CROSS_TO_PURCHASE);
|
||||
fh1=sb->getFrameHeader(FRM__BUTX);
|
||||
x-=shop.instructionsbuttonspace+fh2->W;
|
||||
y+=shop.instructionsbuttonyoffset;
|
||||
sb->printFT4(fh1,x,y,0,0,0);
|
||||
|
||||
x=xbase+shop.instructionsx;
|
||||
y=ybase+shop.instructionsy+(shop.instructionsygap*2);
|
||||
m_font->print(x,y,STR__SHOP_SCREEN__TRIANGLE_TO_EXIT);
|
||||
fh1=sb->getFrameHeader(FRM__BUTT);
|
||||
x-=shop.instructionsbuttonspace+fh2->W;
|
||||
y+=shop.instructionsbuttonyoffset;
|
||||
sb->printFT4(fh1,x,y,0,0,0);
|
||||
|
||||
m_guiFrame->render();
|
||||
}
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
Function:
|
||||
Purpose:
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ public:
|
|||
|
||||
|
||||
private:
|
||||
void renderUi();
|
||||
|
||||
int isItemAvailableToBut(int _itemNumber);
|
||||
|
||||
|
||||
|
|
@ -74,6 +76,9 @@ private:
|
|||
int m_readyToExit;
|
||||
unsigned char *m_image;
|
||||
|
||||
class CGUIGroupFrame *m_guiFrame;
|
||||
|
||||
|
||||
int m_currentlySelectedItem;
|
||||
int m_flashSin;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue