ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2024-11-10 07:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/splint' into splint

Browse source 
Conflicts:
	code/cgame/cg_public.h
This commit is contained in:
Walter Julius Hennecke 2014-11-07 19:11:16 +01:00
commit 2176c18d4e
3 changed files with 67 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/game/bg_list.h
View file

@ -34,8 +34,8 @@ Can be used as a LIFO stack of FIFO queue. */
#include <stdint.h> #include <stdint.h>
#endif #endif
#define LIST_FRONT 0 static const char LIST_FRONT = 0;
#define LIST_BACK 1 static const char LIST_BACK = 1;
/** /**
* Possible type the data in a container may have. * Possible type the data in a container may have.

20
code/game/bg_misc.c
View file

@ -13,15 +13,17 @@ void trap_FS_FCloseFile( fileHandle_t f );
void trap_FS_Read( void *buffer, int len, fileHandle_t f ); void trap_FS_Read( void *buffer, int len, fileHandle_t f );
/* If you change these: PLEASE CHANGE THE COMMENTS ON THE AMMO PICKUPS, WHICH DETAIL THE QUANTITY IN THE CLIP*/ /* If you change these: PLEASE CHANGE THE COMMENTS ON THE AMMO PICKUPS, WHICH DETAIL THE QUANTITY IN THE CLIP*/
#define AMMO_PHASER_CLIP 50 enum ammoCount_e {
#define AMMO_COMPRESSION_CLIP 32 AMMO_PHASER_CLIP = 50,
#define AMMO_IMOD_CLIP 15 AMMO_COMPRESSION_CLIP = 32,
#define AMMO_SCAVENGER_CLIP 30 AMMO_IMOD_CLIP = 15,
#define AMMO_STASIS_CLIP 15 AMMO_SCAVENGER_CLIP = 30,
#define AMMO_GRENADE_CLIP 10 AMMO_STASIS_CLIP = 15,
#define AMMO_TETRION_CLIP 40 AMMO_GRENADE_CLIP = 10,
#define AMMO_QUANTUM_CLIP 6 AMMO_TETRION_CLIP = 40,
#define AMMO_DREADNOUGHT_CLIP 40 AMMO_QUANTUM_CLIP = 6,
AMMO_DREADNOUGHT_CLIP = 40
};
char races[256]; char races[256];

98
code/game/surfaceflags.h
View file

