From dd86f0a9ba34b0de4ece3f10ce8e0f0cdea3a86f Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Mon, 15 Jan 2001 22:02:25 +0000
Subject: [PATCH]

---
 source/frontend/credits.cpp |  8 ++++++++
 source/frontend/start.cpp   | 13 +++++++++++++
 source/game/game.cpp        |  9 +++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/source/frontend/credits.cpp b/source/frontend/credits.cpp
index 90fa8acb8..6fe2ca6b1 100644
--- a/source/frontend/credits.cpp
+++ b/source/frontend/credits.cpp
@@ -82,11 +82,13 @@
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
+#ifdef __USER_PAUL__
 #include "memcard\memcard.h"
 #include "memcard\saveload.h"
 CSaveLoadDatabase	*sl;
 enum{mode_none,mode_save,mode_load};
 int mode=mode_none;
+#endif
 void CFrontEndCredits::init()
 {
 }
@@ -110,9 +112,11 @@ void CFrontEndCredits::shutdown()
 static u8 *s_image;
 void CFrontEndCredits::select()
 {
+#ifdef __USER_PAUL__
 MemCard::Start();
 sl=new ("sldb") CSaveLoadDatabase();
 mode=mode_none;
+#endif
 	m_shuttingDown=false;
 	s_image=CFileIO::loadFile(BACKDROP_CREDITS_GFX);
 	ASSERT(s_image);
@@ -128,8 +132,10 @@ mode=mode_none;
   ---------------------------------------------------------------------- */
 void CFrontEndCredits::unselect()
 {
+#ifdef __USER_PAUL__
 MemCard::Stop();
 delete sl;	
+#endif
 	ClearScreenImage();
 	MemFree(s_image);	s_image=NULL;
 }
@@ -152,6 +158,7 @@ void CFrontEndCredits::render()
   ---------------------------------------------------------------------- */
 void CFrontEndCredits::think(int _frames)
 {
+#ifdef __USER_PAUL__
 sl->think();
 if(mode==mode_none)
 {
@@ -209,6 +216,7 @@ else if(mode==mode_load)
 }
 
 if(mode==mode_none)
+#endif
 	if(!m_shuttingDown&&!CFader::isFading())
 	{
 		if(PadGetDown(0)&(PAD_CROSS|PAD_START))
diff --git a/source/frontend/start.cpp b/source/frontend/start.cpp
index 5050a57be..90e1f94b4 100644
--- a/source/frontend/start.cpp
+++ b/source/frontend/start.cpp
@@ -34,6 +34,8 @@
 #include "gfx\prim.h"
 #endif
 
+#include "gfx\font.h"
+
 
 /*	Std Lib
 	------- */
@@ -68,8 +70,13 @@
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
+FontBank	*s_smallFont;
 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()
 {
+	s_smallFont->dump();		delete s_smallFont;
 }
 
 /*----------------------------------------------------------------------
@@ -123,6 +131,11 @@ void CFrontEndStart::render()
 	setRGB2(g4, 0,50, 0);
 	setRGB3(g4,50, 0,50);
 	AddPrimToList(g4,MAX_OT-1);
+
+	if(!CFader::isFading())
+	{
+		s_smallFont->print(256,120,"Press START to enter game scene");
+	}
 }
 
 /*----------------------------------------------------------------------
diff --git a/source/game/game.cpp b/source/game/game.cpp
index 6b6c842ea..f645c5ccb 100644
--- a/source/game/game.cpp
+++ b/source/game/game.cpp
@@ -14,6 +14,10 @@
 #include	"gfx\font.h"
 #include	"gfx\fdata.h"
 
+#ifndef __GFX_FADER_H__
+#include "gfx\fader.h"
+#endif
+
 #include	"level\level.h"
 #include	"player\player.h"
 #include	"gfx\anim.h"
@@ -54,6 +58,7 @@ void 	CGameScene::init()
 		SetIdentNoTrans(&CamMtx);
 		CamMtx.t[2]=ZPos;
 
+		CFader::setFadingIn();
 }
 
 /*****************************************************************************/
@@ -79,9 +84,9 @@ void 	CGameScene::render()
 void	CGameScene::think(int _frames)
 {
 		m_conversation.think(_frames);
+		Player.think(_frames);
+		Level.setCameraCentre(Player.getMapPos());
 		Level.think(_frames);
-		Player.think();
-		Player.Animate();
 
 		if(!m_conversation.isActive()&&PadGetDown(0)&PAD_START)
 		{