Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code-Cleanup: remove a lot of type,function,variable 

declarations/definitions which are not used anywhere.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1421 4a71c877-e1ca-e34f-864e-861f7616d084
master
Stefan Huehner 2007-04-10 17:01:53 +00:00
parent c0fd40ff19
commit 9eda7db8a1
15 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/framework/types.h
View File

@ -62,13 +62,6 @@ typedef Sint32 SDWORD;
typedef int BOOL; typedef int BOOL;
typedef struct {
UBYTE peRed;
UBYTE peGreen;
UBYTE peBlue;
UBYTE peFlags;
} PALETTEENTRY;
typedef struct typedef struct
{ {
int x; int x;

4
lib/gamelib/gtime.h
View File

@ -75,10 +75,6 @@ void gameTimeSetMod(FRACT mod);
// get the current time modifier // get the current time modifier
void gameTimeGetMod(FRACT *pMod); void gameTimeGetMod(FRACT *pMod);
// get the current time modifier
void gameTimeGetModifier(UDWORD *pMod, UDWORD *pFactor);
/* Useful for periodical stuff */ /* Useful for periodical stuff */
/* Will return a number that climbs over tickFrequency game ticks and ends up in the required range. */ /* Will return a number that climbs over tickFrequency game ticks and ends up in the required range. */
/* /*

1
lib/gamelib/parser.h
View File

@ -34,7 +34,6 @@ extern BOOL ParseFile( char szFileName[] );
extern void IncludeFile( char szFileName[] ); extern void IncludeFile( char szFileName[] );
extern void parserSetInputFile(PHYSFS_file* fileHandle); extern void parserSetInputFile(PHYSFS_file* fileHandle);
extern BOOL ParseResourceFile(PHYSFS_file* fileHandle); extern BOOL ParseResourceFile(PHYSFS_file* fileHandle);
extern BOOL ParsingBuffer( void );
extern void parseGetErrorData(int *pLine, char **ppText); extern void parseGetErrorData(int *pLine, char **ppText);
/***************************************************************************/ /***************************************************************************/

9
lib/ivis_common/bitimage.h
View File

@ -21,17 +21,8 @@
#define __INCLUDED_BITIMAGE__ #define __INCLUDED_BITIMAGE__
typedef struct {
UWORD NumCluts;
UWORD *ClutIDs;
} CLUTLIST;
typedef void (*CLUTCALLBACK)(UWORD *clut);
UWORD iV_GetImageWidth(IMAGEFILE *ImageFile,UWORD ID); UWORD iV_GetImageWidth(IMAGEFILE *ImageFile,UWORD ID);
UWORD iV_GetImageHeight(IMAGEFILE *ImageFile,UWORD ID); UWORD iV_GetImageHeight(IMAGEFILE *ImageFile,UWORD ID);
UWORD iV_GetImageWidthNoCC(IMAGEFILE *ImageFile,UWORD ID);
UWORD iV_GetImageHeightNoCC(IMAGEFILE *ImageFile,UWORD ID);
SWORD iV_GetImageXOffset(IMAGEFILE *ImageFile,UWORD ID); SWORD iV_GetImageXOffset(IMAGEFILE *ImageFile,UWORD ID);
SWORD iV_GetImageYOffset(IMAGEFILE *ImageFile,UWORD ID); SWORD iV_GetImageYOffset(IMAGEFILE *ImageFile,UWORD ID);
UWORD iV_GetImageCenterX(IMAGEFILE *ImageFile,UWORD ID); UWORD iV_GetImageCenterX(IMAGEFILE *ImageFile,UWORD ID);

1
lib/ivis_common/bspfunc.h
View File

@ -26,7 +26,6 @@
/***************************************************************************/ /***************************************************************************/
void GetRealCameraPos(OBJPOS *Camera, SDWORD Distance, Vector3i *CameraLoc); void GetRealCameraPos(OBJPOS *Camera, SDWORD Distance, Vector3i *CameraLoc);
void DrawBSPIMD(iIMDShape *IMDdef, Vector3i *pPos);
PSBSPTREENODE InitNode(PSBSPTREENODE psBSPNode); PSBSPTREENODE InitNode(PSBSPTREENODE psBSPNode);
void GetPlane( iIMDShape *s, UDWORD PolygonID, PSPLANE psPlane ); void GetPlane( iIMDShape *s, UDWORD PolygonID, PSPLANE psPlane );

5
lib/ivis_common/bspimd.h
View File

@ -138,13 +138,8 @@ BSPTREENODE, *PSBSPTREENODE;
#define OPPOSITE_SIDE 0 #define OPPOSITE_SIDE 0
#define IN_PLANE 1 #define IN_PLANE 1
#define SAME_SIDE 2 #define SAME_SIDE 2
#define SPLIT_BY_PLANE 3
#define INTERSECTION_INSIDE_LINE_SEGMENT 4
#define INTERSECTION_OUTSIDE_LINE_SEGMENT 5
#define SPLITTING_ERROR (-1)
/***************************************************************************/ /***************************************************************************/
#endif #endif

1
lib/ivis_common/imd.h
View File

@ -92,7 +92,6 @@
//************************************************************************* //*************************************************************************
extern iIMDShape *iV_ProcessIMD(char **ppFileData, char *FileDataEnd ); extern iIMDShape *iV_ProcessIMD(char **ppFileData, char *FileDataEnd );
iIMDShape *iV_ProcessBPIE(iIMDShape *, UDWORD size);
extern BOOL iV_IMDSave(char *filename, iIMDShape *s, BOOL PieIMD); extern BOOL iV_IMDSave(char *filename, iIMDShape *s, BOOL PieIMD);
extern void iV_IMDDebug(iIMDShape *s); extern void iV_IMDDebug(iIMDShape *s);

29
lib/ivis_common/ivi.h
View File

@ -28,19 +28,10 @@
#include "piedef.h" #include "piedef.h"
#define iV_SWAP(a,b) { (a) ^= (b); (b) ^= (a); (a) ^= (b); }
#ifdef iV_DDX
#define iV_DDX_ERROR 0x1000000
#endif
#define iV_DIVSHIFT 15 #define iV_DIVSHIFT 15
#define iV_DIVMULTP (1<<iV_DIVSHIFT) #define iV_DIVMULTP (1<<iV_DIVSHIFT)
#define iV_DIVMULTP_2 (1<<(iV_DIVSHIFT-1)) #define iV_DIVMULTP_2 (1<<(iV_DIVSHIFT-1))
// Simple derived types
typedef union {Uint32 *dp; Uint8 *bp; Uint16 *wp;} iPointer;
extern void iV_Error(long n, const char *msge, ...); extern void iV_Error(long n, const char *msge, ...);
// If its a final build we need to undefine iv_error so that it doesn't generate any code ! // If its a final build we need to undefine iv_error so that it doesn't generate any code !
@ -61,37 +52,18 @@ extern void iV_Error(long n, const char *msge, ...);
//* Macros: //* Macros:
//* //*
#define iV_ASHIFT 4
#define iV_SSHIFT 7
#define iV_RSHIFT 12 #define iV_RSHIFT 12
#define iV_RMULTP (1L<<iV_RSHIFT) #define iV_RMULTP (1L<<iV_RSHIFT)
#define iV_MSHIFT 10
#define iV_MMULTP (1L<<iV_MSHIFT);
#define iV_DIVTABLE_MAX 1024
#define iV_POLY_MAX_POINTS pie_MAX_POLY_SIZE #define iV_POLY_MAX_POINTS pie_MAX_POLY_SIZE
#define iV_POLY_FLAT (1) // added by TJC
#define iV_POLY_TEXT (2)
#define iV_POLY_TEXT0 (3)
#define iV_POLY_GOUR (4)
#ifdef iV_DDX
#define iV_DDX_ERROR 0x1000000
#endif
/***************************************************************************/ /***************************************************************************/
/* /*
* Global Type Definitions * Global Type Definitions
*/ */
/***************************************************************************/ /***************************************************************************/
// Basic type (replace with framework definitions)
typedef unsigned char uchar;
typedef Uint32 ufixed;
typedef struct {Sint32 w, x, y, z;} iQuat;
typedef struct {int x0, y0, x1, y1;} iBox;
//************************************************************************* //*************************************************************************
@ -106,7 +78,6 @@ extern void iV_Reset( void );
extern void iV_ShutDown(void); extern void iV_ShutDown(void);
extern void iV_Stop(char *string, ...); extern void iV_Stop(char *string, ...);
extern void iV_Abort(char *string, ...); extern void iV_Abort(char *string, ...);
extern void iV_DisplayLogFile(void);

8
lib/ivis_common/ivisdef.h
View File

@ -181,14 +181,6 @@ typedef struct iIMDShape {
// //
//************************************************************************* //*************************************************************************
typedef struct {
UBYTE Type[4];
UWORD Version;
UWORD ClutSize;
UWORD NumCluts;
UWORD Pad;
} CLUTHEADER;
typedef struct { typedef struct {
UBYTE Type[4]; UBYTE Type[4];
UWORD Version; UWORD Version;

6
lib/ivis_common/piefunc.h
View File

@ -32,14 +32,8 @@
#include "lib/framework/frame.h" #include "lib/framework/frame.h"
#include "lib/ivis_common/piedef.h" #include "lib/ivis_common/piedef.h"
extern void pie_DrawBoundingDisc(iIMDShape *shape, int pieFlag);
extern void pie_Blit(SDWORD texPage, SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1);
extern void pie_Sky(SDWORD texPage, PIEVERTEX* aSky );
extern void pie_Water(SDWORD texPage, SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1, SDWORD height, SDWORD translucency);
extern void pie_InitMaths(void); extern void pie_InitMaths(void);
extern UBYTE pie_ByteScale(UBYTE a, UBYTE b); extern UBYTE pie_ByteScale(UBYTE a, UBYTE b);
extern void pie_CornerBox(SDWORD x0, SDWORD y0, SDWORD x1, SDWORD y1, UDWORD colour,
UBYTE a, UBYTE b, UBYTE c, UBYTE d);
extern void pie_TransColouredTriangle( PIEVERTEX *vrt, UDWORD rgb ); extern void pie_TransColouredTriangle( PIEVERTEX *vrt, UDWORD rgb );
extern void pie_DrawSkybox(float scale, int u, int v, int w, int h); extern void pie_DrawSkybox(float scale, int u, int v, int w, int h);
extern void pie_DrawFogBox(float left, float right, float front, float back, float height, float wider); extern void pie_DrawFogBox(float left, float right, float front, float back, float height, float wider);

3
lib/ivis_common/rendfunc.h
View File

@ -59,15 +59,12 @@
//************************************************************************* //*************************************************************************
extern void SetTransFilter(UDWORD rgb,UDWORD tablenumber); extern void SetTransFilter(UDWORD rgb,UDWORD tablenumber);
extern void TransBoxFill(UDWORD x0, UDWORD y0, UDWORD x1, UDWORD y1); extern void TransBoxFill(UDWORD x0, UDWORD y0, UDWORD x1, UDWORD y1);
extern void DrawImageDef(IMAGEDEF *Image,iBitmap *Bmp,UDWORD Modulus,int x,int y);
extern void DrawSemiTransImageDef(IMAGEDEF *Image,iBitmap *Bmp,UDWORD Modulus,int x,int y,int TransRate);
extern void DrawImage(IMAGEFILE *ImageFile,UWORD ID,int x,int y); extern void DrawImage(IMAGEFILE *ImageFile,UWORD ID,int x,int y);
extern void DrawImageRect(IMAGEFILE *ImageFile,UWORD ID,int x,int y,int x0,int y0,int Width,int Height); extern void DrawImageRect(IMAGEFILE *ImageFile,UWORD ID,int x,int y,int x0,int y0,int Width,int Height);
extern void DrawTransImage(IMAGEFILE *ImageFile,UWORD ID,int x,int y); extern void DrawTransImage(IMAGEFILE *ImageFile,UWORD ID,int x,int y);
extern void DrawTransImageRect(IMAGEFILE *ImageFile,UWORD ID,int x,int y,int x0,int y0,int Width,int Height); extern void DrawTransImageRect(IMAGEFILE *ImageFile,UWORD ID,int x,int y,int x0,int y0,int Width,int Height);
extern void iV_SetMousePointer(IMAGEFILE *ImageFile,UWORD ImageID); extern void iV_SetMousePointer(IMAGEFILE *ImageFile,UWORD ImageID);
extern void iV_DrawMousePointer(int x,int y); extern void iV_DrawMousePointer(int x,int y);
extern void ScaleBitmapRGB(char *DisplayBuffer,int Width,int Height,int ScaleR,int ScaleG,int ScaleB);
extern UDWORD iV_GetMouseFrame(void); extern UDWORD iV_GetMouseFrame(void);

1
lib/ivis_common/tex.h
View File

@ -65,6 +65,5 @@ extern void pie_TexInit(void);
//************************************************************************* //*************************************************************************
extern void pie_TexShutDown(void); extern void pie_TexShutDown(void);
BOOL FindTextureNumber(UDWORD TexNum,int* TexPage);
#endif #endif

2
lib/ivis_common/textdraw.h
View File

@ -81,8 +81,6 @@ extern void pie_DrawText270(const char *String, int XPos, int YPos);
extern void pie_RenderBlueTintedBitmap(iBitmap *bmp, int x, int y, int w, int h, int ow); extern void pie_RenderBlueTintedBitmap(iBitmap *bmp, int x, int y, int w, int h, int ow);
extern void pie_RenderDeepBlueTintedBitmap(iBitmap *bmp, int x, int y, int w, int h, int ow); extern void pie_RenderDeepBlueTintedBitmap(iBitmap *bmp, int x, int y, int w, int h, int ow);
void InitClut24(UWORD *InputClut);
typedef void (*RENDERTEXT_CALLBACK)(const char *String, UDWORD X, UDWORD Y); typedef void (*RENDERTEXT_CALLBACK)(const char *String, UDWORD X, UDWORD Y);
// routines used for textdraw // routines used for textdraw
void SetIndirectDrawTextCallback(RENDERTEXT_CALLBACK routine); void SetIndirectDrawTextCallback(RENDERTEXT_CALLBACK routine);

2
src/display.c
View File

@ -300,8 +300,6 @@ SDWORD screenShakeTable[100] =
1,0,-1,-1,-2,-1,1,0,1,0 1,0,-1,-1,-2,-1,1,0,1,0
}; };
PALETTEENTRY gamePalette[255]; // another game palette (yawn)
#define TESTLEVEL_ID (0) #define TESTLEVEL_ID (0)
#define METAKEY_DOWN (keyDown(KEY_LALT) || keyDown(KEY_RALT) || keyDown(KEY_LSHIFT) || keyDown(KEY_RSHIFT) ) #define METAKEY_DOWN (keyDown(KEY_LALT) || keyDown(KEY_RALT) || keyDown(KEY_LSHIFT) || keyDown(KEY_RSHIFT) )

2
src/display.h
View File

@ -205,8 +205,6 @@ extern int gammaValue;
BASE_OBJECT *mouseTarget( void ); BASE_OBJECT *mouseTarget( void );
extern PALETTEENTRY gamePalette[255];
BOOL StartObjectOrbit(BASE_OBJECT *psObj); BOOL StartObjectOrbit(BASE_OBJECT *psObj);
void CancelObjectOrbit(void); void CancelObjectOrbit(void);