TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
8314 commits 2 branches 28 tags 122 MiB
Commit graph

575 commits

Author SHA1 Message Date
Kp f6631ce742 Unpack various structures 
Prohibit conversion to void* to avoid accidental use with memcpy
 2014-06-21 23:56:27 +00:00
Kp 3c6f787e15 Use array<> for Polygon_models 2014-06-20 02:59:53 +00:00
Kp 7b33018cb5 Use array<> for Textures 2014-06-20 02:59:53 +00:00
Kp 3200823a8b Use array<> for TmapInfo 2014-06-20 02:59:53 +00:00
Kp d510438fd4 Use array<> for WallAnims 2014-06-15 03:35:21 +00:00
Kp bd35eb7469 Use array<> for wclip arrays 2014-06-14 23:13:38 +00:00
Kp 93ec327a10 Write powerup_type_info structures carefully 2014-06-14 23:13:37 +00:00
Kp 7c62bf98ef Use array<> for Powerup_info 2014-06-14 01:15:33 +00:00
Kp e326567cdf Skip useless sin computation 2014-06-08 00:05:33 +00:00
Kp dd3c1144a9 Remove useless Sounds[] counting loop 2014-06-08 00:05:33 +00:00
zico ad7cb106bc Changed custom D1X license to GPLv3 2014-06-01 19:55:23 +02:00
Kp 72b7ff6720 Write vclip structures carefully 2014-02-01 19:26:16 +00:00
Kp 9b0fb5da0a Write eclip structures carefully 2014-02-01 18:55:18 +00:00
Kp b9764fb45e Use array<> for Effects 2014-01-25 17:21:56 +00:00
Kp 8a4c553a8a Remove needless recomputation of Effects[] pointer 2014-01-25 17:21:56 +00:00
Kp 917ef39258 Use array<> for Vclip 2014-01-23 03:48:25 +00:00
Kp 9a5d0f6f09 Use symbolic values for segment/object first/none 2014-01-06 04:17:55 +00:00
Kp 094dfbf3d4 Reduce header inclusions 2013-12-31 03:22:03 +00:00
Kp 073f00974a Eliminate uses of the typedef struct X { ... } X; pattern 
C++ does not require this pattern.

import re, fileinput
to = re.compile(r'^typedef struct ([a-z_A-Z]+)\s*{')
tc = re.compile(r'^}(.*?)\s*([a-z_A-Z]+);$')
osn = None
for line in fileinput.input(inplace=True):
	m = to.match(line)
	if m:
		osn = m.group(1)
		print 'struct %s\n{' % osn
		continue
	if osn:
		m = tc.match(line)
		if m:
			csn = m.group(2)
			if osn == csn:
				print '}%s;' % m.group(1)
				osn = None
				continue
			else:
				osn = None
	print line,
 2013-12-28 22:48:07 +00:00
