Skip to content

Commit

Permalink
sanity check for saber automagical return
Browse files Browse the repository at this point in the history
  • Loading branch information
@TwelveEyes
TwelveEyes committed Jun 29, 2024
1 parent 84e79fb commit f608420
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
8 changes: 4 additions & 4 deletions code/game/g_utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -911,16 +911,16 @@ void G_FreeEntity( gentity_t *ed ) {
if(ed->client->clientInfo.customJediSoundDir) {
gi.Free(ed->client->clientInfo.customJediSoundDir);
}
if(ed->client->ps.saber[0].name && gi.bIsFromZone(ed->client->ps.saber[0].name, TAG_G_ALLOC) ) {
if(ed->client->ps.saber[0].name /* && gi.bIsFromZone(ed->client->ps.saber[0].name, TAG_G_ALLOC) */ ) {
gi.Free(ed->client->ps.saber[0].name);
}
if(ed->client->ps.saber[0].model && gi.bIsFromZone(ed->client->ps.saber[0].model, TAG_G_ALLOC) ) {
if(ed->client->ps.saber[0].model /* && gi.bIsFromZone(ed->client->ps.saber[0].model, TAG_G_ALLOC) */ ) {
gi.Free(ed->client->ps.saber[0].model);
}
if(ed->client->ps.saber[1].name && gi.bIsFromZone(ed->client->ps.saber[1].name, TAG_G_ALLOC) ) {
if(ed->client->ps.saber[1].name /* && gi.bIsFromZone(ed->client->ps.saber[1].name, TAG_G_ALLOC) */ ) {
gi.Free(ed->client->ps.saber[1].name);
}
if(ed->client->ps.saber[1].model && gi.bIsFromZone(ed->client->ps.saber[1].model, TAG_G_ALLOC) ) {
if(ed->client->ps.saber[1].model /* && gi.bIsFromZone(ed->client->ps.saber[1].model, TAG_G_ALLOC) */ ) {
gi.Free(ed->client->ps.saber[1].model);
}

Expand Down
15 changes: 9 additions & 6 deletions code/game/wp_saber.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7075,8 +7075,9 @@ void WP_SaberThrow( gentity_t *self, usercmd_t *ucmd )
}
return;
}
if ( (!self->s.number && level.time - saberent->aimDebounceTime > 15000)
|| (self->s.number && level.time - saberent->aimDebounceTime > 5000) )
if ( self->health > 0 &&
( (!self->s.number && level.time - saberent->aimDebounceTime > 15000)
|| (self->s.number && level.time - saberent->aimDebounceTime > 5000) ) )
{//(only for player) been missing for 15 seconds, automagicially return
WP_SaberCatch( self, saberent, qfalse );
return;
Expand All @@ -7097,8 +7098,9 @@ void WP_SaberThrow( gentity_t *self, usercmd_t *ucmd )
return;
}
}
if ( (!self->s.number && level.time - saberent->aimDebounceTime > 15000)
|| (self->s.number && level.time - saberent->aimDebounceTime > 5000) )
if ( self->health > 0 &&
( (!self->s.number && level.time - saberent->aimDebounceTime > 15000)
|| (self->s.number && level.time - saberent->aimDebounceTime > 5000) ) )
{//(only for player) been missing for 15 seconds, automagicially return
WP_SaberCatch( self, saberent, qfalse );
return;
Expand All @@ -7119,8 +7121,9 @@ void WP_SaberThrow( gentity_t *self, usercmd_t *ucmd )
self->client->ps.saberEntityNum = ENTITYNUM_NONE;
return;
}
if ( (!self->s.number && level.time - saberent->aimDebounceTime > 15000)
|| (self->s.number && level.time - saberent->aimDebounceTime > 5000) )
if ( self->health > 0 &&
( (!self->s.number && level.time - saberent->aimDebounceTime > 15000)
|| (self->s.number && level.time - saberent->aimDebounceTime > 5000) ) )
{//(only for player) been missing for 15 seconds, automagicially return
WP_SaberCatch( self, saberent, qfalse );
return;
Expand Down

0 comments on commit f608420

Please sign in to comment.