source/frontend/credits.cpp

@@ -55,8 +55,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/frontend/demomode.cpp

@@ -57,8 +57,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/frontend/frontend.cpp

@@ -77,8 +77,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -164,7 +164,7 @@ void CFrontEndScene::init()
 #endif
 
 	m_sprites=new ("MainTitle Sprites") SpriteBank();
-	m_sprites->load(FRONTEND_FRONTEND_SPR);
+	m_sprites->load(SPRITES_SPRITES_SPR);
 	
 	m_font=new ("frontendfont") FontBank();
 	m_font->initialise(&standardFont);

source/frontend/maintitl.cpp

@@ -73,8 +73,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -118,7 +118,7 @@ int sval=0;
 void CFrontEndMainTitles::init()
 {
 	m_sprites=new ("MainTitle Sprites") SpriteBank();
-	m_sprites->load(FRONTEND_FRONTEND_SPR);
+	m_sprites->load(SPRITES_SPRITES_SPR);
 
 	m_smallFont=new ("MainTitle SmallFont") FontBank();
 	m_smallFont->initialise(&standardFont);

source/frontend/options.cpp

@@ -73,12 +73,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
-#endif
-
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/frontend/scrollbg.cpp

@@ -33,8 +33,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -63,7 +63,7 @@
 void CScrollyBackground::init()
 {
 	m_sprites=new ("Scrolly Background sprites") SpriteBank;
-	m_sprites->load(FRONTEND_FRONTEND_SPR);
+	m_sprites->load(SPRITES_SPRITES_SPR);
 	m_xOff=m_yOff=0;
 
 	setSpeed(DEFAULT_X_SPEED,DEFAULT_Y_SPEED);

source/frontend/start.cpp

@@ -49,8 +49,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/game/convo.cpp

@@ -57,8 +57,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef __STRING_ENUMS__
@@ -135,7 +135,7 @@ void CConversation::init()
 		s_guiIcon->init(s_guiFrame);
 		s_guiIcon->setObjectXYWH(0,0,FRAME_HEIGHT,FRAME_HEIGHT);
 		s_guiIcon->setOt(OT_POS);
-		s_guiIcon->setSpriteBank(INGAMEFX_INGAMEFX_SPR);
+		s_guiIcon->setSpriteBank(SPRITES_SPRITES_SPR);
 		s_guiIcon->setFrame(0);
 
 		s_guiText=new("Conversation Text") CGUITextBox();

source/game/game.cpp

@@ -103,8 +103,8 @@
 #include "gfx\bubicles.h"
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef _ANIMTEX_HEADER_
@@ -130,9 +130,6 @@
 
 #include "gfx\actor.h"
 
-
-//int		GX=512/2;
-//int		GY=256/;
 int			RenderZ=256;
 
 /*****************************************************************************/

source/gfx/bubicles.cpp

@@ -45,8 +45,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -388,7 +388,7 @@ void CBubicleFactory::init()
 	CBubicle		*bub;
 
 	s_sprites=new ("Bubble Sprites") SpriteBank();
-	s_sprites->load(INGAMEFX_INGAMEFX_SPR);
+	s_sprites->load(SPRITES_SPRITES_SPR);
 
 	for(i=0;i<s_frameTabSize;i++)
 	{

source/gfx/fdata.cpp

@@ -22,7 +22,9 @@
 #include	"biglump.h"
 #endif
 
-#include	<ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
+#endif
 
 
 /*	Std Lib
@@ -84,7 +86,7 @@ s16	standardFontTab[]=
 	/* ð ñ ò ó ô õ ö ÷ */	      -1,      -1,FRM__242,FRM__243,FRM__244,FRM__245,FRM__246,      -1,
 	/* ø ù ú û ü ý þ ÿ */	      -1,FRM__249,FRM__250,FRM__251,FRM__252,FRM__253,      -1,FRM__255,
 };
-FontData	standardFont( INGAMEFX_INGAMEFX_SPR,	standardFontTab,	13,	1,1, 4 );
+FontData	standardFont( SPRITES_SPRITES_SPR,	standardFontTab,	13,	1,1, 4 );
 
 /*----------------------------------------------------------------------
 	Function:

source/gui/greadout.cpp

@@ -204,7 +204,7 @@ void CGUISpriteReadout::init(CGUIObject *_parent,GUIId _id)
 	m_lastValue=-1;
 	m_frame=0;
 	m_x=m_y=0;
-	setSpriteBank(INGAMEFX_INGAMEFX_SPR);
+	setSpriteBank(SPRITES_SPRITES_SPR);
 }
 
 

source/gui/gui.cpp

@@ -37,8 +37,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGMAEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -422,7 +422,7 @@ void initGUIStuff()
 	ASSERT(!s_uiSpriteBank);
 
 	s_uiSpriteBank=new ("UI Sprites") SpriteBank();
-	s_uiSpriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	s_uiSpriteBank->load(SPRITES_SPRITES_SPR);
 }
 
 

source/level/layertile3d.cpp

@@ -116,6 +116,11 @@ sOT				*ThisOT;
 MATRIX			&CamMtx=CGameScene::GetCamMtx();
 VECTOR			BlkPos;
 
+extern int RenderZ;
+		SetGeomScreen(RenderZ);
+		CamMtx.t[2]=RenderZ;
+		SetTransMatrix(&CamMtx);		
+
 		SetIdentNoTrans(&CamMtx);
 		SetRotMatrix(&CamMtx);
 

source/paul/paul.cpp

@@ -89,8 +89,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pballoon.cpp

@@ -52,8 +52,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pblower.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pbubmix.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pglasses.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/phealth.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/phelmet.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pickup.cpp

@@ -82,8 +82,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -114,7 +114,7 @@ void	CBasePickup::init()
 	CPickupThing::init();
 
 	m_spriteBank=new ("pickup sprite") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 }
 
 /*----------------------------------------------------------------------

source/pickups/pjlammo.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/plife.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pnet.cpp

@@ -32,8 +32,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef	__GFX_OTPOS_H__

source/pickups/pquest.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pshoes.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pspatula.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/player.cpp

@@ -83,8 +83,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -249,7 +249,7 @@ void	CPlayer::init()
 	m_fontBank->setOt(5);
 
 	m_spriteBank=new ("PlayerSprites") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 
 	m_layerCollision=NULL;
 

source/player/pmbloon.cpp

@@ -36,8 +36,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmbubble.cpp

@@ -36,8 +36,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmcoral.cpp

@@ -57,8 +57,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmjelly.cpp

@@ -44,8 +44,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmnet.cpp

@@ -45,8 +45,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/projectl/projectl.cpp

@@ -27,8 +27,8 @@
 #include <biglump.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef __VID_HEADER_
@@ -55,7 +55,7 @@ void CProjectile::init()
 	CEnemyProjectileThing::init();
 
 	m_spriteBank=new ("projectile sprites") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 
 	m_heading = 0;
 	m_lifetime = GameState::getOneSecondInFrames() * 2;
@@ -389,7 +389,7 @@ void CPlayerProjectile::init()
 	CPlayerProjectileThing::init();
 
 	m_spriteBank=new ("projectile sprites") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 
 	m_heading = 0;
 	m_lifetime = GameState::getOneSecondInFrames() * 2;

source/script/function.cpp

@@ -199,7 +199,7 @@ static signed short func_drawSprite(unsigned short *_args)
 	if(!sb)
 	{
 		sb=new ("sb") SpriteBank;
-		sb->load(INGAMEFX_INGAMEFX_SPR);
+		sb->load(SPRITES_SPRITES_SPR);
 	}
 	fh=sb->getFrameHeader(_args[0]);
 	sb->printFT4(_args[0],_args[1]-(fh->W/2),_args[2]-(fh->H/2),0,0,_args[3]);

source/system/main.cpp

@@ -77,12 +77,14 @@ CPaulScene s_paulScene;
 #endif
 
 
+/*****************************************************************************/
+static SpriteBank	GenericSpriteBank;
+
 /*****************************************************************************/
 
 void	SaveScreen(RECT R);
 
 /*****************************************************************************/
-
 void	InitSystem()	// reordered to reduce black screen (hope all is well
 {
 	ResetCallback();
@@ -120,12 +122,13 @@ void	InitSystem()	// reordered to reduce black screen (hope all is well
 	CBubicleFactory::init();
 
 	CActorPool::AddActor(ACTORS_SPONGEBOB_SBK);
+	GenericSpriteBank.load(SPRITES_SPRITES_SPR);
+
 
 #if defined(__DEBUG_MEM__)
 	DebugMemFontInit();
 #endif
 
-
 #ifdef __USER_paul__
 s_paulScene.init();
 #endif