Kp
24f511bbb0
Remove unused piggy_get_bitmap_name
2013-10-29 03:24:42 +00:00
Kp
68e936b809
Disable Parallax AI path debug printing
2013-10-29 03:24:41 +00:00
Kp
3d20ee8c92
Move d1x-rebirth/editor/ehostage.c -> d1x-rebirth/editor/ehostage.cpp
2013-10-28 04:14:19 +00:00
Kp
8ed99faf5c
Make headers freestanding
2013-10-26 03:50:28 +00:00
Kp
a6b1bd58a2
Use MALLOC consistently
2013-10-26 03:50:27 +00:00
Kp
5b0c4b10ac
Use accessor for most get/set object->id accesses
2013-10-20 22:49:09 +00:00
Kp
f51e9e8cfc
Fix ancient hxm memory leak
2013-10-19 17:03:11 +00:00
Kp
fabed11b2f
Fix ancient animbrush memory leak
2013-10-19 17:03:11 +00:00
Kp
740a190835
Move */main/playsave.c -> similar/main/playsave.c
2013-10-06 17:56:37 +00:00
Kp
7dd7d6704b
Make write_player_file void
2013-10-06 17:56:37 +00:00
Kp
a2fc216cf6
Restructure playsave.c for merging
2013-10-06 17:56:37 +00:00
Kp
f92e234054
Move */main/dumpmine.c -> similar/main/dumpmine.c
2013-10-06 16:58:49 +00:00
Kp
fa1b1a1217
Restructure dumpmine.c for merging
2013-10-06 16:20:00 +00:00
Kp
e73205faac
Use enum for player awareness types
2013-10-05 21:35:58 +00:00
Kp
c58c4e4d06
Move declarations to headers
2013-10-03 03:11:52 +00:00
Kp
f9899a9f20
Mark various functions static
2013-10-03 03:11:51 +00:00
Kp
1b4169b0d0
Move */main/powerup.c -> similar/main/powerup.c
2013-10-02 02:51:25 +00:00
Kp
7c7bff061e
Remove BUILD_PSX_DATA code
...
This is never activated.
2013-10-02 02:50:37 +00:00
Kp
bca4a99f3e
Move */main/laser.c -> similar/main/laser.c
2013-09-21 23:19:38 +00:00
Kp
7aef24071c
Simplify weapon sufficiency logic
2013-09-21 23:19:38 +00:00
Kp
8df7e8c6b4
Restructure laser.c to simplify merge
2013-09-21 23:19:31 +00:00
Kp
53c8c2f812
Backport D2X use of helper call_find_homing_object_complete
2013-09-21 17:02:14 +00:00
Kp
ec015d8814
Backport D2X ancestor sanity check
2013-09-20 23:14:47 +00:00
Kp
f4b21088a0
Track vulcan ammo explicitly
2013-09-20 23:12:54 +00:00
Kp
6e1d9f1f0c
Add helper to test for weapons that use vulcan ammo
2013-09-20 23:12:51 +00:00
Kp
d447d02a1d
Move */main/newdemo.c -> similar/main/newdemo.c
2013-09-15 21:34:08 +00:00
Kp
aa9127e3c1
Enable -Wwrite-strings
2013-09-15 21:34:03 +00:00
Kp
485c3f8a2a
Convert d1x newdemo to menu helpers
2013-09-15 21:34:02 +00:00
Kp
eb9b126ab1
Reorder newdemo.c to simplify merging
2013-09-15 21:03:58 +00:00
Kp
c3bbc41796
Remove !defined(NETWORK) code
...
Rebirth has always defined NETWORK, so checking for it clutters the code.
2013-09-15 21:01:06 +00:00
Kp
4848179857
Remove unused bm_read_hostage_face
2013-09-14 17:42:11 +00:00
Kp
88403fbfd8
Remove defined(SHAREWARE) code
...
Rebirth supports shareware and retail data based on runtime decisions.
2013-09-11 02:39:50 +00:00
Kp
d4e4a34be7
Remove obsolete descent_critical_error variables
...
These appear to be for reporting serious errors from DOS. Commit
1de5349
removed the ability to set them to anything other than 0, so
remove them.
2013-09-02 23:59:31 +00:00
Kp
d156a4c1ab
Simplify D1X hostage handling
2013-09-02 23:59:31 +00:00
Kp
b7dac2941c
Move */main/gamesave.c -> similar/main/gamesave.c
2013-09-01 22:59:55 +00:00
Kp
ce2dd25e3f
Use helper for setting menu items to types menu and text
2013-09-01 22:24:13 +00:00
Kp
bf027e3df0
Move */main/titles.c -> similar/main/titles.c
2013-09-01 22:19:27 +00:00
Kp
17037caa4d
Mark titles.c briefings static const
2013-09-01 21:52:34 +00:00
Kp
801dfbcd81
Move */main/net_udp.c -> similar/main/net_udp.c
2013-09-01 21:51:54 +00:00
Kp
ccb92fdefa
Use macro to define advanced net UDP options
2013-09-01 21:11:27 +00:00
Kp
9d2d8bb552
Scrub netgame flags on load/save/send/recv
2013-09-01 21:09:01 +00:00
Kp
923c2111de
Move */main/switch.c -> similar/main/switch.c
2013-09-01 18:42:31 +00:00
Kp
25b7735e44
Move */main/aipath.c -> similar/main/aipath.c
2013-09-01 18:38:37 +00:00
Kp
3554d17614
Move */main/render.c -> similar/main/render.c
2013-09-01 18:22:55 +00:00
Kp
f131fcd3da
Move */main/menu.c -> similar/main/menu.c
2013-09-01 18:06:24 +00:00
Kp
1fd1aa05bc
Move */main/mission.c -> similar/main/mission.c
2013-09-01 17:43:27 +00:00
Kp
24bbd2a76d
Move */main/automap.c -> similar/main/automap.c
2013-09-01 17:37:38 +00:00
Kp
7bf5b29be4
Move */main/kconfig.c -> similar/main/kconfig.c
2013-09-01 17:20:07 +00:00
Kp
051e346186
Restructure menu.c for merging
2013-08-31 17:17:35 +00:00
Kp
31b9ad0bde
Restructure misc options menu for merging
2013-08-31 17:17:34 +00:00
Kp
567b1d13c2
Remove broken COMPACT_SEGS code
...
It has not built since at least 0c36fecb
.
2013-08-31 16:45:43 +00:00
Kp
897023eda5
Reorder vertex render lookups to simplify merge
2013-08-24 17:10:06 +00:00
Kp
3f0f68e862
Remove unused move_object_to_goal
2013-08-24 16:54:28 +00:00
Kp
e8776caf16
Remove unused get_random_child
2013-08-24 16:54:28 +00:00
Kp
0365b3600f
Remove unused special_object_in_seg
2013-08-24 16:54:28 +00:00
Kp
335c56111b
Remove unused move_object_to_legal_spot
2013-08-24 16:54:28 +00:00
Kp
b1b40bfe99
Remove unused set_rotvel_and_saturate
2013-08-24 16:54:28 +00:00
Kp
1b44fe5844
Move alpha blend test to helper to simplify merge
2013-08-24 16:44:30 +00:00
Kp
afcbfe8e54
Rename d1x/d2x variables to unify names between D1X and D2X
2013-08-24 16:44:30 +00:00
Kp
045082f3eb
Use static const fix Flash_rate
2013-08-20 03:02:30 +00:00
Kp
00381b2652
Abstract out weapon names
2013-08-20 02:59:09 +00:00
Kp
a04cd57d71
Move */main/multi.c -> similar/main/multi.c
2013-08-11 23:46:13 +00:00
Kp
e86a9b67a6
Move multi.c variables to top of file
2013-08-11 23:03:40 +00:00
Kp
ad6a7820cf
Make PowerupAdjustMapping static const
2013-08-11 22:42:51 +00:00
Kp
82dc40c891
Remove unused prototypes
2013-08-11 20:46:53 +00:00
Kp
69b3618961
Make vm_angvec_zero a static inline function
2013-08-11 20:46:53 +00:00
Kp
6b4ca09376
Split out anarchy object deletion predicate to simplify merge
2013-08-11 20:46:52 +00:00
Kp
743dd2f964
Rearrange code to simplify merge with D1X
2013-08-11 20:46:52 +00:00
Kp
836aa10f8c
Use macro PUT_WEAPON_FLAGS to hide differences in D1X vs D2X
...
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
2013-08-11 20:46:52 +00:00
Kp
d55054d82e
Always play a sound when a player escapes the mine
2013-08-11 20:46:52 +00:00
Kp
431282fd7b
Remove redundant Game_mode guard on multi_strip_robots
2013-08-11 20:46:52 +00:00
Kp
202755e8e3
Use macro GET_WEAPON_FLAGS to hide differences in D1X vs D2X
...
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
2013-08-11 20:46:52 +00:00
Kp
5ef0358a4b
Remove unnecessary int casts in multi buffer parsing
2013-08-11 20:46:52 +00:00
Kp
de6422d58f
Remove unused multi_send_audio_taunt
2013-08-11 20:43:08 +00:00
Kp
6e88008677
Use unaligned-safe copy of powerup position
2013-08-11 20:43:08 +00:00
Kp
760667eb60
Remove unused multi_set_robot_ai
2013-08-11 20:43:08 +00:00
Kp
91928c2afc
Rename 'new' to 'n' for C++ compatibility
2013-08-11 20:43:08 +00:00
Kp
85dc42189b
Add extent to RankStrings to match D2X
2013-08-11 15:11:45 +00:00
Kp
33aa8937d9
Merge branch d1x-rebirth/master into unification/master
...
Conflicts:
SConstruct
common/main/multi.h
similar/main/gamerend.c
2013-08-09 22:49:04 +00:00
zico
01f155382e
Removed chaff ability from D1X-Rebirth's proxys as they were never intended to do that
2013-08-09 17:29:10 +02:00
zico
830bcd7845
merge with ccea6b3547
2013-08-09 17:25:42 +02:00
zico
a527348681
Added MULTI_FIRE_BOMB as alteration of MULTI_FIRE to keep bombs mapped in a Multiplayer match for later Host authority and to make their chaff ability work correctly. Additionally added MULTI_FIRE_TRACK to only send Network_laser_track if > -1. On the way I made laser.c a bit more similar between D1X and D2X
2013-08-09 17:21:03 +02:00
Kp
2cc0068fa9
Move */main/fvi.c -> similar/main/fvi.c
2013-08-09 03:13:33 +00:00
Kp
319b3ec5fd
Mark more math as const correct
2013-08-09 03:04:18 +00:00
zico
40c5f10e20
Added definition of DESIGNATED_GAME_FPS as 30 and DESIGNATED_GAME_FRAMETIME based on the former. We use those for d_tick_count intervals and to scale other parts that have never been properly aligned to FrameTime before. In that regard, Release builds will take DESIGNATED_GAME_FPS as MINIMUM_FPS for -maxfps argument
2013-08-08 22:07:29 +02:00
Kp
a881ee455e
Remove fix.h
2013-08-08 03:01:48 +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
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
zico
2b632008b2
Cleaned code for homing projectiles a bit and reverted to state of Descent 1 source release; Added ticks to rule target aquisition and adjusted turn rate scaling accordingly
2013-08-06 21:04:44 +02:00
Kp
07d6e2c994
Fix format mismatch on Win32 newdemo
...
Win32 makes sizeof(object) an unsigned int instead of unsigned long.
2013-08-03 20:32:48 +00:00
Kp
ff90315978
Use SConscript configure support to probe for format(printf) attribute
2013-07-27 22:17:13 +00:00
Kp
74bcb86cf4
Remove some const modifiers that broke SDL-only build
2013-07-27 21:29:01 +00:00
Kp
e613b81db6
Remove obsolete tmapflat.c
2013-07-27 21:08:33 +00:00
Kp
4725ca5f73
Move */main/songs.c -> similar/main/songs.c
2013-07-24 01:43:02 +00:00
Kp
862d1b561c
Move */main/switch.h -> common/main/switch.h
2013-07-24 01:43:02 +00:00
Kp
90cd2f4938
Move */main/multi.h -> common/main/multi.h
2013-07-24 01:43:01 +00:00
Kp
f84884cfa0
Move */main/gauges.c -> similar/main/gauges.c
2013-07-24 01:27:35 +00:00
Kp
a05793fd84
Mark various things static
2013-07-23 02:09:12 +00:00
Kp
d55f622691
Add missed const for Side_to_verts
2013-07-23 02:05:37 +00:00
Kp
1686732c4e
Move */main/text.h -> common/main/text.h
2013-07-21 22:10:01 +00:00
Kp
f8564907fa
Make gauges.c more like D2X
2013-07-21 21:55:19 +00:00
Kp
4187648621
Remove redundant/obsolete declarations
2013-07-21 21:55:00 +00:00
Kp
d0f2d66c89
Fix preprocessor guard for draw_outline
2013-07-21 21:40:46 +00:00
Kp
5874d7935c
Remove unused gauge macros
2013-07-21 21:35:21 +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
9b50efca0e
Make local_to_remote and remote_to_local static
2013-07-20 17:09:53 +00:00
Kp
a5181a3208
Remove unused multi_allow_powerup_mask
2013-07-20 16:58:37 +00:00
Kp
6c9c87e27c
Move */main/weapon.h -> common/main/weapon.h
2013-07-20 16:40:08 +00:00
Kp
012d8e249b
Merge branch d1x-rebirth/master into unification/master
2013-07-19 22:32:28 +00:00
Kp
e0d8afc8e1
Remove d1x-rebirth/editor/meddraw.c
2013-06-30 21:22:10 +00:00
Kp
06a2bb4c6b
Move */main/aistruct.h -> common/main/aistruct.h
2013-03-03 01:03:33 +00:00
Kp
a2b7e663df
Move */main/weapon.c -> similar/main/weapon.c
2013-03-03 01:03:33 +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
89be67732b
Fix powerup_basic warnings after merge
2013-06-04 03:12:35 +00:00
Kp
a49aff4897
Restore use of Windows icon file
2013-06-02 21:46:32 +00:00
Kp
72eacd118b
Move */main/ai.h -> common/main/ai.h
2013-03-03 01:03:33 +00:00
Kp
e0dbe97264
Move */main/bm.h -> common/main/bm.h
2013-03-03 01:03:33 +00:00
Kp
c1b6f8ef8c
Move */main/playsave.h -> common/main/playsave.h
2013-03-03 01:03:33 +00:00
Kp
5d487f4d4d
Move */main/state.h -> common/main/state.h
2013-03-03 01:03:33 +00:00
Kp
020cdecf31
Remove d*x-rebirth/main/gamemine.h
2013-03-03 01:03:33 +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
997c35c351
Move */include/loadgl.h -> common/include/loadgl.h
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
410b07d5c4
Merge branch 'd1x-rebirth/master' into unification/master
...
Conflicts:
SConstruct
2013-05-05 22:08:34 +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
4bf4710aff
Move */main/menu.h -> common/main/menu.h
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
c1f9bcbf64
Move */main/cntrlcen.h -> common/main/cntrlcen.h
...
Also, adjust includes in source files that assumed cntrlcen.h would
include switch.h.
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
6ddc31fc33
Move */main/hostage.h -> common/main/hostage.h
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
3e93f2d707
Move */main/gauges.h -> common/main/gauges.h
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
ed814d313e
Move */main/multibot.h -> common/main/multibot.h
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
d2b9accbf0
Move */main/wall.h -> common/main/wall.h
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
a3515545dd
Move */main/titles.h -> common/main/titles.h
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
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
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
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
996cb3ee99
Move */main/scores.h -> similar/main/scores.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
21c078df5b
Move */main/paging.c -> similar/main/paging.c
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
5cf2b5873b
Move */main/newmenu.c -> similar/main/newmenu.c
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
cb64b8540b
Move */main/morph.c -> similar/main/morph.c
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
85c4602199
Move */main/mglobal.c -> similar/main/mglobal.c
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
5fa1819e63
Move */main/kmatrix.c -> similar/main/kmatrix.c
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
c48a9ea87d
Move */main/hud.c -> similar/main/hud.c
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
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
b5001feb2f
Move */editor/objpage.c -> similar/editor/objpage.c
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
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
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
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
1c7c90d038
Move */editor/eswitch.c -> similar/editor/eswitch.c
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
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
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
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
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
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
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
f9f14afec5
Move */editor/func.c -> common/editor/func.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
357b375ba1
Remove unused editor/kgroup.c
2013-03-17 23:01:32 +00:00