mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 19:20:46 +00:00
SW: Remove very bad externs.
Patch from Striker. git-svn-id: https://svn.eduke32.com/eduke32@7505 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
38e55f1a8b
commit
8ab6e700f1
12 changed files with 13 additions and 24 deletions
|
@ -417,7 +417,6 @@ void DrawPanelBorderSides(PLAYERp pp, short x, short y, short x2, short y2, shor
|
|||
static
|
||||
void BorderSetView(PLAYERp UNUSED(pp), int *Xdim, int *Ydim, int *ScreenSize)
|
||||
{
|
||||
void setview(int scrx1, int scry1, int scrx2, int scry2);
|
||||
int x, x2, y, y2;
|
||||
BORDER_INFO *b;
|
||||
|
||||
|
|
|
@ -955,7 +955,6 @@ int AutoBreakSprite(short BreakSprite, short type)
|
|||
SPRITEp bp = &sprite[BreakSprite];
|
||||
BREAK_INFOp break_info;
|
||||
extern void DoWallBreakMatch(short match);
|
||||
int SpawnBreakFlames(int16_t SpriteNum);
|
||||
|
||||
break_info = FindSpriteBreakInfo(bp->picnum);
|
||||
|
||||
|
|
|
@ -1,6 +1,13 @@
|
|||
#ifndef colormap_public_
|
||||
#define colormap_public_
|
||||
|
||||
extern unsigned char DefaultPalette[];
|
||||
|
||||
void MapColors(short num,COLOR_MAP cm,short create);
|
||||
void InitPalette(void);
|
||||
void SetPaletteToVESA(unsigned char *pal);
|
||||
void set_pal(unsigned char *pal);
|
||||
void GetPaletteFromVESA(unsigned char *pal);
|
||||
void InitPalette(void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -57,7 +57,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
|
|||
static int OverlapDraw = FALSE;
|
||||
extern SWBOOL QuitFlag, LocationInfo, ConPanel, SpriteInfo, PauseKeySet;
|
||||
extern SWBOOL Voxel;
|
||||
extern char tempbuf[];
|
||||
extern char buffer[];
|
||||
SWBOOL DrawScreen;
|
||||
extern short f_c;
|
||||
|
@ -1388,8 +1387,8 @@ void PrintLocationInfo(PLAYERp pp)
|
|||
i = totalclock;
|
||||
if (i != frameval[framecnt])
|
||||
{
|
||||
sprintf(tempbuf, "FPS: %d", ((120 * AVERAGEFRAMES) / (i - frameval[framecnt])) + f_c);
|
||||
printext256(x, y, 1, -1, tempbuf, 1);
|
||||
sprintf(buffer, "FPS: %d", ((120 * AVERAGEFRAMES) / (i - frameval[framecnt])) + f_c);
|
||||
printext256(x, y, 1, -1, buffer, 1);
|
||||
frameval[framecnt] = i;
|
||||
}
|
||||
|
||||
|
@ -1541,9 +1540,6 @@ void SpriteSortList2D(int tx, int ty)
|
|||
|
||||
int COVERsetgamemode(int mode, int xdim, int ydim, int bpp)
|
||||
{
|
||||
extern int ScreenHeight, ScreenWidth, ScreenMode, ScreenBPP;
|
||||
|
||||
|
||||
ScreenHeight = ydim;
|
||||
ScreenWidth = xdim;
|
||||
ScreenMode = mode;
|
||||
|
|
|
@ -563,7 +563,6 @@ static char sectorfloorpals[MAXSECTORS], sectorceilingpals[MAXSECTORS], wallpals
|
|||
void
|
||||
DoPlayerNightVisionPalette(PLAYERp pp)
|
||||
{
|
||||
extern char DefaultPalette[];
|
||||
short i;
|
||||
|
||||
if (pp->InventoryActive[INVENTORY_NIGHT_VISION] && (pp - Player == screenpeek))
|
||||
|
@ -611,8 +610,6 @@ DoPlayerNightVisionPalette(PLAYERp pp)
|
|||
void
|
||||
DoPlayerNightVisionPalette(PLAYERp pp)
|
||||
{
|
||||
extern char DefaultPalette[];
|
||||
|
||||
if (pp != Player + screenpeek) return;
|
||||
|
||||
if (pp->InventoryActive[INVENTORY_NIGHT_VISION])
|
||||
|
|
|
@ -122,7 +122,6 @@ short buttonsettings[btn_max];
|
|||
// EXTERNS ////////////////////////////
|
||||
#define XDIM 320
|
||||
#define YDIM 200
|
||||
extern char DefaultPalette[];
|
||||
extern SWBOOL QuitFlag;
|
||||
|
||||
void TerminateGame(void);
|
||||
|
|
|
@ -80,7 +80,6 @@ void ResetMenuInput(void);
|
|||
)
|
||||
|
||||
extern SWBOOL BorderAdjust;
|
||||
extern int FXDevice,MusicDevice;
|
||||
extern SWBOOL MultiPlayQuitFlag;
|
||||
|
||||
// Make memcpy an intrinsic function for an easy frame rate boost
|
||||
|
|
|
@ -62,7 +62,7 @@ SYNC BUG NOTES:
|
|||
|
||||
//#undef MAXSYNCBYTES
|
||||
//#define MAXSYNCBYTES 16
|
||||
uint8_t tempbuf[576], packbuf[576];
|
||||
static uint8_t tempbuf[576], packbuf[576];
|
||||
int PlayClock;
|
||||
extern SWBOOL PauseKeySet;
|
||||
extern char CommPlayerName[32];
|
||||
|
|
|
@ -138,7 +138,6 @@ char PlayerGravity = PLAYER_JUMP_GRAV;
|
|||
#endif
|
||||
|
||||
int vel, svel, angvel;
|
||||
extern char tempbuf[];
|
||||
extern SWBOOL DebugOperate;
|
||||
|
||||
//unsigned char synctics, lastsynctics;
|
||||
|
@ -5058,8 +5057,6 @@ DoPlayerWarpToSurface(PLAYERp pp)
|
|||
void
|
||||
DoPlayerDivePalette(PLAYERp pp)
|
||||
{
|
||||
extern char DefaultPalette[];
|
||||
|
||||
if (pp != Player + screenpeek) return;
|
||||
|
||||
if ((pp->DeathType == PLAYER_DEATH_DROWN || TEST((Player+screenpeek)->Flags, PF_DIVING)) && !TEST(pp->Flags, PF_DIVING_IN_LAVA))
|
||||
|
@ -5220,7 +5217,6 @@ DoPlayerStopDive(PLAYERp pp)
|
|||
{
|
||||
USERp u = User[pp->PlayerSprite];
|
||||
SPRITEp sp = &sprite[pp->PlayerSprite];
|
||||
extern char DefaultPalette[];
|
||||
|
||||
if (Prediction)
|
||||
return;
|
||||
|
@ -6399,8 +6395,6 @@ char *KilledPlayerMessage(PLAYERp pp, PLAYERp killer)
|
|||
char *p1 = pp->PlayerName;
|
||||
char *p2 = killer->PlayerName;
|
||||
|
||||
extern char *DeathString(short SpriteNum);
|
||||
|
||||
if (pp->HitBy == killer->PlayerSprite)
|
||||
{
|
||||
sprintf(ds,"%s was killed by %s.",p1,p2);
|
||||
|
|
|
@ -3155,7 +3155,6 @@ void initlava(void)
|
|||
#if 0
|
||||
int x, y, z, r;
|
||||
int i;
|
||||
extern char tempbuf[];
|
||||
|
||||
//char lavabakpic[(LAVASIZ + 2) * (LAVASIZ + 2)], lavainc[LAVASIZ];
|
||||
//int lavanumdrops, lavanumframes;
|
||||
|
|
|
@ -10948,12 +10948,10 @@ SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
|
|||
|
||||
|
||||
int
|
||||
SpawnBreakFlames(int16_t SpriteNum, int16_t enemy)
|
||||
SpawnBreakFlames(int16_t SpriteNum)
|
||||
{
|
||||
SPRITEp sp = &sprite[SpriteNum];
|
||||
USERp u = User[SpriteNum];
|
||||
SPRITEp ep = &sprite[enemy];
|
||||
USERp eu = User[enemy];
|
||||
SPRITEp np;
|
||||
USERp nu;
|
||||
short New;
|
||||
|
|
|
@ -82,6 +82,8 @@ int DoShrapVelocity(int16_t SpriteNum);
|
|||
int ShrapKillSprite(short SpriteNum);
|
||||
SWBOOL MissileSetPos(short Weapon,ANIMATORp DoWeapon,int dist);
|
||||
int ActorPain(short SpriteNum);
|
||||
int SpawnBreakFlames(int16_t SpriteNum);
|
||||
const char *DeathString(short SpriteNum);
|
||||
|
||||
//
|
||||
// Damage Amounts defined in damage.h
|
||||
|
|
Loading…
Reference in a new issue