source/enemy/npc.cpp

@@ -21,10 +21,6 @@
 #include <biglump.h>
 #endif
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
-#endif
-
 #ifndef __GAME_GAME_H__
 #include	"game\game.h"
 #endif

source/frontend/options.cpp

@@ -77,8 +77,8 @@
 #include <frontend.h>
 #endif
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.h>
 #endif
 
 

source/game/convo.cpp

@@ -57,8 +57,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.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(UI_UIGFX_SPR);
+		s_guiIcon->setSpriteBank(INGAMEFX_INGAMEFX_SPR);
 		s_guiIcon->setFrame(0);
 
 		s_guiText=new("Conversation Text") CGUITextBox();

source/gfx/fdata.cpp

@@ -22,7 +22,7 @@
 #include	"biglump.h"
 #endif
 
-#include	<UiGfx.h>
+#include	<ingamefx.h>
 
 
 /*	Std Lib
@@ -84,7 +84,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( UI_UIGFX_SPR,	standardFontTab,	13,	1,1, 4 );
+FontData	standardFont( INGAMEFX_INGAMEFX_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(UI_UIGFX_SPR);
+	setSpriteBank(INGAMEFX_INGAMEFX_SPR);
 }
 
 

source/gui/gui.cpp

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

source/paul/paul.cpp

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

source/projectl/projectl.cpp

@@ -27,8 +27,8 @@
 #include <biglump.h>
 #endif
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.h>
 #endif
 
 #ifndef __VID_HEADER_
@@ -51,7 +51,7 @@ void CProjectile::init()
 	CEnemyProjectileThing::init();
 
 	m_spriteBank=new ("projectile sprites") SpriteBank();
-	m_spriteBank->load(UI_UIGFX_SPR);
+	m_spriteBank->load(INGAMEFX_INGAMEFX_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(UI_UIGFX_SPR);
+		sb->load(INGAMEFX_INGAMEFX_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/vid.cpp

@@ -7,10 +7,6 @@
 #include "gfx\prim.h"
 #include "fileio\fileio.h"
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
-#endif
-
 /*****************************************************************************/
 #define MaxVBFuncs 	4