This commit is contained in:
Paul 2001-01-15 22:02:25 +00:00
parent 986955a772
commit dd86f0a9ba
3 changed files with 28 additions and 2 deletions

View File

@ -82,11 +82,13 @@
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
#ifdef __USER_PAUL__
#include "memcard\memcard.h" #include "memcard\memcard.h"
#include "memcard\saveload.h" #include "memcard\saveload.h"
CSaveLoadDatabase *sl; CSaveLoadDatabase *sl;
enum{mode_none,mode_save,mode_load}; enum{mode_none,mode_save,mode_load};
int mode=mode_none; int mode=mode_none;
#endif
void CFrontEndCredits::init() void CFrontEndCredits::init()
{ {
} }
@ -110,9 +112,11 @@ void CFrontEndCredits::shutdown()
static u8 *s_image; static u8 *s_image;
void CFrontEndCredits::select() void CFrontEndCredits::select()
{ {
#ifdef __USER_PAUL__
MemCard::Start(); MemCard::Start();
sl=new ("sldb") CSaveLoadDatabase(); sl=new ("sldb") CSaveLoadDatabase();
mode=mode_none; mode=mode_none;
#endif
m_shuttingDown=false; m_shuttingDown=false;
s_image=CFileIO::loadFile(BACKDROP_CREDITS_GFX); s_image=CFileIO::loadFile(BACKDROP_CREDITS_GFX);
ASSERT(s_image); ASSERT(s_image);
@ -128,8 +132,10 @@ mode=mode_none;
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CFrontEndCredits::unselect() void CFrontEndCredits::unselect()
{ {
#ifdef __USER_PAUL__
MemCard::Stop(); MemCard::Stop();
delete sl; delete sl;
#endif
ClearScreenImage(); ClearScreenImage();
MemFree(s_image); s_image=NULL; MemFree(s_image); s_image=NULL;
} }
@ -152,6 +158,7 @@ void CFrontEndCredits::render()
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CFrontEndCredits::think(int _frames) void CFrontEndCredits::think(int _frames)
{ {
#ifdef __USER_PAUL__
sl->think(); sl->think();
if(mode==mode_none) if(mode==mode_none)
{ {
@ -209,6 +216,7 @@ else if(mode==mode_load)
} }
if(mode==mode_none) if(mode==mode_none)
#endif
if(!m_shuttingDown&&!CFader::isFading()) if(!m_shuttingDown&&!CFader::isFading())
{ {
if(PadGetDown(0)&(PAD_CROSS|PAD_START)) if(PadGetDown(0)&(PAD_CROSS|PAD_START))

View File

@ -34,6 +34,8 @@
#include "gfx\prim.h" #include "gfx\prim.h"
#endif #endif
#include "gfx\font.h"
/* Std Lib /* Std Lib
------- */ ------- */
@ -68,8 +70,13 @@
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
FontBank *s_smallFont;
void CFrontEndStart::init() void CFrontEndStart::init()
{ {
s_smallFont=new ("Start SmallFont") FontBank();
s_smallFont->initialise(&standardFont);
s_smallFont->setJustification(FontBank::JUST_CENTRE);
s_smallFont->setOt(5);
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -80,6 +87,7 @@ void CFrontEndStart::init()
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CFrontEndStart::shutdown() void CFrontEndStart::shutdown()
{ {
s_smallFont->dump(); delete s_smallFont;
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -123,6 +131,11 @@ void CFrontEndStart::render()
setRGB2(g4, 0,50, 0); setRGB2(g4, 0,50, 0);
setRGB3(g4,50, 0,50); setRGB3(g4,50, 0,50);
AddPrimToList(g4,MAX_OT-1); AddPrimToList(g4,MAX_OT-1);
if(!CFader::isFading())
{
s_smallFont->print(256,120,"Press START to enter game scene");
}
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------

View File

@ -14,6 +14,10 @@
#include "gfx\font.h" #include "gfx\font.h"
#include "gfx\fdata.h" #include "gfx\fdata.h"
#ifndef __GFX_FADER_H__
#include "gfx\fader.h"
#endif
#include "level\level.h" #include "level\level.h"
#include "player\player.h" #include "player\player.h"
#include "gfx\anim.h" #include "gfx\anim.h"
@ -54,6 +58,7 @@ void CGameScene::init()
SetIdentNoTrans(&CamMtx); SetIdentNoTrans(&CamMtx);
CamMtx.t[2]=ZPos; CamMtx.t[2]=ZPos;
CFader::setFadingIn();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -79,9 +84,9 @@ void CGameScene::render()
void CGameScene::think(int _frames) void CGameScene::think(int _frames)
{ {
m_conversation.think(_frames); m_conversation.think(_frames);
Player.think(_frames);
Level.setCameraCentre(Player.getMapPos());
Level.think(_frames); Level.think(_frames);
Player.think();
Player.Animate();
if(!m_conversation.isActive()&&PadGetDown(0)&PAD_START) if(!m_conversation.isActive()&&PadGetDown(0)&PAD_START)
{ {