Commit graph

494 commits

Author SHA1 Message Date
Kp 92e8cb7a31 Add type checking to newmenu subfunction userdata 2013-12-15 21:54:38 +00:00
Kp cea46651fc Check type of window handler function 2013-12-15 18:51:26 +00:00
Kp 49f80d5886 Move movie control structure onto RunMovie stack 2013-12-08 19:01:53 +00:00
Kp 3e42f8c382 Move temporary bitmap descriptor onto bm_load_sub stack 2013-12-08 18:25:42 +00:00
Kp 75c229c6bf Normalize con_printf newline usage 2013-12-07 21:13:37 +00:00
Kp d3dadc66e8 Handle ESCORT_GOAL_UNSPECIFIED in say_escort_goal 2013-12-07 19:32:44 +00:00
Kp f1ddfd448a Simplify search for guide bot in escort menu 2013-12-07 19:32:29 +00:00
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