diff --git a/TODO b/TODO index 25f1133..8b13789 100644 --- a/TODO +++ b/TODO @@ -1,3 +1 @@ -* ScreenDescriptorBlock: init this somewhere before StartGame, seems to be - initialized in the menu code diff --git a/notes.txt b/notes.txt index f24bfcc..af4566f 100644 --- a/notes.txt +++ b/notes.txt @@ -5,7 +5,11 @@ win95/awtexld.hpp line 79: ======== Changed filenames: avp/win95/system.c (avp_load_rif calls) +and other places that forgot to be documented ======== is AvP.CurrentEnv and StartingEnv used? +Env_List can be removed ======== SCREENDESCRIPTORBLOCK.SDB_DiagonalWidth is unused +======== +movement.txt and genparam.txt code is unused diff --git a/src/avp/bh_gener.c b/src/avp/bh_gener.c index 446e1b3..3e6fc30 100644 --- a/src/avp/bh_gener.c +++ b/src/avp/bh_gener.c @@ -40,7 +40,6 @@ static int TypeOfNPCGenerated; /* prototypes for this file */ static void ResetGeneratorTimer(GENERATOR_BLOCK *genBlock); -static void InitGeneratorTimer(GENERATOR_BLOCK *genBlock); static void ResetHiveStateTime(void); int NumNPCsFromThisGenerator(STRATEGYBLOCK* gen_sbptr); @@ -831,7 +830,7 @@ int NumNPCsFromThisGenerator(STRATEGYBLOCK* gen_sbptr) } break; - //default - do nothing + default: // - do nothing } } diff --git a/src/avp/bh_light.c b/src/avp/bh_light.c index c38abb7..497212a 100644 --- a/src/avp/bh_light.c +++ b/src/avp/bh_light.c @@ -533,10 +533,10 @@ void SendRequestToPlacedLight(STRATEGYBLOCK* sbptr,BOOL state,int extended_data) { if(extended_data & (LightRequest_AdjustType_Standard|LightRequest_AdjustType_Flicker)) { - //changing state , try to preserve strobe timer + /* changing state, try to preserve strobe timer */ switch(pl_bhv->state) { - //lack of break's intended + /* lack of break's intended */ case Light_State_StrobeUpDelay: pl_bhv->timer+=pl_bhv->fade_up_time; @@ -545,6 +545,8 @@ void SendRequestToPlacedLight(STRATEGYBLOCK* sbptr,BOOL state,int extended_data) case Light_State_StrobeDownDelay: pl_bhv->timer+=pl_bhv->fade_down_time; + + default: } } diff --git a/src/avp/bh_pargen.c b/src/avp/bh_pargen.c index 1c2b890..3f8cb43 100644 --- a/src/avp/bh_pargen.c +++ b/src/avp/bh_pargen.c @@ -227,7 +227,8 @@ void ParticleGeneratorBehaveFun(STRATEGYBLOCK* sbptr) } } break; - + + default: } } diff --git a/src/avp/bh_queen.c b/src/avp/bh_queen.c index df10737..c3f6ab5 100644 --- a/src/avp/bh_queen.c +++ b/src/avp/bh_queen.c @@ -3826,7 +3826,7 @@ void QueenBehaviour(STRATEGYBLOCK *sbPtr) textprint("Queen climbing out of airlock\n"); break; - + default: } } textprint("Queen Bias - Object %d Player %d\n",queenStatusPointer->QueenObjectBias,queenStatusPointer->QueenPlayerBias); diff --git a/src/avp/bh_track.c b/src/avp/bh_track.c index 2ba7877..6ee629b 100644 --- a/src/avp/bh_track.c +++ b/src/avp/bh_track.c @@ -266,6 +266,8 @@ void TrackObjectBehaveFun(STRATEGYBLOCK* sbptr) to_bhv->request=track_no_request; } break; + + default: } if(!track->playing) return; diff --git a/src/avp/bh_types.c b/src/avp/bh_types.c index 1bcf185..0d35df0 100644 --- a/src/avp/bh_types.c +++ b/src/avp/bh_types.c @@ -2459,9 +2459,7 @@ void RequestState(STRATEGYBLOCK* sbptr, int message, STRATEGYBLOCK * SBRequester lfxbb->current_state = LFXS_Flicking; } break; - - - + default: } } diff --git a/src/avp/game.c b/src/avp/game.c index 10e0ddf..6467de4 100644 --- a/src/avp/game.c +++ b/src/avp/game.c @@ -36,23 +36,13 @@ #define UseLocalAssert Yes #include "ourasert.h" -/* KJL 09:47:33 03/19/97 - vision stuff for marine and predator. -Currently PC only because it will probably be implemented in a completely -different way on the consoles, so I won't worry the PSX guys for now. -*/ -#if SupportWindows95 - #include "vision.h" #include "cheat.h" #include "pldnet.h" -#endif - -#if SupportWindows95 || Saturn #include "kshape.h" #include "krender.h" -#endif /* KJL 16:00:13 11/22/96 - One of my evil experiments.... */ #define PENTIUM_PROFILING_ON 0 @@ -76,14 +66,8 @@ different way on the consoles, so I won't worry the PSX guys for now. Extern Engine Varibles ******************/ -extern void (*UpdateScreen[]) (void); extern int VideoMode; -#if PSX -#else -extern void (*SetVideoMode[]) (void); -#endif - extern int FrameRate; extern int NormalFrameTime; extern int FrameRate; @@ -242,25 +226,12 @@ void StartGame(void) InitialiseSfxBlocks(); InitialiseLightElementSystem(); - #if PSX - { - extern int RedOut; - RedOut=0; - } - #endif AvP.DestructTimer=-1; // DHM 18/11/97: I've put hooks for screen mode changes here for the moment: DAVEHOOK_ScreenModeChange_Setup(); DAVEHOOK_ScreenModeChange_Cleanup(); - /* KJL 11:46:42 30/03/98 - I thought it'd be nice to display the version details - when you start a game */ - #if PREDATOR_DEMO||MARINE_DEMO||ALIEN_DEMO - #else -// GiveVersionDetails(); - #endif - #if MIRRORING_ON if(Current_Level_Requires_Mirror_Image()) { @@ -455,10 +426,6 @@ void UpdateGame(void) HandleCheatModes(); #endif - #if PSX - HandleCheatModes(); - #endif - /*------------Patrick 1/6/97--------------- New sound system -------------------------------------------*/ diff --git a/src/avp/game_statistics.c b/src/avp/game_statistics.c index d4de953..a2725de 100644 --- a/src/avp/game_statistics.c +++ b/src/avp/game_statistics.c @@ -46,8 +46,7 @@ extern void DoStatisticsScreen(int completed_level); AvP_GameStats_Stored DefaultLevelGameStats = { {0,0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0}, /* Trophies */ - {0,0,0,0,0,0,0,0,0,0}, /* LiveHeadBites */ + {0,0,0,0,0,0,0,0,0,0}, /* TrophiesOrLiveHeadBites */ {0,0,0,0,0,0,0,0,0,0}, 10000, 0, @@ -829,7 +828,8 @@ extern void CurrentGameStats_CreatureKilled(STRATEGYBLOCK *sbPtr,SECTION_DATA *s CurrentGameStatistics.Killed[STATS_VICTIM_PREDATOR]++; break; } - + + default: } } @@ -1169,8 +1169,8 @@ extern void DoStatisticsScreen(int completed_level) { if ((CurrentGameStatistics.Killed[i]) ||(LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.Killed[i]>-1) - ||((AvP.PlayerType==I_Predator)&&(LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.Trophies[i]>-1)) - ||((AvP.PlayerType==I_Alien)&&(LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.LiveHeadBites[i]>-1)) + ||((AvP.PlayerType==I_Predator)&&(LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]>-1)) + ||((AvP.PlayerType==I_Alien)&&(LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]>-1)) ||((AvP.PlayerType==I_Alien)&&(LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.DeadHeadBites[i]>-1)) ) { if ((completed_level)&&(level_numPersonalBests[AvP.Difficulty][level_num].Trophies[i]<=CurrentGameStatistics.Trophies[i]) { - UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].Trophies[i]=CurrentGameStatistics.Trophies[i]; + if (UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].TrophiesOrLiveHeadBites[i]<=CurrentGameStatistics.Trophies[i]) { + UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].TrophiesOrLiveHeadBites[i]=CurrentGameStatistics.Trophies[i]; colour_to_draw=COLOUR_GREEN; } } @@ -1249,7 +1249,7 @@ extern void DoStatisticsScreen(int completed_level) if ((level_numPersonalBests[AvP.Difficulty][level_num].Trophies[i] + UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].TrophiesOrLiveHeadBites[i] ); RenderStringCentred(buffer,TABPOINT3,y,colour_to_draw); } else { @@ -1259,9 +1259,9 @@ extern void DoStatisticsScreen(int completed_level) colour_to_draw=COLOUR_WHITE; if ((completed_level)&&(level_num-1) { + if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]>-1) { targets++; - if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.Trophies[i]<=CurrentGameStatistics.Trophies[i]) { + if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]<=CurrentGameStatistics.Trophies[i]) { colour_to_draw=COLOUR_RED; targetspassed++; } @@ -1269,9 +1269,9 @@ extern void DoStatisticsScreen(int completed_level) } if ((level_numCheatMode[LevelStatsTargets[AvP.Difficulty][level_num].CheatModeToActivate]!=1) { - if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.Trophies[i]>-1) { + if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]>-1) { sprintf(buffer,"%d", - LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.Trophies[i] + LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i] ); RenderStringCentred(buffer,TABPOINT4,y,colour_to_draw); } else { @@ -1299,8 +1299,8 @@ extern void DoStatisticsScreen(int completed_level) if ((completed_level)&&(level_numPersonalBests[AvP.Difficulty][level_num].LiveHeadBites[i]<=CurrentGameStatistics.LiveHeadBites[i]) { - UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].LiveHeadBites[i]=CurrentGameStatistics.LiveHeadBites[i]; + if (UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].TrophiesOrLiveHeadBites[i]<=CurrentGameStatistics.LiveHeadBites[i]) { + UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].TrophiesOrLiveHeadBites[i]=CurrentGameStatistics.LiveHeadBites[i]; colour_to_draw=COLOUR_GREEN; } } @@ -1313,7 +1313,7 @@ extern void DoStatisticsScreen(int completed_level) if ((level_numPersonalBests[AvP.Difficulty][level_num].LiveHeadBites[i] + UserProfilePtr->PersonalBests[AvP.Difficulty][level_num].TrophiesOrLiveHeadBites[i] ); RenderStringCentred(buffer,TABPOINT3,y,colour_to_draw); } else { @@ -1323,9 +1323,9 @@ extern void DoStatisticsScreen(int completed_level) colour_to_draw=COLOUR_WHITE; if ((completed_level)&&(level_num-1) { + if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]>-1) { targets++; - if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.LiveHeadBites[i]<=CurrentGameStatistics.LiveHeadBites[i]) { + if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]<=CurrentGameStatistics.LiveHeadBites[i]) { colour_to_draw=COLOUR_RED; targetspassed++; } @@ -1333,9 +1333,9 @@ extern void DoStatisticsScreen(int completed_level) } if ((level_numCheatMode[LevelStatsTargets[AvP.Difficulty][level_num].CheatModeToActivate]!=1) { - if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.LiveHeadBites[i]>-1) { + if (LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i]>-1) { sprintf(buffer,"%d", - LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.LiveHeadBites[i] + LevelStatsTargets[AvP.Difficulty][level_num].StatTargets.TrophiesOrLiveHeadBites[i] ); RenderStringCentred(buffer,TABPOINT4,y,colour_to_draw); } else { diff --git a/src/avp/game_statistics.h b/src/avp/game_statistics.h index 1381dae..e8372a0 100644 --- a/src/avp/game_statistics.h +++ b/src/avp/game_statistics.h @@ -53,8 +53,9 @@ typedef struct int Decapitated[STATS_VICTIM_MAXIMUM]; // union { - int Trophies[STATS_VICTIM_MAXIMUM]; - int LiveHeadBites[STATS_VICTIM_MAXIMUM]; + int TrophiesOrLiveHeadBites[STATS_VICTIM_MAXIMUM]; +// int Trophies[STATS_VICTIM_MAXIMUM]; +// int LiveHeadBites[STATS_VICTIM_MAXIMUM]; // }; int DeadHeadBites[STATS_VICTIM_MAXIMUM]; @@ -104,4 +105,4 @@ extern void InitialiseCurrentGameStatistics(void); } #endif -#endif \ No newline at end of file +#endif diff --git a/src/avp/hud.c b/src/avp/hud.c index 632f7d4..6f6f02a 100644 --- a/src/avp/hud.c +++ b/src/avp/hud.c @@ -2270,8 +2270,6 @@ int Fast3dMagnitude(VECTORCH *v) #define ZOOM_SCALE_2 0.1f #define ZOOM_SCALE_3 0.02f -static int CurrentCameraZoomLevel=0; - static float ZoomLevels[] = {1.0f,0.4f,0.1f,0.02f}; void MaintainZoomingLevel(void) diff --git a/src/avp/inventry.c b/src/avp/inventry.c index 220e384..cc3188f 100644 --- a/src/avp/inventry.c +++ b/src/avp/inventry.c @@ -155,7 +155,7 @@ void MaintainPlayersInventory(void) break; } - + default: } } } else if((collidedWith) && (collidedWith->I_SBtype == I_BehaviourNetGhost)) { diff --git a/src/avp/lighting.c b/src/avp/lighting.c index b73a70d..a98ec75 100644 --- a/src/avp/lighting.c +++ b/src/avp/lighting.c @@ -395,6 +395,7 @@ void MakeLightElement(VECTORCH *positionPtr, enum LIGHTELEMENT_BEHAVIOUR_ID beha lightElementPtr->LifeTime = 0; break; } + default: } } diff --git a/src/avp/los.c b/src/avp/los.c index bc929c7..48af5d8 100644 --- a/src/avp/los.c +++ b/src/avp/los.c @@ -129,8 +129,6 @@ extern DISPLAYBLOCK *ActiveBlockList[]; static VECTORCH *ViewpointDirectionPtr; static VECTORCH *ViewpointPositionPtr; -static int ObjectVisiblityTest(DISPLAYBLOCK *objectPtr,VECTORCH *positionPtr,int maxRange); - /*KJL**************************************************************************************** * CODE STARTS HERE! * diff --git a/src/avp/particle.c b/src/avp/particle.c index 0c941c9..dc3185b 100644 --- a/src/avp/particle.c +++ b/src/avp/particle.c @@ -1748,8 +1748,6 @@ void HandleParticleSystem(void) } case PARTICLE_FLARESMOKE: { - extern sine[],cosine[]; - // particlePtr->Position.vy -= MUL_FIXED(1000+(FastRandom()&511),NormalFrameTime); particlePtr->Position.vy += MUL_FIXED(particlePtr->Velocity.vy,NormalFrameTime); @@ -1816,8 +1814,6 @@ void HandleParticleSystem(void) } case PARTICLE_STEAM: { - extern sine[],cosine[]; - // particlePtr->Position.vy -= MUL_FIXED(1000+(FastRandom()&511),NormalFrameTime); particlePtr->Position.vy += MUL_FIXED(particlePtr->Velocity.vy,NormalFrameTime); @@ -1883,8 +1879,6 @@ void HandleParticleSystem(void) case PARTICLE_BLACKSMOKE: case PARTICLE_IMPACTSMOKE: { - extern sine[],cosine[]; - // particlePtr->Position.vy -= MUL_FIXED(1000+(FastRandom()&511),NormalFrameTime); particlePtr->Position.vy += MUL_FIXED(particlePtr->Velocity.vy,NormalFrameTime); @@ -1947,8 +1941,6 @@ void HandleParticleSystem(void) } case PARTICLE_GUNMUZZLE_SMOKE: { - extern sine[],cosine[]; - // particlePtr->Position.vy -= MUL_FIXED(1000+(FastRandom()&511),NormalFrameTime); particlePtr->Position.vy += MUL_FIXED(particlePtr->Velocity.vy,NormalFrameTime); #if 1 @@ -3780,10 +3772,8 @@ void HandleRainShaft(MODULE *modulePtr, int bottomY, int topY, int numberOfRaind } -#include void HandleRipples(void) { - extern int sine[]; int i; for(i=0; i NUM_SAVES_FOR_HARD_MODE) NumberOfSavesLeft = NUM_SAVES_FOR_HARD_MODE; break; - + default: } @@ -1043,7 +1043,8 @@ static void SaveStrategies() case I_BehaviourFrisbee : SaveStrategy_Frisbee(sbPtr); break; - + + default: } } @@ -1232,7 +1233,8 @@ static void LoadStrategy(SAVE_BLOCK_STRATEGY_HEADER* header) case I_BehaviourFrisbee : LoadStrategy_Frisbee(header); break; - + + default: } } @@ -1368,6 +1370,7 @@ extern void ResetNumberOfSaves() case I_Impossible : NumberOfSavesLeft = NUM_SAVES_FOR_HARD_MODE; break; - + + default: } -} \ No newline at end of file +} diff --git a/src/avp/weapons.c b/src/avp/weapons.c index a6f3a0b..dadd65f 100644 --- a/src/avp/weapons.c +++ b/src/avp/weapons.c @@ -83,7 +83,9 @@ * G L O B A L S * ****************************************************************************************KJL*/ +#if 0 static char tempstring[256]; +#endif static int WBStrikeTime=(ONE_FIXED>>1); static int ACStrikeTime=(ONE_FIXED/6); @@ -11216,6 +11218,8 @@ int FriendlyFireDamageFilter(DAMAGE_PROFILE *damage) { case AMMO_PRED_TROPHY_KILLSECTION: return(VulnerableToPredatorDamage); break; + + default: } return TRUE; diff --git a/src/avp/win95/frontend/avp_envinfo.c b/src/avp/win95/frontend/avp_envinfo.c index 326f75d..e22709f 100644 --- a/src/avp/win95/frontend/avp_envinfo.c +++ b/src/avp/win95/frontend/avp_envinfo.c @@ -210,10 +210,10 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O { { { /* Derelict / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -232,17 +232,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Colony / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -261,17 +261,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Invasion / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -290,17 +290,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Orbital / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -319,17 +319,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Tyrago / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -348,17 +348,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Hangar / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -377,17 +377,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Waterfall / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -406,17 +406,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Area52 / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -435,17 +435,17 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Vaults / Easy */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -464,10 +464,10 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ + CHEATMODE_NONACTIVE /* Cheat to activate */ }, { { /* Fury161 / Easy */ @@ -5091,10 +5091,10 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O }, { { /* E3DemoSP / Impossible */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures Killed */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Creatures decapitated*/ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Trophies / Live Head Bites */ - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,}, /* Dead Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures Killed */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Creatures decapitated*/ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Trophies / Live Head Bites */ + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, /* Dead Head Bites */ -1, /* Shots Fired */ -1, /* Accuracy */ -1, /* Spotted */ @@ -5113,12 +5113,12 @@ AvP_Level_Target_Desc LevelStatsTargets[I_MaxDifficulties][AVP_ENVIRONMENT_END_O 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0, - }, + 0,0,0,0,0,0,0,0,0,0 + } }, - CHEATMODE_NONACTIVE, /* Cheat to activate */ - }, -}, + CHEATMODE_NONACTIVE /* Cheat to activate */ + } +} }; diff --git a/src/avp/win95/objsetup.cpp b/src/avp/win95/objsetup.cpp index ffe3970..6e8c577 100644 --- a/src/avp/win95/objsetup.cpp +++ b/src/avp/win95/objsetup.cpp @@ -5,7 +5,6 @@ #endif #include -//#include #include "list_tem.hpp" #include "chnkload.hpp" @@ -477,6 +476,9 @@ static void select_alternate_location(BehaviourBlockData* bbd) part_temp->orientation=m; break; } + + default: + break; } } @@ -499,6 +501,8 @@ void create_strategies_from_list () case I_Impossible : if(!bbd->diff_hard) continue; break; + default: + break; } if(AvP.Network != I_No_Network && !AvP.NetworkAIServer) @@ -784,6 +788,9 @@ void deallocate_behaviour_list() } #endif //!NEW_DEALLOCATION_ORDER + + default: + break; } #if !USE_LEVEL_MEMORY_POOL diff --git a/src/avp/win95/vision.c b/src/avp/win95/vision.c index 1883664..5959f4a 100644 --- a/src/avp/win95/vision.c +++ b/src/avp/win95/vision.c @@ -220,6 +220,8 @@ extern void ChangePredatorVisionMode(void) CurrentVisionMode=VISION_MODE_NORMAL; break; } + default: + break; } Sound_Play(SID_VISION_ON,"h"); PredatorVisionChangeCounter=ONE_FIXED; diff --git a/src/version.c b/src/version.c index 0dcc229..2d2681b 100644 --- a/src/version.c +++ b/src/version.c @@ -1,15 +1,8 @@ -/* KJL 16:41:33 29/03/98 - not the most complicated code I've ever written... */ #include "version.h" -extern void NewOnScreenMessage(unsigned char *messagePtr); +extern void NewOnScreenMessage(unsigned char *messagePtr); void GiveVersionDetails(void) { - /* KJL 15:54:25 29/03/98 - give version details; this is not language localised since I thought that would be a little odd */ -// NewOnScreenMessage("ALIENS VS PREDATOR - DEATHMATCH DEMO V1.0 - REBELLION DEVELOPMENTS 1998/11/28"); -// NewOnScreenMessage("Aliens vs Predator - Alien Demo V1.3 - Rebellion Developments 1999/1/25"); -// NewOnScreenMessage("Aliens vs Predator - \n Build 103 \n Rebellion Developments 1999/7/13 \n (European Release)"); -// NewOnScreenMessage("Aliens vs Predator - \n Build 103 \n Rebellion Developments 1999/7/13 \n (American Release)"); - NewOnScreenMessage("Aliens vs Predator - Gold\n Build 116 \n Rebellion Developments 2000/16/3 \n"); //11:25 - + NewOnScreenMessage("Aliens vs Predator - Linux\n Build 000 \n Based on Rebellion Developments AvP Gold source \n"); } diff --git a/src/win95/plat_shp.h b/src/win95/plat_shp.h index c6551d8..ac5c45c 100644 --- a/src/win95/plat_shp.h +++ b/src/win95/plat_shp.h @@ -1,5 +1,9 @@ +#ifndef __WIN95_PLAT_SHP_H__ +#define __WIN95_PLAT_SHP_H__ + /* Plat_Shp.h */ +struct ColPolyTag; extern void SetupPolygonFlagAccessForShape(SHAPEHEADER *shape); extern int Request_PolyFlags(void *polygon); @@ -9,3 +13,5 @@ extern void AccessNextPolygon(void); extern void GetPolygonVertices(struct ColPolyTag *polyPtr); extern void GetPolygonNormal(struct ColPolyTag *polyPtr); extern int SetupPolygonAccessFromShapeIndex(int shapeIndex); + +#endif