merge HOMING_MAX_TRACKABLE_DOT in builds, giving D2X same tracking as D1X as requested by testers

This commit is contained in:
zico 2013-08-30 23:07:55 +02:00
parent 267f560a66
commit f2cdd906a6

View file

@ -104,11 +104,7 @@ enum weapon_type_t
#define MUZZLE_QUEUE_MAX 8
// Constants governing homing missile behavior.
#if defined(DXX_BUILD_DESCENT_I)
#define HOMING_MAX_TRACKABLE_DOT (3*F1_0/4)
#elif defined(DXX_BUILD_DESCENT_II)
#define HOMING_MAX_TRACKABLE_DOT (5*F1_0/7) // was (7*F1_0/8) but changed to compensate all the change from D2 to D1 trackong code
#endif
#define HOMING_MAX_TRACKABLE_DOT (3*F1_0/4) // was (7*F1_0/8) in original Descent 2
#define HOMING_MIN_TRACKABLE_DOT (3*(F1_0 - HOMING_MAX_TRACKABLE_DOT)/4 + HOMING_MAX_TRACKABLE_DOT)
#define HOMING_MAX_TRACKABLE_DIST (F1_0*250)
#define HOMING_FLY_STRAIGHT_TIME (F1_0/8)