Kp
c3bbc41796
Remove !defined(NETWORK) code
...
Rebirth has always defined NETWORK, so checking for it clutters the code.
2013-09-15 21:01:06 +00:00
Kp
88403fbfd8
Remove defined(SHAREWARE) code
...
Rebirth supports shareware and retail data based on runtime decisions.
2013-09-11 02:39:50 +00:00
Kp
d4e4a34be7
Remove obsolete descent_critical_error variables
...
These appear to be for reporting serious errors from DOS. Commit
1de5349
removed the ability to set them to anything other than 0, so
remove them.
2013-09-02 23:59:31 +00:00
Kp
bb8b229dc2
Use helper for setting menu items to type input
2013-09-01 23:23:55 +00:00
Kp
c7b9a45f63
Combine D2X ai.c, ai2.c
2013-09-01 23:21:57 +00:00
Kp
b7dac2941c
Move */main/gamesave.c -> similar/main/gamesave.c
2013-09-01 22:59:55 +00:00
Kp
19c1a65627
Rearrange gamesave.c to simplify merge
2013-09-01 22:24:13 +00:00
Kp
ce2dd25e3f
Use helper for setting menu items to types menu and text
2013-09-01 22:24:13 +00:00
Kp
bf027e3df0
Move */main/titles.c -> similar/main/titles.c
2013-09-01 22:19:27 +00:00
Kp
17037caa4d
Mark titles.c briefings static const
2013-09-01 21:52:34 +00:00
Kp
801dfbcd81
Move */main/net_udp.c -> similar/main/net_udp.c
2013-09-01 21:51:54 +00:00
Kp
ccb92fdefa
Use macro to define advanced net UDP options
2013-09-01 21:11:27 +00:00
Kp
9d2d8bb552
Scrub netgame flags on load/save/send/recv
2013-09-01 21:09:01 +00:00
Kp
923c2111de
Move */main/switch.c -> similar/main/switch.c
2013-09-01 18:42:31 +00:00
Kp
25b7735e44
Move */main/aipath.c -> similar/main/aipath.c
2013-09-01 18:38:37 +00:00
Kp
3554d17614
Move */main/render.c -> similar/main/render.c
2013-09-01 18:22:55 +00:00
Kp
f131fcd3da
Move */main/menu.c -> similar/main/menu.c
2013-09-01 18:06:24 +00:00
Kp
1fd1aa05bc
Move */main/mission.c -> similar/main/mission.c
2013-09-01 17:43:27 +00:00
Kp
24bbd2a76d
Move */main/automap.c -> similar/main/automap.c
2013-09-01 17:37:38 +00:00
Kp
7bf5b29be4
Move */main/kconfig.c -> similar/main/kconfig.c
2013-09-01 17:20:07 +00:00
Kp
8ddcf5c0fc
Mark titles.c functions static
2013-08-31 17:17:35 +00:00
Kp
e23035e61f
Move Last_afterburner_time into laser_info
2013-08-31 17:17:35 +00:00
Kp
051e346186
Restructure menu.c for merging
2013-08-31 17:17:35 +00:00
Kp
31b9ad0bde
Restructure misc options menu for merging
2013-08-31 17:17:34 +00:00
Kp
567b1d13c2
Remove broken COMPACT_SEGS code
...
It has not built since at least 0c36fecb
.
2013-08-31 16:45:43 +00:00
Kp
1abcfcb844
Add sanity check that DiskBitmapHeader is the right size
...
This would have caught the -mms-bitfields bug at build time.
2013-08-25 17:16:41 +00:00
Kp
af52e78a50
Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp
2013-08-24 17:10:35 +00:00
Kp
897023eda5
Reorder vertex render lookups to simplify merge
2013-08-24 17:10:06 +00:00
Kp
1b44fe5844
Move alpha blend test to helper to simplify merge
2013-08-24 16:44:30 +00:00
Kp
828ced10a5
Declare newdemo_count_demos for D2 menu system
2013-08-24 16:44:30 +00:00
Kp
afcbfe8e54
Rename d1x/d2x variables to unify names between D1X and D2X
2013-08-24 16:44:30 +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
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
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