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
|
173a3febc9
|
Enable -Wpointer-arith
|
2013-09-15 21:39:18 +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
|
b7db46a43a
|
Switch to std::min
|
2013-09-15 04:06:07 +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
|
88403fbfd8
|
Remove defined(SHAREWARE) code
Rebirth supports shareware and retail data based on runtime decisions.
|
2013-09-11 02:39:50 +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
|
6be4dc01c5
|
Pass non-const string to putenv
|
2013-08-29 22:52:30 +00:00 |
|
Kp
|
af52e78a50
|
Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp
|
2013-08-24 17:10:35 +00:00 |
|
Kp
|
d909692148
|
Allow compiler to unroll pow2ize
|
2013-08-24 16:44:23 +00:00 |
|
Kp
|
20cf3f4cdb
|
Mark various OGL functions static
|
2013-08-24 16:44:23 +00:00 |
|
Kp
|
8ef8371563
|
Use unsigned screen width/height
|
2013-08-24 16:44:23 +00:00 |
|
Kp
|
b3e2c99b17
|
Use MALLOC for ogl_init_pixel_buffers
|
2013-08-20 02:58:15 +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
|
4e6142d779
|
Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp
|
2013-08-10 03:56:14 +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 |
|
Kp
|
e23a06fb4f
|
Drop worthless font zeroing
BSS is initialized to zero. Explicitly zeroing it again wastes time and
space.
|
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
|
f31f74c2e6
|
Add realloc cast to gr_set_mode
|
2013-08-07 02:39:43 +00:00 |
|
Kp
|
b81100d54d
|
Make OGL_VIEWPORT static inline
|
2013-08-07 02:39:43 +00:00 |
|
Kp
|
1b7c9734ad
|
Pass unsigned dimensions to write_bmp
|
2013-08-07 02:39:43 +00:00 |
|
Kp
|
924cc78c43
|
Use MALLOC for save_screen_shot
|
2013-08-07 02:39:43 +00: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
|
22d006f525
|
Remove unused function tex_format_supported
|
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
|
d7b978c433
|
Remove unused functions digi_mixer_set_max_channels, digi_mixer_get_max_channels
|
2013-08-07 02:33:19 +00:00 |
|
Kp
|
192d9f2178
|
Remove unused function tex_format_verify
|
2013-08-07 02:33:19 +00:00 |
|
Kp
|
78f3438c2b
|
Remove unused function digi_audio_get_max_channels
|
2013-08-07 02:33:19 +00:00 |
|
Kp
|
fa9a91a1ef
|
Remove unused function digi_audio_set_max_channels
|
2013-08-07 02:33:19 +00:00 |
|
Kp
|
d751b8f8ed
|
Remove unused function digi_audio_set_digi_volume
|
2013-08-07 02:33:18 +00:00 |
|
Kp
|
1fd8a91f45
|
Remove unused function digi_set_sample_rate
|
2013-08-07 02:33:18 +00:00 |
|
Kp
|
f26c6fdc66
|
Remove unused function ogl_atotexfilti
|
2013-08-07 02:33:18 +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
|
861ff0e8db
|
Fix format mismatch on Win32 info_display_default
Win32 makes (pointer1-pointer2) an int instead of long.
|
2013-08-03 20:32:48 +00:00 |
|
Kp
|
ad0d499022
|
Fix format mismatch on Win32 centers_dialog_handler
Win32 makes (pointer1-pointer2) an int instead of long.
|
2013-08-03 20:32:48 +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
|
48c1b7a321
|
Fix const mismatch in digi_win32_play_midi_song
|
2013-08-03 20:32:48 +00:00 |
|
Kp
|
0d26464bfa
|
Simplify AppendIniArgs
|
2013-08-03 17:45:22 +00:00 |
|
Kp
|
3c5c8a8068
|
Make arg processing static
|
2013-08-03 17:45:22 +00:00 |
|
Kp
|
d1479abb2e
|
Remove unused FindResArg
|
2013-08-03 17:45:22 +00:00 |
|
Kp
|
c953fabbfc
|
Remove unused variable sng_file[]
|
2013-07-28 23:27:10 +00:00 |
|
Kp
|
e961be1c14
|
u_mem: split memory debugging from NDEBUG
|
2013-07-28 23:18:44 +00:00 |
|
Kp
|
ff90315978
|
Use SConscript configure support to probe for format(printf) attribute
|
2013-07-27 22:17:13 +00:00 |
|
Kp
|
d10aaea55b
|
Mark various font functions static
|
2013-07-27 21:41:27 +00:00 |
|
Kp
|
934867aaf3
|
Ensure font allocation failure if tw/th not initialized
|
2013-07-27 21:41:09 +00:00 |
|
Kp
|
74bcb86cf4
|
Remove some const modifiers that broke SDL-only build
|
2013-07-27 21:29:01 +00:00 |
|
Kp
|
2f4ffebde6
|
Add const markers to some texture mapping code
|
2013-07-27 21:28:53 +00:00 |
|
Kp
|
e0b30077e9
|
Simplify texpage name printing
|
2013-07-27 20:49:38 +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
|
a05793fd84
|
Mark various things static
|
2013-07-23 02:09:12 +00:00 |
|
Kp
|
4187648621
|
Remove redundant/obsolete declarations
|
2013-07-21 21:55:00 +00:00 |
|
Kp
|
14f6b9baff
|
Use unsigned iteration counters in bald_guy_load
|
2013-07-21 21:42:09 +00:00 |
|
Kp
|
46664b522b
|
Fix probable infinite loop in bald_guy_load
|
2013-07-21 21:42:09 +00:00 |
|
Kp
|
d1e4a68a3b
|
Use MALLOC in bald_guy_load
|
2013-07-21 21:42:09 +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 |
|
Kp
|
177e500893
|
Fix sign mismatch in control_center_triggers_swap
|
2013-07-19 02:50:49 +00:00 |
|
Kp
|
c4f00d42f7
|
Fix sign mismatch in timer_delay2
|
2013-07-19 02:49:20 +00:00 |
|
Kp
|
853713190d
|
Make ogl_init_load_library static
|
2013-06-22 21:36:28 +00:00 |
|
Kp
|
ee2273a77b
|
Delete unused ReadLispMacro
|
2012-06-10 21:17:22 +00:00 |
|
Kp
|
9667abeaa7
|
Make d_splitpath const
|
2013-06-09 18:10:09 +00:00 |
|
Kp
|
a2b7e663df
|
Move */main/weapon.c -> similar/main/weapon.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
5648874a37
|
Merge branch d2x-rebirth/master into unification/master
|
2013-06-14 03:31:59 +00:00 |
|
Kp
|
88208fc228
|
Merge branch d1x-rebirth/master into unification/master
Conflicts:
SConstruct
d1x-rebirth/main/multi.c
similar/main/cntrlcen.c
similar/main/wall.c
|
2013-06-14 03:18:32 +00:00 |
|
Kp
|
22e31c0e8d
|
Remove unused argument to clear_warn_func
|
2013-06-08 23:12:44 +00:00 |
|
Kp
|
3c07a98d18
|
Move old_gametime into #ifdef D2
|
2013-06-04 03:30:50 +00:00 |
|
Kp
|
cb4f543ad2
|
Move segment tmap restore logic out of #ifdef D2
|
2013-06-04 03:30:50 +00:00 |
|
Kp
|
738fdf41c4
|
Fix SDL-only D2X build failure
|
2013-06-03 01:20:26 +00:00 |
|
Kp
|
05a8aaccaf
|
Move */arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
b09f96b31f
|
Move */arch/sdl/digi.c -> similar/arch/sdl/digi.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
544a07bffa
|
Move */2d/palette.c -> similar/2d/palette.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
61001e1d94
|
Move */2d/pcx.c -> similar/2d/pcx.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
606a455c88
|
Move */2d/font.c -> similar/2d/font.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
8d6698b4e6
|
Move */misc/args.c -> similar/misc/args.c
|
2013-03-03 01:03:33 +00:00 |
|