Commit graph

4135 commits

Author SHA1 Message Date
Kp 2d964c414c Remove unused strcins/strndel 2013-09-07 16:39:25 +00:00
Kp a3883ab6ac Move restore_state into #if 0 2013-09-07 16:39:10 +00:00
Kp 7a2c9ea021 Remove useless menu text change 2013-09-07 16:35:03 +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 243f8cdd36 Simplify D1X SPREADFIRE truncation 2013-09-02 23:59:31 +00:00
Kp 4e177dd3fa Move common/arch/win32/messagebox.c -> common/arch/win32/messagebox.cpp 2013-09-02 23:59:31 +00:00
Kp cc90678647 Move common/arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.cpp 2013-09-02 23:59:31 +00:00
Kp d165b9c422 Make briefing->message const 2013-09-02 23:59:31 +00:00
Kp d156a4c1ab Simplify D1X hostage handling 2013-09-02 23:59:31 +00:00
Kp c8f0c799b7 Use helper for setting menu items to type number 2013-09-01 23:50:55 +00:00
Kp 4fe618b325 Use helper for setting menu items to type slider 2013-09-01 23:50:55 +00:00
Kp 0645e96e17 Use helper for setting menu items to type radio 2013-09-01 23:50:54 +00:00
Kp 4c5eaded8d Use helper for setting menu items to type checkbox 2013-09-01 23:23:55 +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 6386023a86 Remove obsolete arch/linux/include in CPPPATH 2013-09-01 22:22:18 +00:00
Kp a15996a761 Format maximum starting level once 2013-09-01 22:22:12 +00:00
Kp 6768c9bd6c Reduce wasted space in briefing_screen struct 2013-09-01 22:19:33 +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 b77c7fe357 Mark kconfig functions static 2013-09-01 17:20:08 +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 4b6bd54e7d Simplify text decoding 2013-08-31 16:45:43 +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
zico f2cdd906a6 merge HOMING_MAX_TRACKABLE_DOT in builds, giving D2X same tracking as D1X as requested by testers 2013-08-30 23:07:55 +02:00
zico 267f560a66 merge 2013-08-30 23:06:19 +02:00
Kp 6be4dc01c5 Pass non-const string to putenv 2013-08-29 22:52:30 +00:00
Kp 6e7462134e Print builddir into platform banner 2013-08-27 02:45:31 +00:00
Kp 16039a3f99 Remove unused extern global hitobj_list 2013-08-27 02:44:09 +00:00
Kp 20fdaa3fa7 Remove duplicate object addition in SConstruct 2013-08-27 02:43:27 +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 5bafa16e7f Fix level load hang on >=mingw32-gcc-4.7
Starting in gcc 4.7 "Windows mingw targets are using the -mms-bitfields
option by default." <http://gcc.gnu.org/gcc-4.7/changes.html>.  This
causes __attribute__((packed)) not to be effective on structures that
are used to express the layout of on-disk data.  In turn, that causes
piggy.c to mishandle texture loads, eventually resulting in an infinite
loop.  Add a pragma pack to force the headers to pack tightly on
Windows.
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