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

620 commits

Author SHA1 Message Date
Kp fa73ca8a17 Pass gr_remap_bitmap_good arg by & 2015-01-25 05:32:45 +00:00
Kp 31450e4843 Pass iff_read_bitmap arg by & 2015-01-25 05:32:44 +00:00
Kp 922a7b7dc9 Pass grs_main_bitmap to iff_read_animbrush 2015-01-25 05:32:44 +00:00
Kp 40fd988a0f Hide local classes in anonymous namespaces 2015-01-23 03:55:06 +00:00
Kp a6884e77db Unpack robot_info 2015-01-23 03:55:04 +00:00
Kp 84e3a03451 Remove unused parameters 2015-01-18 01:58:33 +00:00
Kp c6664a45a6 Add newmenu_do helper for array<newmenu_item, N> 2015-01-18 01:58:32 +00:00
Kp f8163957ef Add helper nm_item_input 2015-01-18 01:58:31 +00:00
Kp 547193c591 Compile out unused bm_write_all 
Unused since e2a2cc579a deleted caller
piggy_dump_all.
 2015-01-17 18:31:43 +00:00
Kp f7815810e8 Use RAIIPHYSFS_File to manage PHYSFS_File 
Fixes a few leaks on error paths.
 2015-01-17 18:31:42 +00:00
Kp 68d705a85a Use bool conversion to test PHYSFS_File pointer 2015-01-17 18:31:42 +00:00
Kp 28a31a223f Centralize window_close calls 2015-01-17 18:31:41 +00:00
Kp 61ba3d1ba2 Centralize buddy search 2015-01-12 00:26:04 +00:00
Kp 846b6b4b82 Improve buddy message suppression 2015-01-12 00:26:03 +00:00
Kp 12770802ab Use ntstring for guidebot name 2015-01-12 00:26:02 +00:00
Kp fbac119095 Propagate use of objptridx_t 2014-12-23 04:20:27 +00:00
Kp 0f30d4eb72 Use PHYSFSX_gets_line_t for Current_level_palette 2014-12-20 04:36:08 +00:00
Kp 5867b5d690 Remove useless bmread whitespace loop 
Obsolete since 44bbb66101.
 2014-12-18 04:12:39 +00:00
Kp da6632a917 Use array<> for Robot_joints 2014-12-18 04:12:38 +00:00
Kp 4af33f12a4 Fix gcc-4.7 -Wmissing-braces warning 2014-12-15 03:59:15 +00:00
Kp 73b0a016a8 Fix loading robots-?.mvl 
Rework movie loading to fix loading built-in robot movies.  The previous
code always ignored loading the last entry in the movie array, which was
blank until 18f6919b33.  The last entry
was unused after d38a3d1362, so it was
removed, which caused the code to skip the robots entry.

Commit d38a3d1362 broke unloading add-on
movies by removing the strcpy which saved their name.  Add code to save
the name to extra_robot_movie_mission and call it when switching
missions.

Reported by btb: https://github.com/dxx-rebirth/dxx-rebirth/pull/17
 2014-12-06 17:56:56 +00:00
Kp 0375876a08 Pass gr_bm_ubitbltm arg by & 2014-12-02 03:35:01 +00:00
Kp e7aae37c8d Pass ogl_ubitblt_i arg by & 2014-12-02 03:35:01 +00:00
Kp 5aaf847c41 Fix various -Wnarrowing errors 2014-11-26 03:39:21 +00:00
Kp d63be88eb0 Propagate use of vsegptridx_t 2014-11-23 04:58:45 +00:00
Kp a17cf6f808 Avoid slicing into objnum_t local 2014-11-20 03:00:41 +00:00
Kp 2c349136cc Avoid slicing into segnum_t local 2014-11-20 03:00:36 +00:00
Kp 9aa0cf0b89 Pass read_model_guns vector as array & 2014-11-01 03:08:27 +00:00
Kp 6d61198130 Pass compute_segment_center vector by & 2014-10-30 03:32:51 +00:00
Kp 5bb9c88979 Add vm_vec_sub that returns result 2014-10-29 03:24:31 +00:00
Kp fb1704780b Move pMovie into local data structures 2014-10-29 03:01:18 +00:00
Kp d8024d4d26 Use RAII to manage MVESTREAM 2014-10-29 02:59:08 +00:00
Kp 19bb554f31 Move MVESTREAM pointer up one layer 2014-10-29 02:57:52 +00:00
Kp 53aa70cecb Use vsegptridx_t 2014-10-28 03:08:51 +00:00
Kp b871228f92 Pass create_morph_robot vector by const & 2014-10-28 01:47:18 +00:00
Kp 8a0582766a Pass drop_powerup vector by const & 2014-10-28 01:46:07 +00:00
Kp d14c0ba71c Pass do_snipe_frame vector by & 2014-10-28 01:45:53 +00:00
Kp ad717e59e8 Pass laser vectors as const & 2014-10-26 21:37:27 +00:00
Kp a32547af16 Pass position-related vms_vector arg by & 2014-10-22 02:46:03 +00:00
Kp 019b572c0e Remove #define Segment2s Segments 2014-10-21 03:15:12 +00:00
Kp e7e23eb92e Make unused_window_userdata_t const 2014-10-16 02:30:29 +00:00
Kp 7f648c0f5f Wrap segment iteration idiom 2014-10-12 23:10:05 +00:00
Kp fb641b3250 Wrap object iteration idiom 2014-10-12 23:05:46 +00:00
Kp 4e368ac946 Make mve args const 2014-10-10 02:57:07 +00:00
Kp 6943024647 Fix signaure of mve_cb_Alloc 2014-10-10 02:43:40 +00:00
Kp a8f853aa7a Pass d_event arg by const& 2014-10-04 22:36:13 +00:00
Kp ec1eb03cc2 Move d2x-rebirth/main/segment.cpp -> similar/main/segment.cpp 2014-10-04 17:53:09 +00:00
Kp 6971dfbf4a Use symbolic *_none constants for -1 2014-10-04 17:31:13 +00:00
Kp 184f828a91 Move iff_read_animbrush array<unique_ptr<grs_bitmap>> down 2014-10-04 15:02:03 +00:00
Kp 5b97433ce5 Make various ai functions take const vms_vector& 2014-10-02 03:02:36 +00:00
Kp 1fff2db9a8 Pass vm_vec_dist_quick arg by & 2014-10-01 02:28:41 +00:00
Kp 0b2636d535 Pass vm_vec_add2 arguments by & 2014-09-28 21:43:00 +00:00
Kp 00b59c3058 Pass vm_vec_dot arguments by & 2014-09-28 21:11:48 +00:00
Kp 321bbe37d8 Pass vm_vec_sub arguments by & 2014-09-28 21:11:45 +00:00
Kp a620a59bda Pass vm_vec_normalize_quick v by & 2014-09-28 21:11:04 +00:00
Kp c0023cad51 Fix memory leak writing hoard data 2014-09-27 23:14:50 +00:00
Kp dc511d0a5c Pass array<> to iff_read_animbrush 2014-09-27 23:06:33 +00:00
Kp 78ad2adabf Write weapon_info carefully 2014-09-27 22:46:25 +00:00
Kp afd995aa22 Centralize N_D2_* constants in bm.h 2014-09-27 15:42:45 +00:00
Kp 22b836147d Propagate for variables in d2x-rebirth/main/movie.cpp 2014-09-26 02:42:16 +00:00
Kp c58d9c72a8 Propagate for variables in d2x-rebirth/main/escort.cpp 2014-09-26 02:42:16 +00:00
Kp 9eda412dff Use symbolic constant wall_none 2014-09-21 23:05:14 +00:00
Kp 703f60ac3f Fix -Wtype-limits warnings 2014-09-21 21:41:55 +00:00
Kp 039bf2f0b7 Fix crash on failure to create afterburner blob 
Fix crash on failure to recreate thief.
 2014-09-13 22:01:17 +00:00
Kp e8f4b20d1d Use special type for PHYSFSX_fgets 2014-09-07 20:07:20 +00:00
Kp a02f78a171 Move saving window pointer into helper 2014-09-07 19:04:07 +00:00
Kp fea751bc62 Use std::string for mission path 2014-08-24 17:45:30 +00:00
Kp b95759aecc Propagate use of objptridx 2014-08-23 23:53:56 +00:00
Kp 54da3b386b Copy bmread strings to local storage 2014-08-23 17:06:44 +00:00
Kp 66cb80c343 Propagate use of objptridx 2014-08-17 20:31:18 +00:00
Kp 414cf3b29b Remove useless buddy rediscovery loop 
Assume Buddy_objnum will be set right.
 2014-08-14 02:03:27 +00:00
