From 9b449609fac7b23f2f9655ce2d766f1f56679ba4 Mon Sep 17 00:00:00 2001 From: Steven Fuller Date: Sun, 4 May 2008 15:17:55 -0700 Subject: [PATCH] Removed SupportWindows95 and platform_pc macros. --- src/avp/avpview.c | 2 +- src/avp/bh_agun.c | 4 -- src/avp/bh_alien.c | 6 +- src/avp/bh_debri.c | 19 ++---- src/avp/bh_dummy.c | 2 - src/avp/bh_ldoor.c | 2 - src/avp/bh_lift.c | 3 - src/avp/bh_light.c | 3 +- src/avp/bh_marin.c | 2 - src/avp/bh_plachier.c | 3 +- src/avp/bh_plift.c | 10 --- src/avp/bh_pred.c | 2 - src/avp/bh_rubberduck.c | 3 +- src/avp/bh_spcl.c | 24 ++------ src/avp/bh_types.c | 11 +--- src/avp/bh_weap.c | 116 ++++++++--------------------------- src/avp/bh_weap.h | 7 +-- src/avp/bh_xeno.c | 2 - src/avp/bonusabilities.c | 3 +- src/avp/comp_map.c | 3 - src/avp/davehook.cpp | 4 -- src/avp/game.c | 10 --- src/avp/gamedef.h | 5 -- src/avp/hud.c | 2 - src/avp/inventry.c | 14 ++--- src/avp/language.c | 12 +--- src/avp/pheromon.c | 3 +- src/avp/player.c | 9 +-- src/avp/pmove.c | 18 ++---- src/avp/pvisible.c | 11 +--- src/avp/pvisible.h | 5 -- src/avp/support/rentrntq.cpp | 8 --- src/avp/targeting.c | 4 -- src/avp/triggers.c | 2 - src/avp/weapons.c | 16 +---- src/avp/win95/kzsort.c | 2 +- src/avp/win95/system.h | 2 - src/avp/win95/winmain.c | 2 - src/include/mem3dc.h | 6 -- src/include/module.h | 2 - src/include/prototyp.h | 8 --- src/include/shape.h | 11 +--- src/mem3dc.c | 8 +-- src/module.c | 2 - src/vdb.c | 14 +---- src/win95/platform.h | 2 - src/win95/plspecfn.c | 4 -- 47 files changed, 66 insertions(+), 347 deletions(-) diff --git a/src/avp/avpview.c b/src/avp/avpview.c index c2c72cd..e982476 100644 --- a/src/avp/avpview.c +++ b/src/avp/avpview.c @@ -724,7 +724,7 @@ void AvpShowViews(void) PlatformSpecificShowViewExit(Global_VDB_Ptr, &ScreenDescriptorBlock); - #if (SupportWindows95 && SupportZBuffering) + #if SupportZBuffering if ((ScanDrawMode != ScanDrawDirectDraw) && (ZBufferMode != ZBufferOff)) { /* KJL 10:25:44 7/23/97 - this offset is used to push back the normal game gfx, diff --git a/src/avp/bh_agun.c b/src/avp/bh_agun.c index dc84931..a06990b 100644 --- a/src/avp/bh_agun.c +++ b/src/avp/bh_agun.c @@ -51,11 +51,9 @@ #include "bh_dummy.h" #include "bh_corpse.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldghost.h" #include "pldnet.h" -#endif #define SENTRYGUN_DRAMA 0 @@ -719,7 +717,6 @@ int Autogun_TargetFilter(STRATEGYBLOCK *candidate) { case I_BehaviourXenoborg: return(1); break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -736,7 +733,6 @@ int Autogun_TargetFilter(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; diff --git a/src/avp/bh_alien.c b/src/avp/bh_alien.c index b06996e..ce74f89 100644 --- a/src/avp/bh_alien.c +++ b/src/avp/bh_alien.c @@ -1012,7 +1012,7 @@ void AlienBehaviour(STRATEGYBLOCK *sbPtr) if(sbPtr->SBdptr) { LOCALASSERT(ModuleCurrVisArray[(sbPtr->containingModule->m_index)]); - #if 0/*SupportWindows95 */ + #if 0 textprint("Near Alien in module %s \n",sbPtr->containingModule->name); #endif NearAlienBehaviour(sbPtr); @@ -1022,7 +1022,7 @@ void AlienBehaviour(STRATEGYBLOCK *sbPtr) { /* NB if this assert fires, we may just have run out of displayblocks */ LOCALASSERT(ModuleCurrVisArray[(sbPtr->containingModule->m_index)] == 0); - #if 0/*SupportWindows95 */ + #if 0 textprint("Far Alien in module %s \n",sbPtr->containingModule->name); #endif FarAlienBehaviour(sbPtr); @@ -2096,7 +2096,6 @@ int Alien_TargetFilter(STRATEGYBLOCK *candidate) { /* Valid. */ return(1); break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -2114,7 +2113,6 @@ int Alien_TargetFilter(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; diff --git a/src/avp/bh_debri.c b/src/avp/bh_debri.c index b3c1bf4..3872dc5 100644 --- a/src/avp/bh_debri.c +++ b/src/avp/bh_debri.c @@ -27,10 +27,9 @@ #include "weapons.h" #include "lighting.h" #include "sfx.h" -#if SupportWindows95 + /* for win95 net game support */ #include "pldghost.h" -#endif #include "avp_userprofile.h" #include "savegame.h" @@ -637,13 +636,9 @@ void MakeFragments (STRATEGYBLOCK * sbptr) VECTORCH diff; int massfact; - #if SupportWindows95 - int mslpos; - SHAPEFRAGMENT * frags; - SHAPEFRAGMENTDESC * fragdesc; - #else - int frags = 0; - #endif + int mslpos; + SHAPEFRAGMENT * frags; + SHAPEFRAGMENTDESC * fragdesc; if( (NumActiveBlocks > maxobjects-5) || (NumActiveStBlocks > maxstblocks-5)) @@ -662,9 +657,7 @@ void MakeFragments (STRATEGYBLOCK * sbptr) posPtr = &(sbptr->DynPtr->Position); - -#if SupportWindows95 - mmbptr = &TempModuleMap; + mmbptr = &TempModuleMap; mslpos = sbptr->shapeIndex; @@ -862,8 +855,6 @@ void MakeFragments (STRATEGYBLOCK * sbptr) frags++; } -#endif - } DISPLAYBLOCK *MakeHierarchicalDebris(STRATEGYBLOCK *parent_sbPtr,SECTION_DATA *root, VECTORCH *positionPtr, MATRIXCH *orientation, int *wounds, int speed) diff --git a/src/avp/bh_dummy.c b/src/avp/bh_dummy.c index 4fc2803..4b7737c 100644 --- a/src/avp/bh_dummy.c +++ b/src/avp/bh_dummy.c @@ -49,11 +49,9 @@ #include "psndplat.h" #include "extents.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldghost.h" #include "pldnet.h" -#endif extern int NormalFrameTime; extern unsigned char Null_Name[8]; diff --git a/src/avp/bh_ldoor.c b/src/avp/bh_ldoor.c index 9aa8ada..8c35485 100644 --- a/src/avp/bh_ldoor.c +++ b/src/avp/bh_ldoor.c @@ -33,10 +33,8 @@ #include "psnd.h" #include "savegame.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldghost.h" -#endif extern int NormalFrameTime; diff --git a/src/avp/bh_lift.c b/src/avp/bh_lift.c index b674788..f8cdaa9 100644 --- a/src/avp/bh_lift.c +++ b/src/avp/bh_lift.c @@ -29,11 +29,8 @@ #include "psnd.h" - -#if SupportWindows95 /* for win95 net game support */ #include "pldghost.h" -#endif extern int NormalFrameTime; // stuff for environment changing diff --git a/src/avp/bh_light.c b/src/avp/bh_light.c index 6aacf43..939f84c 100644 --- a/src/avp/bh_light.c +++ b/src/avp/bh_light.c @@ -338,9 +338,8 @@ void MakePlacedLightNear(STRATEGYBLOCK *sbPtr) tempModule.m_lightarray = pl_bhv->light; tempModule.m_extraitemdata = (struct extraitemdata *)0; tempModule.m_dptr = NULL; /* this is important */ - #if SupportWIndows95 tempModule.name = NULL; /* this is important */ - #endif + AllocateModuleObject(&tempModule); dPtr = tempModule.m_dptr; if(dPtr==NULL) return; /* cannot create displayblock, so leave object "far" */ diff --git a/src/avp/bh_marin.c b/src/avp/bh_marin.c index f67c266..8befd1c 100644 --- a/src/avp/bh_marin.c +++ b/src/avp/bh_marin.c @@ -11176,7 +11176,6 @@ int Marine_TargetFilter(STRATEGYBLOCK *candidate) { return(0); #endif break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -11194,7 +11193,6 @@ int Marine_TargetFilter(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; diff --git a/src/avp/bh_plachier.c b/src/avp/bh_plachier.c index 32a663c..840ef95 100644 --- a/src/avp/bh_plachier.c +++ b/src/avp/bh_plachier.c @@ -101,9 +101,8 @@ void MakePlacedHierarchyNear(STRATEGYBLOCK* sbptr) tempModule.m_lightarray = (struct lightblock *)0; tempModule.m_extraitemdata = (struct extraitemdata *)0; tempModule.m_dptr = NULL; /* this is important */ - #if SupportWIndows95 tempModule.name = NULL; /* this is important */ - #endif + AllocateModuleObject(&tempModule); dPtr = tempModule.m_dptr; if(dPtr==NULL) return; /* cannot create displayblock, so leave object "far" */ diff --git a/src/avp/bh_plift.c b/src/avp/bh_plift.c index 8accdf4..8cf5343 100644 --- a/src/avp/bh_plift.c +++ b/src/avp/bh_plift.c @@ -18,11 +18,9 @@ #include "ourasert.h" #include "bh_plift.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldnet.h" #include "pldghost.h" -#endif /* prototypes for this file */ static int SquashingSomething(DYNAMICSBLOCK *dynPtr); @@ -83,10 +81,8 @@ void PlatformLiftBehaviour(STRATEGYBLOCK *sbPtr) } else { - #if SupportWindows95 LOCALASSERT(AvP.Network==I_Peer); if(ActivatedByPlayer(dynPtr)) AddNetMsg_RequestPlatformLiftActivate(sbPtr); - #endif } //textprint("Platform state: at rest\n"); break; @@ -223,7 +219,6 @@ void PlatformLiftBehaviour(STRATEGYBLOCK *sbPtr) //textprint("Platform pos: %d / %d / %d\n",platformliftdata->upHeight,dynPtr->Position.vy,platformliftdata->downHeight); /* send state messages in net game */ - #if SupportWindows95 if(AvP.Network==I_Host) { if(platformliftdata->netMsgCount>0) @@ -236,7 +231,6 @@ void PlatformLiftBehaviour(STRATEGYBLOCK *sbPtr) platformliftdata->netMsgCount--; } } - #endif } void InitialisePlatformLift(void* bhdata, STRATEGYBLOCK *sbPtr) @@ -510,7 +504,6 @@ static int PlayerIsNearOtherTerminal(STRATEGYBLOCK *sbPtr) the lift track...*/ static int NetPlayerAtOtherTerminal(STRATEGYBLOCK *sbPtr) { -#if SupportWindows95 extern int NumActiveStBlocks; extern STRATEGYBLOCK *ActiveStBlockList[]; @@ -563,9 +556,6 @@ static int NetPlayerAtOtherTerminal(STRATEGYBLOCK *sbPtr) } } return 0; -#else - return 0; -#endif } diff --git a/src/avp/bh_pred.c b/src/avp/bh_pred.c index ca1caed..2303442 100644 --- a/src/avp/bh_pred.c +++ b/src/avp/bh_pred.c @@ -5139,7 +5139,6 @@ int Predator_TargetFilter(STRATEGYBLOCK *candidate) { return(0); #endif break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -5157,7 +5156,6 @@ int Predator_TargetFilter(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; diff --git a/src/avp/bh_rubberduck.c b/src/avp/bh_rubberduck.c index 3e8cdba..62a5713 100644 --- a/src/avp/bh_rubberduck.c +++ b/src/avp/bh_rubberduck.c @@ -277,9 +277,8 @@ extern void CreateFlamingDebris(VECTORCH *positionPtr, VECTORCH *dirPtr) tempModule.m_lightarray = (struct lightblock *)0; tempModule.m_extraitemdata = (struct extraitemdata *)0; tempModule.m_dptr = NULL; /* this is important */ - #if SupportWIndows95 tempModule.name = NULL; /* this is important */ - #endif + AllocateModuleObject(&tempModule); dPtr = tempModule.m_dptr; if(dPtr==NULL) diff --git a/src/avp/bh_spcl.c b/src/avp/bh_spcl.c index ccc9efc..8c2ee21 100644 --- a/src/avp/bh_spcl.c +++ b/src/avp/bh_spcl.c @@ -103,7 +103,6 @@ void * InitXenoMorphRoom (void * bhdata, STRATEGYBLOCK * sbptr) // set up the animation control -#if SupportWindows95 { int item_num; TXACTRLBLK **pptxactrlblk; @@ -158,7 +157,6 @@ void * InitXenoMorphRoom (void * bhdata, STRATEGYBLOCK * sbptr) } *pptxactrlblk=0; } -#endif RequestFadeToBlackLevel = 0; @@ -344,12 +342,10 @@ void XenoMorphRoomBehaviour (STRATEGYBLOCK * sbptr) UpdateMorphing(mctrl); if(mctrl->ObMorphFlags & mph_flag_finished) { - #if SupportWindows95 d3d_light_ctrl.ctrl = LCCM_CONSTCOLOUR; d3d_light_ctrl.r = ONE_FIXED - RequestFadeToBlackLevel; d3d_light_ctrl.g = ONE_FIXED - RequestFadeToBlackLevel; d3d_light_ctrl.b = ONE_FIXED - RequestFadeToBlackLevel; - #endif xmrd->XMR_State = XMRS_FadeToBlack; } @@ -367,14 +363,11 @@ void XenoMorphRoomBehaviour (STRATEGYBLOCK * sbptr) xmrd->timer = 0; xmrd->XMR_State = XMRS_Process; } - #if SupportWindows95 d3d_light_ctrl.r = ONE_FIXED - RequestFadeToBlackLevel; d3d_light_ctrl.g = ONE_FIXED - RequestFadeToBlackLevel; d3d_light_ctrl.b = ONE_FIXED - RequestFadeToBlackLevel; - #endif - break; } @@ -438,17 +431,13 @@ void XenoMorphRoomBehaviour (STRATEGYBLOCK * sbptr) xmrd->timer = 0; xmrd->XMR_State = XMRS_ReleasePlayer; - #if SupportWindows95 - d3d_light_ctrl.ctrl = LCCM_NORMAL; - #endif + + d3d_light_ctrl.ctrl = LCCM_NORMAL; } - #if SupportWindows95 - d3d_light_ctrl.r = ONE_FIXED - RequestFadeToBlackLevel; - d3d_light_ctrl.g = ONE_FIXED - RequestFadeToBlackLevel; - d3d_light_ctrl.b = ONE_FIXED - RequestFadeToBlackLevel; - - #endif + d3d_light_ctrl.r = ONE_FIXED - RequestFadeToBlackLevel; + d3d_light_ctrl.g = ONE_FIXED - RequestFadeToBlackLevel; + d3d_light_ctrl.b = ONE_FIXED - RequestFadeToBlackLevel; break; } @@ -488,9 +477,8 @@ void XenoMorphRoomBehaviour (STRATEGYBLOCK * sbptr) { SHAPEHEADER * pis = GetShapeData(xmrd->ProbesInShape); -#if SupportWindows95 sbptr->SBdptr->ObTxAnimCtrlBlks = 0; -#endif + pis->items = xmrd->pis_items_str; pis->sh_textures = xmrd->pis_sht_str; diff --git a/src/avp/bh_types.c b/src/avp/bh_types.c index 8b30e3f..e8c40a4 100644 --- a/src/avp/bh_types.c +++ b/src/avp/bh_types.c @@ -64,10 +64,9 @@ #include "db.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldghost.h" -#endif + #include "bh_corpse.h" /* @@ -1390,8 +1389,6 @@ void ObjectBehaviours(void) { int i; -#if SupportWindows95 - #ifdef AVP_DEBUG_VERSION for (i=0; iSBdataptr); @@ -3264,7 +3258,6 @@ void RemoveBehaviourStrategy(STRATEGYBLOCK* sbptr) Dispel_HModel(&ghostData->HModelController); } } - #endif break; } @@ -3449,7 +3442,6 @@ void RemoveBehaviourStrategy(STRATEGYBLOCK* sbptr) } case I_BehaviourNetCorpse: { - #if SupportWindows95 { NETCORPSEDATABLOCK *corpseData; corpseData = (NETCORPSEDATABLOCK *)(sbptr->SBdataptr); @@ -3459,7 +3451,6 @@ void RemoveBehaviourStrategy(STRATEGYBLOCK* sbptr) Dispel_HModel(&corpseData->HModelController); } } - #endif break; } diff --git a/src/avp/bh_weap.c b/src/avp/bh_weap.c index 78fa9b5..6535d56 100644 --- a/src/avp/bh_weap.c +++ b/src/avp/bh_weap.c @@ -40,11 +40,9 @@ #include "los.h" #include "detaillevels.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldghost.h" #include "pldnet.h" -#endif #define FLAMETHROWER_PARTICLES_PER_FRAME (MUL_FIXED(120,NormalFrameTime)) #define PREDPISTOLFLECHETTES_PARTICLES_PER_FRAME (MUL_FIXED(50,NormalFrameTime)) @@ -309,7 +307,6 @@ int Frisbee_TargetFilter(STRATEGYBLOCK *candidate) { case I_BehaviourMarine: return(0); break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -351,7 +348,6 @@ int Frisbee_TargetFilter(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; @@ -526,9 +522,7 @@ STRATEGYBLOCK* CreateFrisbeeKernel(VECTORCH *position, MATRIXCH *orient, int fro #endif /* for net game support */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif return dispPtr->ObStrategyBlock; @@ -624,12 +618,10 @@ extern void FrisbeeBehaviour(STRATEGYBLOCK *sbPtr) } /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) { AddNetMsg_LocalObjectDestroyed(sbPtr); AddNetMsg_SpotOtherSound(SID_NICE_EXPLOSION,&dynPtr->Position,1); } - #endif /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); @@ -787,12 +779,10 @@ extern void FrisbeeBehaviour(STRATEGYBLOCK *sbPtr) } /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) { AddNetMsg_LocalObjectDestroyed(sbPtr); AddNetMsg_SpotOtherSound(SID_ED_SKEETERPLASMAFIRE,&dynPtr->Position,1); } - #endif /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); @@ -872,9 +862,7 @@ STRATEGYBLOCK* CreateRocketKernel(VECTORCH *position, MATRIXCH *orient, int from dynPtr->LinVelocity.vz = MUL_FIXED(dynPtr->LinVelocity.vz, MISSILE_SPEED); /* for net game support */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif return dispPtr->ObStrategyBlock; @@ -979,9 +967,7 @@ extern void RocketBehaviour(STRATEGYBLOCK *sbPtr) } /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); @@ -1099,9 +1085,7 @@ STRATEGYBLOCK* CreateGrenadeKernel(AVP_BEHAVIOUR_TYPE behaviourID, VECTORCH *pos } } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif return dispPtr->ObStrategyBlock; } @@ -1185,7 +1169,6 @@ extern void GrenadeBehaviour(STRATEGYBLOCK *sbPtr) explodeNow = 1; /* kaboom */ } - #if SupportWindows95 if(sbPtr->I_SBtype == I_BehaviourNetGhost) { NETGHOSTDATABLOCK *ghostData = sbPtr->SBdataptr; @@ -1200,7 +1183,6 @@ extern void GrenadeBehaviour(STRATEGYBLOCK *sbPtr) explodeNow = 1; } } - #endif } else { dynPtr->IgnoreThePlayer=0; } @@ -1231,9 +1213,8 @@ extern void GrenadeBehaviour(STRATEGYBLOCK *sbPtr) Sound_Play(SID_ED_GRENADE_EXPLOSION,"n",&Explosion_SoundData); } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); } @@ -1288,7 +1269,7 @@ extern void ClusterGrenadeBehaviour(STRATEGYBLOCK *sbPtr) { explodeNow = 1; /* kaboom */ } - #if SupportWindows95 + if(sbPtr->I_SBtype == I_BehaviourNetGhost) { NETGHOSTDATABLOCK *ghostData = sbPtr->SBdataptr; @@ -1303,7 +1284,6 @@ extern void ClusterGrenadeBehaviour(STRATEGYBLOCK *sbPtr) explodeNow = 1; } } - #endif } else { dynPtr->IgnoreThePlayer=0; } @@ -1336,9 +1316,8 @@ extern void ClusterGrenadeBehaviour(STRATEGYBLOCK *sbPtr) Sound_Play(SID_NADEEXPLODE,"n",&Explosion_SoundData); } /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); } @@ -1406,9 +1385,7 @@ static void InitialiseFragmentationGrenade(VECTORCH *originPtr) dynPtr->AngImpulse.EulerY = ((FastRandom()&2047)-1024)*4; dynPtr->AngImpulse.EulerZ = ((FastRandom()&2047)-1024)*8; - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif } #endif @@ -1594,9 +1571,8 @@ extern void FlareGrenadeBehaviour(STRATEGYBLOCK *sbPtr) } /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); @@ -1755,9 +1731,7 @@ static STRATEGYBLOCK* InitialisePulseGrenadeBehaviour(void) dynPtr->LinVelocity.vy = MUL_FIXED(dynPtr->LinVelocity.vy, PULSEGRENADE_SPEED); dynPtr->LinVelocity.vz = MUL_FIXED(dynPtr->LinVelocity.vz, PULSEGRENADE_SPEED); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif return dispPtr->ObStrategyBlock; } @@ -1817,9 +1791,8 @@ extern void PulseGrenadeBehaviour(STRATEGYBLOCK *sbPtr) } /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); } @@ -1914,9 +1887,7 @@ STRATEGYBLOCK* InitialiseEnergyBoltBehaviourKernel(VECTORCH *position,MATRIXCH * dynPtr->LinVelocity.vz = MUL_FIXED(dynPtr->LinVelocity.vz, ENERGY_BOLT_SPEED); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif /* Extra cunning! */ Sound_Play(SID_PRED_LAUNCHER,"hpd",(FastRandom()&255)-128,&dynPtr->Position); @@ -2015,9 +1986,7 @@ void InitialiseEnergyBoltBehaviour(DAMAGE_PROFILE *damage, int factor) MatrixToEuler(&dynPtr->OrientMat, &dynPtr->OrientEuler); dynPtr->PrevOrientMat = dynPtr->OrientMat; - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif /* Extra cunning! */ Sound_Play(SID_PRED_LAUNCHER,"hpd",(FastRandom()&255)-128,&dynPtr->Position); @@ -2114,9 +2083,8 @@ STRATEGYBLOCK* CreatePPPlasmaBoltKernel(VECTORCH *position,MATRIXCH *orient, int dynPtr->IgnoreThePlayer=0; } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif + return dispPtr->ObStrategyBlock; } #else @@ -2195,9 +2163,7 @@ void CreatePPPlasmaBoltKernel(VECTORCH *position,MATRIXCH *orient, int player) dynPtr->IgnoreThePlayer=0; } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif } #endif @@ -2289,9 +2255,8 @@ extern void PPPlasmaBoltBehaviour(STRATEGYBLOCK *sbPtr) MakeBloodExplosion(&dynPtr->Position,50,&dynPtr->Position,100,PARTICLE_PREDPISTOL_FLECHETTE); #endif - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); } } @@ -2306,9 +2271,8 @@ extern void PPPlasmaBoltBehaviour(STRATEGYBLOCK *sbPtr) if (bbPtr->counter <= 0) { /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); /* timed-out */ } else if (reportPtr) @@ -2318,9 +2282,8 @@ extern void PPPlasmaBoltBehaviour(STRATEGYBLOCK *sbPtr) GetDirectionOfAttack(reportPtr->ObstacleSBPtr,&dynPtr->LinVelocity,&attack_dir); CauseDamageToObject(reportPtr->ObstacleSBPtr,&TemplateAmmo[AMMO_PRED_PISTOL].MaxDamage[AvP.Difficulty], ONE_FIXED,NULL); } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); } else { @@ -2420,9 +2383,7 @@ static void InitialiseSpeargunBoltBehaviour(void) dynPtr->Mass=1000; - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif } static DISPLAYBLOCK* InitialiseSpeargunBoltBehaviour_ForLoad(void) @@ -2764,9 +2725,8 @@ extern void PredatorEnergyBoltBehaviour(STRATEGYBLOCK *sbPtr) if (bbPtr->counter <= 0) { /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); /* timed-out */ } else if (reportPtr) @@ -2888,9 +2848,8 @@ extern void PredatorEnergyBoltBehaviour(STRATEGYBLOCK *sbPtr) } } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* Splash damage? */ HandleEffectsOfExplosion ( @@ -2927,9 +2886,8 @@ extern void XenoborgEnergyBoltBehaviour(STRATEGYBLOCK *sbPtr) if (bbPtr->counter <= 0) { /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); /* timed-out */ } else if (reportPtr) @@ -2937,9 +2895,8 @@ extern void XenoborgEnergyBoltBehaviour(STRATEGYBLOCK *sbPtr) if(reportPtr->ObstacleSBPtr) CauseDamageToObject(reportPtr->ObstacleSBPtr,&TemplateAmmo[AMMO_XENOBORG].MaxDamage[AvP.Difficulty], ONE_FIXED,NULL); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); } else bbPtr->counter -= NormalFrameTime; @@ -3092,11 +3049,9 @@ void InitialiseDiscBehaviour(STRATEGYBLOCK *target,SECTION_DATA *disc_section) { } /* for net game support */ - #if SupportWindows95 if(AvP.Network != I_No_Network) { AddNetGameObjectID(dispPtr->ObStrategyBlock); } - #endif } /* @@ -3194,9 +3149,7 @@ extern void NPCDiscBehaviour(STRATEGYBLOCK *sbPtr) /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); @@ -3218,9 +3171,8 @@ extern void NPCDiscBehaviour(STRATEGYBLOCK *sbPtr) if(bbPtr->counter <= 0) { /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); /* timed-out */ } else if(reportPtr) @@ -3232,9 +3184,8 @@ extern void NPCDiscBehaviour(STRATEGYBLOCK *sbPtr) } } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); } else { bbPtr->counter -= NormalFrameTime; @@ -3339,9 +3290,7 @@ static void InitialiseAlienSpitBehaviour(void) MatrixToEuler(&PlayersWeapon.ObMat, &PlayersWeapon.ObEuler); /* for net game support */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif } } @@ -3354,9 +3303,7 @@ extern void AlienSpitBehaviour(STRATEGYBLOCK *sbPtr) if (bbPtr->counter<=0) { /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); @@ -3377,9 +3324,8 @@ extern void AlienSpitBehaviour(STRATEGYBLOCK *sbPtr) Sound_Play(SID_PRED_NEWROAR,"d",&(dynPtr->Position)); /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); } @@ -3651,9 +3597,8 @@ extern void DiscBehaviour_SeekTrack(STRATEGYBLOCK *sbPtr) Sound_Stop(bbPtr->soundHandle); Sound_Play(SID_PREDATOR_DISK_BEING_CAUGHT,"h"); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); return; @@ -3716,17 +3661,15 @@ extern void DiscBehaviour_SeekTrack(STRATEGYBLOCK *sbPtr) { #if 0 /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); /* timed-out */ return; #else /* For now, do nothing... */ if (bbPtr->counter<-DISC_LIFETIME) { - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); /* timed-out */ return; } @@ -3765,9 +3708,8 @@ extern void DiscBehaviour_SeekTrack(STRATEGYBLOCK *sbPtr) Sound_Stop(bbPtr->soundHandle); Sound_Play(SID_PREDATOR_DISK_RECOVERED,"h"); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); } @@ -3905,9 +3847,8 @@ extern void DiscBehaviour_SeekTrack(STRATEGYBLOCK *sbPtr) Sound_Stop(bbPtr->soundHandle); Sound_Play(SID_PREDATOR_DISK_BEING_CAUGHT,"h"); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); } @@ -4096,7 +4037,6 @@ int PredDisc_TargetFilter(STRATEGYBLOCK *candidate) { /* Valid. */ return(1); break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -4113,7 +4053,6 @@ int PredDisc_TargetFilter(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; @@ -4407,7 +4346,6 @@ extern void MolotovBehaviour(STRATEGYBLOCK *sbPtr) //explodeNow = 0; /* kaboom */ } - #if SupportWindows95 if(sbPtr->I_SBtype == I_BehaviourNetGhost) { NETGHOSTDATABLOCK *ghostData = sbPtr->SBdataptr; @@ -4421,7 +4359,6 @@ extern void MolotovBehaviour(STRATEGYBLOCK *sbPtr) explodeNow = 1; } } - #endif } else { /* What the hell! */ explodeNow=1; @@ -4448,9 +4385,8 @@ extern void MolotovBehaviour(STRATEGYBLOCK *sbPtr) Sound_Play(SID_ED_MOLOTOV_EXPLOSION,"n",&Explosion_SoundData); } - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* destroy rocket */ DestroyAnyStrategyBlock(sbPtr); } @@ -5375,9 +5311,7 @@ STRATEGYBLOCK* InitialiseFrisbeeBoltBehaviourKernel(VECTORCH *position,MATRIXCH dynPtr->LinVelocity.vz = MUL_FIXED(dynPtr->LinVelocity.vz, ENERGY_BOLT_SPEED); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); - #endif /* Extra cunning! */ Sound_Play(SID_PRED_LAUNCHER,"hpd",(FastRandom()&255)-128,&dynPtr->Position); @@ -5404,9 +5338,8 @@ extern void FrisbeeEnergyBoltBehaviour(STRATEGYBLOCK *sbPtr) if (bbPtr->counter <= 0) { /* for net game support: send a message saying we've blown up... */ - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + DestroyAnyStrategyBlock(sbPtr); /* timed-out */ } else if (reportPtr) @@ -5462,9 +5395,8 @@ extern void FrisbeeEnergyBoltBehaviour(STRATEGYBLOCK *sbPtr) } #endif - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(sbPtr); - #endif + /* Splash damage? */ HandleEffectsOfExplosion ( diff --git a/src/avp/bh_weap.h b/src/avp/bh_weap.h index 3d27e08..e19db2a 100644 --- a/src/avp/bh_weap.h +++ b/src/avp/bh_weap.h @@ -133,12 +133,7 @@ typedef struct SpearBehaviourType #define FRAG_LIFETIME 65536 -#if SupportWindows95 - #define NO_OF_FRAGS_IN_CLUSTER_BOMB 6 -#else - #define NO_OF_FRAGS_IN_CLUSTER_BOMB 4 -#endif - +#define NO_OF_FRAGS_IN_CLUSTER_BOMB 6 #define PROX_GRENADE_TRIGGER_TIME (ONE_FIXED/4) #define PROX_GRENADE_RANGE (4000) diff --git a/src/avp/bh_xeno.c b/src/avp/bh_xeno.c index 4f97944..e4c8cfb 100644 --- a/src/avp/bh_xeno.c +++ b/src/avp/bh_xeno.c @@ -2596,7 +2596,6 @@ int Xenoborg_TargetFilter(STRATEGYBLOCK *candidate) { case I_BehaviourXenoborg: return(0); break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -2613,7 +2612,6 @@ int Xenoborg_TargetFilter(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; diff --git a/src/avp/bonusabilities.c b/src/avp/bonusabilities.c index 1e99931..65b0d03 100644 --- a/src/avp/bonusabilities.c +++ b/src/avp/bonusabilities.c @@ -149,9 +149,8 @@ static DISPLAYBLOCK* CreateGrapplingHook(void) tempModule.m_lightarray = (struct lightblock *)0; tempModule.m_extraitemdata = (struct extraitemdata *)0; tempModule.m_dptr = NULL; /* this is important */ - #if SupportWIndows95 tempModule.name = NULL; /* this is important */ - #endif + AllocateModuleObject(&tempModule); dPtr = tempModule.m_dptr; if(dPtr==NULL) diff --git a/src/avp/comp_map.c b/src/avp/comp_map.c index 254408b..059e6ca 100644 --- a/src/avp/comp_map.c +++ b/src/avp/comp_map.c @@ -418,10 +418,7 @@ MODULE Empty_Module = { 0,0,0, 0,0,0}, - #if SupportWindows95 0, - #endif - }; diff --git a/src/avp/davehook.cpp b/src/avp/davehook.cpp index 70d679f..daa7c59 100644 --- a/src/avp/davehook.cpp +++ b/src/avp/davehook.cpp @@ -346,7 +346,6 @@ void DAVEHOOK_Maintain(void) #endif // Hacked in input support: - #if SupportWindows95 { #if 0 if ( KeyboardInput[ KEY_J ] ) @@ -374,9 +373,7 @@ void DAVEHOOK_Maintain(void) } #endif } - #endif // SupportWindows95 - #if SupportWindows95 if ( bFirstFrame ) { RE_ENTRANT_QUEUE_WinMain_FlushMessagesWithoutProcessing(); @@ -391,7 +388,6 @@ void DAVEHOOK_Maintain(void) // Flush the WinProc messages: RE_ENTRANT_QUEUE_WinMain_FlushMessages(); } - #endif // SupportWindows95 } void DAVEHOOK_ScreenModeChange_Setup(void) diff --git a/src/avp/game.c b/src/avp/game.c index 0c5b03f..c7b8e02 100644 --- a/src/avp/game.c +++ b/src/avp/game.c @@ -54,11 +54,9 @@ #if PENTIUM_PROFILING_ON #include "pentime.h" #else -#if SupportWindows95 #define gProfileStart(); #define ProfileStop(x); #endif -#endif #define VERSION_DisableStartupMenus Yes #define VERSION_DisableStartupCredits Yes @@ -145,16 +143,12 @@ void InitGame(void) AvP.CurrentEnv = AvP.StartingEnv; AvP.PlayerType = I_Marine; -#if SupportWindows95 - AvP.GameVideoRequestMode = VideoMode_DX_320x200x8; /* ignored */ if(HWAccel) AvP.MenuVideoRequestMode = VideoMode_DX_640x480x15; else AvP.MenuVideoRequestMode = VideoMode_DX_640x480x8; -#endif - AvP.ElapsedSeconds = 0; AvP.ElapsedMinutes = 0; AvP.ElapsedHours = 0; @@ -378,9 +372,7 @@ void UpdateGame(void) /* netgame support: it seems necessary to collect all our messages here, as some things depend on the player's behaviour running before anything else... including firing the player's weapon */ - #if SupportWindows95 if(AvP.Network != I_No_Network) NetCollectMessages(); - #endif RemoveDestroyedStrategyBlocks(); @@ -420,12 +412,10 @@ void UpdateGame(void) Player->ObWorld.vz = -42249; #endif /* netgame support */ - #if SupportWindows95 if(AvP.Network != I_No_Network) NetSendMessages(); /* KJL 11:50:18 03/21/97 - cheat modes */ HandleCheatModes(); - #endif /*------------Patrick 1/6/97--------------- New sound system diff --git a/src/avp/gamedef.h b/src/avp/gamedef.h index d07085f..c59829f 100644 --- a/src/avp/gamedef.h +++ b/src/avp/gamedef.h @@ -138,12 +138,7 @@ typedef enum environments extern char* LevelNames[]; -#if SupportWindows95 #define GAME_NAME_LENGTH 30 -#else -#define GAME_NAME_LENGTH 12 -#endif - typedef struct avpgamedesc{ diff --git a/src/avp/hud.c b/src/avp/hud.c index cdf35f5..a8f2690 100644 --- a/src/avp/hud.c +++ b/src/avp/hud.c @@ -2031,9 +2031,7 @@ int Fast2dMagnitude(int dx, int dy) extern void NewOnScreenMessage(unsigned char *messagePtr) { - #if SupportWindows95 GADGET_NewOnScreenMessage( messagePtr ); - #endif } static void AimGunSight(int aimingSpeed, TEMPLATE_WEAPON_DATA *twPtr) diff --git a/src/avp/inventry.c b/src/avp/inventry.c index 0c34d4e..b85d01e 100644 --- a/src/avp/inventry.c +++ b/src/avp/inventry.c @@ -19,11 +19,9 @@ rounds fired etc etc etc*/ #include "weapons.h" #include "inventry.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldnet.h" #include "pldghost.h" -#endif #include "avp_userprofile.h" @@ -1492,9 +1490,8 @@ extern void RemovePickedUpObject(STRATEGYBLOCK *objectPtr) if (objStatPtr->ghosted_object) { /* Must be a runtime pickup... */ - #if SupportWindows95 AddNetMsg_LocalObjectDestroyed(objectPtr); - #endif + DestroyAnyStrategyBlock(objectPtr); return; } @@ -1511,9 +1508,8 @@ extern void RemovePickedUpObject(STRATEGYBLOCK *objectPtr) if(AvP.Network==I_No_Network) DestroyAnyStrategyBlock(objectPtr); else { - #if SupportWindows95 AddNetMsg_ObjectPickedUp(&objectPtr->SBname[0]); - #endif + KillInanimateObjectForRespawn(objectPtr); } @@ -1816,9 +1812,8 @@ void Recall_Disc(void) { Sound_Stop(bbPtr->soundHandle); Sound_Play(SID_PREDATOR_DISK_RECOVERED,"h"); - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetMsg_LocalObjectDestroyed(nearest); - #endif + DestroyAnyStrategyBlock(nearest); } @@ -1871,9 +1866,8 @@ void RemoveAllThisPlayersDiscs(void) { /* Are we the right type? */ if (ObjectIsPlayersDisc(candidate)) { - #if SupportWindows95 AddNetMsg_LocalObjectDestroyed(candidate); - #endif + DestroyAnyStrategyBlock(candidate); } } diff --git a/src/avp/language.c b/src/avp/language.c index b0b7fcc..4387099 100644 --- a/src/avp/language.c +++ b/src/avp/language.c @@ -11,10 +11,8 @@ #include "language.h" #include "huffman.hpp" -#if SupportWindows95 - // DHM 12 Nov 97: hooks for C++ string handling code: - #include "strtab.hpp" -#endif +// DHM 12 Nov 97: hooks for C++ string handling code: +#include "strtab.hpp" #define UseLocalAssert Yes #include "ourasert.h" @@ -75,9 +73,7 @@ void InitTextStrings(void) textPtr = TextBufferPtr; } - #if SupportWindows95 AddToTable( EmptyString ); - #endif for (i=1; iIsAlive) { PherPl_WriteBuf[playerPherModule->m_aimodule->m_index] = PlayerSmell; - #if SupportWindows95 + if(playerPherModule->name) { if (ShowDebuggingText.Module) @@ -460,7 +460,6 @@ void PlayerPheromoneSystem(void) /* No scale for 'marine' pheromones, the player will never see it. */ #endif } - #endif } } } diff --git a/src/avp/player.c b/src/avp/player.c index 0ba9824..11db069 100644 --- a/src/avp/player.c +++ b/src/avp/player.c @@ -31,11 +31,10 @@ so player.c is looking a bit bare at the moment. */ #include "player.h" /* for win 95 net support */ -#if SupportWindows95 #include "pldnet.h" #include "pldghost.h" //#include "dp_func.h" -#endif + #include "showcmds.h" #include "bonusabilities.h" @@ -362,11 +361,8 @@ void InitPlayer(STRATEGYBLOCK* sbPtr, int sb_type) //restore the number of saves allowed ResetNumberOfSaves(); -#if SupportWindows95 //choosing a start position now occurs later on // if(AvP.Network!=I_No_Network) TeleportNetPlayerToAStartingPosition(sbPtr, 1); -#endif - } void ChangeToMarine() @@ -1144,7 +1140,6 @@ static void PlayerIsDead(DAMAGE_PROFILE* damage,int multiplier,VECTORCH* incomin } /* network support... */ - #if SupportWindows95 if(AvP.Network!=I_No_Network) { playerStatusPtr->MyCorpse=MakeNewCorpse(); @@ -1314,7 +1309,7 @@ static void PlayerIsDead(DAMAGE_PROFILE* damage,int multiplier,VECTORCH* incomin SpeciesTag_DetermineMyNextCharacterType(); } } - #endif + if (playerStatusPtr->soundHandle!=SOUND_NOACTIVEINDEX) { Sound_Stop(playerStatusPtr->soundHandle); } diff --git a/src/avp/pmove.c b/src/avp/pmove.c index 096e79f..ada4c1c 100644 --- a/src/avp/pmove.c +++ b/src/avp/pmove.c @@ -67,7 +67,7 @@ extern int DebouncedGotAnyKey; *****************************************************KJL*/ #define LOAD_IN_MOVEMENT_VALUES 0 -#if SupportWindows95 && LOAD_IN_MOVEMENT_VALUES +#if LOAD_IN_MOVEMENT_VALUES static int AlienForwardSpeed; static int AlienStrafeSpeed; @@ -97,11 +97,7 @@ extern int predHUDSoundHandle; extern int predOVision_SoundHandle; extern int TauntSoundPlayed; -#if SupportWindows95 extern unsigned char GotAnyKey; -#else -unsigned char GotAnyKey; -#endif static char FlyModeOn = 0; #if FLY_MODE_CHEAT_ON @@ -163,7 +159,7 @@ void InitPlayerMovementData(STRATEGYBLOCK* sbPtr) timeInContactWithFloor=(ONE_FIXED/10); - #if SupportWindows95 && LOAD_IN_MOVEMENT_VALUES + #if LOAD_IN_MOVEMENT_VALUES LoadInMovementValues(); #endif @@ -371,7 +367,7 @@ void ExecuteFreeMovement(STRATEGYBLOCK* sbPtr) int turnSpeed; int jumpSpeed; - #if SupportWindows95 && LOAD_IN_MOVEMENT_VALUES + #if LOAD_IN_MOVEMENT_VALUES switch (AvP.PlayerType) { case I_Alien: @@ -915,12 +911,10 @@ void ExecuteFreeMovement(STRATEGYBLOCK* sbPtr) AllowedLookDownAngle = 2048-128; } - #if SupportWindows95 if (!ControlMethods.AutoCentreOnMovement) { timeBeenContinuouslyMoving = 0; } - #endif if (playerStatusPtr->Mvt_MotionIncrement == 0) { @@ -1176,7 +1170,6 @@ static void CorpseMovement(STRATEGYBLOCK *sbPtr) ------------------------------------------------------*/ static void NetPlayerDeadProcessing(STRATEGYBLOCK *sbPtr) { - #if SupportWindows95 PLAYER_STATUS *psPtr= (PLAYER_STATUS *) (sbPtr->SBdataptr); /* call the read input function so that we can still respawn/quit, etc */ @@ -1250,7 +1243,6 @@ static void NetPlayerDeadProcessing(STRATEGYBLOCK *sbPtr) } } - #endif } extern void InitPlayerCloakingSystem(void); @@ -1262,7 +1254,6 @@ void NetPlayerRespawn(STRATEGYBLOCK *sbPtr) SECTION *root_section; #endif - #if SupportWindows95 PLAYER_STATUS *psPtr= (PLAYER_STATUS *) (sbPtr->SBdataptr); @@ -1449,7 +1440,6 @@ void NetPlayerRespawn(STRATEGYBLOCK *sbPtr) //The player's dropped weapon (if there was one) can now be drawn MakePlayersWeaponPickupVisible(); -#endif } @@ -1646,7 +1636,7 @@ static void AlienContactWeapon(void) /* Demo code removed, CDF 28/9/98, by order of Kevin */ -#if SupportWindows95 && LOAD_IN_MOVEMENT_VALUES +#if LOAD_IN_MOVEMENT_VALUES static void LoadInMovementValues(void) { diff --git a/src/avp/pvisible.c b/src/avp/pvisible.c index ce1d10d..d27c052 100644 --- a/src/avp/pvisible.c +++ b/src/avp/pvisible.c @@ -38,10 +38,8 @@ #include "bh_corpse.h" #include "chnkload.h" -#if SupportWindows95 /* for win95 net game support */ #include "pldghost.h" -#endif #include "pfarlocs.h" @@ -605,9 +603,8 @@ void MakeObjectNear(STRATEGYBLOCK *sbPtr) tempModule.m_lightarray = (struct lightblock *)0; tempModule.m_extraitemdata = (struct extraitemdata *)0; tempModule.m_dptr = NULL; /* this is important */ - #if SupportWIndows95 tempModule.name = NULL; /* this is important */ - #endif + AllocateModuleObject(&tempModule); dPtr = tempModule.m_dptr; if(dPtr==NULL) return; /* cannot create displayblock, so leave object "far" */ @@ -1089,13 +1086,9 @@ void InitInanimateObject(void* bhdata, STRATEGYBLOCK *sbPtr) and Static for multiplayer NB some objects are always static, and initialised using the static dynamics template directly */ - #if SupportWindows95 // if(AvP.Network==I_No_Network) inanimateDynamicsInitialiser = DYNAMICS_TEMPLATE_INANIMATE; // else inanimateDynamicsInitialiser = DYNAMICS_TEMPLATE_STATIC; inanimateDynamicsInitialiser = DYNAMICS_TEMPLATE_INANIMATE; - #else - inanimateDynamicsInitialiser = DYNAMICS_TEMPLATE_STATIC; - #endif /* Initialise object's stats */ { @@ -1540,7 +1533,6 @@ void InanimateObjectIsDamaged(STRATEGYBLOCK *sbPtr, DAMAGE_PROFILE *damage, int INANIMATEOBJECT_STATUSBLOCK* objectstatusptr = sbPtr->SBdataptr; LOCALASSERT(objectstatusptr); - #if SupportWindows95 if((AvP.Network==I_Peer)&&(!InanimateDamageFromNetHost)) { /* this means that the damage was generated locally in a net-game: @@ -1553,7 +1545,6 @@ void InanimateObjectIsDamaged(STRATEGYBLOCK *sbPtr, DAMAGE_PROFILE *damage, int /* if we're the host, inform everyone that the object is dead */ if(sbPtr->SBDamageBlock.Health <= 0) AddNetMsg_InanimateObjectDestroyed(sbPtr); } - #endif if(sbPtr->SBflags.please_destroy_me) { diff --git a/src/avp/pvisible.h b/src/avp/pvisible.h index 28e457b..514c8bd 100644 --- a/src/avp/pvisible.h +++ b/src/avp/pvisible.h @@ -73,10 +73,8 @@ int explosionTimer; //slight time delay after destruction for explosion int explosionStartFrame; //frame that explosion started - #if SupportWindows95 INAN_FRAG * fragments; int num_frags; - #endif unsigned int ghosted_object:1; } INANIMATEOBJECT_STATUSBLOCK; @@ -100,11 +98,8 @@ int explosionType; - #if SupportWindows95 INAN_FRAG * fragments; int num_frags; - #endif - } TOOLS_DATA_INANIMATEOBJECT; #define DEFAULT_OBJECT_INTEGRITY (100) diff --git a/src/avp/support/rentrntq.cpp b/src/avp/support/rentrntq.cpp index da0af28..7fa0638 100644 --- a/src/avp/support/rentrntq.cpp +++ b/src/avp/support/rentrntq.cpp @@ -16,8 +16,6 @@ #include "fixer.h" -#if SupportWindows95 - #include "rentrntq.h" #if UseGadgets @@ -238,9 +236,3 @@ void RE_ENTRANT_QUEUE_WinMain_FlushMessagesWithoutProcessing(void) } /* Internal function definitions ***********************************/ - - - - - -#endif // SupportWindows95 diff --git a/src/avp/targeting.c b/src/avp/targeting.c index ccced65..9ba2d79 100644 --- a/src/avp/targeting.c +++ b/src/avp/targeting.c @@ -46,10 +46,8 @@ #include "paintball.h" /* for win 95 net support */ -#if SupportWindows95 #include "pldghost.h" #include "pldnet.h" -#endif /*KJL**************************************************************************************** * G L O B A L S * @@ -944,7 +942,6 @@ int SmartTarget_TargetFilter(STRATEGYBLOCK *candidate) return(1); } break; - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -998,7 +995,6 @@ int SmartTarget_TargetFilter(STRATEGYBLOCK *candidate) } } break; - #endif default: return(0); break; diff --git a/src/avp/triggers.c b/src/avp/triggers.c index d516868..3e5feed 100644 --- a/src/avp/triggers.c +++ b/src/avp/triggers.c @@ -86,12 +86,10 @@ void OperateObjectInLineOfSight(void) { case I_BehaviourBinarySwitch: { - #if SupportWindows95 if(AvP.Network!=I_No_Network) { AddNetMsg_LOSRequestBinarySwitch(nearestObjectPtr->ObStrategyBlock); } - #endif RequestState(nearestObjectPtr->ObStrategyBlock,1, 0); break; } diff --git a/src/avp/weapons.c b/src/avp/weapons.c index 6663dc3..c4903ea 100644 --- a/src/avp/weapons.c +++ b/src/avp/weapons.c @@ -51,10 +51,8 @@ #include "projload.hpp" /* for win 95 net support */ -#if SupportWindows95 #include "pldghost.h" #include "pldnet.h" -#endif #include "los.h" #include "kshape.h" @@ -2323,10 +2321,9 @@ void HandleWeaponImpact(VECTORCH *positionPtr, STRATEGYBLOCK *sbPtr, enum AMMO_I DISPLAYBLOCK *dispPtr = MakeDebris(I_BehaviourPlasmaImpact,positionPtr); if (dispPtr) { - #if SupportWindows95 if(AvP.Network!=I_No_Network) AddNetMsg_LocalRicochet(I_BehaviourPlasmaImpact,positionPtr,&LOS_ObjectNormal); - #endif + MakeMatrixFromDirection(&LOS_ObjectNormal,&dispPtr->ObMat); } break; @@ -2344,10 +2341,9 @@ void HandleWeaponImpact(VECTORCH *positionPtr, STRATEGYBLOCK *sbPtr, enum AMMO_I DISPLAYBLOCK *dispPtr = MakeDebris(I_BehaviourBulletRicochet,positionPtr); if (dispPtr) { - #if SupportWindows95 if(AvP.Network!=I_No_Network) AddNetMsg_LocalRicochet(I_BehaviourBulletRicochet,positionPtr,&LOS_ObjectNormal); - #endif + MakeMatrixFromDirection(&LOS_ObjectNormal,&dispPtr->ObMat); } break; @@ -2556,9 +2552,7 @@ void CauseDamageToObject(STRATEGYBLOCK *sbPtr, DAMAGE_PROFILE *damage, int multi } case I_BehaviourNetGhost: { - #if SupportWindows95 DamageNetworkGhost(sbPtr, damage, use_multiple,NULL,incoming); - #endif break; } case I_BehaviourAutoGun: @@ -6761,9 +6755,7 @@ DISPLAYBLOCK *CauseDamageToHModel(HMODELCONTROLLER *HMC_Ptr, STRATEGYBLOCK *sbPt /* Whoa, positive feedback! */ case I_BehaviourNetGhost: { - #if SupportWindows95 DamageNetworkGhost(sbPtr, damage, multiple,this_section_data,incoming); - #endif break; } #endif @@ -8116,7 +8108,6 @@ int Target_IsEdible(STRATEGYBLOCK *candidate) { } break; } - #if SupportWindows95 case I_BehaviourNetGhost: { NETGHOSTDATABLOCK *dataptr; @@ -8134,7 +8125,6 @@ int Target_IsEdible(STRATEGYBLOCK *candidate) { } } break; - #endif default: return(0); break; @@ -10840,10 +10830,8 @@ void CreateSpearPossiblyWithFragment(DISPLAYBLOCK *dispPtr, VECTORCH *spearPosit } #if 0 // no network yet! - #if SupportWindows95 if(AvP.Network != I_No_Network) AddNetGameObjectID(dispPtr->ObStrategyBlock); #endif - #endif Sound_Play(SID_SPEARGUN_HITTING_WALL,"d",&dynPtr->Position); return; } diff --git a/src/avp/win95/kzsort.c b/src/avp/win95/kzsort.c index 39e5caf..0fb2ead 100644 --- a/src/avp/win95/kzsort.c +++ b/src/avp/win95/kzsort.c @@ -725,7 +725,7 @@ void KRenderItems(VIEWDESCRIPTORBLOCK *VDBPtr) #endif - #if 0//SupportWindows95 + #if 0 if (ScanDrawMode != ScanDrawDirectDraw) { WriteEndCodeToExecuteBuffer(); diff --git a/src/avp/win95/system.h b/src/avp/win95/system.h index eb36609..3f4a5d8 100644 --- a/src/avp/win95/system.h +++ b/src/avp/win95/system.h @@ -31,8 +31,6 @@ extern "C" { #define SuppressWarnings Yes -#define SupportWindows95 Yes -#define platform_pc Yes #define InterfaceEngine No #define Term -1 diff --git a/src/avp/win95/winmain.c b/src/avp/win95/winmain.c index 072703a..a743825 100644 --- a/src/avp/win95/winmain.c +++ b/src/avp/win95/winmain.c @@ -762,7 +762,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, TimeStampedMessage("After CDDA_Stop"); /* netgame support */ - #if SupportWindows95 /* call me paranoid */ if(AvP.Network != I_No_Network) { /* we cleanup and reset our game mode here, at the end of the game loop, as other @@ -770,7 +769,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, EndAVPNetGame(); //EndOfNetworkGameScreen(); } - #endif //need to get rid of the player rifs before we can clear the memory pool diff --git a/src/include/mem3dc.h b/src/include/mem3dc.h index 4bc4450..b1a1154 100644 --- a/src/include/mem3dc.h +++ b/src/include/mem3dc.h @@ -12,7 +12,6 @@ #include /* defines */ -#if SupportWindows95 #if 1 #define DBGMALLOC 0 #else @@ -26,7 +25,6 @@ #define DBGMALLOC 1 #endif #endif -#endif /* parameters for DumpMallocInfo */ #define PARTIALDUMP 0 /* print outstanding mallocs number and total memory allocated */ @@ -43,11 +41,7 @@ a separate copy of the string for each malloc - just store the pointer. So, on PC this reduces the data size for the malloc records from 1.04Mb to 320K ! */ -#if SupportWindows95 #define COPY_FILENAME 0 /* new behavior */ -#else -#define COPY_FILENAME 1 /* previous behavior */ -#endif /* platform specific memory allocation and deallocation declarations */ extern void *AllocMem(size_t __size); diff --git a/src/include/module.h b/src/include/module.h index 2c64a17..ac68355 100644 --- a/src/include/module.h +++ b/src/include/module.h @@ -275,9 +275,7 @@ typedef struct module { MATRIXCH m_mat; /* Internal use only */ - #if SupportWindows95 char * name; - #endif WAYPOINT_HEADER *m_waypoints; diff --git a/src/include/prototyp.h b/src/include/prototyp.h index 5a84c89..71095b7 100644 --- a/src/include/prototyp.h +++ b/src/include/prototyp.h @@ -479,9 +479,7 @@ typedef struct screendescriptorblock { int SDB_Width; int SDB_Height; int SDB_Depth; - #if SupportWindows95 int SDB_ScreenDepth; - #endif int SDB_Size; int SDB_DiagonalWidth; @@ -593,9 +591,7 @@ typedef struct viewdescriptorblock { int VDB_Width; int VDB_Height; int VDB_Depth; - #if SupportWindows95 int VDB_ScreenDepth; - #endif int VDB_CentreX; int VDB_CentreY; @@ -865,9 +861,7 @@ typedef struct displayblock SHAPEHEADER* ObShapeData; - #if SupportWindows95 char * name; - #endif #if (SupportMorphing && LazyEvaluationForMorphing) VECTORCH *ObMorphedPts; @@ -1996,9 +1990,7 @@ typedef struct i_gouraud3dtexturepolygon_scan { */ -#if SupportWindows95 void ClearScreen(SCREENDESCRIPTORBLOCK *sdb, int Colour); -#endif void PlatformSpecificShowViewEntry(VIEWDESCRIPTORBLOCK *vdb, SCREENDESCRIPTORBLOCK *sdb); diff --git a/src/include/shape.h b/src/include/shape.h index 5ef5c10..2f4981f 100644 --- a/src/include/shape.h +++ b/src/include/shape.h @@ -2,16 +2,13 @@ #define SHAPE_INCLUDED #include "aw.h" // AW_BACKUPTEXTUREHANDLE + /* Header File for Shape Data */ -#ifndef SupportWindows95 /* Enable so that PC code is used */ -#define SupportWindows95 1 -#endif - #include "shpanim.h" @@ -527,9 +524,7 @@ typedef struct merged_poly #else - #if platform_pc #define iflag_zbuffer_w 0x00000080 /* Z-Buffer, Write-Only */ - #endif #endif /* InterfaceEngine */ @@ -550,9 +545,7 @@ typedef struct merged_poly #define iflag_no_mip 0x00008000 /* Use Index #0 */ -#if platform_pc #define iflag_zbuffer_r 0x00010000 /* Z-Buffer, Read-Only */ -#endif #define iflag_linear 0x00020000 /* Linear Interpolation */ @@ -783,12 +776,10 @@ typedef struct imageheader { TEXTURE *ImagePtr; /* Pointer to texture in memory */ -#if SupportWindows95 LPDIRECTDRAWSURFACE DDSurface; LPDIRECT3DTEXTURE D3DTexture; D3DTEXTUREHANDLE D3DHandle; AW_BACKUPTEXTUREHANDLE hBackup; -#endif int ImageNum; /* # MIP images */ char ImageName[ImageNameSize]; /* Filename */ diff --git a/src/mem3dc.c b/src/mem3dc.c index 0a3152b..895e699 100644 --- a/src/mem3dc.c +++ b/src/mem3dc.c @@ -73,7 +73,7 @@ #define FILEPERM "w" #endif -#if SupportWindows95 && !defined(_MSC_VER) /* not required for MS C since MS C has CRT debugging available */ +#if !defined(_MSC_VER) /* not required for MS C since MS C has CRT debugging available */ #define OVERRUN_SIZEMIN 2 #define OVERRUN_SIZEMAX 128 #define OVERRUN_SIZEFACTOR 2 /* this is a shift down */ @@ -413,8 +413,6 @@ void DumpMallocInfo(int type) } else if (type==DUMPTOFILE) { - - #if SupportWindows95 FILE *fp; if( (fp = fopen(MALLOCDUMPFILE,FILEPERM))== (FILE *)NULL) @@ -445,7 +443,6 @@ void DumpMallocInfo(int type) fclose(fp); } - #endif } @@ -489,8 +486,6 @@ void DumpBoundsCheckInfo(int type) } else if (type==DUMPTOFILE) { - - #if SupportWindows95 FILE *fp; if( (fp = fopen(MALLOCDUMPFILE,FILEPERM))== (FILE *)NULL) @@ -526,7 +521,6 @@ void DumpBoundsCheckInfo(int type) fclose(fp); } - #endif } diff --git a/src/module.c b/src/module.c index b181a2b..4df7af1 100644 --- a/src/module.c +++ b/src/module.c @@ -481,9 +481,7 @@ void AllocateModuleObject(MODULE *mptr) /* Added Name to DISPLAYBLOCK */ - #if SupportWindows95 dptr->name = mptr->name; - #endif MapPostProcessing(dptr); diff --git a/src/vdb.c b/src/vdb.c index 7244ebd..848497c 100644 --- a/src/vdb.c +++ b/src/vdb.c @@ -10,9 +10,7 @@ */ - #if SupportWindows95 - extern int ScanDrawMode; - #endif +extern int ScanDrawMode; /* @@ -441,9 +439,7 @@ void SetVDB(vdb, fl, ty, d, cx,cy, prx,pry, mxp, cl,cr,cu,cd, h1,h2,hc, amb) vdb->VDB_Depth = ScreenDescriptorBlock.SDB_Depth; - #if SupportWindows95 - vdb->VDB_ScreenDepth = ScreenDescriptorBlock.SDB_ScreenDepth; - #endif + vdb->VDB_ScreenDepth = ScreenDescriptorBlock.SDB_ScreenDepth; vdb->VDB_CentreX = ScreenDescriptorBlock.SDB_CentreX; vdb->VDB_CentreY = ScreenDescriptorBlock.SDB_CentreY; @@ -461,16 +457,12 @@ void SetVDB(vdb, fl, ty, d, cx,cy, prx,pry, mxp, cl,cr,cu,cd, h1,h2,hc, amb) else { - #if SupportWindows95 if (ScanDrawMode == ScanDrawDirectDraw) vdb->VDB_Depth = d; else vdb->VDB_Depth = VideoModeType_24; - vdb->VDB_ScreenDepth = ScreenDescriptorBlock.SDB_ScreenDepth; - #else - vdb->VDB_Depth = d; - #endif + vdb->VDB_ScreenDepth = ScreenDescriptorBlock.SDB_ScreenDepth; vdb->VDB_CentreX = cx; vdb->VDB_CentreY = cy; diff --git a/src/win95/platform.h b/src/win95/platform.h index d49d4f6..fabeaf5 100644 --- a/src/win95/platform.h +++ b/src/win95/platform.h @@ -15,8 +15,6 @@ extern "C" { #endif -#define platform_pc Yes - /* Types */ typedef struct LONGLONGCH { diff --git a/src/win95/plspecfn.c b/src/win95/plspecfn.c index c3d033d..217fdd6 100644 --- a/src/win95/plspecfn.c +++ b/src/win95/plspecfn.c @@ -10,12 +10,8 @@ #include "bh_types.h" #include "pvisible.h" - - -#if SupportWindows95 #include "kzsort.h" #include "kshape.h" -#endif /*