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

305 commits

Author SHA1 Message Date
Kp 3855291457 Move similar/main/multi.c -> similar/main/multi.cpp 2013-10-20 22:49:12 +00:00
Kp a5f95cab76 Move similar/main/morph.c -> similar/main/morph.cpp 2013-10-20 22:49:12 +00:00
Kp 3693743d41 Move similar/main/mission.c -> similar/main/mission.cpp 2013-10-20 22:49:12 +00:00
Kp 9fb22a8be0 Move similar/main/mglobal.c -> similar/main/mglobal.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 d3ddb816f1 Move similar/main/lighting.c -> similar/main/lighting.cpp 2013-10-20 22:49:11 +00:00
Kp 7bd8ab3af1 Move similar/main/laser.c -> similar/main/laser.cpp 2013-10-20 22:49:11 +00:00
Kp cf2c153c77 Move similar/main/kmatrix.c -> similar/main/kmatrix.cpp 2013-10-20 22:49:11 +00:00
Kp ba7950d3d5 Move similar/main/kconfig.c -> similar/main/kconfig.cpp 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 3756a27518 Use narrowly scoped loop variables in kconfig 2013-10-19 17:06:17 +00:00
Kp 852a4c7f4d Use enum weapon_type_t in more places 2013-10-19 17:06:16 +00:00
Kp e436a5dc43 Use MALLOC for hoard reading 2013-10-19 17:03:11 +00:00
Kp 9f87b72a7d Remove unused SUPER_LASER_INDEX handling 2013-10-19 17:03:11 +00:00
Kp aaa720d4d7 Fix const-ness in load_text 2013-10-19 17:03:11 +00:00
Kp 643fdbc08b Fix const-ness in songs_play_file 2013-10-19 17:03:11 +00:00
Kp a36c7dee08 Remove unused argument to slew_reset_orient 2013-10-19 17:03:11 +00:00
Kp b84f99faf9 Use purpose_type consistently 2013-10-19 17:03:11 +00:00
Kp 6ad5761c66 Use CALLOC in listbox_draw 2013-10-19 17:03:11 +00:00
Kp a9b21cbcee Use enum mle_loc consistently 2013-10-19 17:03:11 +00:00
Kp 743fe4cf0e Fix Descent display of primary weapon names 2013-10-09 01:54:12 +00:00
Kp 2bcc7bb371 Only create lasers for known weapon types 2013-10-09 01:54:12 +00:00
Kp 3adfb546af Mark some kconfig lengths unsigned 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 cb0aa24210 Remove useless rewrite of kconfig title 
Rewriting the title needlessly violates const correctness, and no caller
seems to actually pass the rewritten characters.
 2013-10-08 02:38:22 +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 3caf739dc8 Simplify kconfig height calculation 2013-10-08 02:02:26 +00:00
