mirror of
https://github.com/blendogames/thirtyflightsofloving.git
synced 2025-01-18 22:41:49 +00:00
Fix crash with null pointer in SV_AreaEdicts_r().
Fix crash with null activator in G_UseTargets(). Tweak descripton of cvar r_modulate. Update change log for new layout script commands.
This commit is contained in:
parent
38c148c0f8
commit
d30c74ebe3
4 changed files with 6 additions and 3 deletions
|
@ -208,7 +208,7 @@ void G_UseTargets (edict_t *ent, edict_t *activator)
|
|||
//
|
||||
// print the message
|
||||
//
|
||||
if ((ent->message) && !(activator->svflags & SVF_MONSTER))
|
||||
if ( (ent->message) && (activator) && !(activator->svflags & SVF_MONSTER) )
|
||||
{
|
||||
// Lazarus - change so that noise_index < 0 means no sound
|
||||
safe_centerprintf (activator, "%s", ent->message);
|
||||
|
|
|
@ -61,6 +61,8 @@ Changes as of v0.20 update 8:
|
|||
- Added changeable gl_clear color controlled by cvars r_clearcolor_r, r_clearcolor_g, and r_clearcolor_b.
|
||||
Values are normalized (0-1).
|
||||
|
||||
- Added ifeq, ifneq, ifgt, ifge, iflt, ifle, ifbit, and ifnbit layout script commands.
|
||||
|
||||
- Added a check to prevent game code from sending unicasts to non-present clients (i.e. bots). This would
|
||||
previously cause a fatal server error.
|
||||
|
||||
|
|
|
@ -995,7 +995,7 @@ void R_Register (void)
|
|||
Cvar_SetDescription ("r_particle_max", "Sets maximum clipping distance for particle rendering.");
|
||||
|
||||
r_modulate = Cvar_Get ("r_modulate", "1", CVAR_ARCHIVE );
|
||||
Cvar_SetDescription ("r_modulate", "Sets scale for lightmaps.");
|
||||
Cvar_SetDescription ("r_modulate", "Sets brightness scale for lightmaps.");
|
||||
r_log = Cvar_Get( "r_log", "0", 0 );
|
||||
Cvar_SetDescription ("r_log", "Enables logging of OpenGL API calls.");
|
||||
r_bitdepth = Cvar_Get( "r_bitdepth", "0", 0 );
|
||||
|
|
|
@ -368,7 +368,8 @@ void SV_AreaEdicts_r (areanode_t *node)
|
|||
else
|
||||
start = &node->trigger_edicts;
|
||||
|
||||
for (l=start->next ; l != start ; l = next)
|
||||
// for (l=start->next ; l != start ; l = next)
|
||||
for (l = start->next; l && (l != start); l = next) // Knightmare- catch null 'l' pointer
|
||||
{
|
||||
next = l->next;
|
||||
check = EDICT_FROM_AREA(l);
|
||||
|
|
Loading…
Reference in a new issue