Kp
bb2dafa7be
Simplify search for guide bot in mine
2013-12-07 19:31:06 +00:00
Kp
72b6421877
Simplify Buddy_objnum calculation
2013-12-07 19:29:22 +00:00
Kp
8342558e1f
Remove unused and broken escort energy center check
...
detect_escort_goal_accomplished is passed -4 for energy center and an
object index otherwise. Using the index to search segments is wrong.
Using a side number to search other segments is also wrong. Delete the
whole check, since it is broken and useless.
2013-12-07 19:25:23 +00:00
Kp
a2cec5d71f
Switch PHYSFSX_fgets to auto-sized variant where possible
2013-12-07 18:39:19 +00:00
Kp
babbe8e9e6
Move */arch/carbon -> common/arch/carbon
2013-12-06 03:58:10 +00:00
Kp
18bf9b94ea
Move */arch/cocoa -> common/arch/cocoa
2013-12-06 03:57:18 +00:00
Kp
9de54cfa74
Switch to C++ linkage
...
import fileinput
guard = 0
cxxguard = '#ifdef __cplusplus\n'
for line in fileinput.input(inplace=True):
if line == cxxguard:
guard = 1
continue
if guard:
if line == 'extern "C" {\n':
guard = 2
continue
if line == '}\n':
guard = 0
continue
if guard == 2:
assert(line == '#endif\n')
guard = 0
print cxxguard,
continue
print line,
2013-12-06 03:35:32 +00:00
Kp
fcf216474b
Move */main/collide.c -> similar/main/collide.c
2013-12-06 03:27:30 +00:00
Kp
ef4db00e97
Restructure collide.c for merging
2013-12-02 00:22:11 +00:00
Kp
18aea17f9e
Move */main/fireball.c -> similar/main/fireball.c
2013-12-02 00:21:31 +00:00
Kp
148dd00eeb
Restructure fireball.c for merging
2013-12-02 00:12:36 +00:00
Kp
ff9c15b51f
Move d2x-rebirth/libmve/mveplay.c -> d2x-rebirth/libmve/mveplay.cpp
2013-12-02 00:11:33 +00:00
Kp
22f3f78ac5
Move d2x-rebirth/libmve/mvelib.c -> d2x-rebirth/libmve/mvelib.cpp
2013-12-01 23:57:00 +00:00
Kp
59e4a8f1ba
Move d2x-rebirth/libmve/mve_audio.c -> d2x-rebirth/libmve/mve_audio.cpp
2013-12-01 23:57:00 +00:00
Kp
20a9c83182
Move d2x-rebirth/libmve/decoder8.c -> d2x-rebirth/libmve/decoder8.cpp
2013-12-01 23:57:00 +00:00
Kp
f65d7e8d5c
Move d2x-rebirth/libmve/decoder16.c -> d2x-rebirth/libmve/decoder16.cpp
2013-12-01 23:57:00 +00:00
Kp
8b50798bf7
Move d2x-rebirth/misc/physfsrwops.c -> d2x-rebirth/misc/physfsrwops.cpp
2013-12-01 23:56:17 +00:00
Kp
1ed0a170a9
Remove unused PHYSFSRWOPS_openWrite
2013-12-01 23:56:17 +00:00
Kp
3c61dc4dec
Remove unused PHYSFSRWOPS_openAppend
2013-12-01 23:56:17 +00:00
Kp
8413412426
Remove unused PHYSFSRWOPS_makeRWops
2013-12-01 23:56:17 +00:00
Kp
2ac98f7269
Move */main/gamemine.c -> similar/main/gamemine.c
2013-12-01 23:55:29 +00:00
Kp
38832fd1af
Restructure gamemine.c for merge
2013-12-01 23:52:27 +00:00
Kp
f99c2b739a
Move */iff/iff.c -> similar/main/iff.c
2013-12-01 23:24:51 +00:00
Kp
1b59de804b
Move d2x-rebirth/main/bmread.c -> d2x-rebirth/main/bmread.cpp
2013-12-01 23:24:33 +00:00
Kp
c258115b30
Move */main/bm.c -> similar/main/bm.c
2013-12-01 22:51:44 +00:00
Kp
acb664ae40
Use proper type for mve backbuffers
2013-11-28 02:10:58 +00:00
Kp
69c507c5a7
Add cast for mve play cvt malloc
2013-11-28 02:10:39 +00:00
Kp
48effa8a6b
Make Escort_goal_text [][] from *[]
2013-11-28 02:09:45 +00:00
Kp
c0ffadae44
Make Thief_wait_times const
2013-11-28 00:27:43 +00:00
Kp
83fc5bc7f7
Skip counting unhandled mve segments
2013-11-24 23:52:00 +00:00
Kp
e31f7141b2
Remove obsolete uvl processing
...
Descent refuses to load mines with version less than 16, so fixing up
uvl values in mines less than 15 is never used.
2013-11-24 23:50:44 +00:00
Kp
cb7968159a
Move editor texture data into load_mine_data
2013-11-24 23:50:43 +00:00
Kp
0b34e37a5e
Restructure bmread.c for merging
2013-11-24 23:50:43 +00:00
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