Kp 00f0fddabc Centralize handling of SysUsePlayersDir 2013-10-06 21:04:29 +00:00
Kp 740a190835 Move */main/playsave.c -> similar/main/playsave.c 2013-10-06 17:56:37 +00:00
Kp 15d93a8253 Move similar/main/dumpmine.c -> similar/main/dumpmine.cpp 2013-10-06 16:58:50 +00:00
Kp f92e234054 Move */main/dumpmine.c -> similar/main/dumpmine.c 2013-10-06 16:58:49 +00:00
Kp 42893d8618 Store cheat strings inline 2013-10-05 21:35:58 +00:00
Kp 53714438ca Use MALLOC for state screenshot 2013-10-05 21:35:58 +00:00
Kp 3d3116d09f Use MALLOC for load_text addition 2013-10-05 21:35:58 +00:00
Kp ae8a70ac61 Use MALLOC for polygon reading 2013-10-05 21:35:58 +00:00
Kp 0fc7300ec4 Use MALLOC for newdemo_strip_frames 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 62a5d41a9c Move similar/main/hud.c -> similar/main/hud.cpp 2013-10-05 21:35:58 +00:00
Kp ff3e8bfd7e Move similar/main/hostage.c -> similar/main/hostage.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 8601ef255e Move similar/main/gameseg.c -> similar/main/gameseg.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 ec5fedfc04 Move similar/main/gamerend.c -> similar/main/gamerend.cpp 2013-10-05 21:35:58 +00:00
Kp b2b56098a1 Move similar/main/gamefont.c -> similar/main/gamefont.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 6f152aa016 Move similar/main/fvi.c -> similar/main/fvi.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 5fff15b151 Move similar/main/console.c -> similar/main/console.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 76de0bcc9d Fix bug that prevented using cheat_codes[0] 2013-10-03 03:13:36 +00:00
Kp e2a2971eb1 Remove unused game_top_fileinfo 2013-10-03 03:11:52 +00:00
Kp b43f830719 Default cheat_buffer to blank 2013-10-03 03:11:52 +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 b7d3d4942f Fix declaration of blob_vertices 2013-10-02 02:51:25 +00:00
Kp 1b4169b0d0 Move */main/powerup.c -> similar/main/powerup.c 2013-10-02 02:51:25 +00:00
Kp 91f6d5e72d Move game_init_render_buffers inline 2013-09-28 23:51:52 +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 9210a3870e Remove unused fields in struct player 2013-09-21 18:04:10 +00:00
Kp 7e6278bb0a D2X also needs the workaround for do_weapon_select 2013-09-21 18:01:45 +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 ef218b7665 Simplify pilot deletion 2013-09-15 21:34:03 +00:00
Kp d52a930cab Store pointer to customized demo text out of line 2013-09-15 21:01:30 +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 d858932187 Remove unused parameter in call to slew_stop 2013-09-11 02:41:38 +00:00
Kp 316e71c96c Simplify Toggle_var 2013-09-11 02:41:38 +00:00
Kp c509faf0f7 Cache weapon order value 2013-09-11 02:29:29 +00:00
Kp 7a2c9ea021 Remove useless menu text change 2013-09-07 16:35:03 +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 243f8cdd36 Simplify D1X SPREADFIRE truncation 2013-09-02 23:59:31 +00:00
Kp d165b9c422 Make briefing->message const 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 b7dac2941c Move */main/gamesave.c -> similar/main/gamesave.c 2013-09-01 22:59: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 a15996a761 Format maximum starting level once 2013-09-01 22:22:12 +00:00
Kp 6768c9bd6c Reduce wasted space in briefing_screen struct 2013-09-01 22:19:33 +00:00
Kp bf027e3df0 Move */main/titles.c -> similar/main/titles.c 2013-09-01 22:19:27 +00:00
Kp 801dfbcd81 Move */main/net_udp.c -> similar/main/net_udp.c 2013-09-01 21:51:54 +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 b77c7fe357 Mark kconfig functions static 2013-09-01 17:20:08 +00:00
Kp 7bf5b29be4 Move */main/kconfig.c -> similar/main/kconfig.c 2013-09-01 17:20:07 +00:00
Kp e23035e61f Move Last_afterburner_time into laser_info 2013-08-31 17:17:35 +00:00
Kp 4b6bd54e7d Simplify text decoding 2013-08-31 16:45:43 +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
zico 267f560a66 merge 2013-08-30 23:06:19 +02:00
Kp 20cf3f4cdb Mark various OGL functions static 2013-08-24 16:44:23 +00:00
zico ef23b7a571 Updated copyright 2013-08-17 02:16:49 +02:00
zico aec1f1b808 In update_cockpits() only page-in cockpit bitmap if in a mode which actually has one 2013-08-17 01:07:08 +02:00
zico 31e617c1a0 Made Palette[Red,Green,Blue]Add scaled to game brightness setting before applying to gr_palette_step_up. Also used real timers to diminish palette instead of intervals choosen by d_rand() 2013-08-17 00:54:17 +02:00
Kp a04cd57d71 Move */main/multi.c -> similar/main/multi.c 2013-08-11 23:46:13 +00:00
Kp 8d13642c9f Hide GM_CAPTURE tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 0c3adc48df Hide GM_HOARD tests behind static inline 2013-08-11 20:46:52 +00:00
Kp e750c90b00 Mark more math as const correct 2013-08-10 03:55:50 +00:00
Kp bca0dacc98 Merge branch d2x-rebirth/master into unification/master 
Conflicts:
	SConstruct
 2013-08-09 22:53:45 +00:00
Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master 
Conflicts:
	SConstruct
	common/main/multi.h
	similar/main/gamerend.c
 2013-08-09 22:49:04 +00:00
