adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the last vestiges of K&R function declarations, fixing more warnings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@845 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2003-03-03 02:05:39 +00:00
parent a7f4654e3b
commit 02839d47f8
46 changed files with 90 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/druuge/druugec.c
+1 -2
View File
@@ -135,8 +135,7 @@ static LOCDATA druuge_desc =
static COUNT SlaveryCount = 0; static COUNT SlaveryCount = 0;
static void static void
ExitConversation (Response) ExitConversation (RESPONSE_REF Response)
RESPONSE_REF Response;
{ {
if (PLAYER_SAID (Response, bye)) if (PLAYER_SAID (Response, bye))
{ {
sc2/src/sc2code/comm/ilwrath/ilwrathc.c
+1 -2
View File
@@ -83,8 +83,7 @@ static LOCDATA ilwrath_desc =
}; };
static void static void
CombatIsInevitable (Response) CombatIsInevitable (RESPONSE_REF Response)
RESPONSE_REF Response;
{ {
SET_GAME_STATE (BATTLE_SEGUE, 1); SET_GAME_STATE (BATTLE_SEGUE, 1);
sc2/src/sc2code/comm/spathi/spathic.c
+1 -2
View File
@@ -129,8 +129,7 @@ static LOCDATA spathi_desc =
}; };
static void static void
ExitConversation (Response) ExitConversation (RESPONSE_REF Response)
RESPONSE_REF Response;
{ {
SET_GAME_STATE (BATTLE_SEGUE, 0); SET_GAME_STATE (BATTLE_SEGUE, 0);
sc2/src/sc2code/comm/starbas/starbas.c
+1 -2
View File
@@ -136,8 +136,7 @@ static LOCDATA commander_desc =
static DWORD CurBulletinMask; static DWORD CurBulletinMask;
static void static void
ByeBye (R) ByeBye (RESPONSE_REF R)
RESPONSE_REF R;
{ {
BYTE b0, b1, b2, b3; BYTE b0, b1, b2, b3;
sc2/src/sc2code/commglue.c
+1 -1
View File
@@ -25,7 +25,7 @@
int NPCNumberPhrase (int number, UNICODE **ptrack); int NPCNumberPhrase (int number, UNICODE **ptrack);
void void
NPCPhrase_cb (int index, void (*cb) ()) NPCPhrase_cb (int index, void (*cb) (void))
{ {
UNICODE *pStr, numbuf[100]; UNICODE *pStr, numbuf[100];
void *pClip, *pTimeStamp; void *pClip, *pTimeStamp;
sc2/src/sc2code/commglue.h
+1 -1
View File
@@ -55,7 +55,7 @@ extern void DoResponsePhrase (RESPONSE_REF R, RESPONSE_FUNC
response_func, UNICODE *ContstructStr); response_func, UNICODE *ContstructStr);
extern void DoNPCPhrase (UNICODE *pStr); extern void DoNPCPhrase (UNICODE *pStr);
extern void NPCPhrase_cb (int index, void (*cb) ()); extern void NPCPhrase_cb (int index, void (*cb) (void));
#define NPCPhrase(index) NPCPhrase_cb ((index), NULL) #define NPCPhrase(index) NPCPhrase_cb ((index), NULL)
extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1); extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1);
sc2/src/sc2code/libs/decomp/lzencode.c
+1 -1
View File
@@ -295,7 +295,7 @@ UninitTree (void)
} }
static void static void
_encode_cleanup () _encode_cleanup (void)
{ {
UWORD r, s, last_match_length, len; UWORD r, s, last_match_length, len;
sc2/src/sc2code/libs/graphics/sdl/bbox.c
+1 -1
View File
@@ -4,7 +4,7 @@
TFB_BoundingBox TFB_BBox; TFB_BoundingBox TFB_BBox;
void void
TFB_BBox_Reset () TFB_BBox_Reset (void)
{ {
TFB_BBox.valid = 0; TFB_BBox.valid = 0;
TFB_BBox.clip.corner.x = 0; TFB_BBox.clip.corner.x = 0;
sc2/src/sc2code/libs/graphics/sdl/bbox.h
+1 -1
View File
@@ -24,7 +24,7 @@ void TFB_BBox_RegisterPoint (int x, int y);
void TFB_BBox_RegisterRect (PRECT r); void TFB_BBox_RegisterRect (PRECT r);
void TFB_BBox_RegisterCanvas (TFB_Canvas c, int x, int y); void TFB_BBox_RegisterCanvas (TFB_Canvas c, int x, int y);
void TFB_BBox_Reset (); void TFB_BBox_Reset (void);
void TFB_BBox_GetClipRect (TFB_Canvas c); void TFB_BBox_GetClipRect (TFB_Canvas c);
#endif #endif
sc2/src/sc2code/libs/graphics/sdl/opengl.c
+1 -1
View File
@@ -46,7 +46,7 @@ static BOOLEAN upload_transitiontexture = FALSE;
static SDL_Surface * static SDL_Surface *
Create_Screen () Create_Screen (void)
{ {
SDL_Surface *result = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 32, SDL_Surface *result = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 32,
R_MASK, G_MASK, B_MASK, 0x00000000); R_MASK, G_MASK, B_MASK, 0x00000000);
sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+1 -1
View File
@@ -390,7 +390,7 @@ void TFB_BlitSurface (SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
} }
void void
TFB_ComputeFPS () TFB_ComputeFPS (void)
{ {
static Uint32 last_time = 0, fps_counter = 0; static Uint32 last_time = 0, fps_counter = 0;
Uint32 current_time, delta_time; Uint32 current_time, delta_time;
sc2/src/sc2code/libs/math/fastrand.c
+4 -4
View File
@@ -27,8 +27,8 @@ COUNT fast_index = 0; /* fast random cycling index */
/* ----------------------------PROTOTYPES--------------------------------- */ /* ----------------------------PROTOTYPES--------------------------------- */
DWORD indexed_random_table(COUNT index); DWORD indexed_random_table(COUNT index);
void reseed_fast_random(); void reseed_fast_random(void);
DWORD fast_random(); DWORD fast_random(void);
DWORD seed_fast_random(DWORD seed); DWORD seed_fast_random(DWORD seed);
/***************************************************************************** /*****************************************************************************
@@ -72,7 +72,7 @@ seed_fast_random(DWORD seed)
*****************************************************************************/ *****************************************************************************/
DWORD DWORD
fast_random() fast_random(void)
{ {
fast_index++; fast_index++;
if( fast_index == TABLE_SIZE ) if( fast_index == TABLE_SIZE )
@@ -93,7 +93,7 @@ fast_random()
*****************************************************************************/ *****************************************************************************/
void void
reseed_fast_random() reseed_fast_random(void)
{ {
fast_index = (COUNT)(TFB_Random() % TABLE_SIZE); fast_index = (COUNT)(TFB_Random() % TABLE_SIZE);
sc2/src/sc2code/libs/sound/sfx.c
+2 -2
View File
@@ -21,7 +21,7 @@
#include "sound.h" #include "sound.h"
static void CheckFinishedChannels (); static void CheckFinishedChannels (void);
void void
@@ -46,7 +46,7 @@ StopChannel (COUNT channel, unsigned char Priority)
} }
static void static void
CheckFinishedChannels () CheckFinishedChannels (void)
{ {
int i; int i;
sc2/src/sc2code/libs/sound/sound.h
+1 -1
View File
@@ -40,7 +40,7 @@ typedef struct
int type; int type;
uint32 value; uint32 value;
void *data; void *data;
void (*callback) (); void (*callback) (void);
} TFB_SoundTag; } TFB_SoundTag;
enum enum
sc2/src/sc2code/libs/sound/trackplayer.c
+1 -1
View File
@@ -373,7 +373,7 @@ SpliceMultiTrack (UNICODE *TrackNames[], UNICODE *TrackText)
} }
void void
SpliceTrack (UNICODE *TrackName, UNICODE *TrackText, UNICODE *TimeStamp, void (*cb) ()) SpliceTrack (UNICODE *TrackName, UNICODE *TrackText, UNICODE *TimeStamp, void (*cb) (void))
{ {
unsigned long startTime; unsigned long startTime;
UNICODE **split_text = NULL; UNICODE **split_text = NULL;
sc2/src/sc2code/libs/sound/trackplayer.h
+10 -10
View File
@@ -21,16 +21,16 @@
#define ACCEL_SCROLL_SPEED 30 #define ACCEL_SCROLL_SPEED 30
void ResumeTrack(); void ResumeTrack(void);
void PauseTrack(); void PauseTrack(void);
COUNT PlayingTrack(); COUNT PlayingTrack(void);
void JumpTrack(); void JumpTrack(void);
void FastForward_Smooth(); void FastForward_Smooth(void);
void FastForward_Page(); void FastForward_Page(void);
void FastReverse_Smooth(); void FastReverse_Smooth(void);
void FastReverse_Page(); void FastReverse_Page(void);
void StopTrack(); void StopTrack(void);
void SpliceTrack(UNICODE *filespec, UNICODE *textspec, UNICODE *TimeStamp, void (*cb) ()); void SpliceTrack(UNICODE *filespec, UNICODE *textspec, UNICODE *TimeStamp, void (*cb) (void));
void SpliceMultiTrack (UNICODE *TrackNames[], UNICODE *TrackText); void SpliceMultiTrack (UNICODE *TrackNames[], UNICODE *TrackText);
int GetSoundData (void *data); int GetSoundData (void *data);
int GetSoundInfo (int max_len); int GetSoundInfo (int max_len);
sc2/src/sc2code/planets/plangen.c
+1 -1
View File
@@ -475,7 +475,7 @@ SetPlanetTilt (int angle)
#define SHIELD_RADIUS (RADIUS + 5) #define SHIELD_RADIUS (RADIUS + 5)
#define SHIELD_DIAM ((SHIELD_RADIUS << 1) + 1) #define SHIELD_DIAM ((SHIELD_RADIUS << 1) + 1)
#define SHIELD_RADIUS_2 (SHIELD_RADIUS * SHIELD_RADIUS) #define SHIELD_RADIUS_2 (SHIELD_RADIUS * SHIELD_RADIUS)
static void CreateShieldMask () static void CreateShieldMask (void)
{ {
DWORD rad2, clear, *rgba, *p_rgba, p; DWORD rad2, clear, *rgba, *p_rgba, p;
sc2/src/sc2code/planets/report.c
+1 -1
View File
@@ -27,7 +27,7 @@
extern FRAME SpaceJunkFrame; extern FRAME SpaceJunkFrame;
static void static void
ClearReportArea () ClearReportArea (void)
{ {
COUNT i; COUNT i;
RECT r; RECT r;
sc2/src/sc2code/setup.c
+1 -1
View File
@@ -275,7 +275,7 @@ LoadKeyConfig (FILE *fp, DWORD length)
} }
static void static void
initKeyConfig() { initKeyConfig(void) {
char userFile[PATH_MAX]; /* System-wide key config */ char userFile[PATH_MAX]; /* System-wide key config */
FILE *fp; FILE *fp;
int cb; int cb;
sc2/src/sc2code/ships/androsyn/androsyn.c
+2 -5
View File
@@ -214,10 +214,7 @@ initialize_bubble (PELEMENT ShipPtr, HELEMENT BubbleArray[])
} }
static void static void
androsynth_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) androsynth_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -456,7 +453,7 @@ androsynth_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_androsynth () init_androsynth (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/blackurq/blackurq.c
+4 -10
View File
@@ -108,8 +108,7 @@ static RACE_DESC black_urquan_desc =
#define MAX_SAWS 8 #define MAX_SAWS 8
static void static void
spin_preprocess (ElementPtr) spin_preprocess (PELEMENT ElementPtr)
PELEMENT ElementPtr;
{ {
ELEMENTPTR ShipPtr; ELEMENTPTR ShipPtr;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -342,10 +341,7 @@ initialize_buzzsaw (PELEMENT ShipPtr, HELEMENT SawArray[])
} }
static void static void
black_urquan_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) black_urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -458,8 +454,7 @@ gas_cloud_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PP
} }
static void static void
spawn_gas_cloud (ElementPtr) spawn_gas_cloud (PELEMENT ElementPtr)
PELEMENT ElementPtr;
{ {
#define GAS_SPEED 16 #define GAS_SPEED 16
#define GAS_HITS 100 #define GAS_HITS 100
@@ -545,7 +540,7 @@ black_urquan_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_black_urquan () init_black_urquan (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
@@ -560,4 +555,3 @@ init_black_urquan ()
return (RaceDescPtr); return (RaceDescPtr);
} }
sc2/src/sc2code/ships/chenjesu/chenjesu.c
+3 -7
View File
@@ -330,8 +330,7 @@ doggy_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT
#define CHENJESU_OFFSET 16 #define CHENJESU_OFFSET 16
static void static void
spawn_doggy (ElementPtr) spawn_doggy (PELEMENT ElementPtr)
PELEMENT ElementPtr;
{ {
HELEMENT hDoggyElement; HELEMENT hDoggyElement;
@@ -379,10 +378,7 @@ PELEMENT ElementPtr;
} }
static void static void
chenjesu_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) chenjesu_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -565,7 +561,7 @@ chenjesu_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_chenjesu () init_chenjesu (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/chmmr/chmmr.c
+2 -5
View File
@@ -242,10 +242,7 @@ initialize_megawatt_laser (PELEMENT ShipPtr, HELEMENT LaserArray[])
} }
static void static void
chmmr_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) chmmr_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
@@ -742,7 +739,7 @@ chmmr_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_chmmr () init_chmmr (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/druuge/druuge.c
+2 -5
View File
@@ -183,10 +183,7 @@ initialize_cannon (PELEMENT ShipPtr, HELEMENT CannonArray[])
} }
static void static void
druuge_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) druuge_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
UWORD ship_flags; UWORD ship_flags;
STARSHIPPTR StarShipPtr, EnemyStarShipPtr; STARSHIPPTR StarShipPtr, EnemyStarShipPtr;
@@ -300,7 +297,7 @@ druuge_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_druuge () init_druuge (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/human/human.c
+2 -5
View File
@@ -291,10 +291,7 @@ initialize_nuke (PELEMENT ShipPtr, HELEMENT NukeArray[])
} }
static void static void
human_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) human_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -335,7 +332,7 @@ human_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_human () init_human (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/ilwrath/ilwrath.c
+2 -5
View File
@@ -125,10 +125,7 @@ flame_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT
} }
static void static void
ilwrath_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) ilwrath_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -359,7 +356,7 @@ ilwrath_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_ilwrath () init_ilwrath (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/lastbat/lastbat.c
+2 -5
View File
@@ -663,10 +663,7 @@ sentinel_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPO
} }
static void static void
samatra_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) samatra_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter); ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter);
} }
@@ -886,7 +883,7 @@ samatra_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_samatra () init_samatra (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/melnorme/melnorme.c
+2 -5
View File
@@ -537,10 +537,7 @@ initialize_test_pump_up (PELEMENT ShipPtr, HELEMENT PumpUpArray[])
} }
static void static void
melnorme_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) melnorme_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
COUNT old_count; COUNT old_count;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -638,7 +635,7 @@ melnorme_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_melnorme () init_melnorme (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c
+2 -5
View File
@@ -144,10 +144,7 @@ missile_preprocess (PELEMENT ElementPtr)
} }
static void static void
mmrnmhrm_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) mmrnmhrm_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
BOOLEAN CanTransform; BOOLEAN CanTransform;
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
@@ -452,7 +449,7 @@ mmrnmhrm_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_mmrnmhrm () init_mmrnmhrm (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/mycon/mycon.c
+2 -5
View File
@@ -218,10 +218,7 @@ plasma_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN
} }
static void static void
mycon_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) mycon_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
@@ -354,7 +351,7 @@ mycon_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_mycon () init_mycon (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/orz/orz.c
+2 -5
View File
@@ -217,10 +217,7 @@ count_marines (STARSHIPPTR StarShipPtr, BOOLEAN FindSpot)
} }
static void static void
orz_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) orz_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
ELEMENTPTR TurretPtr; ELEMENTPTR TurretPtr;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -1059,7 +1056,7 @@ orz_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_orz () init_orz (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/pkunk/pkunk.c
+2 -5
View File
@@ -174,10 +174,7 @@ initialize_bug_missile (PELEMENT ShipPtr, HELEMENT MissileArray[])
static HELEMENT hPhoenix = 0; static HELEMENT hPhoenix = 0;
static void static void
pkunk_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) pkunk_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -545,7 +542,7 @@ PELEMENT ElementPtr;
} }
RACE_DESCPTR RACE_DESCPTR
init_pkunk () init_pkunk (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/probe/probe.c
+1 -1
View File
@@ -101,7 +101,7 @@ static RACE_DESC probe_desc =
}; };
RACE_DESCPTR RACE_DESCPTR
init_probe () init_probe (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/shofixti/shofixti.c
+2 -5
View File
@@ -300,10 +300,7 @@ self_destruct (PELEMENT ElementPtr)
} }
static void static void
shofixti_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) shofixti_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -356,7 +353,7 @@ shofixti_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_shofixti () init_shofixti (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/sis_ship/sis_ship.c
+2 -5
View File
@@ -658,10 +658,7 @@ initialize_blasters (PELEMENT ShipPtr, HELEMENT BlasterArray[])
} }
static void static void
sis_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) sis_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -733,7 +730,7 @@ COUNT ConcernCounter;
} }
RACE_DESCPTR RACE_DESCPTR
init_sis () init_sis (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/slylandr/slylandr.c
+3 -8
View File
@@ -243,10 +243,7 @@ initialize_lightning (PELEMENT ElementPtr, HELEMENT LaserArray[])
} }
static void static void
slylandro_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) slylandro_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -286,8 +283,7 @@ COUNT ConcernCounter;
} }
static BOOLEAN static BOOLEAN
harvest_space_junk (ElementPtr) harvest_space_junk (PELEMENT ElementPtr)
PELEMENT ElementPtr;
{ {
BOOLEAN retval; BOOLEAN retval;
HELEMENT hElement, hNextElement; HELEMENT hElement, hNextElement;
@@ -412,7 +408,7 @@ slylandro_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_slylandro () init_slylandro (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
@@ -427,4 +423,3 @@ init_slylandro ()
return (RaceDescPtr); return (RaceDescPtr);
} }
sc2/src/sc2code/ships/spathi/spathi.c
+3 -8
View File
@@ -132,8 +132,7 @@ butt_missile_preprocess (PELEMENT ElementPtr)
} }
static void static void
spawn_butt_missile (ShipPtr) spawn_butt_missile (PELEMENT ShipPtr)
PELEMENT ShipPtr;
{ {
#define SPATHI_REAR_OFFSET 20 #define SPATHI_REAR_OFFSET 20
#define DISCRIMINATOR_LIFE 30 #define DISCRIMINATOR_LIFE 30
@@ -173,10 +172,7 @@ PELEMENT ShipPtr;
} }
static void static void
spathi_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) spathi_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
@@ -277,7 +273,7 @@ spathi_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_spathi () init_spathi (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
@@ -291,4 +287,3 @@ init_spathi ()
return (RaceDescPtr); return (RaceDescPtr);
} }
sc2/src/sc2code/ships/supox/supox.c
+2 -5
View File
@@ -103,10 +103,7 @@ static RACE_DESC supox_desc =
}; };
static void static void
supox_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) supox_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
@@ -261,7 +258,7 @@ supox_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_supox () init_supox (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/syreen/syreen.c
+2 -5
View File
@@ -211,10 +211,7 @@ spawn_crew (PELEMENT ElementPtr)
} }
static void static void
syreen_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) syreen_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
@@ -259,7 +256,7 @@ syreen_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_syreen () init_syreen (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/thradd/thradd.c
+2 -6
View File
@@ -104,10 +104,7 @@ static RACE_DESC thraddash_desc =
}; };
static void static void
thraddash_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) thraddash_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -367,7 +364,7 @@ thraddash_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_thraddash () init_thraddash (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
@@ -381,4 +378,3 @@ init_thraddash ()
return (RaceDescPtr); return (RaceDescPtr);
} }
sc2/src/sc2code/ships/umgah/umgah.c
+2 -5
View File
@@ -133,10 +133,7 @@ cone_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT
#define JUMP_DIST DISPLAY_TO_WORLD (40) #define JUMP_DIST DISPLAY_TO_WORLD (40)
static void static void
umgah_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) umgah_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr, EnemyStarShipPtr; STARSHIPPTR StarShipPtr, EnemyStarShipPtr;
@@ -352,7 +349,7 @@ umgah_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_umgah () init_umgah (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/urquan/urquan.c
+3 -7
View File
@@ -376,8 +376,7 @@ fighter_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI
} }
static void static void
spawn_fighters (ElementPtr) spawn_fighters (PELEMENT ElementPtr)
PELEMENT ElementPtr;
{ {
SIZE i; SIZE i;
COUNT facing; COUNT facing;
@@ -450,10 +449,7 @@ PELEMENT ElementPtr;
} }
static void static void
urquan_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
PEVALUATE_DESC lpEvalDesc; PEVALUATE_DESC lpEvalDesc;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -525,7 +521,7 @@ urquan_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_urquan () init_urquan (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/utwig/utwig.c
+2 -5
View File
@@ -176,10 +176,7 @@ initialize_lance (PELEMENT ShipPtr, HELEMENT WeaponArray[])
} }
static void static void
utwig_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) utwig_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
SIZE ShieldStatus; SIZE ShieldStatus;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -352,7 +349,7 @@ utwig_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_utwig () init_utwig (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/ships/yehat/yehat.c
+2 -6
View File
@@ -142,10 +142,7 @@ initialize_standard_missiles (PELEMENT ShipPtr, HELEMENT MissileArray[])
} }
static void static void
yehat_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) yehat_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
SIZE ShieldStatus; SIZE ShieldStatus;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -345,7 +342,7 @@ yehat_preprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_yehat () init_yehat (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
@@ -360,4 +357,3 @@ init_yehat ()
return (RaceDescPtr); return (RaceDescPtr);
} }
sc2/src/sc2code/ships/zoqfot/zoqfot.c
+2 -5
View File
@@ -252,10 +252,7 @@ PELEMENT ElementPtr;
} }
static void static void
zoqfotpik_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter) zoqfotpik_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
PELEMENT ShipPtr;
PEVALUATE_DESC ObjectsOfConcern;
COUNT ConcernCounter;
{ {
BOOLEAN GiveTongueJob; BOOLEAN GiveTongueJob;
STARSHIPPTR StarShipPtr; STARSHIPPTR StarShipPtr;
@@ -348,7 +345,7 @@ zoqfotpik_postprocess (PELEMENT ElementPtr)
} }
RACE_DESCPTR RACE_DESCPTR
init_zoqfotpik () init_zoqfotpik (void)
{ {
RACE_DESCPTR RaceDescPtr; RACE_DESCPTR RaceDescPtr;
sc2/src/sc2code/sis.c
+1 -1
View File
@@ -675,7 +675,7 @@ GetGaugeRect (PRECT pRect, BOOLEAN IsCrewRect)
pRect->corner.y = IsCrewRect ? 117 : 38; pRect->corner.y = IsCrewRect ? 117 : 38;
} }
void DrawPC_SIS () void DrawPC_SIS (void)
{ {
TEXT t; TEXT t;
RECT r; RECT r;