diff options
| -rw-r--r-- | src/cgame/cg_tutorial.c | 5 | ||||
| -rw-r--r-- | src/game/bg_misc.c | 4 | ||||
| -rw-r--r-- | src/game/bg_public.h | 2 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 23 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 4 |
5 files changed, 20 insertions, 18 deletions
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c index 2dd5a5a2..eb598cf9 100644 --- a/src/cgame/cg_tutorial.c +++ b/src/cgame/cg_tutorial.c @@ -656,7 +656,7 @@ const char *CG_TutorialText( void ) { entityState_t *es = CG_BuildableInRange( ps, NULL ); - if( ps->stats[ STAT_STATE ] & SS_HOVELING ) + /*if( ps->stats[ STAT_STATE ] & SS_HOVELING ) { Q_strcat( text, MAX_TUTORIAL_TEXT, va( "Press %s to exit the hovel\n", @@ -671,7 +671,8 @@ const char *CG_TutorialText( void ) va( "Press %s to enter the hovel\n", CG_KeyNameForCommand( "+button7" ) ) ); } - else if( BG_AlienCanEvolve( ps->stats[ STAT_CLASS ], + else*/ + if( BG_AlienCanEvolve( ps->stats[ STAT_CLASS ], ps->persistant[ PERS_CREDIT ], cgs.alienStage ) ) { diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 002d4111..dab1eff9 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -280,7 +280,7 @@ static const buildableAttributes_t bg_buildableList[ ] = qfalse, //qboolean uniqueTest; HIVE_VALUE, //int value; }, - { + /*{ BA_A_HOVEL, //int buildNum; "hovel", //char *buildName; "Hovel", //char *humanName; @@ -314,7 +314,7 @@ static const buildableAttributes_t bg_buildableList[ ] = qfalse, //qboolean transparentTest; qtrue, //qboolean uniqueTest; HOVEL_VALUE, //int value; - }, + },*/ { BA_H_SPAWN, //int buildNum; "telenode", //char *buildName; diff --git a/src/game/bg_public.h b/src/game/bg_public.h index a08b8cdd..2b303d22 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -403,7 +403,7 @@ typedef enum BA_A_BOOSTER, BA_A_HIVE, - BA_A_HOVEL, + /*BA_A_HOVEL,*/ BA_H_SPAWN, diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 574ab230..73ffa110 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -1218,7 +1218,8 @@ Is this hovel entrance blocked? */ qboolean AHovel_Blocked( gentity_t *hovel, gentity_t *player, qboolean provideExit ) { - vec3_t forward, normal, origin, start, end, angles, hovelMaxs; + return qfalse; + /*vec3_t forward, normal, origin, start, end, angles, hovelMaxs; vec3_t mins, maxs; float displacement; trace_t tr; @@ -1262,7 +1263,7 @@ qboolean AHovel_Blocked( gentity_t *hovel, gentity_t *player, qboolean provideEx G_SetClientViewAngle( player, angles ); } - return tr.fraction < 1.0f; + return tr.fraction < 1.0f;*/ } /* @@ -2664,7 +2665,7 @@ static int G_CompareBuildablesForRemoval( const void *a, const void *b ) BA_A_TRAPPER, BA_A_HIVE, BA_A_BOOSTER, - BA_A_HOVEL, + /*BA_A_HOVEL,*/ BA_A_SPAWN, BA_A_OVERMIND, @@ -2875,8 +2876,8 @@ static itemBuildError_t G_SufficientBPAvailable( buildable_t buildable, continue; // Don't allow destruction of hovel with granger inside - if( ent->s.modelindex == BA_A_HOVEL && ent->active ) - continue; + /*if( ent->s.modelindex == BA_A_HOVEL && ent->active ) + continue;*/ // Explicitly disallow replacement of the core buildable with anything // other than the core buildable @@ -3045,7 +3046,7 @@ itemBuildError_t G_CanBuild( gentity_t *ent, buildable_t buildable, int distance reason = IBE_NOCREEP; } - if( buildable == BA_A_HOVEL ) + /*if( buildable == BA_A_HOVEL ) { vec3_t builderMins, builderMaxs; @@ -3054,7 +3055,7 @@ itemBuildError_t G_CanBuild( gentity_t *ent, buildable_t buildable, int distance if( APropHovel_Blocked( angles, origin, normal, ent ) ) reason = IBE_HOVELEXIT; - } + }*/ // Check permission to build here if( tr1.surfaceFlags & SURF_NOALIENBUILD || contents & CONTENTS_NOALIENBUILD ) @@ -3108,9 +3109,9 @@ itemBuildError_t G_CanBuild( gentity_t *ent, buildable_t buildable, int distance reason = IBE_ONEOVERMIND; break; - case BA_A_HOVEL: + /*case BA_A_HOVEL: reason = IBE_ONEHOVEL; - break; + break;*/ case BA_H_REACTOR: reason = IBE_ONEREACTOR; @@ -3264,12 +3265,12 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, vec3_t ori built->pain = AGeneric_Pain; break; - case BA_A_HOVEL: + /*case BA_A_HOVEL: built->die = AHovel_Die; built->use = AHovel_Use; built->think = AHovel_Think; built->pain = AGeneric_Pain; - break; + break;*/ case BA_H_SPAWN: built->die = HSpawn_Die; diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 422a25a3..cbd9f63b 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1808,8 +1808,8 @@ void Cmd_Destroy_f( gentity_t *ent ) } // Don't allow destruction of hovel with granger inside - if( traceEnt->s.modelindex == BA_A_HOVEL && traceEnt->active ) - return; + /*if( traceEnt->s.modelindex == BA_A_HOVEL && traceEnt->active ) + return;*/ // Don't allow destruction of buildables that cannot be rebuilt if( G_TimeTilSuddenDeath( ) <= 0 ) |