zico 830bcd7845 merge with ccea6b3547 2013-08-09 17:25:42 +02:00
zico a527348681 Added MULTI_FIRE_BOMB as alteration of MULTI_FIRE to keep bombs mapped in a Multiplayer match for later Host authority and to make their chaff ability work correctly. Additionally added MULTI_FIRE_TRACK to only send Network_laser_track if > -1. On the way I made laser.c a bit more similar between D1X and D2X 2013-08-09 17:21:03 +02:00
Kp 2cc0068fa9 Move */main/fvi.c -> similar/main/fvi.c 2013-08-09 03:13:33 +00:00
Kp 2cd7748e93 Convert vsprintf to vsnprintf 2013-08-09 01:58:17 +00:00
zico 40c5f10e20 Added definition of DESIGNATED_GAME_FPS as 30 and DESIGNATED_GAME_FRAMETIME based on the former. We use those for d_tick_count intervals and to scale other parts that have never been properly aligned to FrameTime before. In that regard, Release builds will take DESIGNATED_GAME_FPS as MINIMUM_FPS for -maxfps argument 2013-08-08 22:07:29 +02:00
Kp a881ee455e Remove fix.h 2013-08-08 03:01:48 +00:00
Kp b624684ba5 Switch gr_printf(x,y,"%s",s) to gr_string(x,y,s) 2013-08-08 03:01:47 +00:00
Kp 400b18b78a Mark gauges variables const 2013-08-08 03:01:47 +00:00
Kp 9cb88f4db6 Store weapon_name as const char* 2013-08-08 03:01:47 +00:00
zico bbaa3c21f3 HAMERS! Wait 33ms between each turn of a homing missile projectile, only scale turns if FPS are below 30 2013-08-08 00:29:56 +02:00
Kp 4c3703c31c Remove unused function johns_obj_unlink 2013-08-07 02:33:19 +00:00
Kp 6a53581b55 Remove unused function is_object_in_seg 2013-08-07 02:33:19 +00:00
Kp 021fc26b77 Remove unused function remove_all_objects_but 2013-08-07 02:33:19 +00:00
Kp a39c44b6fd Remove unused function search_all_segments_for_object 2013-08-07 02:33:19 +00:00
Kp 98224892c5 Remove unused function expand_row 2013-08-07 02:33:19 +00:00
Kp bc8f302b40 Remove unused function on_seismic_level 2013-08-07 02:33:19 +00:00
Kp 84383deea2 Remove unused function wall_reset 2013-08-07 02:33:19 +00:00
Kp cd5bb27ff1 Remove unused function list_seg_objects 2013-08-07 02:33:19 +00:00
Kp b2305d4ab3 Remove unused function check_duplicate_objects 2013-08-07 02:33:19 +00:00
Kp d02daa44fa Remove unused function remove_incorrect_objects 2013-08-07 02:33:19 +00:00
Kp edc7e87c2e Remove unused function create_vclip_on_object 2013-08-07 02:33:19 +00:00
Kp 1b63fff340 Remove unused function obj_return_num_of_typeid 2013-08-07 02:33:19 +00:00
Kp f74910aa7f Remove unused function obj_return_num_of_type 2013-08-07 02:33:19 +00:00
Kp d316bc1bf5 Remove unused function object_goto_prev_viewer 2013-08-07 02:33:19 +00:00
Kp 768a5b190f Remove unused function game_expand_bitmap 2013-08-07 02:33:19 +00:00
Kp 18c430655f Remove unused function show_free_objects 2013-08-07 02:33:19 +00:00
Kp 04949b1f75 Move */main/object.c -> similar/main/object.c 2013-08-07 02:33:18 +00:00
Kp 2c362aae80 Move */main/polyobj.c -> similar/main/polyobj.c 2013-08-07 02:33:18 +00:00
Kp 2355df5eaf Fix format mismatch on Win32 HandleTestKey 
Win32 needs a special modifier to represent an int64_t parameter.
 2013-08-03 20:32:48 +00:00
Kp 4f56ed0819 Fix format mismatch on Win32 draw_window_label 
Win32 makes (pointer1-pointer2) an int instead of long.
 2013-08-03 20:32:48 +00:00