Commit graph

395 commits

Author SHA1 Message Date
zico ec516b5675 Disable powerup capping for cooperative game mode as it potentially deletes weapons carried over from another level 2013-12-14 02:53:45 +01:00
Kp cb4fd7c1b4 Compact known file extension storage 2013-12-13 03:58:01 +00:00
Kp 4dfceab50b Factor out file extension filtering 2013-12-13 03:51:14 +00:00
Kp 593d0b25ff Remove duplicate kconfig labels
import re, fileinput
which = 3
last = [None, None]
e = re.compile(r'(?P<left>	\{(?:\s*\d+,){8})(?P<quote>"?)(?P<s>[^",]+)(?P=quote)(?P<right>,.*},)$')
for line in fileinput.input(inplace=True):
	if line == '#if defined(DXX_BUILD_DESCENT_I)\n':
		which = 1
	elif line == '#elif defined(DXX_BUILD_DESCENT_II)\n':
		which = 2
	elif line == '#endif\n':
		which = 3
	else:
		m = e.match(line)
		if m:
			s = m.group('s')
			suppress = True
			if (which & 1) and last[0] != s:
				suppress = False
				last[0] = s
			if (which & 2) and last[1] != s:
				suppress = False
				last[1] = s
			if suppress:
				line = m.group('left') + ' NULL /* duplicate */' + m.group('right') + '\n'
	print line,
2013-12-13 03:50:51 +00:00
Kp ff8db8d39e Reduce relocations for Controls members 2013-12-13 03:49:37 +00:00
Kp 2bd302cddd Move Controls ubyte values into substructure 2013-12-13 03:47:57 +00:00
Kp 07877853ba Use static_assert where available 2013-12-13 03:44:02 +00:00
Kp 02f4c007e3 Make scores_handler fades[] static const 2013-12-11 04:06:35 +00:00
Kp a3fa660d33 Remove casts in dxx_sendto calls 2013-12-11 04:05:24 +00:00
zico e195290fe4 Added quick load ability for savestates 2013-12-10 18:13:32 +01:00
zico 5a36ffdb17 Reduced base divisor for mouse X and Y axes, doubling acceleration and base sensitivity 2013-12-10 16:26:37 +01:00
zico dc2a7c6df0 Rearranged EVENT_KEY_RELEASE for automap_handler so it will not trigger automap_key_command and create a double input following EVEN_KEY_COMMAND 2013-12-10 02:58:56 +01:00
zico 6bd9c2bfc1 Rearranged game mode check so ANARCHY_ONLY_MISSION will not prohibit CTF, Hoard or Bounty 2013-12-10 01:52:19 +01:00
zico a04aa340c5 Keep multi frame running during game idle events to decrease delay on packet forwarding 2013-12-09 16:28:34 +01:00
zico 4f56e3d9ca Removed ancient multiplayer message header handling of D2X that broke communication between players. 2013-12-09 14:51:13 +01:00
zico dae83f9edc Set PPS limits from 5 to 40 2013-12-09 14:25:32 +01:00
zico 3e2fd4f74b Improved pdata update sync when firing and not limiting general use of the force flag 2013-12-09 14:05:24 +01:00
zico 2e407fa5a8 Removed short packets and added segment number to quaternion structure 2013-12-09 14:00:23 +01:00
Kp 04fdf83298 Use helper to copy default key settings 2013-12-08 21:43:53 +00:00
Kp 322c61ef01 Remove use of heap-based splitword 2013-12-08 21:43:53 +00:00
Kp 0c712921b7 Simplify string search in playsave.cpp 2013-12-08 21:43:52 +00:00
Kp b7fe431979 Use RAII for playsave strings 2013-12-08 21:02:10 +00:00
Kp 3b9b5ebfb0 Use RAII to manage function-local heap objects 2013-12-08 19:04:52 +00:00
Kp 9bb36c002a Move object_rw onto state_restore_all_sub stack 2013-12-08 18:26:20 +00:00
Kp 938b9e4427 Move object_rw onto state_save_all_sub stack 2013-12-08 18:26:20 +00:00
Kp f4ac8b34fe Move grs_bitmap BBM onto piggy_new_pigfile stack 2013-12-08 18:26:20 +00:00
Kp 3b75f65359 Move callsign buf onto change_playernum_to stack 2013-12-08 18:26:20 +00:00
Kp 50d14ea3b0 Move ending tmp buffer onto load_mission stack 2013-12-08 18:26:20 +00:00
Kp cebd52442b Move briefing tmp buffer onto load_mission stack 2013-12-08 18:26:20 +00:00
Kp af5ff85286 Move drive letter newmenu_item onto select_file_handler stack 2013-12-08 18:26:19 +00:00
Kp fddcfc8e99 Fix technical buffer overrun in drive letter selection
Padding makes this safe, but moving onto the stack is cleaner.
2013-12-08 18:26:19 +00:00
Kp d16dff3a16 Move kmatrix_screen onto kmatrix_view stack 2013-12-08 18:26:19 +00:00
Kp 4d877c5d67 Move ai_save_state *_rw onto stack 2013-12-08 18:26:19 +00:00
Kp 953a1888d7 Combine state pointer and count pointer 2013-12-08 00:12:45 +00:00
Kp a4f3c93247 Separate mutable and const kconfig data 2013-12-08 00:10:29 +00:00
Kp 3e4884f499 Consolidate ramped keyboard input
This also fixes a copy-paste bug in bank handling.
2013-12-07 21:34:53 +00:00
Kp 65ef441f20 Fix copy-paste bug from 98bf17c0 change of keyboard sensitivity
Using different sensitivities for left-slide versus right-slide looks
like a bug.  Fix it.
2013-12-07 21:32:03 +00:00
Kp 141ead1830 Move ramped controls into template structure 2013-12-07 21:13:37 +00:00
Kp 75c229c6bf Normalize con_printf newline usage 2013-12-07 21:13:37 +00:00
Kp 76765624a0 Simplify calculation of buddy ouch_str 2013-12-07 20:37:24 +00:00
Kp c3dd634cce Remove unused flag OF_HARMLESS 2013-12-07 18:41:35 +00:00
Kp a2cec5d71f Switch PHYSFSX_fgets to auto-sized variant where possible 2013-12-07 18:39:19 +00:00
Kp 7f5410cc8b Use lengthof instead of sizeof(A)/sizeof(A[0])
The latter form can accept pointers, but the template lengthof cannot.
2013-12-07 18:38:10 +00:00
Kp da70171db2 Mark various newmenu strings as const 2013-12-06 04:44:55 +00:00
Kp 70149044c1 Switch gr_printf(x,y,s) to gr_string(x,y,s) 2013-12-06 04:02:13 +00:00
Kp 70caa4e7b6 Fix array understep in guidebot flare code 2013-12-06 03:36:07 +00:00
Kp 320d22aae1 Move similar/main/collide.c -> similar/main/collide.cpp 2013-12-06 03:27:30 +00:00
Kp fcf216474b Move */main/collide.c -> similar/main/collide.c 2013-12-06 03:27:30 +00:00
Kp 517a8c1e37 Move similar/main/fireball.c -> similar/main/fireball.cpp 2013-12-06 03:27:30 +00:00
Kp 3620392f56 Remove unused nm_messagebox_fixedfont 2013-12-06 00:24:07 +00:00