teambeef/doom3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/Doom3Quest.git synced 2024-11-23 20:32:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Asset Fixes

Browse source
This commit is contained in:
Grant Bagwell 2020-11-30 21:41:28 +01:00
parent 7a66df5945
commit 347efca8fc
3 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Projects/Android/jni/d3es-multithread-master/neo/game/AFEntity.cpp
View file

@ -985,6 +985,7 @@ idAFEntity_Gibbable::idAFEntity_Gibbable( void ) {
skeletonModel = NULL; skeletonModel = NULL;
skeletonModelDefHandle = -1; skeletonModelDefHandle = -1;
gibbed = false; gibbed = false;
wasThrown = false;
} }
/* /*
@ -1007,6 +1008,7 @@ idAFEntity_Gibbable::Save
void idAFEntity_Gibbable::Save( idSaveGame *savefile ) const { void idAFEntity_Gibbable::Save( idSaveGame *savefile ) const {
savefile->WriteBool( gibbed ); savefile->WriteBool( gibbed );
savefile->WriteBool( combatModel != NULL ); savefile->WriteBool( combatModel != NULL );
savefile->WriteBool( wasThrown );
} }
/* /*
@ -1019,6 +1021,7 @@ void idAFEntity_Gibbable::Restore( idRestoreGame *savefile ) {
savefile->ReadBool( gibbed ); savefile->ReadBool( gibbed );
savefile->ReadBool( hasCombatModel ); savefile->ReadBool( hasCombatModel );
savefile->ReadBool( wasThrown );
InitSkeletonModel(); InitSkeletonModel();
@ -1037,6 +1040,7 @@ void idAFEntity_Gibbable::Spawn( void ) {
InitSkeletonModel(); InitSkeletonModel();
gibbed = false; gibbed = false;
wasThrown = false;
} }
/* /*
@ -1232,6 +1236,9 @@ void idAFEntity_Gibbable::Gib( const idVec3 &dir, const char *damageDefName ) {
return; return;
} }
// Don't grab this ent after it's been gibbed (and now invisible!)
noGrab = true;
const idDict *damageDef = gameLocal.FindEntityDefDict( damageDefName ); const idDict *damageDef = gameLocal.FindEntityDefDict( damageDefName );
if ( !damageDef ) { if ( !damageDef ) {
gameLocal.Error( "Unknown damageDef '%s'", damageDefName ); gameLocal.Error( "Unknown damageDef '%s'", damageDefName );

43
Projects/Android/jni/d3es-multithread-master/neo/renderer/Material.h
View file

@ -273,30 +273,29 @@ typedef enum {
} materialFlags_t; } materialFlags_t;
// contents flags, NOTE: make sure to keep the defines in doom_defs.script up to date with these! // contents flags, NOTE: make sure to keep the defines in doom_defs.script up to date with these!
typedef enum typedef enum {
{ CONTENTS_SOLID = BIT(0), // an eye is never valid in a solid
CONTENTS_SOLID = BIT( 0 ), // an eye is never valid in a solid CONTENTS_OPAQUE = BIT(1), // blocks visibility (for ai)
CONTENTS_OPAQUE = BIT( 1 ), // blocks visibility (for ai) CONTENTS_WATER = BIT(2), // used for water
CONTENTS_WATER = BIT( 2 ), // used for water CONTENTS_PLAYERCLIP = BIT(3), // solid to players
CONTENTS_PLAYERCLIP = BIT( 3 ), // solid to players CONTENTS_MONSTERCLIP = BIT(4), // solid to monsters
CONTENTS_MONSTERCLIP = BIT( 4 ), // solid to monsters CONTENTS_MOVEABLECLIP = BIT(5), // solid to moveable entities
CONTENTS_MOVEABLECLIP = BIT( 5 ), // solid to moveable entities CONTENTS_IKCLIP = BIT(6), // solid to IK
CONTENTS_IKCLIP = BIT( 6 ), // solid to IK CONTENTS_BLOOD = BIT(7), // used to detect blood decals
CONTENTS_BLOOD = BIT( 7 ), // used to detect blood decals CONTENTS_BODY = BIT(8), // used for actors
CONTENTS_BODY = BIT( 8 ), // used for actors CONTENTS_PROJECTILE = BIT(9), // used for projectiles
CONTENTS_PROJECTILE = BIT( 9 ), // used for projectiles CONTENTS_CORPSE = BIT(10), // used for dead bodies
CONTENTS_CORPSE = BIT( 10 ), // used for dead bodies CONTENTS_RENDERMODEL = BIT(11), // used for render models for collision detection
CONTENTS_RENDERMODEL = BIT( 11 ), // used for render models for collision detection CONTENTS_TRIGGER = BIT(12), // used for triggers
CONTENTS_TRIGGER = BIT( 12 ), // used for triggers CONTENTS_AAS_SOLID = BIT(13), // solid for AAS
CONTENTS_AAS_SOLID = BIT( 13 ), // solid for AAS CONTENTS_AAS_OBSTACLE = BIT(14), // used to compile an obstacle into AAS that can be enabled/disabled
CONTENTS_AAS_OBSTACLE = BIT( 14 ), // used to compile an obstacle into AAS that can be enabled/disabled CONTENTS_FLASHLIGHT_TRIGGER = BIT(15), // used for triggers that are activated by the flashlight
CONTENTS_FLASHLIGHT_TRIGGER = BIT( 15 ), // used for triggers that are activated by the flashlight
// contents used by utils // contents used by utils
CONTENTS_AREAPORTAL = BIT( 20 ), // portal separating renderer areas CONTENTS_AREAPORTAL = BIT(20), // portal separating renderer areas
CONTENTS_NOCSG = BIT( 21 ), // don't cut this brush with CSG operations in the editor CONTENTS_NOCSG = BIT(21), // don't cut this brush with CSG operations in the editor
CONTENTS_REMOVE_UTIL = (int)(~( CONTENTS_AREAPORTAL | CONTENTS_NOCSG )) CONTENTS_REMOVE_UTIL = ~(CONTENTS_AREAPORTAL|CONTENTS_NOCSG)
} contentsFlags_t; } contentsFlags_t;
// surface types // surface types

BIN
assets/pak399.pk4
View file

Binary file not shown.