#define to enum changes
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1077 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ
parent
7b0f0fb0e1
commit
ffe7dc485b
4 changed files with 64 additions and 58 deletions
|
|
@ -606,9 +606,11 @@ entity newmis;
|
|||
#endif
|
||||
|
||||
// weaponstate defines
|
||||
#define WS_IDLE 0
|
||||
#define WS_FIRING1 1
|
||||
#define WS_FIRING2 2 // used with nailgun
|
||||
enum {
|
||||
WS_IDLE,
|
||||
WS_FIRING1,
|
||||
WS_FIRING2 // used with nailgun
|
||||
};
|
||||
|
||||
// unions
|
||||
// DO NOT MIX UNION TYPES LIKE I AM DOING
|
||||
|
|
@ -646,17 +648,17 @@ entity newmis;
|
|||
entity movetarget; // target entity to move to
|
||||
};
|
||||
struct { // fields used with generic projectiles
|
||||
float damage_direct; // damage done with a direct hit
|
||||
float damage_exp; // damage done from radius damage
|
||||
float radius_exp; // radius of radius damage
|
||||
INTEGER mod_direct; // mod type for direct hit
|
||||
INTEGER mod_exp; // mod type for radius damage
|
||||
float expire_time; // time when projectile dies
|
||||
void() proj_think; // extra think function used with projectile
|
||||
float proj_think_time; // interval between thinks
|
||||
float damage_direct; // damage done with a direct hit
|
||||
float damage_exp; // damage done from radius damage
|
||||
float radius_exp; // radius of radius damage
|
||||
INTEGER mod_direct; // mod type for direct hit
|
||||
INTEGER mod_exp; // mod type for radius damage
|
||||
float expire_time; // time when projectile dies
|
||||
void() proj_think; // extra think function used with projectile
|
||||
float proj_think_time; // interval between thinks
|
||||
INTEGER proj_effect; // effect used with projectile
|
||||
INTEGER voided; // projectile has been voided
|
||||
float() proj_touch; // extra touch function used with projectile
|
||||
INTEGER voided; // projectile has been voided
|
||||
float() proj_touch; // extra touch function used with projectile
|
||||
};
|
||||
// fields used with ambient sounds?
|
||||
/*
|
||||
|
|
@ -799,4 +801,3 @@ float (entity e, float healamount, float ignore) T_Heal; // health function
|
|||
|
||||
float(entity targ, entity inflictor) CanDamage;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,15 @@
|
|||
var float chan_no_phs_add = 0;
|
||||
|
||||
INTEGER eng_support;
|
||||
#define ENG_STOF 0x01
|
||||
#define ENG_CVARSTRING 0x02
|
||||
#define ENG_TEBUILTINS 0x04
|
||||
#define ENG_TEBLOOD 0x08
|
||||
#define ENG_EFRED 0x10
|
||||
#define ENG_EFBLUE 0x20
|
||||
|
||||
enumflags {
|
||||
ENG_STOF,
|
||||
ENG_CVARSTRING,
|
||||
ENG_TEBUILTINS,
|
||||
ENG_TEBLOOD,
|
||||
ENG_EFRED,
|
||||
ENG_EFBLUE
|
||||
};
|
||||
|
||||
// prototypes
|
||||
void() EFF_SetEffects;
|
||||
|
|
|
|||
|
|
@ -1,30 +1,32 @@
|
|||
// client death messages
|
||||
#define MOD_NONE 0
|
||||
#define MOD_AXE 1
|
||||
#define MOD_SHOTGUN 2
|
||||
#define MOD_SUPERSHOTGUN 3
|
||||
#define MOD_SPIKE 4
|
||||
#define MOD_SUPERSPIKE 5
|
||||
#define MOD_GRENADE 6
|
||||
#define MOD_ROCKET 8
|
||||
#define MOD_ROCKETRADIUS 9
|
||||
#define MOD_SHAFT 10
|
||||
#define MOD_SHAFTWATER 11
|
||||
#define MOD_SHAFTSLIME 12
|
||||
#define MOD_SHAFTLAVA 13
|
||||
#define MOD_TELEFRAG 14
|
||||
#define MOD_TELEFRAGDEFLECT 15
|
||||
#define MOD_SQUISH 16
|
||||
#define MOD_DROWN 17
|
||||
#define MOD_SLIME 18
|
||||
#define MOD_LAVA 19
|
||||
#define MOD_EXPLOBOX 20
|
||||
#define MOD_FALL 21
|
||||
#define MOD_FIREBALL 22
|
||||
#define MOD_EXIT 23
|
||||
#define MOD_LASER 24
|
||||
#define MOD_SELFWATER 25
|
||||
#define MOD_HURT 26
|
||||
enum {
|
||||
MOD_NONE,
|
||||
MOD_AXE,
|
||||
MOD_SHOTGUN,
|
||||
MOD_SUPERSHOTGUN,
|
||||
MOD_SPIKE,
|
||||
MOD_SUPERSPIKE,
|
||||
MOD_GRENADE,
|
||||
MOD_ROCKET,
|
||||
MOD_ROCKETRADIUS,
|
||||
MOD_SHAFT,
|
||||
MOD_SHAFTWATER,
|
||||
MOD_SHAFTSLIME,
|
||||
MOD_SHAFTLAVA,
|
||||
MOD_TELEFRAG,
|
||||
MOD_TELEFRAGDEFLECT,
|
||||
MOD_SQUISH,
|
||||
MOD_DROWN,
|
||||
MOD_SLIME,
|
||||
MOD_LAVA,
|
||||
MOD_EXPLOBOX,
|
||||
MOD_FALL,
|
||||
MOD_FIREBALL,
|
||||
MOD_EXIT,
|
||||
MOD_LASER,
|
||||
MOD_SELFWATER,
|
||||
MOD_HURT
|
||||
};
|
||||
|
||||
void(string targ, INTEGER mod) SuicideMessage =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
|
||||
// Generic projectile spawning code (PRJ) ---
|
||||
|
||||
// projectile effect defines
|
||||
#define PE_NONE 0
|
||||
#define PE_SPIKE 1
|
||||
#define PE_SUPERSPIKE 2
|
||||
#define PE_WIZSPIKE 3
|
||||
#define PE_KNIGHTSPIKE 4
|
||||
#define PE_GUNSHOT 5
|
||||
#define PE_EXPLOSION 6
|
||||
#define PE_EXPLOSIONGROUND 7
|
||||
#define PE_LASER 8
|
||||
// projectile effect enumerator
|
||||
enum {
|
||||
PE_NONE,
|
||||
PE_SPIKE,
|
||||
PE_SUPERSPIKE,
|
||||
PE_WIZSPIKE,
|
||||
PE_KNIGHTSPIKE,
|
||||
PE_GUNSHOT,
|
||||
PE_EXPLOSION,
|
||||
PE_EXPLOSIONGROUND,
|
||||
PE_LASER
|
||||
};
|
||||
|
||||
// functions used only by this QC file
|
||||
float() _PRJ_Bounce =
|
||||
|
|
@ -181,4 +182,3 @@ void(entity parent, string modl, vector org, vector vel, INTEGER effect, INTEGER
|
|||
setsize (newmis, VEC_ORIGIN, VEC_ORIGIN);
|
||||
setorigin (newmis, org);
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue