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
Kp
e1c6fd9690
Move */main/config.c -> similar/main/config.c
2013-03-03 01:03:33 +00:00
Kp
0952484183
Move part of */main/hostage.c -> similar/main/hostage.c
2013-03-03 01:03:33 +00:00
Kp
acbe1209e8
Move */arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.c
2013-03-03 01:03:33 +00:00
Kp
2679c2be10
Move */editor/texpage.c -> similar/editor/texpage.c
2013-03-03 01:03:33 +00:00
Kp
a27d667716
Move */editor/medrobot.c -> similar/editor/medrobot.c
2013-03-03 01:03:33 +00:00
Kp
8263b74663
Move */editor/centers.c -> similar/editor/centers.c
2013-03-03 01:03:33 +00:00
Kp
40c71caf92
Move */main/credits.c -> similar/main/credits.c
2013-03-03 01:03:33 +00:00
Kp
a622ccf07f
Move */main/player.c -> similar/main/player.c
2013-03-03 01:03:33 +00:00
Kp
a42e743694
Move */main/effects.c -> similar/main/effects.c
2013-03-03 01:03:33 +00:00
Kp
828452910a
Move */main/digiobj.c -> similar/main/digiobj.c
2013-03-03 01:03:33 +00:00
Kp
29c9334261
Move */main/vclip.c -> similar/main/vclip.c
2013-03-03 01:03:33 +00:00
Kp
543f6002b8
Move */main/texmerge.c -> similar/main/texmerge.c
2013-03-03 01:03:33 +00:00
Kp
83ba5b6241
Move */main/terrain.c -> similar/main/terrain.c
2013-03-03 01:03:33 +00:00
Kp
2b613ee05a
Move */main/slew.c -> similar/main/slew.c
2013-03-03 01:03:33 +00:00
Kp
996cb3ee99
Move */main/scores.h -> similar/main/scores.h
2013-03-03 01:03:33 +00:00
Kp
21c078df5b
Move */main/paging.c -> similar/main/paging.c
2013-03-03 01:03:33 +00:00
Kp
5cf2b5873b
Move */main/newmenu.c -> similar/main/newmenu.c
2013-03-03 01:03:33 +00:00
Kp
cb64b8540b
Move */main/morph.c -> similar/main/morph.c
2013-03-03 01:03:33 +00:00
Kp
85c4602199
Move */main/mglobal.c -> similar/main/mglobal.c
2013-03-03 01:03:33 +00:00
Kp
5fa1819e63
Move */main/kmatrix.c -> similar/main/kmatrix.c
2013-03-03 01:03:33 +00:00
Kp
c48a9ea87d
Move */main/hud.c -> similar/main/hud.c
2013-03-03 01:03:33 +00:00
Kp
f418785edc
Move */main/gamefont.c -> similar/main/gamefont.c
2013-03-03 01:03:33 +00:00
Kp
b5001feb2f
Move */editor/objpage.c -> similar/editor/objpage.c
2013-03-03 01:03:33 +00:00
Kp
7224dde00a
Move */editor/seguvs.c -> similar/editor/seguvs.c
2013-03-03 01:03:33 +00:00
Kp
93d6dc54bd
Move */editor/segment.c -> similar/editor/segment.c
2013-03-03 01:03:33 +00:00
Kp
47b6daaa7a
Move */editor/mine.c -> similar/editor/mine.c
2013-03-03 01:03:33 +00:00
Kp
cd4b771b30
Move */editor/medwall.c -> similar/editor/medwall.c
2013-03-03 01:03:33 +00:00
Kp
5722aee654
Move */editor/meddraw.c -> similar/editor/meddraw.c
2013-03-03 01:03:33 +00:00
Kp
fa8217ff13
Move */editor/med.c -> similar/editor/med.c
2013-03-03 01:03:33 +00:00
Kp
631bc1e3a6
Move */editor/group.c -> similar/editor/group.c
2013-03-03 01:03:33 +00:00
Kp
75fc0d5e8a
Move */editor/ksegsize.c -> similar/editor/ksegsize.c
2013-03-03 01:03:33 +00:00
Kp
931b944cba
Move */editor/kgame.c -> similar/editor/kgame.c
2013-03-03 01:03:33 +00:00
Kp
1c7c90d038
Move */editor/eswitch.c -> similar/editor/eswitch.c
2013-03-03 01:03:33 +00:00
Kp
4ba0495b0a
Move */editor/eobject.c -> similar/editor/eobject.c
2013-03-03 01:03:33 +00:00
Kp
0d8cf57ab0
Move */editor/eglobal.c -> similar/editor/eglobal.c
2013-03-03 01:03:33 +00:00
Kp
043f12db26
Move */editor/curves.c -> similar/editor/curves.c
2013-03-03 01:03:33 +00:00
Kp
a4277df58f
Merge branch 'unify-d2x-rebirth' into unify
...
Conflicts:
SConstruct
common/include/editor/editor.h
d2x-rebirth/editor/ehostage.c
d2x-rebirth/include/d_glob.h
d2x-rebirth/include/d_io.h
d2x-rebirth/main/desc_id.h
d2x-rebirth/main/gamestat.h
d2x-rebirth/main/link.bat
2013-03-31 17:24:44 +00:00
Kp
53c19f14f1
Move */editor/kmine.c -> similar/editor/kmine.c
2013-03-17 23:01:33 +00:00
Kp
7cb761f0a3
Move */editor/ksegmove.c -> similar/editor/ksegmove.c
2013-03-17 23:01:33 +00:00
Kp
4aeeab376b
Move */editor/ksegsel.c -> similar/editor/ksegsel.c
2013-03-17 23:01:33 +00:00
Kp
1692f38127
Move */editor/ktmap.c -> similar/editor/ktmap.c
2013-03-17 23:01:33 +00:00
Kp
baf0da84d2
Move */editor/kview.c -> similar/editor/kview.c
2013-03-17 23:01:33 +00:00
Kp
1030915f1c
Move */editor/medmisc.c -> similar/editor/medmisc.c
2013-03-17 23:01:33 +00:00
Kp
bff770f1d8
Move */editor/medsel.c -> similar/editor/medsel.c
2013-03-17 23:01:33 +00:00
Kp
5ca4d35bf5
Move */editor/texture.c -> similar/editor/texture.c
2013-03-17 23:01:33 +00:00
Kp
db5239deee
Move */main/console.c -> similar/main/console.c
2013-03-17 23:01:32 +00:00
Kp
9058a5c791
Move segment handling from editor.h
2013-03-17 23:01:32 +00:00
Kp
a842ddca86
Move */editor/autosave.c -> similar/editor/autosave.c
2013-03-17 23:01:32 +00:00
Kp
bd9702463e
Move */editor/elight.c -> similar/editor/elight.c
2013-03-17 23:01:32 +00:00
Kp
1aa9ae721e
Move */editor/fixseg.c -> similar/editor/fixseg.c
2013-03-17 23:01:32 +00:00
Kp
756ded6007
Move */editor/info.c -> similar/editor/info.c
2013-03-17 23:01:32 +00:00
Kp
a338f81663
Move */editor/kbuild.c -> similar/editor/kbuild.c
2013-03-17 23:01:32 +00:00
Kp
af3707d1c0
Move */editor/kcurve.c -> similar/editor/kcurve.c
2013-03-17 23:01:32 +00:00
Kp
6b5336a4b3
Move */editor/kfuncs.c -> similar/editor/kfuncs.c
2013-03-17 23:01:32 +00:00
Kp
ead39c4cc8
Move */editor/khelp.c -> similar/editor/khelp.c
2013-03-17 23:01:32 +00:00
Kp
e66b36de14
Move */arch/sdl/gr.c -> similar/arch/sdl/gr.c
2013-03-17 23:01:32 +00:00
Kp
6ef38884e1
Move */arch/sdl/key.c -> similar/arch/sdl/key.c
2013-03-17 23:01:31 +00:00
Kp
ddb26fa198
Move */arch/sdl/event.c -> similar/arch/sdl/event.c
2013-03-17 23:01:31 +00:00
Kp
b5c3902697
Move */arch/sdl/init.c -> similar/arch/sdl/init.c
2013-03-17 23:01:31 +00:00
Kp
4bd3f0dbec
Move */arch/sdl/mouse.c -> similar/arch/sdl/mouse.c
2013-03-17 23:01:31 +00:00
Kp
b14f7c2f5f
Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c
2013-03-17 23:01:31 +00:00
Kp
299b47656b
Move */misc/hash.c -> similar/misc/hash.c
2013-03-17 23:01:31 +00:00
Kp
68fec5f94a
Move */misc/physfsx.c -> similar/misc/physfsx.c
2013-03-17 23:01:31 +00:00
Kp
5c1f0f68cc
Move */mem/mem.c -> similar/mem/mem.c
2013-03-17 23:01:31 +00:00
Kp
78fde624f6
Move */arch/sdl/timer.c -> similar/arch/sdl/timer.c
2013-03-17 23:01:31 +00:00
Kp
ea29654c53
Move */arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.c
2013-03-17 23:01:31 +00:00
Kp
3fe3da9a25
Move */arch/ogl/ogl.c -> similar/arch/ogl/ogl.c
2013-03-17 23:01:31 +00:00