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
Kp
e18fc92b68
Move */main/gamecntl.c -> similar/main/gamecntl.c
2013-03-03 01:03:33 +00:00
Kp
c49fb2a68d
Move */main/state.c -> similar/main/state.c
2013-03-03 01:03:33 +00:00
Kp
9fe359baae
Move */main/game.c -> similar/main/game.c
2013-03-03 01:03:33 +00:00
Kp
d607792030
Move */main/gameseg.c -> similar/main/gameseg.c
2013-03-03 01:03:33 +00:00
Kp
fd710386b5
Move */main/gamerend.c -> similar/main/gamerend.c
2013-03-03 01:03:33 +00:00
Kp
1e0f0c8f1b
Move */main/cntrlcen.c -> similar/main/cntrlcen.c
2013-03-03 01:03:33 +00:00
Kp
306ab24486
Merge branch 'd1x-rebirth/master' into unification/master
2013-06-02 20:13:38 +00:00
Kp
e30828a1f6
Fix mismerge that doubled up jointlist reading
...
Commit 616a3a6
improperly brought in both D1X and D2X copies of the same
loop, but it is a bug for the loop to be run twice. This caused the
game to crash during initialization because the file position was not as
expected and the loader error handling is poor.
2013-05-09 23:46:58 +00:00
Kp
dbec5197f6
Move */main/vers_id.c -> similar/main/vers_id.c
2013-05-05 17:39:03 +00:00
Kp
616a3a6b70
Merge branch d1x-rebirth into unification/master
...
Conflicts:
SConstruct
common/main/cntrlcen.h
common/main/fuelcen.h
common/main/fvi.h
common/main/gameseq.h
common/main/gauges.h
common/main/multibot.h
common/main/net_udp.h
common/main/object.h
common/main/player.h
common/main/vers_id.h
d1x-rebirth/main/hostage.c
d1x-rebirth/main/multi.c
main/controls.c
main/hostage.h
main/laser.h
main/screens.h
similar/arch/ogl/gr.c
similar/editor/centers.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/paging.c
similar/main/physics.c
similar/main/player.c
similar/main/robot.c
similar/main/wall.c
2013-04-21 04:51:35 +00:00
Kp
ff96f3239d
Move */main/controls.c -> similar/main/controls.c
2013-03-03 01:03:33 +00:00
Kp
86f373e4e0
Move */main/multibot.c -> similar/main/multibot.c
2013-03-03 01:03:33 +00:00
Kp
691b95a02c
Move */main/physics.c -> similar/main/physics.c
2013-03-03 01:03:33 +00:00
Kp
0138d330b3
Move */main/inferno.c -> similar/main/inferno.c
2013-03-03 01:03:33 +00:00
Kp
dab72f3127
Move */main/robot.c -> similar/main/robot.c
2013-03-03 01:03:33 +00:00
Kp
4b18dcbff9
Move */main/text.c -> similar/main/text.c
2013-03-03 01:03:33 +00:00
Kp
8d379f4f9c
Move */3d/interp.c -> similar/3d/interp.c
2013-03-03 01:03:33 +00:00
Kp
d2e3ed0228
Move */main/wall.c -> similar/main/wall.c
2013-03-03 01:03:33 +00:00
Kp
ccbb392fd4
Move */main/lighting.c -> similar/main/lighting.c
2013-03-03 01:03:33 +00:00