Kp 5b5c8a3c6a Remove write-only variable TmapList 2013-12-22 01:16:16 +00:00
Kp b1c5307eb1 Use array for palette_array_t 2013-12-22 00:37:36 +00:00
Kp a3d66a3b37 Add typedef palette_array_t for palette data 2013-12-22 00:05:13 +00:00
Kp 11f7bc51ee Use unsigned count of frames in a vclip 2013-12-22 00:05:13 +00:00
Kp 7c0204095e Simplify name setup in load_pig1 2013-12-18 05:00:20 +00:00
Kp be041a9cfc Add type checking for ui_create_dialog 2013-12-17 03:49:24 +00:00
Kp 3b9b5ebfb0 Use RAII to manage function-local heap objects 2013-12-08 19:04:52 +00:00
Kp 3e42f8c382 Move temporary bitmap descriptor onto bm_load_sub stack 2013-12-08 18:25:42 +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 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 de366b12ee Move d1x-rebirth/main/bmread.c -> d1x-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 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 1932647fb1 Set Texture* values at load time 2013-11-24 23:50:43 +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 67407d211e Reset hours-on-level in D1X, too 2013-11-23 22:48:23 +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 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 313c36d8ee Move d1x-rebirth/main/snddecom.c -> d1x-rebirth/main/snddecom.cpp 2013-11-09 18:07:28 +00:00
Kp f720f937f5 Move d1x-rebirth/main/hostage.c -> d1x-rebirth/main/hostage.cpp 2013-11-09 18:07:28 +00:00
Kp ee0f60ddb7 Move d1x-rebirth/main/custom.c -> d1x-rebirth/main/custom.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 cede90c2fb Restructure piggy.c for merging 2013-11-09 17:45:21 +00:00
Kp 996cff7fec Remove DEST_SAT code in ai.c 2013-11-08 03:14:44 +00:00
Kp 0a4c1ec7bf Quick out search for boss segments 2013-11-03 23:39:08 +00:00
Kp 58958e091b Only give primaries that exist 2013-11-02 04:24:14 +00:00
Kp b08a6bf98b Remove unused multi.h include in bm.c 2013-11-02 04:24:05 +00:00
Kp 6a8859b3a5 Remove unused multi.h include in bmread.c 2013-11-02 04:23:55 +00:00
Kp 2714679284 Mark private functions static 2013-11-02 04:23:55 +00:00
Kp a37faa738d Remove unused d1x-rebirth/main/digicomp.{c,h} 2013-11-01 02:58:05 +00:00
Kp 4693eaecdf Fix ancient array shift bug in fuelcen_delete 2013-11-01 02:48:55 +00:00
Kp 69567b1b99 Remove unused vclip_play 2013-10-29 03:24:42 +00:00
Kp 00ed0c17ff Mark reset_all_robot_centers as used for debuggers 2013-10-29 03:24:42 +00:00
Kp 19ae39a2d4 Include snddecom.h in snddecom.c 2013-10-29 03:24:42 +00:00
Kp 24f511bbb0 Remove unused piggy_get_bitmap_name 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 3d20ee8c92 Move d1x-rebirth/editor/ehostage.c -> d1x-rebirth/editor/ehostage.cpp 2013-10-28 04:14:19 +00:00
Kp 8ed99faf5c Make headers freestanding 2013-10-26 03:50:28 +00:00
Kp a6b1bd58a2 Use MALLOC consistently 2013-10-26 03:50:27 +00:00
Kp 5b0c4b10ac Use accessor for most get/set object->id accesses 2013-10-20 22:49:09 +00:00
Kp f51e9e8cfc Fix ancient hxm memory leak 2013-10-19 17:03:11 +00:00
Kp fabed11b2f Fix ancient animbrush memory leak 2013-10-19 17:03:11 +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 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 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 7c7bff061e Remove BUILD_PSX_DATA code 
This is never activated.
 2013-10-02 02:50:37 +00:00
Kp bca4a99f3e Move */main/laser.c -> similar/main/laser.c 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 53c8c2f812 Backport D2X use of helper call_find_homing_object_complete 2013-09-21 17:02:14 +00:00
Kp ec015d8814 Backport D2X ancestor sanity check 2013-09-20 23:14:47 +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 485c3f8a2a Convert d1x newdemo to menu helpers 2013-09-15 21:34:02 +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 4848179857 Remove unused bm_read_hostage_face 2013-09-14 17:42:11 +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 d156a4c1ab Simplify D1X hostage handling 2013-09-02 23:59:31 +00:00
Kp b7dac2941c Move */main/gamesave.c -> similar/main/gamesave.c 2013-09-01 22:59:55 +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 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 897023eda5 Reorder vertex render lookups to simplify merge 2013-08-24 17:10:06 +00:00
Kp 3f0f68e862 Remove unused move_object_to_goal 2013-08-24 16:54:28 +00:00
Kp e8776caf16 Remove unused get_random_child 2013-08-24 16:54:28 +00:00
Kp 0365b3600f Remove unused special_object_in_seg 2013-08-24 16:54:28 +00:00
Kp 335c56111b Remove unused move_object_to_legal_spot 2013-08-24 16:54:28 +00:00
Kp b1b40bfe99 Remove unused set_rotvel_and_saturate 2013-08-24 16:54:28 +00:00
Kp 1b44fe5844 Move alpha blend test to helper to simplify merge 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 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 d55054d82e Always play a sound when a player escapes the mine 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 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 de6422d58f Remove unused multi_send_audio_taunt 2013-08-11 20:43:08 +00:00
Kp 6e88008677 Use unaligned-safe copy of powerup position 2013-08-11 20:43:08 +00:00