Kp
6ddc31fc33
Move */main/hostage.h -> common/main/hostage.h
2013-03-03 01:03:33 +00:00
Kp
3e93f2d707
Move */main/gauges.h -> common/main/gauges.h
2013-03-03 01:03:33 +00:00
Kp
ed814d313e
Move */main/multibot.h -> common/main/multibot.h
2013-03-03 01:03:33 +00:00
Kp
d2b9accbf0
Move */main/wall.h -> common/main/wall.h
2013-03-03 01:03:33 +00:00
Kp
a3515545dd
Move */main/titles.h -> common/main/titles.h
2013-03-03 01:03:33 +00:00
Kp
1b6433ec70
Move */main/texmerge.h -> common/main/texmerge.h
2013-03-03 01:03:33 +00:00
Kp
84248c65df
Move */main/terrain.h -> common/main/terrain.h
2013-03-03 01:03:33 +00:00
Kp
004ca9780f
Move */main/segpoint.h -> common/main/segpoint.h
2013-03-03 01:03:33 +00:00
Kp
887449f51b
Move */main/screens.h -> common/main/screens.h
2013-03-03 01:03:33 +00:00
Kp
14dc71243c
Move */main/scores.h -> common/main/scores.h
2013-03-03 01:03:33 +00:00
Kp
0af7543161
Move */main/robot.h -> common/main/robot.h
2013-03-03 01:03:33 +00:00
Kp
0866e9c7fd
Move */main/powerup.h -> common/main/powerup.h
2013-03-03 01:03:33 +00:00
Kp
e89d4d7765
Move */main/polyobj.h -> common/main/polyobj.h
2013-03-03 01:03:33 +00:00
Kp
3125d6bd52
Move */main/player.h -> common/main/player.h
2013-03-03 01:03:33 +00:00
Kp
4ee6714372
Move */main/physics.h -> common/main/physics.h
2013-03-03 01:03:33 +00:00
Kp
cb246551d9
Move */main/paging.h -> common/main/paging.h
2013-03-03 01:03:33 +00:00
Kp
ea2cd17e70
Move */main/object.h -> common/main/object.h
2013-03-03 01:03:33 +00:00
Kp
15f569d5b1
Move */main/newmenu.h -> common/main/newmenu.h
2013-03-03 01:03:33 +00:00
Kp
ff444c844b
Move */main/newdemo.h -> common/main/newdemo.h
2013-03-03 01:03:33 +00:00
Kp
6cc3560fbd
Move */main/net_udp.h -> common/main/net_udp.h
2013-03-03 01:03:33 +00:00
Kp
30c7274c17
Move d2x-rebirth/include/interp.h -> common/include/interp.h
...
Prior to the Bazaar import, an unidentified committer moved some
function declarations from 3d.h to interp.h, but only for Descent II.
Replicate those changes in Descent I, and move the Descent II header
interp.h to become common.
2013-03-03 01:03:33 +00:00
Kp
d6073aa8d2
Move */main/mission.h -> common/main/mission.h
2013-03-03 01:03:33 +00:00
Kp
3eaec8bb39
Move */main/laser.h -> common/main/laser.h
2013-03-03 01:03:33 +00:00
Kp
bd6ae78911
Move */main/kmatrix.h -> common/main/kmatrix.h
2013-03-03 01:03:33 +00:00
Kp
30d53dca16
Move */main/kconfig.h -> common/main/kconfig.h
2013-03-03 01:03:33 +00:00
Kp
3aa3b1695f
Move */main/gameseq.h -> common/main/gameseq.h
2013-03-03 01:03:33 +00:00
Kp
b4e7d2e899
Move */main/game.h -> common/main/game.h
2013-03-03 01:03:33 +00:00
Kp
a51d4fccae
Move */main/fvi.h -> common/main/fvi.h
2013-03-03 01:03:33 +00:00
Kp
62d30ec457
Move */main/fuelcen.h -> common/main/fuelcen.h
2013-03-03 01:03:33 +00:00
Kp
947de0c94f
Move */main/fireball.h -> common/main/fireball.h
2013-03-03 01:03:33 +00:00
Kp
5294b473d7
Move */main/endlevel.h -> common/main/endlevel.h
2013-03-03 01:03:33 +00:00
Kp
ac43b52a74
Move */main/effects.h -> common/main/effects.h
2013-03-03 01:03:33 +00:00
Kp
fe25826fa9
Move */main/credits.h -> common/main/credits.h
2013-03-03 01:03:33 +00:00
Kp
b34b00a98f
Move */main/controls.h -> common/main/controls.h
2013-03-03 01:03:33 +00:00
Kp
4cabcb5d3d
Move */main/collide.h -> common/main/collide.h
2013-03-03 01:03:33 +00:00
Kp
c8bc4ec7ef
Move */main/automap.h -> common/main/automap.h
2013-03-03 01:03:33 +00:00
Kp
49046095f5
Move */*/hash.h -> common/include/hash.h
2013-03-03 01:03:33 +00:00
Kp
f39cd4dbf6
Centralize RDL/RL2 file extension text
2013-03-17 22:18:42 +00:00
Kp
04a6716b90
Move */main/gameseg.h -> common/main/gameseg.h
2013-03-03 01:03:33 +00:00
Kp
7002c4be66
Move */main/gamesave.h -> common/main/gamesave.h
2013-03-03 01:03:33 +00:00
Kp
4662fe9490
Move */main/gamemine.h -> common/main/gamemine.h
2013-03-03 01:03:33 +00:00
Kp
f938bd3845
Move */main/segment.h -> common/main/segment.h
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
5c5618f671
Merge branch 'unify-d1x-rebirth' into unify
...
Conflicts:
SConstruct
common/main/vers_id.h
d1x-rebirth/include/alloca.h
d1x-rebirth/include/bcd.h
d1x-rebirth/include/clipboard.h
d1x-rebirth/include/compare.h
d1x-rebirth/include/tracker/tracker.h
d1x-rebirth/main/desc_id.h
d1x-rebirth/main/script.h
2013-03-31 17:21:59 +00:00
Kp
5e89ce7cd3
Move */editor/data -> common/editor/data
2013-03-17 23:01:32 +00:00
Kp
a9123e0b45
Move */texmap/*.c -> common/texmap
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
f9f14afec5
Move */editor/func.c -> common/editor/func.c
2013-03-17 23:01:32 +00:00
Kp
d64f605f54
Move */arch/sdl/joy.c -> common/arch/sdl/joy.c
2013-03-17 23:01:31 +00:00
Kp
5aeec83d49
Move */main/vclip.h -> common/main/vclip.h
2013-03-17 23:01:31 +00:00
Kp
92a2bfe1fc
Move */main/textures.h -> common/main/textures.h
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
8979873ee8
Move */include/pcx.h -> similar/include/pcx.h
2013-03-17 23:01:31 +00:00
Kp
643293169c
Move */main/sounds.h -> common/main/sounds.h
2013-03-17 23:01:31 +00:00
Kp
bb96e0ba5e
Move */main/digi.h -> common/main/digi.h
2013-03-17 23:01:31 +00:00
Kp
a0e2f7f12f
Move */main/piggy.h -> common/main/piggy.h
2013-03-17 23:01:31 +00:00
Kp
c34a25e1ed
Move */arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.c
2013-03-17 23:01:31 +00:00
Kp
11306c249e
Move */main/songs.h -> common/main/songs.h
2013-03-17 23:01:30 +00:00
Kp
68af7a81ba
Move */arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.c
2013-03-17 23:01:30 +00:00
Kp
eb8ebe40b9
Move */arch/sdl/window.c -> common/arch/sdl/window.c
2013-03-03 01:03:33 +00:00
Kp
504cf23746
Move */arch/win32/messagebox.c -> common/arch/win32/messagebox.c
2013-03-03 01:03:33 +00:00
Kp
ccd65b83ae
Move */include/editor/eswitch.h -> common/include/editor/eswitch.h
2013-03-03 01:03:33 +00:00
Kp
b732616404
Move */include/editor/kdefs.h -> common/include/editor/kdefs.h
2013-03-03 01:03:33 +00:00
Kp
923633b2ac
Move */include/editor/texpage.h -> common/include/editor/texpage.h
2013-03-03 01:03:33 +00:00
Kp
29ede4c86c
Move */ui/button.c -> common/ui/button.c
2013-03-03 01:03:33 +00:00
Kp
ac04f4b247
Move */ui/checkbox.c -> common/ui/checkbox.c
2013-03-03 01:03:33 +00:00
Kp
7ecbc5b123
Move */ui/dialog.c -> common/ui/dialog.c
2013-03-03 01:03:33 +00:00
Kp
08e8d0e499
Move */ui/file.c -> common/ui/file.c
2013-03-03 01:03:33 +00:00
Kp
b42de62167
Move */ui/gadget.c -> common/ui/gadget.c
2013-03-03 01:03:33 +00:00
Kp
8657a99491
Move */ui/icon.c -> common/ui/icon.c
2013-03-03 01:03:33 +00:00
Kp
345b90bf3f
Move */ui/inputbox.c -> common/ui/inputbox.c
2013-03-03 01:03:33 +00:00
Kp
091b287c82
Move */ui/keypad.c -> common/ui/keypad.c
2013-03-03 01:03:33 +00:00
Kp
64708c932f
Move */ui/keypress.c -> common/ui/keypress.c
2013-03-03 01:03:33 +00:00
Kp
60f0b1e557
Move */ui/keytrap.c -> common/ui/keytrap.c
2013-03-03 01:03:33 +00:00
Kp
a0a6f508a5
Move */ui/listbox.c -> common/ui/listbox.c
2013-03-03 01:03:33 +00:00
Kp
2ecc20143a
Move */ui/menu.c -> common/ui/menu.c
2013-03-03 01:03:33 +00:00
Kp
53ef9150ed
Move */ui/menubar.c -> common/ui/menubar.c
2013-03-03 01:03:33 +00:00
Kp
eea0add439
Move */ui/message.c -> common/ui/message.c
2013-03-03 01:03:33 +00:00
Kp
d07828f8d2
Move */ui/popup.c -> common/ui/popup.c
2013-03-03 01:03:33 +00:00
Kp
96c0c1f06b
Move */ui/radio.c -> common/ui/radio.c
2013-03-03 01:03:33 +00:00
Kp
2c67ea8f66
Move */ui/scroll.c -> common/ui/scroll.c
2013-03-03 01:03:33 +00:00
Kp
9c047e69c0
Move */ui/ui.c -> common/ui/ui.c
2013-03-03 01:03:33 +00:00
Kp
daa5fbf373
Move */ui/uidraw.c -> common/ui/uidraw.c
2013-03-03 01:03:33 +00:00
Kp
975df703a8
Move */ui/userbox.c -> common/ui/userbox.c
2013-03-03 01:03:33 +00:00
Kp
501f1d6a25
Move */include/ui.h -> common/include/ui.h
2013-03-03 01:03:33 +00:00
Kp
0d2a2910e5
Move */include/editor/editor.h -> common/include/editor/editor.h
2013-03-03 01:03:33 +00:00
Kp
5b2b6b1975
Move */include/editor/centers.h -> common/include/editor/centers.h
2013-03-03 01:03:33 +00:00
Kp
4b4ff91172
Move */include/editor/ehostage.h -> common/include/editor/ehostage.h
2013-03-03 01:03:33 +00:00
Kp
69679eed12
Move */include/editor/eobject.h -> common/include/editor/eobject.h
2013-03-03 01:03:33 +00:00
Kp
5fbeb7c27b
Move */include/editor/info.h -> common/include/editor/info.h
2013-03-03 01:03:33 +00:00
Kp
70c4a8ea0f
Move */include/editor/kfuncs.h -> common/include/editor/kfuncs.h
2013-03-03 01:03:33 +00:00
Kp
1f6fdba458
Move */include/editor/macro.h -> common/include/editor/macro.h
2013-03-03 01:03:33 +00:00
Kp
ce742086b5
Move */include/editor/meddraw.h -> common/include/editor/meddraw.h
2013-03-03 01:03:33 +00:00
Kp
ca7947a7ce
Move */include/editor/medlist.h -> common/include/editor/medlist.h
2013-03-03 01:03:33 +00:00
Kp
f9cd5142dc
Move */include/editor/medmisc.h -> common/include/editor/medmisc.h
2013-03-03 01:03:33 +00:00
Kp
dff777bca7
Move */include/editor/medrobot.h -> common/include/editor/medrobot.h
2013-03-03 01:03:33 +00:00
Kp
ba84aecf73
Move */include/editor/medsel.h -> common/include/editor/medsel.h
2013-03-03 01:03:33 +00:00
Kp
5499dd374b
Move */include/editor/medwall.h -> common/include/editor/medwall.h
2013-03-03 01:03:33 +00:00
Kp
e3885cb709
Move */include/editor/objpage.h -> common/include/editor/objpage.h
2013-03-03 01:03:33 +00:00
Kp
a259ecf691
Move */include/editor/seguvs.h -> common/include/editor/seguvs.h
2013-03-03 01:03:33 +00:00
Kp
b00d8130fa
Move */main/render.h -> common/main/render.h
2013-03-03 01:03:33 +00:00
Kp
863bcff083
Move */misc/dl_list.c -> common/misc/dl_list.c
2013-03-03 01:03:33 +00:00
Kp
54affd79a9
Move */misc/error.c -> common/misc/error.c
2013-03-03 01:03:33 +00:00
Kp
630344aa98
Move */misc/hmp.c -> common/misc/hmp.c
2013-03-03 01:03:33 +00:00
Kp
451c3746a5
Move */misc/ignorecase.c -> common/misc/ignorecase.c
2013-03-03 01:03:33 +00:00
Kp
c5279ea5e8
Move */misc/strio.c -> common/misc/strio.c
2013-03-03 01:03:33 +00:00
Kp
610459c520
Move */misc/strutil.c -> common/misc/strutil.c
2013-03-03 01:03:33 +00:00
Kp
57dbf885ec
Move */main/config.h -> common/main/config.h
2013-03-03 01:03:33 +00:00
Kp
bb13bf5618
Move */main/vers_id.h -> common/main/vers_id.h
2013-03-03 01:03:33 +00:00
Kp
fa26a436aa
Move */main/gamefont.h -> common/main/gamefont.h
2013-03-03 01:03:33 +00:00
Kp
7f023bc8b0
Move */main/lighting.h -> common/main/lighting.h
2013-03-03 01:03:33 +00:00
Kp
a0de8a594c
Move */main/hudmsg.h -> common/main/hudmsg.h
2013-03-03 01:03:33 +00:00
Kp
6d10818c40
Move */include/func.h -> common/include/func.h
2013-03-03 01:03:33 +00:00
Kp
b2382d7772
Move */include/makesig.h -> common/include/makesig.h
2013-03-03 01:03:33 +00:00
Kp
70d4274106
Move */include/rbaudio.h -> common/include/rbaudio.h
2013-03-03 01:03:33 +00:00
Kp
1abda3c5a6
Move */include/strio.h -> common/include/strio.h
2013-03-03 01:03:33 +00:00
Kp
c90750e802
Move */include/dl_list.h -> common/include/dl_list.h
2013-03-03 01:03:33 +00:00
Kp
972da8a7c7
Move */arch/include/window.h -> common/include/window.h
2013-03-03 01:03:33 +00:00
Kp
2ab85c0413
Move */arch/include/messagebox.h -> common/include/messagebox.h
2013-03-03 01:03:33 +00:00
Kp
0b38376ebd
Move */arch/include/key.h -> common/include/key.h
2013-03-03 01:03:33 +00:00
Kp
536203188c
Move */arch/include/jukebox.h -> common/include/jukebox.h
2013-03-03 01:03:33 +00:00
Kp
2fc1cba2b5
Move */3d -> common/3d
...
Move all the common 3d/ code into a common directory. Substantial
differences exist in 3d/interp.c, so it is not yet common.
2013-03-03 01:03:33 +00:00
Kp
3becab2461
Move */include/texmap.h -> common/include/texmap.h
2013-03-03 01:03:33 +00:00
Kp
26cfa7b39c
Move */2d/2dsline.c -> common/2d/2dsline.c
2013-03-03 01:03:33 +00:00
Kp
9951b893ab
Move */2d/bitblt.c -> common/2d/bitblt.c
2013-03-03 01:03:33 +00:00
Kp
cc67fd23a2
Move */2d/bitmap.c,bitmap.h -> common/2d/bitmap.c,bitmap.h
...
Modify */2d/font.c to find the moved bitmap.h
2013-03-03 01:03:33 +00:00
Kp
ccd1268e9d
Move */2d/box.c -> common/2d/box.c
2013-03-03 01:03:33 +00:00
Kp
733c0f34da
Move */2d/canvas.c -> common/2d/canvas.c
2013-03-03 01:03:33 +00:00
Kp
016c2a44f5
Move */2d/circle.c -> common/2d/circle.c
2013-03-03 01:03:33 +00:00
Kp
55cb06f45f
Move */2d/disc.c -> common/2d/disc.c
2013-03-03 01:03:33 +00:00
Kp
4adefcdfa1
Move */2d/gpixel.c -> common/2d/gpixel.c
2013-03-03 01:03:33 +00:00
Kp
2d84c85915
Move */2d/clip.h,line.c -> common/2d/clip.h,line.c
2013-03-03 01:03:33 +00:00
Kp
2e7c092bb0
Move */2d/pixel.c -> common/2d/pixel.c
2013-03-03 01:03:33 +00:00
Kp
11f7182d45
Move */2d/poly.c -> common/2d/poly.c
2013-03-03 01:03:33 +00:00
Kp
54c847a88b
Move */2d/rect.c -> common/2d/rect.c
2013-03-03 01:03:33 +00:00
Kp
291e32b1e9
Move */include/3d.h -> common/include/3d.h
2013-03-03 01:03:33 +00:00
Kp
902e068d1c
Move */2d/rle.c -> common/2d/rle.c
2013-03-03 01:03:33 +00:00
Kp
227d1377fa
Move */2d/scalec.c -> common/2d/scalec.c
2013-03-03 01:03:33 +00:00
Kp
04b545ee29
Move */maths/vecmat.c -> common/maths/vecmat.c
2013-03-03 01:03:33 +00:00
Kp
a872eb86a7
Move */maths/tables.c -> common/maths/tables.c
2013-03-03 01:03:33 +00:00
Kp
7099238a95
Move */maths/rand.c -> common/maths/rand.c
2013-03-03 01:03:33 +00:00
Kp
05e34150db
Move */maths/fixc.c -> common/maths/fixc.c
2013-03-03 01:03:33 +00:00
Kp
e6c78ed004
Move */main/slew.h -> common/main/slew.h
2013-03-03 01:03:33 +00:00
Kp
53e4ff58e0
Move */main/morph.h -> common/main/morph.h
2013-03-03 01:03:33 +00:00
Kp
daeada6d98
Move */include/palette.h -> common/include/palette.h
2013-03-03 01:03:33 +00:00
Kp
88b0cd1cf4
Move */include/ogl_init.h -> common/include/ogl_init.h
2013-03-03 01:03:33 +00:00
Kp
1633f29eab
Move */include/grdef.h -> common/include/grdef.h
...
Drop the special case for Metrowerks in Descent I.
2013-03-03 01:03:33 +00:00
Kp
139ed37bc8
Move */include/gr.h -> common/include/gr.h
2013-03-03 01:03:33 +00:00
Kp
9a236566b8
Move */include/args.h -> common/include/args.h
2013-03-03 01:03:33 +00:00
Kp
4033f2020b
Move */main/inferno.h -> common/main/inferno.h
...
Add preprocessor symbols to detect which version of Descent is built,
since some headers are not identical between the two versions, but are
close enough to be worth sharing.
2013-03-03 01:03:33 +00:00
Kp
0c2a08ec01
Move */include/physfsx.h -> common/include/physfsx.h
2013-03-03 01:03:33 +00:00
Kp
2afbfda4ee
Move */include/ignorecase.h -> common/include/ignorecase.h
2013-03-03 01:03:33 +00:00
Kp
a05d292255
Move */include/u_mem.h -> common/include/u_mem.h
...
The Descent I reference to virtual_memory_on is unused, so drop it.
2013-03-03 01:03:33 +00:00
Kp
d9ee4c7dce
Move */include/strutil.h -> common/include/strutil.h
2013-03-03 01:03:33 +00:00
Kp
d99d197f8d
Move */include/iff.h -> common/include/iff.h
2013-03-03 01:03:33 +00:00
Kp
781d4abdf2
Move */include/rle.h -> common/include/mouse.h
2013-03-03 01:03:33 +00:00
Kp
8298b3c7e6
Move */arch/include/mouse.h -> common/include/mouse.h
2013-03-03 01:03:33 +00:00
Kp
10260197f6
Move */arch/include/joy.h -> common/include/joy.h
2013-03-03 01:03:33 +00:00
Kp
896865c4c4
Move */arch/include/digi_mixer_music.h -> common/include/digi_mixer_music.h
2013-03-03 01:03:33 +00:00
Kp
94e1ee629a
Move */arch/include/digi_mixer.h -> common/include/digi_mixer.h
2013-03-03 01:03:33 +00:00
Kp
c6e0882f51
Move */arch/include/digi_audio.h -> common/include/digi_audio.h
2013-03-03 01:03:33 +00:00
Kp
27953049cf
Move */arch/include/event.h -> common/include/event.h
2013-03-03 01:03:33 +00:00
Kp
9bc42c0b32
Move */include/timer.h -> common/include/timer.h
2013-03-03 01:03:33 +00:00
Kp
f2fef2eef5
Move */include/byteswap.h -> common/include/byteswap.h
2013-03-03 01:03:33 +00:00
Kp
204b1e4700
Move */include/console.h -> common/include/console.h
2013-03-03 01:03:33 +00:00
Kp
6555abf09e
Move */include/hmp.h -> common/include/hmp.h
2013-03-03 01:03:33 +00:00
Kp
ac1af0a58a
Move */include/vecmat.h -> common/include/vecmat.h
2013-03-03 01:03:33 +00:00
Kp
ba96e9c7ff
Move */include/internal.h -> common/include/internal.h
2013-03-03 01:03:33 +00:00
Kp
88371ff28a
Move */include/fix.h -> common/include/fix.h
2013-03-03 01:03:33 +00:00
Kp
85c66cad08
Move */include/maths.h -> common/include/maths.h
2013-03-03 01:03:33 +00:00
Kp
4044caeb2d
Move */include/dxxerror.h -> common/include/dxxerror.h
2013-03-03 01:03:33 +00:00
Kp
1c2ab15475
Move */include/pstypes.h -> common/include/pstypes.h
2013-03-03 01:03:33 +00:00