Commit graph

566 commits

Author SHA1 Message Date
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 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 eb84a067fa Remove now unused fgets_unlimited 2013-12-06 03:28:59 +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 1d3395cad1 Improve strlen usage 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 be0e9f5162 Use d_strdup for ui_add_gadget_button 2013-12-05 00:10:35 +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 18aea17f9e Move */main/fireball.c -> similar/main/fireball.c 2013-12-02 00:21:31 +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 2d01f3a649 Optimize references to player ship 2013-12-01 22:53:25 +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 25c731cc2c Probe for usable array template 2013-12-01 22:42:47 +00:00
Kp d3637e7524 Invert sense of SysUseNiceFPS 2013-12-01 22:37:21 +00:00
Kp d626b6c3d4 Add include guard to kdefs.h 2013-12-01 00:53:22 +00:00
Kp 08efe14586 Remove unused Laser_player_fire parameter harmless_flag 2013-11-28 02:12:13 +00:00
Kp 3e2c0b5e1b Switch multi_allow_powerup_text to [][] from *[] 2013-11-28 02:09:30 +00:00
Kp 5d1769cd2c Switch RankStrings to be [][14] instead of *[]
Saves 10 .rel.ro entries and 6 bytes on x86 / 46 bytes on x64.
2013-11-28 02:08:54 +00:00
Kp 6439e41e3a Store SDL key name inline 2013-11-28 00:52:37 +00:00
Kp 86c49079a1 Move rod_points onto stack 2013-11-28 00:27:43 +00:00
Kp c47d1b3d30 Move lrgb_list onto stack 2013-11-28 00:27:43 +00:00
Kp 86a6f4b18b Mark rod.cpp uvl_list[] static 2013-11-28 00:27:43 +00:00
Kp 541961a2f7 Make Object_type_names const 2013-11-28 00:27:43 +00:00
Kp 386c193cae Make med_functions const 2013-11-28 00:27:43 +00:00
Kp 68732756e8 Make Wall_names const 2013-11-28 00:27:43 +00:00
Kp cbc46e343d Remove unused MULTI_ANGER 2013-11-24 23:11:30 +00:00
Kp a65d774c83 Improve packing of struct segment
Shrinks Segments[] by 36000 bytes.
2013-11-24 23:08:32 +00:00
Kp c70c6c98b3 Remove obsolete segment::degenerated flag
Shrinks Segments[] by 36000 bytes.
2013-11-24 23:08:32 +00:00
Kp e30f548d60 Invert sense of DbgAltTexMerge 2013-11-24 22:57:36 +00:00
Kp 761795e4c8 Invert sense of DbgBigPig 2013-11-24 22:57:36 +00:00
Kp 3b49e65f95 Invert sense of DbgUseDoubleBuffer 2013-11-24 22:57:36 +00:00
Kp bbb9214e0e Invert sense of hires/lowres options 2013-11-24 22:57:36 +00:00
Kp 8899120312 Remove SndDisableSdlMixer when mixer=0 2013-11-24 22:57:36 +00:00
Kp 6be79cadce Unify ai_follow_path 2013-11-23 22:41:01 +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 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 c3d328ea5c Use helper to test for guidebot flag 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 1312369c94 Restructure ai.c for merging 2013-11-16 23:20:30 +00:00
Kp e2a2cc579a Remove unused piggy_dump_all 2013-11-10 19:08:12 +00:00
Kp 9b167689ba Remove unused variable joy_num_axes 2013-11-09 05:08:37 +00:00
Kp ce929926e8 Remove duplicate warning on excess joystick axes 2013-11-08 03:14:44 +00:00
Kp f11e787ef3 Use helper for bounding check 2013-11-08 03:14:44 +00:00
Kp ed8484f096 Remove unnecessary packing on vms_vector 2013-11-08 03:14:43 +00:00
Kp 6e6b480082 Use enum for weapon types 2013-11-02 04:26:51 +00:00
Kp 6fc8d110f3 Only give secondaries that exist 2013-11-02 04:25:33 +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 9dec31d801 Remove unused vms_svec 2013-11-01 02:58:05 +00:00
Kp 663d81cc8f Remove unused function med_rotate_segment_ang 2013-10-29 03:24:43 +00:00
Kp be777c78a3 Remove unused function med_copy_segment 2013-10-29 03:24:43 +00:00
Kp 765f34eb0a Remove unused function med_check_all_vertices 2013-10-29 03:24:42 +00:00
Kp aa7f36e3b7 Provide HUD prototypes in Descent 1 2013-10-29 03:24:42 +00:00
Kp 50392e9a3c Mark OpenGL loader functions static 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 4fcf34fdbb Make create_weapon_object static 2013-10-28 04:16:45 +00:00
Kp 19fef0a51d Simplify full_palette_save calls 2013-10-28 04:16:44 +00:00
Kp 685c3fd8e7 Fix Win64 build errors due to pointer casting 2013-10-28 04:14:20 +00:00
Kp 8ed99faf5c Make headers freestanding 2013-10-26 03:50:28 +00:00
Kp 9e1c33cca3 Rename struct _grs_* to struct grs_* for consistency 2013-10-26 03:50:28 +00:00
Kp fdd2dd65c7 Use underlying type for state_game_id
This avoids the need for a header to declare it.
2013-10-26 03:50:27 +00:00
Kp a6b1bd58a2 Use MALLOC consistently 2013-10-26 03:50:27 +00:00
Kp 980621b9d4 Move similar/editor/med.c -> similar/editor/med.cpp 2012-11-17 06:14:09 +00:00
Kp 7de558490f Move similar/editor/kfuncs.c -> similar/editor/kfuncs.cpp 2012-11-17 06:14:09 +00:00
Kp 65b809b218 Move similar/editor/info.c -> similar/editor/info.cpp 2012-11-17 06:14:09 +00:00
Kp f95d401926 Move similar/editor/group.c -> similar/editor/group.cpp 2012-11-17 06:14:09 +00:00
Kp 3693743d41 Move similar/main/mission.c -> similar/main/mission.cpp 2013-10-20 22:49:12 +00:00
Kp e663767201 Move similar/main/menu.c -> similar/main/menu.cpp 2013-10-20 22:49:12 +00:00
Kp cf2c153c77 Move similar/main/kmatrix.c -> similar/main/kmatrix.cpp 2013-10-20 22:49:11 +00:00
Kp 1d073475e7 Mark various headers for C linkage 2013-10-20 22:49:11 +00:00
Kp 5b0c4b10ac Use accessor for most get/set object->id accesses 2013-10-20 22:49:09 +00:00
Kp 852a4c7f4d Use enum weapon_type_t in more places 2013-10-19 17:06:16 +00:00
Kp 14d7c8cef4 Match MAX_SECRET_LEVELS_PER_MISSION type to N_secret_levels 2013-10-19 17:03:11 +00:00
Kp 24ac83d88c Make PLAYER_DIRECTORY_STRING work in C++ 2013-10-19 17:03:11 +00:00
Kp 2bcc7bb371 Only create lasers for known weapon types 2013-10-09 01:54:12 +00:00
Kp a8050a462f Only fire valid level lasers 2013-10-09 01:54:12 +00:00
Kp 553dc95b05 Use helper to check for laser type weapons 2013-10-09 01:54:12 +00:00
Kp 798774294f Use weapon_type_t for Laser_create_new* weapon type 2013-10-08 02:10:18 +00:00
Kp bd46b7ea73 Make CONTROLCEN_WEAPON_NUM a weapon_type_t member 2013-10-08 02:07:39 +00:00
Kp 00f0fddabc Centralize handling of SysUsePlayersDir 2013-10-06 21:04:29 +00:00
Kp 7dd7d6704b Make write_player_file void 2013-10-06 17:56:37 +00:00
Kp fa1b1a1217 Restructure dumpmine.c for merging 2013-10-06 16:20:00 +00:00
Kp 2dddf084e0 Move similar/editor/eobject.c -> similar/editor/eobject.cpp 2013-10-05 23:10:44 +00:00
Kp 57a0b23ae4 Move similar/editor/elight.c -> similar/editor/elight.cpp 2013-10-05 23:09:01 +00:00
Kp 21c9e11811 Move similar/editor/centers.c -> similar/editor/centers.cpp 2013-10-05 23:07:23 +00:00
Kp e73205faac Use enum for player awareness types 2013-10-05 21:35:58 +00:00
Kp bd467b4140 Move similar/main/inferno.c -> similar/main/inferno.cpp 2013-10-05 21:35:58 +00:00
Kp 9c65aa3cc5 Move similar/main/gauges.c -> similar/main/gauges.cpp 2013-10-05 21:35:58 +00:00
Kp 4db024f953 Move similar/main/gamesave.c -> similar/main/gamesave.cpp 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 d656bd4115 Move similar/main/game.c -> similar/main/game.cpp 2013-10-05 21:35:58 +00:00
Kp 782372d6b8 Move similar/main/effects.c -> similar/main/effects.cpp 2013-10-05 21:35:58 +00:00
Kp c7e34f5330 Move similar/main/digiobj.c -> similar/main/digiobj.cpp 2013-10-05 21:35:58 +00:00
Kp f4393ca1b6 Move similar/main/credits.c -> similar/main/credits.cpp 2013-10-05 21:35:58 +00:00
Kp ba4b87d44a Move similar/main/controls.c -> similar/main/controls.cpp 2013-10-05 21:35:58 +00:00
Kp b1dbeb6199 Move similar/main/config.c -> similar/main/config.cpp 2013-10-05 21:35:58 +00:00
Kp 64350f83b8 Move similar/main/cntrlcen.c -> similar/main/cntrlcen.cpp 2013-10-05 21:35:58 +00:00
Kp 584fc93f34 Move similar/main/automap.c -> similar/main/automap.cpp 2013-10-05 21:35:58 +00:00
Kp e5ee9b72f1 Move similar/main/aipath.c -> similar/main/aipath.cpp 2013-10-05 21:35:58 +00:00
Kp b4107e6526 Remove duplicate declarations 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 e2b7b802e3 Move similar/arch/sdl/digi.c -> similar/arch/sdl/digi.cpp 2013-10-01 02:53:23 +00:00
Kp 4863c42c9d Move similar/3d/interp.c -> similar/3d/interp.cpp 2013-10-01 02:53:09 +00:00
Kp 4d026f8b69 Move similar/2d/pcx.c -> similar/2d/pcx.cpp 2013-10-01 02:53:09 +00:00
Kp fce2717e83 Move similar/arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.cpp 2013-10-01 02:53:09 +00:00
Kp ace3238790 Move similar/arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.cpp 2013-10-01 02:53:09 +00:00
Kp 91f6d5e72d Move game_init_render_buffers inline 2013-09-28 23:51:52 +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 9e3fb796e1 Use helper for comparing to proximity bomb index 2013-09-21 23:19:38 +00:00
Kp 9210a3870e Remove unused fields in struct player 2013-09-21 18:04:10 +00:00
Kp 83df42af8e Fix loading of older save files
struct player_rw offsets must not change within a savefile version
2013-09-21 17:47:03 +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 aa9127e3c1 Enable -Wwrite-strings 2013-09-15 21:34:03 +00:00
Kp ef218b7665 Simplify pilot deletion 2013-09-15 21:34:03 +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 df69df56dc Remove unused common/ui/popup.cpp 2013-09-07 16:39:25 +00:00
Kp 2d964c414c Remove unused strcins/strndel 2013-09-07 16:39:25 +00:00
Kp a3883ab6ac Move restore_state into #if 0 2013-09-07 16:39:10 +00:00
Kp 4e177dd3fa Move common/arch/win32/messagebox.c -> common/arch/win32/messagebox.cpp 2013-09-02 23:59:31 +00:00
Kp cc90678647 Move common/arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.cpp 2013-09-02 23:59:31 +00:00
Kp d156a4c1ab Simplify D1X hostage handling 2013-09-02 23:59:31 +00:00
Kp c8f0c799b7 Use helper for setting menu items to type number 2013-09-01 23:50:55 +00:00
Kp 4fe618b325 Use helper for setting menu items to type slider 2013-09-01 23:50:55 +00:00
Kp 0645e96e17 Use helper for setting menu items to type radio 2013-09-01 23:50:54 +00:00
Kp 4c5eaded8d Use helper for setting menu items to type checkbox 2013-09-01 23:23:55 +00:00
Kp bb8b229dc2 Use helper for setting menu items to type input 2013-09-01 23:23: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 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