Chris Taylor
d302a40662
Merge branch 'xcode' of https://github.com/btb/dxx-rebirth into btb-xcode
2015-01-10 18:54:13 +08:00
Kp
76bec9f31f
Fix spelling of "available" in help text
2015-01-03 23:44:31 +00:00
Bradley Bell
cf3ba80824
Merge branch 'unification/master' of https://github.com/dxx-rebirth/dxx-rebirth into xcode
2015-01-02 21:11:14 -08:00
Kp
0bf2a6eb80
Return unique_ptr from ui_add_gadget_button
2014-12-20 04:36:10 +00:00
Kp
89b1ff8795
Return unique_ptr from ui_add_gadget_userbox
2014-12-20 04:36:09 +00:00
Kp
80a21ab7d6
Remove obsolete hostage message support
...
This was never included in the game. Editor support for it is
incomplete and does not allow text entry. Remove it.
2014-12-20 04:36:09 +00:00
Kp
cf1d08c1b6
Use unique_ptr for hostage_dialog
2014-12-20 04:36:08 +00:00
Kp
da6632a917
Use array<> for Robot_joints
2014-12-18 04:12:38 +00:00
Bradley Bell
f897688c12
delete old broken XCode project files
2014-12-06 22:43:12 -08:00
Kp
e5acd8056d
Pass gr_set_bitmap_flags arg by &
2014-11-30 22:09:21 +00:00
Kp
53ce29e789
Pass gr_init_bitmap arg by &
2014-11-30 22:09:20 +00:00
Kp
0672cdff1b
Pass gr_set_bitmap_data grs_bitmap by &
2014-11-30 22:09:20 +00:00
Kp
97332b848c
Pass gr_free_bitmap_data arg by &
2014-11-30 22:09:20 +00:00
Kp
968f7ddc97
Pass gr_gpixel arg by &
2014-11-30 22:09:18 +00:00
Kp
9aa0cf0b89
Pass read_model_guns vector as array &
2014-11-01 03:08:27 +00:00
Kp
6d61198130
Pass compute_segment_center vector by &
2014-10-30 03:32:51 +00:00
Kp
53aa70cecb
Use vsegptridx_t
2014-10-28 03:08:51 +00:00
Kp
44084ff261
Pass PHYSFSX_readVector vector by &
2014-10-26 22:08:58 +00:00
Kp
258d6b4a04
Pass place_object vms_vector arg by &
2014-10-26 21:36:10 +00:00
Kp
a8f853aa7a
Pass d_event arg by const&
2014-10-04 22:36:13 +00:00
Kp
6971dfbf4a
Use symbolic *_none constants for -1
2014-10-04 17:31:13 +00:00
Kp
184f828a91
Move iff_read_animbrush array<unique_ptr<grs_bitmap>> down
2014-10-04 15:02:03 +00:00
Kp
0b2636d535
Pass vm_vec_add2 arguments by &
2014-09-28 21:43:00 +00:00
Kp
c0023cad51
Fix memory leak writing hoard data
2014-09-27 23:14:50 +00:00
Kp
dc511d0a5c
Pass array<> to iff_read_animbrush
2014-09-27 23:06:33 +00:00
Kp
78ad2adabf
Write weapon_info carefully
2014-09-27 22:46:25 +00:00
Kp
096e9314c5
Propagate for variables in d1x-rebirth/main/hostage.cpp
2014-09-26 02:42:15 +00:00
Kp
6d5b9e3004
Move MAX_BITMAPS_PER_BRUSH definitions to piggy.h
2014-09-21 21:53:54 +00:00
Kp
703f60ac3f
Fix -Wtype-limits warnings
2014-09-21 21:41:55 +00:00
Kp
e8f4b20d1d
Use special type for PHYSFSX_fgets
2014-09-07 20:07:20 +00:00
Kp
94550355a8
Use make_unique instead of bare new
2014-08-24 18:28:09 +00:00
Kp
54da3b386b
Copy bmread strings to local storage
2014-08-23 17:06:44 +00:00
Kp
6a475c7d0e
Use common definition for remove_char
2014-08-23 16:27:28 +00:00
Kp
66cb80c343
Propagate use of objptridx
2014-08-17 20:31:18 +00:00
Kp
125d9257be
Use special type names for segment/object numbers
2014-08-13 02:57:12 +00:00
Kp
ade7dbc238
Use unique_ptr for pig/pog
2014-08-05 02:32:00 +00:00
Kp
1adaad4147
Remove broken assembler support
...
Assembler failed to build in 0.58.1. Assembler failed to run correctly
after 59344482
/ fc92651eb
changed y_pointers from int[] to int*.
2014-08-04 03:09:33 +00:00
Kp
13b233b7d7
Fix Windows build
2014-07-26 22:53:41 +00:00
Kp
cc0ce764c2
Fix reading HXM polymodels on x64
2014-07-26 04:01:35 +00:00
Kp
51fdeea84b
Use unique_ptr for model_data
2014-07-26 04:01:35 +00:00
Kp
ebb1b70350
Fix polymodel writing on x64
...
Packed writing a structure containing a pointer, but reading it as an
int, is wrong on x64.
2014-07-26 04:01:35 +00:00
Kp
6020c9c013
Use d_fname for DOS filenames
2014-07-25 02:54:31 +00:00
Kp
2ddc37d804
Write tmap_info carefully
2014-07-25 02:54:31 +00:00
Kp
e72f293ba3
Use array<> for ab_load
2014-07-22 23:48:23 +00:00
Kp
bd1c6d8c5d
Reduce header includes of physfsx.h
2014-07-22 23:48:23 +00:00
Kp
4a81c3c482
List initialize bitmap
2014-07-04 03:44:25 +00:00
Matt Vandermeulen
28f307eb85
Fixes #5 - Byteswap header renamed to byteutil, plus sed magic
...
[Kp: switch to #pragma for byteutil.h]
2014-07-03 02:03:08 +00:00
Kp
22a6906702
Update example INI for stricter parsing rules
2014-06-22 21:58:55 +00:00
Kp
f6631ce742
Unpack various structures
...
Prohibit conversion to void* to avoid accidental use with memcpy
2014-06-21 23:56:27 +00:00
Kp
3c6f787e15
Use array<> for Polygon_models
2014-06-20 02:59:53 +00:00
Kp
7b33018cb5
Use array<> for Textures
2014-06-20 02:59:53 +00:00
Kp
3200823a8b
Use array<> for TmapInfo
2014-06-20 02:59:53 +00:00
Kp
d510438fd4
Use array<> for WallAnims
2014-06-15 03:35:21 +00:00
Kp
bd35eb7469
Use array<> for wclip arrays
2014-06-14 23:13:38 +00:00
Kp
93ec327a10
Write powerup_type_info structures carefully
2014-06-14 23:13:37 +00:00
Kp
7c62bf98ef
Use array<> for Powerup_info
2014-06-14 01:15:33 +00:00
Kp
e326567cdf
Skip useless sin computation
2014-06-08 00:05:33 +00:00
Kp
dd3c1144a9
Remove useless Sounds[] counting loop
2014-06-08 00:05:33 +00:00
zico
ad7cb106bc
Changed custom D1X license to GPLv3
2014-06-01 19:55:23 +02:00
Kp
72b7ff6720
Write vclip structures carefully
2014-02-01 19:26:16 +00:00
Kp
9b0fb5da0a
Write eclip structures carefully
2014-02-01 18:55:18 +00:00
Kp
b9764fb45e
Use array<> for Effects
2014-01-25 17:21:56 +00:00
Kp
8a4c553a8a
Remove needless recomputation of Effects[] pointer
2014-01-25 17:21:56 +00:00
Kp
917ef39258
Use array<> for Vclip
2014-01-23 03:48:25 +00:00
Kp
9a5d0f6f09
Use symbolic values for segment/object first/none
2014-01-06 04:17:55 +00:00
Kp
094dfbf3d4
Reduce header inclusions
2013-12-31 03:22:03 +00:00
Kp
073f00974a
Eliminate uses of the typedef struct X { ... } X; pattern
...
C++ does not require this pattern.
import re, fileinput
to = re.compile(r'^typedef struct ([a-z_A-Z]+)\s*{')
tc = re.compile(r'^}(.*?)\s*([a-z_A-Z]+);$')
osn = None
for line in fileinput.input(inplace=True):
m = to.match(line)
if m:
osn = m.group(1)
print 'struct %s\n{' % osn
continue
if osn:
m = tc.match(line)
if m:
csn = m.group(2)
if osn == csn:
print '}%s;' % m.group(1)
osn = None
continue
else:
osn = None
print line,
2013-12-28 22:48:07 +00:00
Kp
5b5c8a3c6a
Remove write-only variable TmapList
2013-12-22 01:16:16 +00:00
Kp
b1c5307eb1
Use array for palette_array_t
2013-12-22 00:37:36 +00:00
Kp
a3d66a3b37
Add typedef palette_array_t for palette data
2013-12-22 00:05:13 +00:00
Kp
11f7bc51ee
Use unsigned count of frames in a vclip
2013-12-22 00:05:13 +00:00
Kp
7c0204095e
Simplify name setup in load_pig1
2013-12-18 05:00:20 +00:00
Kp
be041a9cfc
Add type checking for ui_create_dialog
2013-12-17 03:49:24 +00:00
Kp
3b9b5ebfb0
Use RAII to manage function-local heap objects
2013-12-08 19:04:52 +00:00
Kp
3e42f8c382
Move temporary bitmap descriptor onto bm_load_sub stack
2013-12-08 18:25:42 +00:00
Kp
a2cec5d71f
Switch PHYSFSX_fgets to auto-sized variant where possible
2013-12-07 18:39:19 +00:00
Kp
babbe8e9e6
Move */arch/carbon -> common/arch/carbon
2013-12-06 03:58:10 +00:00
Kp
18bf9b94ea
Move */arch/cocoa -> common/arch/cocoa
2013-12-06 03:57:18 +00:00
Kp
9de54cfa74
Switch to C++ linkage
...
import fileinput
guard = 0
cxxguard = '#ifdef __cplusplus\n'
for line in fileinput.input(inplace=True):
if line == cxxguard:
guard = 1
continue
if guard:
if line == 'extern "C" {\n':
guard = 2
continue
if line == '}\n':
guard = 0
continue
if guard == 2:
assert(line == '#endif\n')
guard = 0
print cxxguard,
continue
print line,
2013-12-06 03:35:32 +00:00
Kp
fcf216474b
Move */main/collide.c -> similar/main/collide.c
2013-12-06 03:27:30 +00:00
Kp
ef4db00e97
Restructure collide.c for merging
2013-12-02 00:22:11 +00:00
Kp
18aea17f9e
Move */main/fireball.c -> similar/main/fireball.c
2013-12-02 00:21:31 +00:00
Kp
148dd00eeb
Restructure fireball.c for merging
2013-12-02 00:12:36 +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
f99c2b739a
Move */iff/iff.c -> similar/main/iff.c
2013-12-01 23:24:51 +00:00
Kp
de366b12ee
Move d1x-rebirth/main/bmread.c -> d1x-rebirth/main/bmread.cpp
2013-12-01 23:24:33 +00:00
Kp
c258115b30
Move */main/bm.c -> similar/main/bm.c
2013-12-01 22:51:44 +00:00
Kp
e31f7141b2
Remove obsolete uvl processing
...
Descent refuses to load mines with version less than 16, so fixing up
uvl values in mines less than 15 is never used.
2013-11-24 23:50:44 +00:00
Kp
cb7968159a
Move editor texture data into load_mine_data
2013-11-24 23:50:43 +00:00
Kp
0b34e37a5e
Restructure bmread.c for merging
2013-11-24 23:50:43 +00:00
Kp
1932647fb1
Set Texture* values at load time
2013-11-24 23:50:43 +00:00
Kp
aa05263b29
Move */main/gameseq.c -> similar/main/gameseq.c
2013-11-24 22:47:19 +00:00
Kp
c90ade08fe
Restructure gameseq.c for merging
2013-11-24 22:44:25 +00:00
Kp
67407d211e
Reset hours-on-level in D1X, too
2013-11-23 22:48:23 +00:00
Kp
47a4bb1ff1
Move */main/ai.c -> similar/main/ai.c
2013-11-23 22:47:45 +00:00
Kp
6be79cadce
Unify ai_follow_path
2013-11-23 22:41:01 +00:00
Kp
a56edce84a
Cache result of indexing Robot_info
2013-11-23 18:53:13 +00:00
Kp
93b0f5396f
Use helpers to test next_fire state
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
c3d328ea5c
Use helper to test for guidebot flag
2013-11-16 23:24:12 +00:00
Kp
1312369c94
Restructure ai.c for merging
2013-11-16 23:20:30 +00:00
Kp
5ff051cf4e
Move */main/fuelcen.c -> similar/main/fuelcen.c
2013-11-10 22:56:12 +00:00
Kp
7c1945345c
Restructure fuelcen.c for merging
2013-11-10 19:30:14 +00:00
Kp
4ef3937d35
Move */main/piggy.c -> similar/main/piggy.c
2013-11-10 19:08:12 +00:00
Kp
e2a2cc579a
Remove unused piggy_dump_all
2013-11-10 19:08:12 +00:00
Kp
313c36d8ee
Move d1x-rebirth/main/snddecom.c -> d1x-rebirth/main/snddecom.cpp
2013-11-09 18:07:28 +00:00
Kp
f720f937f5
Move d1x-rebirth/main/hostage.c -> d1x-rebirth/main/hostage.cpp
2013-11-09 18:07:28 +00:00
Kp
ee0f60ddb7
Move d1x-rebirth/main/custom.c -> d1x-rebirth/main/custom.cpp
2013-11-09 18:07:28 +00:00
Kp
ea2022bb01
Move */main/endlevel.c -> similar/main/endlevel.c
2013-11-09 17:46:41 +00:00
Kp
1c754aa55e
Restructure endlevel.c for merging
2013-11-09 17:45:21 +00:00
Kp
cede90c2fb
Restructure piggy.c for merging
2013-11-09 17:45:21 +00:00
Kp
996cff7fec
Remove DEST_SAT code in ai.c
2013-11-08 03:14:44 +00:00
Kp
0a4c1ec7bf
Quick out search for boss segments
2013-11-03 23:39:08 +00:00
Kp
58958e091b
Only give primaries that exist
2013-11-02 04:24:14 +00:00
Kp
b08a6bf98b
Remove unused multi.h include in bm.c
2013-11-02 04:24:05 +00:00
Kp
6a8859b3a5
Remove unused multi.h include in bmread.c
2013-11-02 04:23:55 +00:00
Kp
2714679284
Mark private functions static
2013-11-02 04:23:55 +00:00
Kp
a37faa738d
Remove unused d1x-rebirth/main/digicomp.{c,h}
2013-11-01 02:58:05 +00:00
Kp
4693eaecdf
Fix ancient array shift bug in fuelcen_delete
2013-11-01 02:48:55 +00:00
Kp
69567b1b99
Remove unused vclip_play
2013-10-29 03:24:42 +00:00
Kp
00ed0c17ff
Mark reset_all_robot_centers as used for debuggers
2013-10-29 03:24:42 +00:00
Kp
19ae39a2d4
Include snddecom.h in snddecom.c
2013-10-29 03:24:42 +00:00
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