@ -10,62 +10,66 @@
#ifndef SURFACEFLAGS_H_ #ifndef SURFACEFLAGS_H_
#define SURFACEFLAGS_H_ #define SURFACEFLAGS_H_
#define CONTENTS_NONE 0 enum contents_e {
#define CONTENTS_SOLID 1 // an eye is never valid in a solid CONTENTS_NONE = 0,
#define CONTENTS_LAVA 8 CONTENTS_SOLID = 1, // an eye is never valid in a solid
#define CONTENTS_SLIME 16 CONTENTS_LAVA = 8,
#define CONTENTS_WATER 32 CONTENTS_SLIME = 16,
#define CONTENTS_FOG 64 CONTENTS_WATER = 32,
#define CONTENTS_LADDER 128 CONTENTS_FOG = 64,
CONTENTS_LADDER = 128,
#define CONTENTS_AREAPORTAL 0x8000 CONTENTS_AREAPORTAL = 0x8000,
#define CONTENTS_PLAYERCLIP 0x10000 CONTENTS_PLAYERCLIP = 0x10000,
#define CONTENTS_MONSTERCLIP 0x20000 CONTENTS_MONSTERCLIP = 0x20000,
#define CONTENTS_SHOTCLIP 0x40000 //!< These are not needed if CONTENTS_SOLID is included CONTENTS_SHOTCLIP = 0x40000, //!< These are not needed if CONTENTS_SOLID is included
//q3 bot specific contents types //q3 bot specific contents types
#define CONTENTS_TELEPORTER 0x40000 CONTENTS_TELEPORTER = 0x40000,
#define CONTENTS_JUMPPAD 0x80000 //!< needed for bspc CONTENTS_JUMPPAD = 0x80000, //!< needed for bspc
#define CONTENTS_ITEM 0x80000 //!< Items can be touched but do not block movement (like triggers) but can be hit by the infoString trace CONTENTS_ITEM = 0x80000, //!< Items can be touched but do not block movement (like triggers) but can be hit by the infoString trace
#define CONTENTS_CLUSTERPORTAL 0x100000 CONTENTS_CLUSTERPORTAL = 0x100000,
#define CONTENTS_DONOTENTER 0x200000 CONTENTS_DONOTENTER = 0x200000,
#define CONTENTS_BOTCLIP 0x400000 CONTENTS_BOTCLIP = 0x400000,
#define CONTENTS_ORIGIN 0x1000000 //!< removed before bsping an entity CONTENTS_ORIGIN = 0x1000000, //!< removed before bsping an entity
#define CONTENTS_BODY 0x2000000 //!< should never be on a brush, only in game CONTENTS_BODY = 0x2000000, //!< should never be on a brush, only in game
#define CONTENTS_CORPSE 0x4000000 CONTENTS_CORPSE = 0x4000000,
#define CONTENTS_DETAIL 0x8000000 //!< brushes not used for the bsp CONTENTS_DETAIL = 0x8000000, //!< brushes not used for the bsp
#define CONTENTS_STRUCTURAL 0x10000000 //!< brushes used for the bsp CONTENTS_STRUCTURAL = 0x10000000, //!< brushes used for the bsp
#define CONTENTS_TRANSLUCENT 0x20000000 //!< don't consume surface fragments inside CONTENTS_TRANSLUCENT = 0x20000000, //!< don't consume surface fragments inside
#define CONTENTS_TRIGGER 0x40000000 CONTENTS_TRIGGER = 0x40000000,
#define CONTENTS_NODROP 0x80000000 //!< don't leave bodies or items (death fog, lava) CONTENTS_NODROP = 0x80000000 //!< don't leave bodies or items (death fog, lava)
};
#define SURF_NODAMAGE 0x1 //!< never give falling damage enum surfaceFlags_e {
#define SURF_SLICK 0x2 //!< effects game physics SURF_NODAMAGE = 0x1, //!< never give falling damage
#define SURF_SKY 0x4 //!< lighting from environment map SURF_SLICK = 0x2, //!< effects game physics
#define SURF_NOIMPACT 0x10 //!< don't make missile explosions SURF_SKY = 0x4, //!< lighting from environment map
#define SURF_NOMARKS 0x20 //!< don't leave missile marks SURF_NOIMPACT = 0x10, //!< don't make missile explosions
#define SURF_FLESH 0x40 //!< make flesh sounds and effects SURF_NOMARKS = 0x20, //!< don't leave missile marks
#define SURF_NODRAW 0x80 //!< don't generate a drawsurface at all SURF_FLESH = 0x40, //!< make flesh sounds and effects
#define SURF_HINT 0x100 //!< make a primary bsp splitter SURF_NODRAW = 0x80, //!< don't generate a drawsurface at all
#define SURF_SKIP 0x200 //!< completely ignore, allowing non-closed brushes SURF_HINT = 0x100, //!< make a primary bsp splitter
#define SURF_NOLIGHTMAP 0x400 //!< surface doesn't need a lightmap SURF_SKIP = 0x200, //!< completely ignore, allowing non-closed brushes
#define SURF_POINTLIGHT 0x800 //!< generate lighting info at vertexes SURF_NOLIGHTMAP = 0x400, //!< surface doesn't need a lightmap
#define SURF_METALSTEPS 0x1000 //!< clanking footsteps SURF_POINTLIGHT = 0x800, //!< generate lighting info at vertexes
#define SURF_NOSTEPS 0x2000 //!< no footstep sounds SURF_METALSTEPS = 0x1000, //!< clanking footsteps
#define SURF_NONSOLID 0x4000 //!< don't collide against curves with this set SURF_NOSTEPS = 0x2000, //!< no footstep sounds
#define SURF_LIGHTFILTER 0x8000 //!< act as a light filter during q3map -light SURF_NONSOLID = 0x4000, //!< don't collide against curves with this set
#define SURF_ALPHASHADOW 0x10000 //!< do per-pixel light shadow casting in q3map SURF_LIGHTFILTER = 0x8000, //!< act as a light filter during q3map -light
#define SURF_NODLIGHT 0x20000 //!< don't dlight even if solid (solid lava, skies) SURF_ALPHASHADOW = 0x10000, //!< do per-pixel light shadow casting in q3map
#define SURF_FORCEFIELD 0x40000 //!< the surface in question is a forcefield SURF_NODLIGHT = 0x20000, //!< don't dlight even if solid (solid lava, skies)
SURF_FORCEFIELD = 0x40000, //!< the surface in question is a forcefield
//RPG-X | GSIO01 | 20/05/2009 | START MOD //RPG-X | GSIO01 | 20/05/2009 | START MOD
#define SURF_GRASS 0x80000 //!< grass, use grass footsteps etc. SURF_GRASS = 0x80000, //!< grass, use grass footsteps etc.
#define SURF_GRAVEL 0x100000 //!< gravel, use grass footsteps etc. SURF_GRAVEL = 0x100000, //!< gravel, use grass footsteps etc.
#define SURF_SNOW 0x200000 //!< snow, use grass footsteps etc. SURF_SNOW = 0x200000, //!< snow, use grass footsteps etc.
#define SURF_WOOD 0x400000 //!< wood, use grass footsteps etc. SURF_WOOD = 0x400000 //!< wood, use grass footsteps etc.
//RPG-X | GSIO01 | 20/05/2009 | END MOD //RPG-X | GSIO01 | 20/05/2009 | END MOD
};
#endif /* SURFACEFLAGS_H_ */ #endif /* SURFACEFLAGS_H_ */