Kp bf8d29b348 Remove useless buddy bot checks 
These are only hit after the condition is assumed true.
 2014-08-13 22:17:38 +00:00
Kp d6b81d2fe3 Deduce create_bfs_list max_segs 2014-08-13 03:19:13 +00:00
Kp 125d9257be Use special type names for segment/object numbers 2014-08-13 02:57:12 +00:00
Kp 4acbb40ad7 Use enum for window event result 2014-08-07 02:47:48 +00:00
Kp 0f7e561775 Add helper to iterate over objects in segment 2014-07-30 03:06:40 +00:00
Kp 13b233b7d7 Fix Windows build 2014-07-26 22:53:41 +00:00
Kp 51fdeea84b Use unique_ptr for model_data 2014-07-26 04:01:35 +00:00
Kp ebb1b70350 Fix polymodel writing on x64 
Packed writing a structure containing a pointer, but reading it as an
int, is wrong on x64.
 2014-07-26 04:01:35 +00:00
Kp 6020c9c013 Use d_fname for DOS filenames 2014-07-25 02:54:31 +00:00
Kp 2ddc37d804 Write tmap_info carefully 2014-07-25 02:54:31 +00:00
Kp bd1c6d8c5d Reduce header includes of physfsx.h 2014-07-22 23:48:23 +00:00
Matt Vandermeulen 28f307eb85 Fixes #5 - Byteswap header renamed to byteutil, plus sed magic 
[Kp: switch to #pragma for byteutil.h]
 2014-07-03 02:03:08 +00:00
Kp c4b31f875f Use array<> for MarkerMessage 2014-06-22 18:53:42 +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
zico ad7cb106bc Changed custom D1X license to GPLv3 2014-06-01 19:55:23 +02:00
Kp 07f0555099 Switch missed sites to vclip_write/eclip_write 2014-02-05 02:37:39 +00:00
Kp 6ba95cb83b Use objptridx_t for detect_escort_goal_accomplished 2014-01-25 18:06:54 +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 a2427f58b5 Use special type to reduce pointer/index conversions 2014-01-12 19:32:12 +00:00
Kp 85b95efc70 Fix ugly hack of using -4 for fuelcen reached 2014-01-11 22:24:55 +00:00
Kp ae88d2ed8b Split out guidebot fuelcen search to separate function 2014-01-11 22:23:37 +00:00
Kp 21c9aa6c16 Remove unused ESCORT_GOAL_EXIT2 2014-01-11 22:20:48 +00:00
Kp 1ec7ea4e8f Remove goto logic in detect_escort_goal_accomplished 2014-01-11 22:19:19 +00:00
Kp 729f9c7d90 Check escort goal directly, rather than using goal_seg hack 2014-01-11 22:17:13 +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 cf5343db18 Move ai_local into ai_static 
Eliminates a global and some pointer math.
 2013-12-29 03:59:21 +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 6e722eb789 Remove more unnecessary sprintf calls in do_escort_menu 2013-12-28 22:10:25 +00:00
Kp ba63c18d9b Remove unnecessary sprintf in do_escort_menu 2013-12-28 22:10:24 +00:00
Kp 38b2dbe639 Move object* -> objnum conversion into init_ai_object 2013-12-28 22:10:24 +00:00
Kp 44f1814b45 Store boss gate/teleport segments in countarray objects 2013-12-22 20:02:42 +00:00
Kp 0d7705cb05 Use visited_segment_bitarray_t for escort create_bfs_list 2013-12-22 05:29:49 +00:00
Kp 4fb6990b6c Make Stolen_items[] a C++ array 2013-12-22 01:53:26 +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 150281ac28 Use thief_message_str instead of thief_message where possible 2013-12-17 04:03:34 +00:00
Kp 21de8bc8f6 Use buddy_message_str instead of buddy_message where possible 2013-12-17 04:03:34 +00:00
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 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 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 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 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 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 a6b1bd58a2 Use MALLOC consistently 2013-10-26 03:50:27 +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
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 9c0be7cdfa Remove unused kconfig globals 2013-08-20 02:58:51 +00:00
Kp 948e03dcbf Copy mission parameters properly so that D1 missions load 
Copying unrelated structures with an undocumented assumption that one is
a prefix of the other is dangerous and broken.  Remove it and copy the
relevant fields explicitly.
 2013-08-18 21:05:31 +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