Commit graph

94 commits

Author SHA1 Message Date
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
Kp c953fabbfc Remove unused variable sng_file[] 2013-07-28 23:27:10 +00:00
Kp ff90315978 Use SConscript configure support to probe for format(printf) attribute 2013-07-27 22:17:13 +00:00
Kp 74bcb86cf4 Remove some const modifiers that broke SDL-only build 2013-07-27 21:29:01 +00:00
Kp 4725ca5f73 Move */main/songs.c -> similar/main/songs.c 2013-07-24 01:43:02 +00:00
Kp f84884cfa0 Move */main/gauges.c -> similar/main/gauges.c 2013-07-24 01:27:35 +00:00
Kp 14851e633e Commit code for dumping Text_string[] 2013-07-23 02:21:37 +00:00
Kp 4187648621 Remove redundant/obsolete declarations 2013-07-21 21:55:00 +00:00
Kp 4577dd3977 Merge branch 'd2x-rebirth/master' into unification/master 2013-07-21 21:34:46 +00:00
Kp a1ba420031 Mark various parameters and variables as const 2013-07-20 23:12:24 +00:00
Kp 012d8e249b Merge branch d1x-rebirth/master into unification/master 2013-07-19 22:32:28 +00:00
Kp ee564a45ff Fix sign mismatch in paging_touch_robot_maker 2013-07-19 02:51:32 +00:00