Commit graph

132 commits

Author SHA1 Message Date
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