Kp
3620392f56
Remove unused nm_messagebox_fixedfont
2013-12-06 00:24:07 +00:00
Drakona
04d84ae61d
Pass shot orientation with each weapon packet
2013-12-05 13:11:49 +01:00
Kp
18aea17f9e
Move */main/fireball.c -> similar/main/fireball.c
2013-12-02 00:21:31 +00:00
Kp
2ac98f7269
Move */main/gamemine.c -> similar/main/gamemine.c
2013-12-01 23:55:29 +00:00
Kp
38832fd1af
Restructure gamemine.c for merge
2013-12-01 23:52:27 +00:00
Kp
2d01f3a649
Optimize references to player ship
2013-12-01 22:53:25 +00:00
Kp
74ac85076f
Store joystick button text in one allocation
2013-12-01 22:42:47 +00:00
Kp
5354d05fbf
Store joystick axis text in one allocation
2013-12-01 22:42:47 +00:00
Kp
08efe14586
Remove unused Laser_player_fire parameter harmless_flag
2013-11-28 02:12:13 +00:00
Kp
3e2c0b5e1b
Switch multi_allow_powerup_text to [][] from *[]
2013-11-28 02:09:30 +00:00
Kp
5d1769cd2c
Switch RankStrings to be [][14] instead of *[]
...
Saves 10 .rel.ro entries and 6 bytes on x86 / 46 bytes on x64.
2013-11-28 02:08:54 +00:00
Kp
541961a2f7
Make Object_type_names const
2013-11-28 00:27:43 +00:00
Kp
68732756e8
Make Wall_names const
2013-11-28 00:27:43 +00:00
Kp
cbc46e343d
Remove unused MULTI_ANGER
2013-11-24 23:11:30 +00:00
Kp
a65d774c83
Improve packing of struct segment
...
Shrinks Segments[] by 36000 bytes.
2013-11-24 23:08:32 +00:00
Kp
c70c6c98b3
Remove obsolete segment::degenerated flag
...
Shrinks Segments[] by 36000 bytes.
2013-11-24 23:08:32 +00:00
Kp
6be79cadce
Unify ai_follow_path
2013-11-23 22:41:01 +00:00
Kp
7a9db6716a
Make ready_to_fire static
2013-11-18 04:51:33 +00:00
Kp
f4cbfca8e2
Use helper to test for thief flag
2013-11-18 04:51:33 +00:00
Kp
dc72fb5932
Use player_awareness_type_t for create_awareness_event
2013-11-18 04:51:33 +00:00
Kp
6becfdacca
Remove NUM_DXX_REBIRTH_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
a842b31a20
Remove NUM_MOUSE_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
04b0bd892d
Remove NUM_JOYSTICK_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
bf7063080e
Remove NUM_KEY_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
c3d328ea5c
Use helper to test for guidebot flag
2013-11-16 23:24:12 +00:00
Kp
d0514455b3
Use automap_state instead of automap_count
2013-11-16 23:24:12 +00:00
Kp
321e240744
Use rear_view_state instead of rear_view_count
2013-11-16 23:24:12 +00:00
Kp
cda0b60687
Remove unused fire_secondary_count
2013-11-16 23:24:12 +00:00
Kp
494c380abb
Switch automap to use fire_primary_state
...
Counting is unnecessary here.
2013-11-16 23:24:12 +00:00
Kp
1312369c94
Restructure ai.c for merging
2013-11-16 23:20:30 +00:00
Kp
e2a2cc579a
Remove unused piggy_dump_all
2013-11-10 19:08:12 +00:00
Kp
6e6b480082
Use enum for weapon types
2013-11-02 04:26:51 +00:00
Kp
6fc8d110f3
Only give secondaries that exist
2013-11-02 04:25:33 +00:00
Kp
58958e091b
Only give primaries that exist
2013-11-02 04:24:14 +00:00
Kp
765f34eb0a
Remove unused function med_check_all_vertices
2013-10-29 03:24:42 +00:00
Kp
aa7f36e3b7
Provide HUD prototypes in Descent 1
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
4fcf34fdbb
Make create_weapon_object static
2013-10-28 04:16:45 +00:00
Kp
19fef0a51d
Simplify full_palette_save calls
2013-10-28 04:16:44 +00:00
Kp
8ed99faf5c
Make headers freestanding
2013-10-26 03:50:28 +00:00
Kp
fdd2dd65c7
Use underlying type for state_game_id
...
This avoids the need for a header to declare it.
2013-10-26 03:50:27 +00:00
Kp
3693743d41
Move similar/main/mission.c -> similar/main/mission.cpp
2013-10-20 22:49:12 +00:00
Kp
e663767201
Move similar/main/menu.c -> similar/main/menu.cpp
2013-10-20 22:49:12 +00:00
Kp
cf2c153c77
Move similar/main/kmatrix.c -> similar/main/kmatrix.cpp
2013-10-20 22:49:11 +00:00
Kp
1d073475e7
Mark various headers for C linkage
2013-10-20 22:49:11 +00:00
Kp
5b0c4b10ac
Use accessor for most get/set object->id accesses
2013-10-20 22:49:09 +00:00
Kp
852a4c7f4d
Use enum weapon_type_t in more places
2013-10-19 17:06:16 +00:00
Kp
14d7c8cef4
Match MAX_SECRET_LEVELS_PER_MISSION type to N_secret_levels
2013-10-19 17:03:11 +00:00
Kp
2bcc7bb371
Only create lasers for known weapon types
2013-10-09 01:54:12 +00:00
Kp
a8050a462f
Only fire valid level lasers
2013-10-09 01:54:12 +00:00
Kp
553dc95b05
Use helper to check for laser type weapons
2013-10-09 01:54:12 +00:00
Kp
798774294f
Use weapon_type_t for Laser_create_new* weapon type
2013-10-08 02:10:18 +00:00
Kp
bd46b7ea73
Make CONTROLCEN_WEAPON_NUM a weapon_type_t member
2013-10-08 02:07:39 +00:00
Kp
00f0fddabc
Centralize handling of SysUsePlayersDir
2013-10-06 21:04:29 +00:00
Kp
7dd7d6704b
Make write_player_file void
2013-10-06 17:56:37 +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
bd467b4140
Move similar/main/inferno.c -> similar/main/inferno.cpp
2013-10-05 21:35:58 +00:00
Kp
9c65aa3cc5
Move similar/main/gauges.c -> similar/main/gauges.cpp
2013-10-05 21:35:58 +00:00
Kp
4db024f953
Move similar/main/gamesave.c -> similar/main/gamesave.cpp
2013-10-05 21:35:58 +00:00
Kp
06c83c9393
Move similar/main/gamecntl.c -> similar/main/gamecntl.cpp
2013-10-05 21:35:58 +00:00
Kp
d656bd4115
Move similar/main/game.c -> similar/main/game.cpp
2013-10-05 21:35:58 +00:00
Kp
782372d6b8
Move similar/main/effects.c -> similar/main/effects.cpp
2013-10-05 21:35:58 +00:00
Kp
c7e34f5330
Move similar/main/digiobj.c -> similar/main/digiobj.cpp
2013-10-05 21:35:58 +00:00
Kp
f4393ca1b6
Move similar/main/credits.c -> similar/main/credits.cpp
2013-10-05 21:35:58 +00:00
Kp
ba4b87d44a
Move similar/main/controls.c -> similar/main/controls.cpp
2013-10-05 21:35:58 +00:00
Kp
b1dbeb6199
Move similar/main/config.c -> similar/main/config.cpp
2013-10-05 21:35:58 +00:00
Kp
64350f83b8
Move similar/main/cntrlcen.c -> similar/main/cntrlcen.cpp
2013-10-05 21:35:58 +00:00
Kp
584fc93f34
Move similar/main/automap.c -> similar/main/automap.cpp
2013-10-05 21:35:58 +00:00
Kp
e5ee9b72f1
Move similar/main/aipath.c -> similar/main/aipath.cpp
2013-10-05 21:35:58 +00:00
Kp
b4107e6526
Remove duplicate declarations
2013-10-03 03:11:52 +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
e2b7b802e3
Move similar/arch/sdl/digi.c -> similar/arch/sdl/digi.cpp
2013-10-01 02:53:23 +00:00
Kp
fce2717e83
Move similar/arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.cpp
2013-10-01 02:53:09 +00:00
Kp
91f6d5e72d
Move game_init_render_buffers inline
2013-09-28 23:51:52 +00:00
Kp
1ff627f85e
Move multi_send_got_flag declaration to header
2013-09-21 23:34:05 +00:00
Kp
cbe52ce1c7
Move d2x-rebirth/main/escort.h -> common/main/escort.h
2013-09-21 23:31:51 +00:00
Kp
9e3fb796e1
Use helper for comparing to proximity bomb index
2013-09-21 23:19:38 +00:00
Kp
9210a3870e
Remove unused fields in struct player
2013-09-21 18:04:10 +00:00
Kp
83df42af8e
Fix loading of older save files
...
struct player_rw offsets must not change within a savefile version
2013-09-21 17:47:03 +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
aa9127e3c1
Enable -Wwrite-strings
2013-09-15 21:34:03 +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
d156a4c1ab
Simplify D1X hostage handling
2013-09-02 23:59:31 +00:00
Kp
c8f0c799b7
Use helper for setting menu items to type number
2013-09-01 23:50:55 +00:00
Kp
4fe618b325
Use helper for setting menu items to type slider
2013-09-01 23:50:55 +00:00
Kp
0645e96e17
Use helper for setting menu items to type radio
2013-09-01 23:50:54 +00:00
Kp
4c5eaded8d
Use helper for setting menu items to type checkbox
2013-09-01 23:23:55 +00:00
Kp
bb8b229dc2
Use helper for setting menu items to type input
2013-09-01 23:23: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
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
f131fcd3da
Move */main/menu.c -> similar/main/menu.c
2013-09-01 18:06:24 +00:00
Kp
e23035e61f
Move Last_afterburner_time into laser_info
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
zico
f2cdd906a6
merge HOMING_MAX_TRACKABLE_DOT in builds, giving D2X same tracking as D1X as requested by testers
2013-08-30 23:07:55 +02:00
Kp
16039a3f99
Remove unused extern global hitobj_list
2013-08-27 02:44:09 +00:00
Kp
af52e78a50
Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp
2013-08-24 17:10:35 +00:00
Kp
828ced10a5
Declare newdemo_count_demos for D2 menu system
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
8d13642c9f
Hide GM_CAPTURE tests behind static inline
2013-08-11 20:46:52 +00:00
Kp
0c3adc48df
Hide GM_HOARD tests behind static inline
2013-08-11 20:46:52 +00:00
Kp
3226a57848
Remove unused MULTI_ACTIVE_DOOR
2013-08-11 20:43:08 +00:00
Kp
de6422d58f
Remove unused multi_send_audio_taunt
2013-08-11 20:43:08 +00:00
Kp
4e6142d779
Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp
2013-08-10 03:56:14 +00:00
Kp
e750c90b00
Mark more math as const correct
2013-08-10 03:55:50 +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
27a4a62b19
To compensate the change between D2's to D1's tracking code base, increased HOMING_MAX_TRACKABLE_DOT, making homing projectiles track a bit more agressivly than D1 to pose more of a challenge while not making them useless when having Afterburner
2013-08-09 17:50:11 +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
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
Kp
400b18b78a
Mark gauges variables const
2013-08-08 03:01:47 +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
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
ff90315978
Use SConscript configure support to probe for format(printf) attribute
2013-07-27 22:17:13 +00:00
Kp
2215c0848d
Use SConscript configure support to probe for format_arg attribute
2013-07-26 02:54:33 +00:00
Kp
1b912463d3
Declare size of Text_string[]
2013-07-26 01:56:42 +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
90a20de57a
Move d2x-rebirth/main/gamepal.h -> common/main/gamepal.h
...
Add stub gamepal.h for d1x-rebirth to make merging easier.
2013-07-23 02:29:25 +00:00
Kp
1686732c4e
Move */main/text.h -> common/main/text.h
2013-07-21 22:10:01 +00:00
Kp
4187648621
Remove redundant/obsolete declarations
2013-07-21 21:55:00 +00:00
Kp
4577dd3977
Merge branch 'd2x-rebirth/master' into unification/master
2013-07-21 21:34:46 +00:00
Kp
707f74883a
Make kconfig.h usable in common source files
2013-07-21 18:15:20 +00:00
Kp
e41fa25905
Make weapon.h usable in common source files
2013-07-21 18:15:20 +00:00
Kp
a1ba420031
Mark various parameters and variables as const
2013-07-20 23:12:24 +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
06a2bb4c6b
Move */main/aistruct.h -> common/main/aistruct.h
2013-03-03 01:03:33 +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
b87e7c2325
Merge branch 'd2x-rebirth/master' into unification/master
2013-06-02 20:14:42 +00:00
Kp
306ab24486
Merge branch 'd1x-rebirth/master' into unification/master
2013-06-02 20:13:38 +00:00
Kp
a842e15d94
Merge branch d2x-rebirth into unification/master
...
Conflicts:
SConstruct
common/include/editor/ehostage.h
common/main/cntrlcen.h
common/main/laser.h
common/main/mission.h
common/main/net_udp.h
common/main/object.h
main/vers_id.h
similar/editor/kfuncs.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/newmenu.c
similar/main/physics.c
2013-04-21 04:52:22 +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
4bf4710aff
Move */main/menu.h -> common/main/menu.h
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
8a153d1f63
Allow common headers with private dependencies to be used in common
2013-03-24 20:32:01 +00:00
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
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
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
a9123e0b45
Move */texmap/*.c -> common/texmap
2013-03-17 23:01:32 +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
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
b00d8130fa
Move */main/render.h -> common/main/render.h
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
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