diff options
author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-12 19:59:50 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:48 +0000 |
commit | ea793aff3bddd1792dc223cf946b33ed1318fd7f (patch) | |
tree | 92632ef455d4f59014da4a31ca00f65a61b8c893 /src/game/g_buildable.c | |
parent | c1d84eb764c11ec255edf4303a6331a90801c89b (diff) |
* (bug 4298) Fix decon messages, add build messages
- Fix decon messages/logging to work when g_friendlyBuildableFire=0 (Rezyn)
- Add messages/logging of building, including what was replaced (Rezyn)
Diffstat (limited to 'src/game/g_buildable.c')
-rw-r--r-- | src/game/g_buildable.c | 54 |
1 files changed, 51 insertions, 3 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 48ac579b..1ac2fd28 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -3017,10 +3017,17 @@ G_FreeMarkedBuildables Free up build points for a team by deconstructing marked buildables =============== */ -void G_FreeMarkedBuildables( gentity_t *deconner ) +void G_FreeMarkedBuildables( gentity_t *deconner, char *buffer, int size ) { int i; + int bNum; + int listItems = 0; + int totalListItems = 0; gentity_t *ent; + int removalCounts[ BA_NUM_BUILDABLES ] = {0}; + + if( buffer ) + buffer[0] = '\0'; if( !g_markDeconstruct.integer ) return; // Not enabled, can't deconstruct anything @@ -3028,10 +3035,34 @@ void G_FreeMarkedBuildables( gentity_t *deconner ) for( i = 0; i < level.numBuildablesForRemoval; i++ ) { ent = level.markedBuildables[ i ]; + bNum = BG_Buildable( ent->s.modelindex )->number; + + if( removalCounts[ bNum ] == 0 ) + totalListItems++; - G_Damage( ent, NULL, deconner, NULL, NULL, ent->health, 0, MOD_DECONSTRUCT ); + removalCounts[ bNum ]++; + + G_Damage( ent, NULL, deconner, NULL, NULL, ent->health, 0, MOD_REPLACE ); G_FreeEntity( ent ); } + + for( i = 0; i < BA_NUM_BUILDABLES; i++ ) + { + if( buffer && removalCounts[ i ] ) + { + if( listItems ) + { + if( listItems == ( totalListItems - 1 ) ) + Q_strcat( buffer, size, va( "%s and ", ( totalListItems > 2 ) ? "," : "" ) ); + else + Q_strcat( buffer, size, ", " ); + } + Q_strcat( buffer, size, va( "%s", BG_Buildable( i )->humanName ) ); + if( removalCounts[ i ] > 1 ) + Q_strcat( buffer, size, va( " x%d", removalCounts[ i ] ) ); + listItems++; + } + } } /* @@ -3472,9 +3503,10 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, vec3_t ori { gentity_t *built; vec3_t normal; + char removed[ MAX_STRING_CHARS ]; // Free existing buildables - G_FreeMarkedBuildables( builder ); + G_FreeMarkedBuildables( builder, removed, sizeof( removed ) ); // Spawn the buildable built = G_Spawn(); @@ -3691,6 +3723,22 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, vec3_t ori trap_LinkEntity( built ); + if( builder && builder->client ) + { + G_TeamCommand( builder->client->ps.stats[ STAT_TEAM ], + va( "print \"%s ^2built^7 by %s%s%s\n\"", + BG_Buildable( built->s.modelindex )->humanName, + builder->client->pers.netname, + ( removed[0] ) ? "^7, replacing " : "", + removed ) ); + G_LogPrintf( "Build: %d %d %d: %s^7 is building %s\n", + builder->client->ps.clientNum, + built->s.modelindex, + level.numBuildablesForRemoval, + builder->client->pers.netname, + BG_Buildable( built->s.modelindex )->name ); + } + return built; } |