Commit graph

36 commits

Author SHA1 Message Date
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
zico 5a36ffdb17 Reduced base divisor for mouse X and Y axes, doubling acceleration and base sensitivity 2013-12-10 16:26:37 +01:00
Kp 04fdf83298 Use helper to copy default key settings 2013-12-08 21:43:53 +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 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 74ac85076f Store joystick button text in one allocation 2013-12-01 22:42:47 +00:00
Kp 5354d05fbf Store joystick axis text in one allocation 2013-12-01 22:42:47 +00:00
Kp b326bb832b Use helper to clamp kconfig values 2013-11-18 04:51:06 +00:00
Kp 810ccd037d Sanity check axis reads 2013-11-18 04:51:06 +00:00
Kp 4ba8444fc8 Use helper to read axis fields 2013-11-18 04:51:06 +00:00
Kp 6f839dedae Use helper to set exclusive binding 2013-11-18 04:51:06 +00:00
Kp 5266426171 Also switch kc_menu to references 2013-11-18 00:56:20 +00:00
Kp 975acb97fe Remove pointer subtraction in kc_change_* 2013-11-18 00:56:20 +00:00
Kp 29826db21c Always keep kc_* table relations const 2013-11-18 00:54:59 +00:00
Kp 6becfdacca Remove NUM_DXX_REBIRTH_CONTROLS 2013-11-18 00:54:59 +00:00
Kp a842b31a20 Remove NUM_MOUSE_CONTROLS 2013-11-18 00:54:59 +00:00
Kp 04b0bd892d Remove NUM_JOYSTICK_CONTROLS 2013-11-18 00:54:59 +00:00
Kp bf7063080e Remove NUM_KEY_CONTROLS 2013-11-18 00:54:59 +00:00
Kp 6586d474f9 Only rebuild tables on request 2013-11-16 23:24:12 +00:00
Kp fc1e00dae6 Pre-compute labelx+inputx 2013-11-16 23:24:12 +00:00
Kp c959915fba Remove always-true test in kc_drawitem 2013-11-16 23:24:12 +00:00
Kp d0514455b3 Use automap_state instead of automap_count 2013-11-16 23:24:12 +00:00
Kp 321e240744 Use rear_view_state instead of rear_view_count 2013-11-16 23:24:12 +00:00
Kp cda0b60687 Remove unused fire_secondary_count 2013-11-16 23:24:12 +00:00
Kp 494c380abb Switch automap to use fire_primary_state
Counting is unnecessary here.
2013-11-16 23:24:12 +00:00
Kp d035fb258a Remove unused kc_item->id 2013-11-16 04:28:39 +00:00
Kp 9a6414ceca Combine hitbox bounds testing 2013-11-16 04:28:39 +00:00
Kp b7f1a71840 Combine item text formatting 2013-11-16 04:28:39 +00:00
Kp ba7950d3d5 Move similar/main/kconfig.c -> similar/main/kconfig.cpp 2013-10-20 22:49:11 +00:00
Renamed from similar/main/kconfig.c (Browse further)