Commit graph

4023 commits

Author SHA1 Message Date
Kp 20cf3f4cdb Mark various OGL functions static 2013-08-24 16:44:23 +00:00
Kp 8ef8371563 Use unsigned screen width/height 2013-08-24 16:44:23 +00:00
Kp 045082f3eb Use static const fix Flash_rate 2013-08-20 03:02:30 +00:00
Kp 00381b2652 Abstract out weapon names 2013-08-20 02:59:09 +00:00
Kp 9c0be7cdfa Remove unused kconfig globals 2013-08-20 02:58:51 +00:00
Kp b3e2c99b17 Use MALLOC for ogl_init_pixel_buffers 2013-08-20 02:58:15 +00:00
Kp 948e03dcbf Copy mission parameters properly so that D1 missions load
Copying unrelated structures with an undocumented assumption that one is
a prefix of the other is dangerous and broken.  Remove it and copy the
relevant fields explicitly.
2013-08-18 21:05:31 +00:00
Kp a04cd57d71 Move */main/multi.c -> similar/main/multi.c 2013-08-11 23:46:13 +00:00
Kp e86a9b67a6 Move multi.c variables to top of file 2013-08-11 23:03:40 +00:00
Kp ad6a7820cf Make PowerupAdjustMapping static const 2013-08-11 22:42:51 +00:00
Kp 82dc40c891 Remove unused prototypes 2013-08-11 20:46:53 +00:00
Kp 69b3618961 Make vm_angvec_zero a static inline function 2013-08-11 20:46:53 +00:00
Kp 6b4ca09376 Split out anarchy object deletion predicate to simplify merge 2013-08-11 20:46:52 +00:00
Kp 743dd2f964 Rearrange code to simplify merge with D1X 2013-08-11 20:46:52 +00:00
Kp 836aa10f8c Use macro PUT_WEAPON_FLAGS to hide differences in D1X vs D2X
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
2013-08-11 20:46:52 +00:00
Kp d55054d82e Always play a sound when a player escapes the mine 2013-08-11 20:46:52 +00:00
Kp 431282fd7b Remove redundant Game_mode guard on multi_strip_robots 2013-08-11 20:46:52 +00:00
Kp 8d13642c9f Hide GM_CAPTURE tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 0c3adc48df Hide GM_HOARD tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 202755e8e3 Use macro GET_WEAPON_FLAGS to hide differences in D1X vs D2X
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
2013-08-11 20:46:52 +00:00
Kp 5ef0358a4b Remove unnecessary int casts in multi buffer parsing 2013-08-11 20:46:52 +00:00
Kp 3226a57848 Remove unused MULTI_ACTIVE_DOOR 2013-08-11 20:43:08 +00:00
Kp de6422d58f Remove unused multi_send_audio_taunt 2013-08-11 20:43:08 +00:00
Kp 6e88008677 Use unaligned-safe copy of powerup position 2013-08-11 20:43:08 +00:00
Kp 760667eb60 Remove unused multi_set_robot_ai 2013-08-11 20:43:08 +00:00
Kp 91928c2afc Rename 'new' to 'n' for C++ compatibility 2013-08-11 20:43:08 +00:00
Kp afd2f5aea1 Remove unused GET/PUT_INTEL_INT64 2013-08-11 20:40:24 +00:00
Kp 85dc42189b Add extent to RankStrings to match D2X 2013-08-11 15:11:45 +00:00
Kp 7042815795 Remove OLDPOWCAP code 2013-08-10 23:01:28 +00:00
Kp 4e6142d779 Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp 2013-08-10 03:56:14 +00:00
Kp e750c90b00 Mark more math as const correct 2013-08-10 03:55:50 +00:00
Kp bca0dacc98 Merge branch d2x-rebirth/master into unification/master
Conflicts:
	SConstruct
2013-08-09 22:53:45 +00:00
Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master
Conflicts:
	SConstruct
	common/main/multi.h
	similar/main/gamerend.c
2013-08-09 22:49:04 +00:00
Kp f062506f91 Remove duplicate % in demo playback
Ryusei117 reports that changes to the HUD renderer caused the demo
progress indicator to show two % instead of one.
2013-08-09 21:16:17 +00:00
zico 27a4a62b19 To compensate the change between D2's to D1's tracking code base, increased HOMING_MAX_TRACKABLE_DOT, making homing projectiles track a bit more agressivly than D1 to pose more of a challenge while not making them useless when having Afterburner 2013-08-09 17:50:11 +02:00
zico 01f155382e Removed chaff ability from D1X-Rebirth's proxys as they were never intended to do that 2013-08-09 17:29:10 +02:00
zico 830bcd7845 merge with ccea6b3547 2013-08-09 17:25:42 +02:00
zico a527348681 Added MULTI_FIRE_BOMB as alteration of MULTI_FIRE to keep bombs mapped in a Multiplayer match for later Host authority and to make their chaff ability work correctly. Additionally added MULTI_FIRE_TRACK to only send Network_laser_track if > -1. On the way I made laser.c a bit more similar between D1X and D2X 2013-08-09 17:21:03 +02:00
Kp 2cc0068fa9 Move */main/fvi.c -> similar/main/fvi.c 2013-08-09 03:13:33 +00:00
Kp 275883ab4f Remove unnecessary Error calls in FVI code 2013-08-09 03:04:18 +00:00
Kp 319b3ec5fd Mark more math as const correct 2013-08-09 03:04:18 +00:00
Kp ccea6b3547 Remove unused multi functions 2013-08-09 02:10:51 +00:00
Kp 9ba729ca3a Print function and line when calling Error 2013-08-09 02:10:51 +00:00
Kp 2cd7748e93 Convert vsprintf to vsnprintf 2013-08-09 01:58:17 +00:00
Kp a01dbc59d6 Make ui_messagebox_n static 2013-08-09 01:56:34 +00:00
zico 40c5f10e20 Added definition of DESIGNATED_GAME_FPS as 30 and DESIGNATED_GAME_FRAMETIME based on the former. We use those for d_tick_count intervals and to scale other parts that have never been properly aligned to FrameTime before. In that regard, Release builds will take DESIGNATED_GAME_FPS as MINIMUM_FPS for -maxfps argument 2013-08-08 22:07:29 +02:00
Kp a881ee455e Remove fix.h 2013-08-08 03:01:48 +00:00
Kp 5ec78f320b Always use 64-bit math in vm_vec_dot3 2013-08-08 03:01:48 +00:00
Kp 4c87504b91 Always use 64-bit math in vm_vec_dotprod 2013-08-08 03:01:48 +00:00
Kp 6b48994596 Avoid unnecessary lookups in fix_sincos 2013-08-08 03:01:47 +00:00