source/system/main.cpp

@@ -71,6 +71,7 @@ CPaulScene s_paulScene;
 #include "gfx\bubicles.h"
 #endif
 
+#include	<sprites.h>
 
 #if	__FILE_SYSTEM__==PC
 	#if	!defined(__USER_CDBUILD__)
@@ -120,6 +121,8 @@ void	InitSystem()	// reordered to reduce black screen (hope all is well
 
 	GenericSpriteBank.load(SPRITES_SPRITES_SPR);
 	CGameScene::setSpriteBank(&GenericSpriteBank);
+	SetUpLoadIcon(GenericSpriteBank.getFrameHeader(FRM__TOKEN));
+//	StartLoad();
 
 	GameState::initialise();
 	CSoundMediator::initialise();

source/system/vid.cpp

@@ -7,6 +7,7 @@
 #include "gfx\prim.h"
 #include "fileio\fileio.h"
 
+
 /*****************************************************************************/
 #define MaxVBFuncs 	4
 
@@ -29,7 +30,7 @@ static const CVECTOR s_defClearCol = {0, 0, 0};
 /*****************************************************************************/
 /*** Loading Icon Cack *******************************************************/
 /*****************************************************************************/
-POLY_FT4	LoadPoly[2];
+POLY_FT4	LoadPoly;
 static int	LoadX=430;
 static int	LoadY=161;
 static int	LoadHalfWidth;
@@ -53,7 +54,7 @@ void	LoadingIcon()
 {
 int			Dst;
 int			rgb;
-POLY_FT4	*PolyPtr=&LoadPoly[LoadIconSide];
+POLY_FT4	*PolyPtr=&LoadPoly;
 
 		Dst=LoadTab[LoadTime];
 		
@@ -70,35 +71,28 @@ POLY_FT4	*PolyPtr=&LoadPoly[LoadIconSide];
 
 		LoadTime++;
 		if (LoadTime>=LoadTabSize)	LoadTime=0;
-		if(LoadTime==LoadTabSize/2)	LoadIconSide^=1;
+//		if(LoadTime==LoadTabSize/2)	LoadIconSide^=1;
 }
 
 /*****************************************************************************/
-void	StartLoad(int _loadX,int _loadY)
+void	SetUpLoadIcon(void *_fh)
 {
-/*	
+sFrameHdr *fh=(sFrameHdr*)_fh;
-sFrameHdr	*fh;
+		setPolyFT4(&LoadPoly);
-SpriteBank	*spr;
+		setXYWH(&LoadPoly,LoadX,LoadY,fh->W,fh->H);
-
+		setUVWH(&LoadPoly,fh->U,fh->V,fh->W,fh->H);
-		spr=UIGetSharedSpriteBank();
+		LoadPoly.tpage=fh->TPage;
-		LoadX=_loadX;
+		LoadPoly.clut=fh->Clut;
-		LoadY=_loadY;
-
-		setPolyFT4(&LoadPoly[0]);
-		fh=spr->getFrameHeader(FRM__CD);
-		setXYWH(&LoadPoly[0],LoadX,LoadY,fh->W,fh->H);
-		setUVWH(&LoadPoly[0],fh->U,fh->V,fh->W,fh->H);
-		LoadPoly[0].tpage=fh->TPage;
-		LoadPoly[0].clut=fh->Clut;
-
-		setPolyFT4(&LoadPoly[1]);
-		fh=spr->getFrameHeader(FRM__CDFRONT);
-		setXYWH(&LoadPoly[1],LoadX,LoadY,fh->W,fh->H);
-		setUVWH(&LoadPoly[1],fh->U,fh->V,fh->W,fh->H);
-		LoadPoly[1].tpage=fh->TPage;
-		LoadPoly[1].clut=fh->Clut;
 
 		LoadHalfWidth=fh->W/2;
+		setRECT(&LoadBackRect,LoadX,LoadY+(LoadBackY^256),fh->W+4,fh->H+4);
+
+}
+/*****************************************************************************/
+void	StartLoad(int _loadX,int _loadY)
+{
+		LoadX=_loadX;
+		LoadY=_loadY;
 
 		Screen[0].Draw.isbg=Screen[1].Draw.isbg=0;
 
@@ -106,12 +100,10 @@ SpriteBank	*spr;
 		PutDispEnv(&Screen[FrameFlipFlag].Disp);
 
 		LoadBackY=Screen[FrameFlipFlag^1].Disp.disp.y;
-		setRECT(&LoadBackRect,LoadX,LoadY+(LoadBackY^256),fh->W+4,fh->H+4);
 
 		LoadTime=0;
 		DrawLoadIcon=1;
 		LoadIconSide=0;
-*/		
 }
 
 /*****************************************************************************/
@@ -357,7 +349,11 @@ int		ScrH=VidGetScrH()*FrameFlipFlag;
 		PutDrawEnv(Draw);
 
 // If set, load background screen
-		if (ScreenImage) LoadImage2(&Screen[LastFrame].Disp.disp ,(u_long*)ScreenImage);
+		if (ScreenImage) 
+		{	
+			LoadImage(&Screen[LastFrame].Disp.disp ,(u_long*)ScreenImage);
+			DrawSync(0);
+		}
 
 
 if(ScreenClipBox==1)

source/system/vid.h

@@ -32,7 +32,6 @@ struct sVidScreen
 extern int		FrameFlipFlag;
 
 /*****************************************************************************/
-
 void		VidInit();
 
 void		VidScrOn();
@@ -59,6 +58,7 @@ void 		VidRemoveVSyncFunc(VbFuncType v);
 
 void 		VRamViewer();
 
+void		SetUpLoadIcon(void *fh);
 void		StartLoad(int _loadX=430,int _loadY=202);
 void		StopLoad();