blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-02-22 03:31:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added bounding boxes to all gibs to prevent dark lighting on sloped surfaces.

Browse source 
Inccrease NUM_FAIL_IMAGES and NUM_WALSIZES, decrease NUM_FAIL_TEXTURES due to maps missing tons of textures being rare.
This commit is contained in:
Knightmare66 2019-06-05 19:08:30 -04:00
parent d78c58d1af
commit 0eac80b08a
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
game/g_misc.c
View file

@ -277,6 +277,9 @@ void ThrowGib (edict_t *self, char *gibname, int damage, int type)
gib->s.origin[2] = origin[2] + crandom() * size[2]; gib->s.origin[2] = origin[2] + crandom() * size[2];
gi.setmodel (gib, modelname); gi.setmodel (gib, modelname);
gib->clipmask = MASK_SHOT;
VectorSet (gib->mins, -4, -4, -4);
VectorSet (gib->maxs, 4, 4, 4);
gib->solid = SOLID_TRIGGER; // Knightmare- was SOLID_NOT gib->solid = SOLID_TRIGGER; // Knightmare- was SOLID_NOT
if (self->blood_type == 1) if (self->blood_type == 1)
{ {
@ -396,6 +399,17 @@ void ThrowHead (edict_t *self, char *gibname, int damage, int type)
self->s.modelindex2 = 0; self->s.modelindex2 = 0;
gi.setmodel (self, modelname); gi.setmodel (self, modelname);
self->clipmask = MASK_SHOT;
if (self->blood_type == 1)
{
VectorSet (self->mins, -4, -4, -4);
VectorSet (self->maxs, 4, 4, 4);
}
else
{
VectorSet (self->mins, -4, -4, 0);
VectorSet (self->maxs, 4, 4, 8);
}
self->solid = SOLID_TRIGGER; // Knightmare- was SOLID_NOT self->solid = SOLID_TRIGGER; // Knightmare- was SOLID_NOT
if(self->blood_type == 1) if(self->blood_type == 1)
{ {
@ -496,15 +510,17 @@ void ThrowClientHead (edict_t *self, int damage)
self->s.frame = 0; self->s.frame = 0;
gi.setmodel (self, gibname); gi.setmodel (self, gibname);
VectorSet (self->mins, -16, -16, 0); // VectorSet (self->mins, -16, -16, 0);
VectorSet (self->maxs, 16, 16, 16); // VectorSet (self->maxs, 16, 16, 16);
VectorSet (self->mins, -4, -4, -4);
VectorSet (self->maxs, 4, 4, 4);
self->takedamage = DAMAGE_NO; self->takedamage = DAMAGE_NO;
self->solid = SOLID_TRIGGER; // Knightmare- was SOLID_NOT self->solid = SOLID_TRIGGER; // Knightmare- was SOLID_NOT
self->s.effects = EF_GIB; self->s.effects = EF_GIB;
self->s.sound = 0; self->s.sound = 0;
self->flags |= FL_NO_KNOCKBACK; self->flags |= FL_NO_KNOCKBACK;
self->svflags |= SVF_GIB; //Knightmare- gib flag self->svflags |= SVF_GIB; // Knightmare- gib flag
self->movetype = MOVETYPE_BOUNCE; self->movetype = MOVETYPE_BOUNCE;
VelocityForDamage (damage, vd); VelocityForDamage (damage, vd);
VectorAdd (self->velocity, vd, self->velocity); VectorAdd (self->velocity, vd, self->velocity);

2
renderer/r_image.c
View file

@ -2088,7 +2088,7 @@ nonscrap:
// store the names of last images that failed to load // store the names of last images that failed to load
#define NUM_FAIL_IMAGES 512 #define NUM_FAIL_IMAGES 1024
char lastFailedImage[NUM_FAIL_IMAGES][MAX_OSPATH]; char lastFailedImage[NUM_FAIL_IMAGES][MAX_OSPATH];
long lastFailedImageHash[NUM_FAIL_IMAGES]; long lastFailedImageHash[NUM_FAIL_IMAGES];
static unsigned failedImgListIndex; static unsigned failedImgListIndex;

4
renderer/r_model.c
View file

@ -480,7 +480,7 @@ void Mod_LoadEdges (lump_t *l)
//======================================================= //=======================================================
// store the names of last textures that failed to load // store the names of last textures that failed to load
#define NUM_FAIL_TEXTURES 512 #define NUM_FAIL_TEXTURES 256
char lastFailedTexture[NUM_FAIL_TEXTURES][MAX_OSPATH]; char lastFailedTexture[NUM_FAIL_TEXTURES][MAX_OSPATH];
long lastFailedTextureHash[NUM_FAIL_TEXTURES]; long lastFailedTextureHash[NUM_FAIL_TEXTURES];
static unsigned failedTexListIndex; static unsigned failedTexListIndex;
@ -576,7 +576,7 @@ typedef struct walsize_s
int height; int height;
} walsize_t; } walsize_t;
#define NUM_WALSIZES 512 #define NUM_WALSIZES 1024
walsize_t walSizeList[NUM_WALSIZES]; walsize_t walSizeList[NUM_WALSIZES];
static unsigned walSizeListIndex; static unsigned walSizeListIndex;