Commit graph

4915 commits

Author SHA1 Message Date
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 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 61d8fe7cc8 Remove unused return value of gr_*printf / gr_*string 2013-12-07 18:44:07 +00:00
Kp 60727dd7d5 Add missing va_end calls 2013-12-07 18:42:50 +00:00
Kp f6125b5f2d Fix array overstep on invalid PCX error number 2013-12-07 18:41:40 +00:00
Kp c3dd634cce Remove unused flag OF_HARMLESS 2013-12-07 18:41:35 +00:00
Kp 706b458699 Mark PHYSFSX_find* functions nonnull 2013-12-07 18:40:32 +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 ff35f946a9 Move char_bm into gr_internal_color_string 2013-12-06 03:58:38 +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 6e8684da0f Remove duplicate FRAMEWORKS setup 2013-12-06 03:56:56 +00:00
Kp d7ab757393 Remove Darwin physfs hacks
When physfs is in the library search path, the regular usage of adding
physfs to LIBS is sufficient.
2013-12-06 03:55:58 +00:00
Kp a14acee361 Clean up install handling 2013-12-06 03:54:52 +00:00
Kp 70caa4e7b6 Fix array understep in guidebot flare code 2013-12-06 03:36:07 +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 eb84a067fa Remove now unused fgets_unlimited 2013-12-06 03:28:59 +00:00
Kp a899b9b945 Restrict ini arguments to 1024 char per line 2013-12-06 03:28:59 +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 bd4029c922 Clean platform handling 2013-12-06 00:24:07 +00:00
Kp 3620392f56 Remove unused nm_messagebox_fixedfont 2013-12-06 00:24:07 +00:00
Kp 91b57e52c3 Mark ui_messagebox button strings const 2013-12-06 00:24:07 +00:00
Kp 2b88289d32 Make Hack_DblClick_MenuMode static 2013-12-06 00:24:07 +00:00
Kp c6d68ca288 Check for game-specific prefix before general ones 2013-12-06 00:24:07 +00:00
Kp dc6ba09b62 Suppress duplicate registration of the same configuration prefix 2013-12-06 00:24:07 +00:00
Kp 0619afcc52 Remove repetitive short name in program setup 2013-12-06 00:24:07 +00:00
Kp 0726431030 Simplify preparing secret level text in MP game setup 2013-12-06 00:24:07 +00:00
Kp 1d3395cad1 Improve strlen usage 2013-12-06 00:24:07 +00:00
Kp 83843f32be Reduce copying in colored MP message 2013-12-06 00:24:07 +00:00
Kp 993d240131 Move feedback_result into multi_message_feedback 2013-12-06 00:24:07 +00:00
zico 7b0bda3302 Merge branch 'unification/master' of github.com:dxx-rebirth/dxx-rebirth into unification/master 2013-12-05 13:39:53 +01:00
Drakona 04d84ae61d Pass shot orientation with each weapon packet 2013-12-05 13:11:49 +01:00
Kp 34cd26a187 Remove hud_msg_buf 2013-12-05 00:11:52 +00:00
Kp d9c1f5425c Simplify jukebox filename setup 2013-12-05 00:10:59 +00:00
Kp be0e9f5162 Use d_strdup for ui_add_gadget_button 2013-12-05 00:10:35 +00:00
Kp 0603067145 Make marker floats const 2013-12-05 00:09:37 +00:00
Kp accaef2ecb Remove unused REMOVE_EOL macro in keypad.cpp
It conflicts with pre-compiled headers.
2013-12-05 00:08:58 +00:00
Kp 8ecfce07a1 Fix missing declarations when tracker is enabled
Drakona reports that tracker support does not build.  Fix it.
2013-12-04 23:43:45 +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