Commit graph

504 commits

Author SHA1 Message Date
Kp 4411532b6a Restructure bm.c for merging 2013-11-24 23:50:43 +00:00
Kp ca4f9e8b30 Fix array overstep in check_effect_blowup
If a robot fires a weapon, and then the robot dies, and then the robot
object is replaced with some object with a high id number, and then the
weapon hits, then check_effect_blowup used the id of the replaced object
as though it were a robot id.  This causes an overstep or understep of
Robot_info.  Tighten the check by requiring that the parent object have
the same signature at impact time as it did when the weapon was fired.
This can misclassify a weapon fired by a now-deceased guidebot as a
non-guidebot weapon, but there is not enough information saved to handle
this case, and guidebot deaths are rare.
2013-11-24 23:12:00 +00:00
Kp bbb9214e0e Invert sense of hires/lowres options 2013-11-24 22:57:36 +00:00
Kp aa05263b29 Move */main/gameseq.c -> similar/main/gameseq.c 2013-11-24 22:47:19 +00:00
Kp c90ade08fe Restructure gameseq.c for merging 2013-11-24 22:44:25 +00:00
Kp 47a4bb1ff1 Move */main/ai.c -> similar/main/ai.c 2013-11-23 22:47:45 +00:00
Kp 6be79cadce Unify ai_follow_path 2013-11-23 22:41:01 +00:00
Kp a56edce84a Cache result of indexing Robot_info 2013-11-23 18:53:13 +00:00
Kp 93b0f5396f Use helpers to test next_fire state 2013-11-18 04:51:33 +00:00
Kp 7a9db6716a Make ready_to_fire static 2013-11-18 04:51:33 +00:00
Kp f4cbfca8e2 Use helper to test for thief flag 2013-11-18 04:51:33 +00:00
Kp dc72fb5932 Use player_awareness_type_t for create_awareness_event 2013-11-18 04:51:33 +00:00
Kp c3d328ea5c Use helper to test for guidebot flag 2013-11-16 23:24:12 +00:00
Kp 1312369c94 Restructure ai.c for merging 2013-11-16 23:20:30 +00:00
Kp 5ff051cf4e Move */main/fuelcen.c -> similar/main/fuelcen.c 2013-11-10 22:56:12 +00:00
Kp 7c1945345c Restructure fuelcen.c for merging 2013-11-10 19:30:14 +00:00
Kp 4ef3937d35 Move */main/piggy.c -> similar/main/piggy.c 2013-11-10 19:08:12 +00:00
Kp e2a2cc579a Remove unused piggy_dump_all 2013-11-10 19:08:12 +00:00
Kp e04dc4e29e Move d2x-rebirth/main/escort.c -> d2x-rebirth/main/escort.cpp 2013-11-09 18:07:28 +00:00
Kp a7eadf58f4 Move d2x-rebirth/main/gamepal.c -> d2x-rebirth/main/gamepal.cpp 2013-11-09 18:07:28 +00:00
Kp 2be7f31d29 Move d2x-rebirth/main/segment.c -> d2x-rebirth/main/segment.cpp 2013-11-09 18:07:28 +00:00
Kp ea2022bb01 Move */main/endlevel.c -> similar/main/endlevel.c 2013-11-09 17:46:41 +00:00
Kp 1c754aa55e Restructure endlevel.c for merging 2013-11-09 17:45:21 +00:00
Kp 4469ff36c0 Manage movie subtitles automatically 2013-11-09 17:45:21 +00:00
Kp ea327d8394 Move d2x-rebirth/main/movie.c -> d2x-rebirth/main/movie.cpp 2013-11-09 17:45:21 +00:00
Kp cede90c2fb Restructure piggy.c for merging 2013-11-09 17:45:21 +00:00
Kp ed8484f096 Remove unnecessary packing on vms_vector 2013-11-08 03:14:43 +00:00
Kp 0a4c1ec7bf Quick out search for boss segments 2013-11-03 23:39:08 +00:00
Kp 2cd3760469 Simplify create_buddy_bot 2013-11-03 23:39:03 +00:00
Kp 5991940f8f Fix bug that object #1 can go faster than robot's top speed 2013-11-03 23:39:02 +00:00
Kp 18f6919b33 Mark movie data const 2013-11-02 04:28:10 +00:00
Kp 58958e091b Only give primaries that exist 2013-11-02 04:24:14 +00:00
Kp 2714679284 Mark private functions static 2013-11-02 04:23:55 +00:00
Kp 53f082f6f7 Send boss teleport index, not boss teleport segment 2013-11-01 23:18:05 +00:00
Kp 005ba16ff9 Include mve_audio.h in mve_audio.c 2013-10-29 03:24:43 +00:00
Kp 00ed0c17ff Mark reset_all_robot_centers as used for debuggers 2013-10-29 03:24:42 +00:00
Kp 68e936b809 Disable Parallax AI path debug printing 2013-10-29 03:24:41 +00:00
Kp 4a2a1bb96c Add definition guard for struct timespec 2013-10-29 03:24:41 +00:00
Kp dcaad9a687 Always include <time.h> in mveplay.c 2013-10-29 03:24:41 +00:00
Kp a6b1bd58a2 Use MALLOC consistently 2013-10-26 03:50:27 +00:00
Kp 8bd98e27c4 Remove unused ksegsize.c 2013-10-20 22:33:30 +00:00
Kp 3693743d41 Move similar/main/mission.c -> similar/main/mission.cpp 2013-10-20 22:49:12 +00:00
Kp 5b0c4b10ac Use accessor for most get/set object->id accesses 2013-10-20 22:49:09 +00:00
Kp 22f24ef783 Simplify guidebot marker name printing 2013-10-08 02:02:26 +00:00
Kp 740a190835 Move */main/playsave.c -> similar/main/playsave.c 2013-10-06 17:56:37 +00:00
Kp 7dd7d6704b Make write_player_file void 2013-10-06 17:56:37 +00:00
Kp 761d0661ea Remove obsolete control_type_dos,control_type_win
This causes the field mapped to control_type_win to always set to 0 on
save.  However, the value was never used during execution.
2013-10-06 17:56:37 +00:00
Kp a2fc216cf6 Restructure playsave.c for merging 2013-10-06 17:56:37 +00:00
Kp f92e234054 Move */main/dumpmine.c -> similar/main/dumpmine.c 2013-10-06 16:58:49 +00:00
Kp fa1b1a1217 Restructure dumpmine.c for merging 2013-10-06 16:20:00 +00:00
Kp e73205faac Use enum for player awareness types 2013-10-05 21:35:58 +00:00
Kp 06c83c9393 Move similar/main/gamecntl.c -> similar/main/gamecntl.cpp 2013-10-05 21:35:58 +00:00
Kp b4107e6526 Remove duplicate declarations 2013-10-03 03:11:52 +00:00
Kp 13b2562ab3 Remove unnecessary bmread.h 2013-10-03 03:11:52 +00:00
Kp c58c4e4d06 Move declarations to headers 2013-10-03 03:11:52 +00:00
Kp f9899a9f20 Mark various functions static 2013-10-03 03:11:51 +00:00
Kp 1b4169b0d0 Move */main/powerup.c -> similar/main/powerup.c 2013-10-02 02:51:25 +00:00
Kp 3118fff45e Compute Boss_invulnerable_dot as needed 2013-09-28 23:51:51 +00:00
Kp 1ff627f85e Move multi_send_got_flag declaration to header 2013-09-21 23:34:05 +00:00
Kp cbe52ce1c7 Move d2x-rebirth/main/escort.h -> common/main/escort.h 2013-09-21 23:31:51 +00:00
Kp bca4a99f3e Move */main/laser.c -> similar/main/laser.c 2013-09-21 23:19:38 +00:00
Kp 9e3fb796e1 Use helper for comparing to proximity bomb index 2013-09-21 23:19:38 +00:00
Kp 7aef24071c Simplify weapon sufficiency logic 2013-09-21 23:19:38 +00:00
Kp 8df7e8c6b4 Restructure laser.c to simplify merge 2013-09-21 23:19:31 +00:00
Kp f4b21088a0 Track vulcan ammo explicitly 2013-09-20 23:12:54 +00:00
Kp 6e1d9f1f0c Add helper to test for weapons that use vulcan ammo 2013-09-20 23:12:51 +00:00
Kp d447d02a1d Move */main/newdemo.c -> similar/main/newdemo.c 2013-09-15 21:34:08 +00:00
Kp aa9127e3c1 Enable -Wwrite-strings 2013-09-15 21:34:03 +00:00
Kp eb9b126ab1 Reorder newdemo.c to simplify merging 2013-09-15 21:03:58 +00:00
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