Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - q_shared.h
diff -s -r q2_305/q_shared.h q2_314/q_shared.h
Left File < - 3.05/q_shared.h
Right File > - 3.14/q_shared.h
Back to Index
127a128
> #if !defined C_ONLY

128a130,132
> #else
> #define Q_ftol( f ) ( long ) (f)
> #endif
164a169,184
> #define BOX_ON_PLANE_SIDE(emins, emaxs, p) \
> (((p)->type < 3)? \
> ( \
> ((p)->dist <= (emins)[(p)->type])? \
> 1 \
> : \
> ( \
> ((p)->dist >= (emaxs)[(p)->type])?\
> 2 \
> : \
> 3 \
> ) \
> ) \
> : \
> BoxOnPlaneSide( (emins), (emaxs), (p)))
>
215a236
> qboolean Info_Validate (char *s);
427,428c448,454
< #define PMF_DUCKED 1
< #define PMF_JUMP_HELD 2
---
> #define PMF_DUCKED 1
> #define PMF_JUMP_HELD 2
> #define PMF_ON_GROUND 4
> #define PMF_TIME_WATERJUMP 8 // pm_time is waterjump
> #define PMF_TIME_LAND 16 // pm_time is time before rejump
> #define PMF_TIME_TELEPORT 32 // pm_time is non-moving time
> #define PMF_NO_PREDICTION 64 // temporarily disables prediction (used for grappling hook)
442c468
< byte teleport_time;
---
> byte pm_time; // each unit = 8 ms
519,520c545,549
<
<
---
> #define EF_TELEPORTER 0x00020000 // particle fountain
> #define EF_FLAG1 0x00040000
> #define EF_FLAG2 0x00080000
> #define EF_BOOMER 0x00100000
> #define EF_GREENGIB 0x00200000
560a590
> #define MZ_BOOMERGUN 16
752c782,787
< TE_BOSSTPORT // used as '22' in a map, so DON'T RENUMBER!!!
---
> TE_BOSSTPORT, // used as '22' in a map, so DON'T RENUMBER!!!
> TE_BFG_LASER,
> TE_GRAPPLE_CABLE,
> TE_WELDING_SPARKS,
> TE_PLASMATRAIL,
> TE_GREENBLOOD
814c849
< #define DF_FRIENDLY_FIRE 256
---
> #define DF_NO_FRIENDLY_FIRE 256
818c853,856
<
---
> #define DF_ALLOW_EXIT 4096
> #define DF_INFINITE_AMMO 8192
> #define DF_QUAD_DROP 16384
> #define DF_FIXED_FOV 32768
843a882
> #define CS_MAXCLIENTS 30
868,871c907,908
< EV_MALE_FALL,
< EV_MALE_FALLFAR,
< EV_FEMALE_FALL,
< EV_FEMALE_FALLFAR,
---
> EV_FALL,
> EV_FALLFAR,