modify #elif statements so they will build if a symbol isn't defined
This commit is contained in:
Jonathan Gray
parent
8cbc7dc223
commit
eba23de0e9
|
|
@ -185,9 +185,9 @@ static void ProcessMoveCommands( Vehicle_t *pVeh )
|
|||
|
||||
#ifndef _JK2MP//SP
|
||||
curTime = level.time;
|
||||
#elif QAGAME//MP GAME
|
||||
#elif defined QAGAME//MP GAME
|
||||
curTime = level.time;
|
||||
#elif CGAME//MP CGAME
|
||||
#elif defined CGAME//MP CGAME
|
||||
//FIXME: pass in ucmd? Not sure if this is reliable...
|
||||
curTime = pm->cmd.serverTime;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -370,9 +370,9 @@ static void ProcessMoveCommands( Vehicle_t *pVeh )
|
|||
qboolean isLandingOrLaunching = qfalse;
|
||||
#ifndef _JK2MP//SP
|
||||
int curTime = level.time;
|
||||
#elif QAGAME//MP GAME
|
||||
#elif defined QAGAME//MP GAME
|
||||
int curTime = level.time;
|
||||
#elif CGAME//MP CGAME
|
||||
#elif defined CGAME//MP CGAME
|
||||
//FIXME: pass in ucmd? Not sure if this is reliable...
|
||||
int curTime = pm->cmd.serverTime;
|
||||
#endif
|
||||
|
|
@ -511,9 +511,9 @@ static void ProcessMoveCommands( Vehicle_t *pVeh )
|
|||
{
|
||||
#ifndef _JK2MP//SP
|
||||
G_SoundIndexOnEnt( pVeh->m_pParentEntity, CHAN_AUTO, pVeh->m_pVehicleInfo->soundTurbo );
|
||||
#elif QAGAME//MP GAME-side
|
||||
#elif defined QAGAME//MP GAME-side
|
||||
G_EntitySound( ((gentity_t *)(pVeh->m_pParentEntity)), CHAN_AUTO, pVeh->m_pVehicleInfo->soundTurbo );
|
||||
#elif CGAME//MP CGAME-side
|
||||
#elif defined CGAME//MP CGAME-side
|
||||
//trap_S_StartSound( NULL, pVeh->m_pParentEntity->s.number, CHAN_AUTO, pVeh->m_pVehicleInfo->soundTurbo );
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1175,9 +1175,9 @@ static void ProcessOrientCommands( Vehicle_t *pVeh )
|
|||
qboolean isLandingOrLanded = qfalse;
|
||||
#ifndef _JK2MP//SP
|
||||
int curTime = level.time;
|
||||
#elif QAGAME//MP GAME
|
||||
#elif defined QAGAME//MP GAME
|
||||
int curTime = level.time;
|
||||
#elif CGAME//MP CGAME
|
||||
#elif defined CGAME//MP CGAME
|
||||
//FIXME: pass in ucmd? Not sure if this is reliable...
|
||||
int curTime = pm->cmd.serverTime;
|
||||
#endif
|
||||
|
|
@ -1559,9 +1559,9 @@ static void AnimateVehicle( Vehicle_t *pVeh )
|
|||
#endif
|
||||
#ifndef _JK2MP//SP
|
||||
//nothing
|
||||
#elif QAGAME//MP GAME
|
||||
#elif defined QAGAME//MP GAME
|
||||
int curTime = level.time;
|
||||
#elif CGAME//MP CGAME
|
||||
#elif defined CGAME//MP CGAME
|
||||
//FIXME: pass in ucmd? Not sure if this is reliable...
|
||||
int curTime = pm->cmd.serverTime;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -324,9 +324,9 @@ static void ProcessMoveCommands( Vehicle_t *pVeh )
|
|||
|
||||
#ifndef _JK2MP//SP
|
||||
curTime = level.time;
|
||||
#elif QAGAME//MP GAME
|
||||
#elif defined QAGAME//MP GAME
|
||||
curTime = level.time;
|
||||
#elif CGAME//MP CGAME
|
||||
#elif defined CGAME//MP CGAME
|
||||
//FIXME: pass in ucmd? Not sure if this is reliable...
|
||||
curTime = pm->cmd.serverTime;
|
||||
#endif
|
||||
|
|
@ -782,9 +782,9 @@ void AnimateRiders( Vehicle_t *pVeh )
|
|||
|
||||
#ifndef _JK2MP//SP
|
||||
curTime = level.time;
|
||||
#elif QAGAME//MP GAME
|
||||
#elif defined QAGAME//MP GAME
|
||||
curTime = level.time;
|
||||
#elif CGAME//MP CGAME
|
||||
#elif defined CGAME//MP CGAME
|
||||
//FIXME: pass in ucmd? Not sure if this is reliable...
|
||||
curTime = pm->cmd.serverTime;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ static qboolean BG_ParseVehWeaponParm( vehWeaponInfo_t *vehWeapon, char *parmNam
|
|||
case VF_MODEL_CLIENT: // (MP cgame only) take the string, get the G_ModelIndex
|
||||
#ifndef _JK2MP
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = G_ModelIndex( value );
|
||||
#elif QAGAME
|
||||
#elif defined QAGAME
|
||||
//*(int *)(b+vehWeaponFields[i].ofs) = G_ModelIndex( value );
|
||||
#else
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = trap_R_RegisterModel( value );
|
||||
|
|
@ -247,16 +247,16 @@ static qboolean BG_ParseVehWeaponParm( vehWeaponInfo_t *vehWeapon, char *parmNam
|
|||
case VF_EFFECT: // take the string, get the G_EffectIndex
|
||||
#ifdef QAGAME
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = G_EffectIndex( value );
|
||||
#elif CGAME
|
||||
#elif defined CGAME
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = trap_FX_RegisterEffect( value );
|
||||
#endif
|
||||
break;
|
||||
case VF_EFFECT_CLIENT: // (MP cgame only) take the string, get the index
|
||||
#ifndef _JK2MP
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = G_EffectIndex( value );
|
||||
#elif QAGAME
|
||||
#elif defined QAGAME
|
||||
//*(int *)(b+vehWeaponFields[i].ofs) = G_EffectIndex( value );
|
||||
#elif CGAME
|
||||
#elif defined CGAME
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = trap_FX_RegisterEffect( value );
|
||||
#endif
|
||||
break;
|
||||
|
|
@ -282,7 +282,7 @@ static qboolean BG_ParseVehWeaponParm( vehWeaponInfo_t *vehWeapon, char *parmNam
|
|||
case VF_SOUND_CLIENT: // (MP cgame only) take the string, get the index
|
||||
#ifndef _JK2MP
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = G_SoundIndex( value );
|
||||
#elif QAGAME
|
||||
#elif defined QAGAME
|
||||
//*(int *)(b+vehWeaponFields[i].ofs) = G_SoundIndex( value );
|
||||
#else
|
||||
*(int *)(b+vehWeaponFields[i].ofs) = trap_S_RegisterSound( value );
|
||||
|
|
@ -912,7 +912,7 @@ static qboolean BG_ParseVehicleParm( vehicleInfo_t *vehicle, char *parmName, cha
|
|||
case VF_MODEL_CLIENT: // (MP cgame only) take the string, get the G_ModelIndex
|
||||
#ifndef _JK2MP
|
||||
*(int *)(b+vehicleFields[i].ofs) = G_ModelIndex( value );
|
||||
#elif QAGAME
|
||||
#elif defined QAGAME
|
||||
//*(int *)(b+vehicleFields[i].ofs) = G_ModelIndex( value );
|
||||
#else
|
||||
*(int *)(b+vehicleFields[i].ofs) = trap_R_RegisterModel( value );
|
||||
|
|
@ -921,23 +921,23 @@ static qboolean BG_ParseVehicleParm( vehicleInfo_t *vehicle, char *parmName, cha
|
|||
case VF_EFFECT: // take the string, get the G_EffectIndex
|
||||
#ifdef QAGAME
|
||||
*(int *)(b+vehicleFields[i].ofs) = G_EffectIndex( value );
|
||||
#elif CGAME
|
||||
#elif defined CGAME
|
||||
*(int *)(b+vehicleFields[i].ofs) = trap_FX_RegisterEffect( value );
|
||||
#endif
|
||||
break;
|
||||
case VF_EFFECT_CLIENT: // (MP cgame only) take the string, get the G_EffectIndex
|
||||
#ifndef _JK2MP
|
||||
*(int *)(b+vehicleFields[i].ofs) = G_EffectIndex( value );
|
||||
#elif QAGAME
|
||||
#elif defined QAGAME
|
||||
//*(int *)(b+vehicleFields[i].ofs) = G_EffectIndex( value );
|
||||
#elif CGAME
|
||||
#elif defined CGAME
|
||||
*(int *)(b+vehicleFields[i].ofs) = trap_FX_RegisterEffect( value );
|
||||
#endif
|
||||
break;
|
||||
case VF_SHADER: // (cgame only) take the string, call trap_R_RegisterShader
|
||||
#ifdef WE_ARE_IN_THE_UI
|
||||
*(int *)(b+vehicleFields[i].ofs) = trap_R_RegisterShaderNoMip( value );
|
||||
#elif CGAME
|
||||
#elif defined CGAME
|
||||
*(int *)(b+vehicleFields[i].ofs) = trap_R_RegisterShader( value );
|
||||
#endif
|
||||
break;
|
||||
|
|
@ -956,7 +956,7 @@ static qboolean BG_ParseVehicleParm( vehicleInfo_t *vehicle, char *parmName, cha
|
|||
case VF_SOUND_CLIENT: // (MP cgame only) take the string, get the G_SoundIndex
|
||||
#ifndef _JK2MP
|
||||
*(int *)(b+vehicleFields[i].ofs) = G_SoundIndex( value );
|
||||
#elif QAGAME
|
||||
#elif defined QAGAME
|
||||
//*(int *)(b+vehicleFields[i].ofs) = G_SoundIndex( value );
|
||||
#else
|
||||
*(int *)(b+vehicleFields[i].ofs) = trap_S_RegisterSound( value );
|
||||
|
|
@ -1326,9 +1326,9 @@ int VEH_LoadVehicle( const char *vehicleName )
|
|||
{
|
||||
#ifndef _JK2MP
|
||||
G_EffectIndex( "ships/swoop_dust" );
|
||||
#elif QAGAME
|
||||
#elif defined QAGAME
|
||||
G_EffectIndex( "ships/swoop_dust" );
|
||||
#elif CGAME
|
||||
#elif defined CGAME
|
||||
trap_FX_RegisterEffect( "ships/swoop_dust" );
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1337,7 +1337,7 @@ int VEH_LoadVehicle( const char *vehicleName )
|
|||
G_EffectIndex( "volumetric/black_smoke" );
|
||||
G_EffectIndex( "ships/fire" );
|
||||
G_SoundIndex( "sound/vehicles/common/release.wav" );
|
||||
#elif CGAME
|
||||
#elif defined CGAME
|
||||
trap_R_RegisterShader( "gfx/menus/radar/bracket" );
|
||||
trap_R_RegisterShader( "gfx/menus/radar/lead" );
|
||||
trap_R_RegisterShaderNoMip( "gfx/menus/radar/asteroid" );
|
||||
|
|
|
|||
Loading…
Reference in New Issue