Kp
3aa3b1695f
Move */main/gameseq.h -> common/main/gameseq.h
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
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
f938bd3845
Move */main/segment.h -> common/main/segment.h
2013-03-03 01:03:33 +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
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
bdb1377c5a
Restructure struct segment to align better
2013-03-17 23:01:32 +00:00
Kp
cd17326d84
Add stub which_bomb to match D2X code
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
ff949a5367
Mark main/snddecom.c data static
2013-03-17 23:01:31 +00:00
Kp
d64e47bfed
Remove unused main/mute.c, main/mute.h
2013-03-17 23:01:31 +00:00
Kp
9f2ac88556
Mark main/custom.c functions static
2013-03-17 23:01:31 +00:00
Kp
3d876bad8b
Remove unused main/altsound.c, main/altsound.h
2013-03-17 23:01:31 +00:00
Kp
331a662869
Remove unused main/compbit.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
11306c249e
Move */main/songs.h -> common/main/songs.h
2013-03-17 23:01:30 +00:00
Kp
caaf44e358
Fix array underrun when searching for highest used object
2012-12-02 23:47:41 +00:00
Kp
a8f8bb3682
Fix array boundary over-read in obj_get_signature
2012-12-02 23:28:56 +00:00
Kp
b00d8130fa
Move */main/render.h -> common/main/render.h
2013-03-03 01:03:33 +00:00
Kp
ed2ca1d9ef
Create Window_rendered_data to match D2X rendering
2013-03-09 04:36:35 +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
687b6284e6
Merge branch 'd1x-rebirth' into unification/master
2013-03-10 03:34:54 +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
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
beb0690633
Move d1x-rebirth source into subdirectory d1x-rebirth
2013-02-19 00:34:46 +00:00
