Kp
e6e00debba
Pass only segidx to pick_connected_segment
...
A full object is not necessary.
2016-10-02 00:34:41 +00:00
Kp
ce65735c04
Expand get_local_player_flags
...
It was a convenient transition macro, but its presence was always
intended to be temporary. Expand it to ease the conversion of usage
sites that already have access to local player data through a local
variable.
2016-10-02 00:34:40 +00:00
Kp
62b58e9890
Move OGL to dxxsconf.h; rename to DXX_USE_OGL
...
Rename symbol OGL to DXX_USE_OGL to show that it is a DXX
symbol, not one inherited from a library. Move it to dxxsconf.h to
shorten the command line.
This is a mostly automated transform, but the changes to SConstruct were
manual.
git grep -lzw OGL -- '*.h' '*.cpp' | xargs -0 sed -i -e 's/\(\s*#\s*if\)def\s*OGL/\1 DXX_USE_OGL/' -e 's/\(\s*#\s*if\)ndef OGL/\1 !DXX_USE_OGL/' -e 's/\(\s*#\s*if !\?\)defined(OGL)/\1DXX_USE_OGL/'
2016-09-24 18:06:11 +00:00
Kp
6a3ded191f
Move EDITOR to dxxsconf.h; rename to DXX_USE_EDITOR
...
Rename symbol EDITOR to DXX_USE_EDITOR to show that it is a DXX
symbol, not one inherited from a library. Move it to dxxsconf.h to
shorten the command line.
This is a mostly automated transform, but the changes to SConstruct were
manual.
git grep -wl EDITOR -- '*.h' '*.cpp' | xargs sed -i -e 's/^\s*#ifdef \(EDITOR\)\>/#if DXX_USE_\1/' -e 's/\s*#\(el\)\?if \(.*\)defined(\(EDITOR\))/#\1if \2DXX_USE_\3/' -e 's/^\s*#ifndef \(EDITOR\)\>/#if !DXX_USE_\1/'
2016-09-11 18:49:16 +00:00
Kp
ddf888cd72
Move USE_SDLMIXER to dxxsconf.h; rename to DXX_USE_SDLMIXER
...
Rename symbol USE_SDLMIXER to DXX_USE_SDLMIXER to show that it is a DXX
symbol, not one inherited from a library. Move it to dxxsconf.h to
shorten the command line.
This is a mostly automated transform, but the changes to SConstruct and
inferno.cpp were manual.
git grep -l USE_SDLMIXER -- '*.h' '*.cpp' | xargs sed -i -e 's/^#ifdef \(USE_SDLMIXER\)$/#if DXX_\1/' -e 's/#\(el\)\?if \(.*\)defined(\(USE_SDLMIXER\))/#\1if \2DXX_\3/'
2016-09-11 18:49:15 +00:00
Kp
39285423db
Switch movie.cpp to reinterpret_cast
2016-09-04 00:02:52 +00:00
Kp
ea153a60fa
Switch libmve to C++ casts
2016-09-04 00:02:52 +00:00
Kp
1a71e4a590
Remove unnecessary cast in compute_average_pixel
2016-09-04 00:02:52 +00:00
Kp
439d82955f
Switch mveplay.cpp to reinterpret_cast
2016-09-04 00:02:52 +00:00
Kp
c802f27968
Switch physfsrwops.cpp integer casts to static_cast
2016-09-04 00:02:50 +00:00
Kp
75241fbbd7
Switch physfsrwops.opp pointer casts to reinterpret_cast
2016-09-04 00:02:50 +00:00
Kp
01de8f95c1
Check segment index in ok_for_buddy_to_talk
2016-09-04 00:02:50 +00:00
Kp
f5bed7b7d8
Remove unnecessary copy in ok_for_buddy_to_talk
2016-09-03 17:30:18 +00:00
zico
8907a2bee4
Updated INSTALL.txt, README.txt, RELEASE-NOTES.txt, d1x.ini, d2x.ini for upcoming release. Updated Debian build to not include obsolete patch (it may still be broken, needs to be verified). Fixed small parsing typo in inferno.cpp help output.
2016-08-30 13:15:55 +02:00
zico
b2cad09c26
Added new texture filtering options based on patch of user 'beware'
2016-08-29 20:53:10 +02:00
zico
6c6a32ba92
Added patch by user 'beware' to remove dark edges around textures and added command-line/INI option to disable this patch if desired (nostalgia). Fixed misleading indentation in ogl.cpp along the way.
2016-08-29 17:07:30 +02:00
Kp
335f24ac31
Move Primary_weapon to player_info
2016-08-28 22:41:49 +00:00
Kp
b7a5f65d5b
Move Secondary_weapon to player_info
2016-08-28 22:41:48 +00:00
Kp
bbdecad649
Add helper macro to handle printf .* conversion for 32/64
...
Field width conversion `.*` always takes an `int`.
On Win32, casting `long` to `int` triggers a `-Wuseless-cast` warning.
Omitting the cast works correctly.
On Linux/amd64, casting `long` to `int` works correctly.
Omitting the cast triggers a `-Wformat` warning.
Add a macro that conditionally expands to `static_cast<int>` or to ``,
as necessary for the target platform.
2016-08-19 03:41:41 +00:00
Kp
9be68f4e99
Add SConf test for struct timespec
2016-08-19 03:41:40 +00:00
Kp
cb99240c2c
Remove useless casts in d2x-rebirth/libmve/decoder8.cpp
2016-08-17 04:44:22 +00:00
Kp
7f3b725c40
Use std::swap to exchange mveplay back buffer pointers
2016-08-17 04:44:22 +00:00
Kp
c97e9af14c
Use player object passed to maybe_steal_secondary_weapon
2016-07-25 03:48:09 +00:00
Kp
c636dc4b98
Convert various static const
expressions to constexpr
2016-07-16 16:52:04 +00:00
Kp
ab09fa1931
Reorder Buddy_sorry_time update
2016-07-14 01:59:02 +00:00
Kp
613a7ecbbb
Rewrite parenthesized uses of uint
to standard unsigned
2016-07-14 01:59:02 +00:00
Kp
0b6af7fcbe
Propagate MAX_OBJ_BITMAPS
2016-07-10 04:11:35 +00:00
Kp
6580c37b6e
Propagate MAX_STOLEN_ITEMS
2016-07-10 04:11:34 +00:00
Kp
a3766a60e3
Remove unnecessary Stolen_item_index modulo
2016-07-10 04:11:34 +00:00
Kp
3779bc25a0
Define Robot_names only if EDITOR
2016-07-09 17:58:34 +00:00
Kp
fee76e6ced
Define Powerup_names only if EDITOR
2016-07-09 17:58:34 +00:00
Kp
b0a2205a4e
Convert various pointer casts to reinterpret_cast
2016-07-06 01:54:24 +00:00
Kp
19f31eb420
Rewrite simple pointer casts from C style to reinterpret_cast<>
...
This pass only targets int8_t and uint8_t.
s/(\s*\(u\?int8_t\s*\*\+\)\s*)\s*(/reinterpret_cast<\1>(/g
2016-07-03 00:54:14 +00:00
Kp
a7ceee3c03
Add parentheses around target of simple unsigned char
casts
...
C casts do not require parentheses. C++ casts require grouping around
the target. Prepare for conversion to C++ casts by adding otherwise
unnecessary parentheses around the target of simple C casts.
s/(\s*unsigned\s\+char\s*\(\*\+\)\s*)\s*\([&+-]\?\)\([[:alnum:]_.]\+\s*->\s*\)*\([[:alnum:]_.]\+\)\(\s*\([];+>)*\/^%,|&<>]\)\|$\|\(\s*-\s*[^>]\)\)/(uint8_t \1)(\2\3\4)\5/g
2016-07-03 00:54:14 +00:00
Kp
3469ff8c34
Change (short*) to (int16_t*)
...
Uses of `(short*)` usually want exactly a 16-bit signed integer. Most
platforms provide that as `short`, but that is not guaranteed.
s/(short \(*\+\)\s*)/(int16_t \1)/g
2016-06-27 04:11:13 +00:00
Kp
a4967ffceb
Move various robot data into namespaces
2016-06-25 23:21:36 +00:00
Kp
65f68877aa
Rewrite simple integer casts from C style to static_cast<>
...
This pass only targets commonly used standard types.
s/(\(\s*\(\(un\)\?signed\|int\|char\|short\|long\|float\|double\|s\?size_t\|\(u\?int[[:digit:]]\+_t\)\)\)\s*)\s*(/static_cast<\1>(/g
2016-06-16 03:56:44 +00:00
Kp
0cb099c5e4
Add parentheses around casts of simple function calls
...
C casts do not require parentheses. C++ casts require grouping around
the target. Prepare for conversion to C++ casts by adding otherwise
unnecessary parentheses around the target of simple C casts.
Exclude float|double from the second substitution. Including it
rewrites medmisc.cpp in an incorrect way, and excluding it does not
exclude any valid rewrites.
s/(\(int\|signed\|float\|double\|long\|short\|unsigned\))\s*\(\w\+\s*(\s*\w\+\s*)\)/(\1)(\2)/
s/(\((\(int\|signed\|long\|short\|unsigned\))(\w\+\s*(\s*\w\+\s*))\))/\1/g
2016-06-16 03:56:44 +00:00
Kp
1b12a3f7ef
Add parentheses around target of more complicated casts
...
C casts do not require parentheses. C++ casts require grouping around
the target. Prepare for conversion to C++ casts by adding otherwise
unnecessary parentheses around the target of some C casts.
This pass attempts to process expressions that involve parenthesized or
bracketed subexpressions, but only if those subexpressions do not
themselves contain parenthesized or bracketed subexpressions.
(int) f(1); // changed
(int) f(g()); // not changed
perl -p -i -e 's/(\(\s*((?:un)?signed|int|char|short|long|float|double|s?size_t|(?:u?int[[:digit:]]+_t))\s*\**\s*\)\s*)([&+-]?)([[:alnum:]_.]+\s*->\s*)*([[:alnum:]_.]+)((?:\s*(?:\[[^][]*\])*|(?:\([^()]*\))*))(\s*([;+>*\/^%,|&<>])|$|(\s*-\s*[^>]))/\1\(\3\4\5\6\)\7/g'
2016-06-12 03:45:37 +00:00
Kp
b282bea173
Rewrite simple integer casts from C style to static_cast<>
...
This pass only targets commonly used standard types.
s/(\(\s*\(\(un\)\?signed\|int\|char\|short\|long\|float\|double\|s\?size_t\|\(u\?int[[:digit:]]\+_t\)\)\)\s*)\s*(/static_cast<\1>(/g
2016-06-05 01:04:26 +00:00
Kp
7fdce88558
Add parentheses around target of simple casts
...
C casts do not require parentheses. C++ casts require grouping around
the target. Prepare for conversion to C++ casts by adding otherwise
unnecessary parentheses around the target of simple C casts.
This pass does not attempt to process expressions that involve
any subexpression that can nest arbitrarily, such as parentheses or
brackets. It also works only on commonly used standard types.
(int) a->b; // changed
(int) a[b]; // not changed
s/\((\s*\(\(un\)\?signed\|int\|char\|short\|long\|float\|double\|s\?size_t\|\(u\?int[[:digit:]]\+_t\)\)\s*\**\s*)\s*\)\([&+-]\?\)\([[:alnum:]_.]\+\s*->\s*\)*\([[:alnum:]_.]\+\)\(\s*\([];+>)*\/^%,|&<>]\)\|$\|\(\s*-\s*[^>]\)\)/\1(\5\6\7)\8/g
2016-06-05 01:04:25 +00:00
Kp
20163c49bc
Fold gr_remap_bitmap_good call in D2 ab_load
2016-05-28 17:31:27 +00:00
Kp
dcc56e6b39
Propagate bm_mode::linear into iff_read_bitmap
2016-05-28 17:31:27 +00:00
Kp
398596c468
Use enum for bitmap mode
2016-05-28 17:31:26 +00:00
Kp
48431682ba
Fix -Wshadow warnings in gamedata_read_tbl
2016-05-22 17:49:31 +00:00
Kp
f9f7ce08db
Fix -Wshadow warnings in bm_read_sound
2016-05-22 17:49:31 +00:00
Kp
0e085e4799
Pass thief ID to recreate_thief
2016-04-06 03:34:15 +00:00
Kp
5b3a36e6b8
Remove valptridx operator-(P *, A &)
2016-04-06 03:34:13 +00:00
zico
7d83eb1e62
Long overdue update for README files considering officially supported Windows versions
2016-03-30 13:30:47 +02:00
Kp
195c589e3f
Move file-local classes into anonymous namespace
2016-03-04 04:12:35 +00:00
Kp
cc18ad2b68
Fix some -Wshadow warnings
2016-02-12 04:02:28 +00:00
Kp
f4e1ebb576
Remove unnecessary gr_setcolor calls
2016-02-12 04:02:28 +00:00
Kp
23047b1165
Pass color to gr_rect
2016-02-12 04:02:28 +00:00
Kp
553b313099
Use vwallptr
2016-02-12 04:02:28 +00:00
Kp
2fd6a425b0
Remove highest_valid
2016-02-12 04:02:28 +00:00
Kp
b57f08c798
Use partial_const_range
2016-02-12 04:02:28 +00:00
Kp
6e20d86941
Move OF_PLAYER_DROPPED into drop_powerup
...
This fixes an issue where calling drop_powerup with num > 1 only tagged
one powerup as player-dropped.
This also changes powerups dropped by the thief to be "player-dropped",
since, aside from the initial shields/energy, they came from the player
originally.
2016-02-06 22:12:55 +00:00
Kp
ec025d4e88
Pass common highest_valid to vptr factory
2016-02-06 22:12:54 +00:00
Kp
2bddeaaadf
Remove sprintf from D2 bmread.cpp
2016-01-09 16:38:16 +00:00
Kp
86709f547b
Fix capitalization of PHYSFS_File
...
Per comment in physfs.h, the spelling PHYSFS_file is deprecated.
Replace all instances with PHYSFS_File.
2016-01-09 16:38:14 +00:00
Kp
a3ae630829
Remove default argument for basic_ptridx(index)
2016-01-09 16:38:14 +00:00
Kp
98f5afa9f8
Remove default argument for basic_ptr(pointer,array &)
2016-01-09 16:38:13 +00:00
Kp
e8c34be843
Use v*ptr* factories with highest_valid
2015-12-22 04:18:51 +00:00
Kp
d479819931
Use absolute_sibling to reduce global references for ptridx
2015-12-22 04:18:51 +00:00
Kp
db9fb0ed42
Move more symbols into namespace dcx/dsx
2015-12-22 04:18:50 +00:00
Kp
2b51578ba6
Use enum class for Player_dead_state (formerly Player_is_dead)
2015-12-15 04:09:35 +00:00
Kp
26e948d5f1
Uninline namespace dsx
2015-12-13 18:00:49 +00:00
Kp
8109379fdd
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
Kp
8a97c173a3
Remove useless gr_remap_mono_fonts
...
gr_remap_mono_fonts searches for fonts with !(font->ft_flags & FT_COLOR)
and calls gr_remap_font on any it finds.
gr_remap_font starts with:
if (!(font->ft_flags & FT_COLOR))
return;
2015-12-04 03:36:32 +00:00
Kp
a9b82e3f7f
Make vlighting static
2015-12-04 03:36:31 +00:00
Kp
708dc0a7e1
Use vobjptr/vcobjptr for more Objects[] access
2015-12-03 03:26:49 +00:00
Kp
b683b4cc68
Scope weapon type
2015-12-03 03:26:49 +00:00
Kp
0c75aecc45
Check most uses of object id
2015-11-27 03:56:13 +00:00
Kp
7153ec69a9
Move SndNoSound to CGameArg
2015-11-24 04:05:36 +00:00
Kp
a579f75d05
Move SndDisableSdlMixer to CGameArg
2015-11-24 04:05:36 +00:00
Kp
82d0c2ed96
Make some implicit uses of ptridx construction explicit
2015-11-19 03:23:34 +00:00
Kp
0ebe9e48b8
Remove buddy's useless Player_is_dead test
...
The headlight should be off when the player is dead.
2015-11-14 18:17:20 +00:00
Kp
6b353cb9ac
Move player powerup_flags to object.ctype.player_info
2015-11-07 21:55:59 +00:00
Kp
8a81e25ab0
Move player laser_level to object.ctype.player_info
2015-11-07 21:55:59 +00:00
Kp
b788d0b563
Move player primary_weapon_flags to object.ctype.player_info
2015-11-07 21:55:59 +00:00
Kp
6037372cdf
Move player vulcan_ammo to object.ctype.player_info
2015-11-07 21:55:59 +00:00
Kp
6fd6436f14
Move player energy to object.ctype.player_info
2015-11-07 21:55:58 +00:00
Kp
dc5dfb80e8
Use macro get_local_player_secondary_ammo for player's secondary_ammo
2015-10-30 02:52:56 +00:00
Kp
070444157e
Use type safe player flags
2015-10-30 02:52:55 +00:00
Kp
e130ea7b36
Remove unnecessary secondary_weapon_flags
2015-10-30 02:52:53 +00:00
Kp
edea687627
Remove HAVE_STRUCT_TIMEVAL
...
SConstruct defines it for all platforms. It is only false on Mac OS 9,
which is no longer supported.
2015-10-27 03:04:49 +00:00
Kp
cf9f777187
Simplify select_tmap
...
Remove unreachable nullptr case. Use case-sensitive comparison. Remove
unsupported entry i386 from documentation.
2015-10-21 02:45:44 +00:00
Kp
21057db809
Move DbgSafelog, DbgVerbose to CArg
2015-10-18 21:01:21 +00:00
Kp
533f1cb3bb
Qualify references to primary weapons
2015-10-18 21:01:18 +00:00
John Ackerman
a606caa2b4
Improve .ini files and help message output
2015-10-11 22:21:00 +00:00
Kp
36c52f7437
Reduce pointer->int->pointer conversions for thief
2015-10-10 03:44:14 +00:00
Kp
78de0ac119
Add fwd-event.h with forward declarations of event.h
2015-10-09 02:46:10 +00:00
Kp
edccaa91f6
Check return of pick_connected_segment before use
2015-09-29 02:41:22 +00:00
Kp
d9cef82f81
Allow nullptr for gr_get_string_size
2015-09-29 02:41:22 +00:00
Kp
bec81b2e62
Cache get_local_player in do_escort_frame
2015-09-26 21:17:13 +00:00
Kp
5d902ad361
Shorten drop_stolen_items
2015-09-26 21:17:13 +00:00
Kp
b87db8d9e8
Factor out thief message call
2015-09-26 21:17:13 +00:00
Kp
c4a8432081
Remove WORDS_NEED_ALIGNMENT memcpy src cast to const uint8_t*
...
The cast provokes a warning on systems that require alignment, so remove
it. memcpy takes const void* input, so the cast is unnecessary.
Reported-by: MattWatt <https://github.com/dxx-rebirth/dxx-rebirth/issues/119 >
2015-09-13 21:02:19 +00:00
Kp
fd5d7b800d
Move reactor gun loop into calc_controlcen_gun_point
2015-08-26 03:15:10 +00:00
Kp
17b1943c5e
Mark various per-file structures as static
2015-08-12 03:11:46 +00:00
Kp
cfd08b5d6c
Suppress physfsx read/write macros in physfsrwops.cpp
2015-07-25 23:10:48 +00:00
Kp
a2816617fe
Pass reactor& to read_model_guns
2015-07-25 23:10:48 +00:00
Kp
de06f639fd
Pass grs_bitmap& to set_lighting_flag
2015-07-25 23:10:47 +00:00
Kp
c942d28197
Use accessor for grs_bitmap::bm_type
2015-07-25 23:10:47 +00:00
Kp
bda7fef3a0
Use get_local_player to compute reference to local player
2015-07-25 23:10:46 +00:00
Kp
f38e80c053
Use get_local_plrobj to compute reference to object of local player
2015-07-25 23:10:45 +00:00
Kp
15fb75c1c7
Fix check_header_includes build
2015-07-25 23:10:45 +00:00
Kp
0fea8ec2b8
Use valptr for escort.cpp
2015-07-12 01:04:22 +00:00
Kp
e3308be8b9
Cache font LINE_SPACING
2015-06-13 22:42:22 +00:00
Kp
ce72014e2e
Always parse WORDS_BIGENDIAN and !WORDS_BIGENDIAN
2015-06-13 22:42:21 +00:00
Kp
03921dfd83
Move d2x-rebirth/include/* -> d2x-rebirth/main/
2015-06-13 22:42:21 +00:00
Kp
215e2dca81
Remove unused libpng support
...
HAVE_LIBPNG has not been set since 2004 when
3325c0b52b
("remove old OSX bundle stuff")
commented out the autoconf check to set it.
2015-06-13 22:42:21 +00:00
Kp
3980c5d472
Use valptr for escort highest_valid
2015-06-13 22:42:16 +00:00
Kp
61019b9dab
Refactor escort code to make it work under strict checks
2015-06-13 22:42:15 +00:00
Kp
678f462c45
Fix buggy guidebot detection of retrieving a key
2015-06-13 22:42:15 +00:00
Kp
00c1429ebf
Use enum for Escort_special_goal
2015-06-13 22:42:15 +00:00
Kp
53a7798d80
Simplify fix_sincos calls
2015-06-02 03:03:31 +00:00
Kp
3ec6340cb4
Update open-coded tests for object_none
2015-05-28 03:08:40 +00:00
Kp
73300a285d
Merge "change u_int*_t to C99 standard uint*_t"
...
Requested-by: btb <https://github.com/dxx-rebirth/dxx-rebirth/pull/67 >
Acked-by: Matt1360 <https://github.com/dxx-rebirth/dxx-rebirth/pull/67#issuecomment-104806115 >
2015-05-23 17:36:29 +00:00
Kp
7243e76c80
Fix gcc-4.6 decoder8 build
...
Fixes: 8a28f7e1c2
("Use array<> for movie decoder")
2015-05-22 03:33:20 +00:00
Bradley Bell
bdacd2f7d7
change u_int*_t to C99 standard uint*_t
2015-05-18 17:12:53 -07:00
Kp
0ece005dfa
Use screen_mode for screen resolution
2015-05-14 02:23:13 +00:00
Kp
cf87ebe54d
Remove write-only grs_bitmap::bm_handle
2015-05-09 17:38:59 +00:00
Kp
0d564814f5
Convert Primary_weapon to primary_weapon_index_t
2015-04-26 20:15:57 +00:00
Kp
8d849b2b39
Wrap laser level in class
...
Move enum laser_level_t to weapon.h for the new class.
2015-04-26 20:15:56 +00:00
Kp
144477f92a
Open movie file before changing GUI
2015-04-26 20:15:56 +00:00
Kp
6792c1bc4b
Enable -Wunused-parameter
2015-04-26 20:15:56 +00:00
Kp
4d046c5336
Split auto_select_weapon
2015-04-26 20:15:51 +00:00
Kp
f15ec9c86a
Use enum for AIM constants
2015-04-26 20:15:51 +00:00
Kp
e883d7c872
Use enum class for AIB constants
2015-04-26 20:15:51 +00:00
Kp
f8ac14b737
Convert mvelib to vector<uint8_t>
2015-04-26 20:15:51 +00:00
Kp
c338862ad6
Reduce gauges.h includes
2015-04-19 04:18:51 +00:00
Kp
150e2d2686
Convert local arrays to array<>
2015-04-19 04:18:49 +00:00
Kp
5ae5033fed
Use enum for AIB constants
2015-04-02 02:36:57 +00:00
Kp
8a28f7e1c2
Use array<> for movie decoder
2015-04-02 02:36:56 +00:00
Kp
9157e5f970
Use enum class for player_awareness_type_t
2015-04-02 02:36:53 +00:00
Kp
fca381727c
Add wrappers for screen width/height
2015-03-22 18:49:21 +00:00
Kp
6e06c6893f
Remove bogus assertion
...
Stack variables are never placed at NULL.
2015-03-22 18:49:21 +00:00
Kp
7bf49fe551
Fix clang -Wmissing-braces warnings
2015-03-22 18:49:21 +00:00
Kp
1f5190bcfd
Fix resource leak closing SDL RW ops
...
Leak introduced in b3d134a6b7
("merged
physfs branch"), but this fix only applies after the conversion to RAII.
An equivalent change from SDL_FreeRW->SDL_RWclose is needed for pre-RAII
code.
Fixes: d0de0cf963
("Use unique_ptr for SDL_RWops")
2015-02-28 22:34:07 +00:00
Kp
d6e029194b
Fix memory leak on escort menu
2015-02-28 22:34:07 +00:00
Kp
3dfac8350e
Use array<> for robot_info
2015-02-28 19:36:01 +00:00
Kp
f900d4a5ee
Remove RAIIdmem::operator pointer
...
Mac OS X defines uint_fast32_t to unsigned int, causing ambiguous
overloads between RAIIdmem::operator[](std::size_t) and
RAIIdmem::operator[](int). Adding a disambiguating overload for OS X
breaks Windows. Remove operator pointer and operator[]. Rely on the
inherited operator[] for indexing. Require users to call ->get() to
convert to a simple pointer.
First btb ambiguity reported: https://github.com/dxx-rebirth/dxx-rebirth/pull/34
Second btb ambiguity reported: https://github.com/dxx-rebirth/dxx-rebirth/pull/43
2015-02-17 03:52:59 +00:00
Kp
68e2168377
Use array<> for bitmap_index arrays
2015-02-14 22:48:30 +00:00
Kp
f17458d353
Explicitly delete valptridx inequality operators
2015-02-14 22:48:30 +00:00
Kp
91cc111295
Provide SndDisableSdlMixer=true if !USE_SDLMIXER
...
Accept -nosdlmixer as a no-op in !USE_SDLMIXER builds.
2015-02-08 17:43:29 +00:00
Kp
d0de0cf963
Use unique_ptr for SDL_RWops
2015-02-08 17:43:29 +00:00
Kp
abb0d86696
Only close opened movies
2015-02-08 17:43:29 +00:00
Kp
99a4a0ed62
Capture range_for by-value temporaries as const
...
Modifying a by-value temporary does not affect the underlying container,
so modifying it is almost always a bug. Require use of a by-reference
capture when modification is desired.
sed -i -e 's/range_for\s*(\s*\(const\s\+\)\?auto\s\+\([[:alpha:]_]\)/range_for (const auto \2/g'
2015-02-05 03:03:49 +00:00
Kp
c2aa2c2e4b
Rename space to space_tab
...
Name space is too simple and causes conflicts elsewhere.
2015-01-29 04:27:35 +00:00
Kp
ff4a0ccd70
Fix RAIIdmem array usage
...
Some RAIIdmem instances managed a T[], but were declared to manage a T.
2015-01-28 03:42:53 +00:00
Kp
786b7c35a5
Use unique_ptr for mve_audio_spec
2015-01-28 03:42:53 +00:00
Kp
accd1db476
Use unique_ptr for mve_audio_buffers
2015-01-28 03:42:52 +00:00
Kp
a3edc2b4f8
Use unique_ptr for MVEFILE::cur_chunk
2015-01-28 03:42:52 +00:00
Kp
77d25fd6d2
Fix uninitialized access in exists_in_mine_2
...
Objects of type OBJ_NONE have no guaranteed values in any other field.
Check curobjp->type before examining the object.
2015-01-28 03:42:52 +00:00
Kp
0ea95e87e7
Pass array<> to create_bfs_list
2015-01-28 03:42:52 +00:00
Kp
fa73ca8a17
Pass gr_remap_bitmap_good arg by &
2015-01-25 05:32:45 +00:00
Kp
31450e4843
Pass iff_read_bitmap arg by &
2015-01-25 05:32:44 +00:00
Kp
922a7b7dc9
Pass grs_main_bitmap to iff_read_animbrush
2015-01-25 05:32:44 +00:00
Kp
40fd988a0f
Hide local classes in anonymous namespaces
2015-01-23 03:55:06 +00:00
Kp
a6884e77db
Unpack robot_info
2015-01-23 03:55:04 +00:00
Kp
84e3a03451
Remove unused parameters
2015-01-18 01:58:33 +00:00
Kp
c6664a45a6
Add newmenu_do helper for array<newmenu_item, N>
2015-01-18 01:58:32 +00:00
Kp
f8163957ef
Add helper nm_item_input
2015-01-18 01:58:31 +00:00
Kp
547193c591
Compile out unused bm_write_all
...
Unused since e2a2cc579a
deleted caller
piggy_dump_all.
2015-01-17 18:31:43 +00:00
Kp
f7815810e8
Use RAIIPHYSFS_File to manage PHYSFS_File
...
Fixes a few leaks on error paths.
2015-01-17 18:31:42 +00:00
Kp
68d705a85a
Use bool conversion to test PHYSFS_File pointer
2015-01-17 18:31:42 +00:00
Kp
28a31a223f
Centralize window_close calls
2015-01-17 18:31:41 +00:00
Chris Taylor
aee62be433
Merge branch 'btb-xcode' into unification/master
2015-01-14 19:42:16 +08:00
Kp
61ba3d1ba2
Centralize buddy search
2015-01-12 00:26:04 +00:00
Kp
846b6b4b82
Improve buddy message suppression
2015-01-12 00:26:03 +00:00
Kp
12770802ab
Use ntstring for guidebot name
2015-01-12 00:26:02 +00:00
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
fbac119095
Propagate use of objptridx_t
2014-12-23 04:20:27 +00:00
Kp
0f30d4eb72
Use PHYSFSX_gets_line_t for Current_level_palette
2014-12-20 04:36:08 +00:00
Kp
5867b5d690
Remove useless bmread whitespace loop
...
Obsolete since 44bbb66101
.
2014-12-18 04:12:39 +00:00
Kp
da6632a917
Use array<> for Robot_joints
2014-12-18 04:12:38 +00:00
Kp
4af33f12a4
Fix gcc-4.7 -Wmissing-braces warning
2014-12-15 03:59:15 +00:00
Bradley Bell
f897688c12
delete old broken XCode project files
2014-12-06 22:43:12 -08:00
Kp
73b0a016a8
Fix loading robots-?.mvl
...
Rework movie loading to fix loading built-in robot movies. The previous
code always ignored loading the last entry in the movie array, which was
blank until 18f6919b33
. The last entry
was unused after d38a3d1362
, so it was
removed, which caused the code to skip the robots entry.
Commit d38a3d1362
broke unloading add-on
movies by removing the strcpy which saved their name. Add code to save
the name to extra_robot_movie_mission and call it when switching
missions.
Reported by btb: https://github.com/dxx-rebirth/dxx-rebirth/pull/17
2014-12-06 17:56:56 +00:00
Bradley Bell
3daa0f63b1
Add search SDL_mixer framework paths for headers instead of using <Framework/Header.h> notation
2014-12-03 15:14:18 -08:00
Kp
0375876a08
Pass gr_bm_ubitbltm arg by &
2014-12-02 03:35:01 +00:00
Kp
e7aae37c8d
Pass ogl_ubitblt_i arg by &
2014-12-02 03:35:01 +00:00
Kp
91a2eb8491
Include <vector> in mveplay.cpp for std::vector
...
Reported by btb: https://github.com/dxx-rebirth/dxx-rebirth/pull/12
Fixed by btb: f502740fdd
2014-11-30 17:01:39 +00:00
Kp
5aaf847c41
Fix various -Wnarrowing errors
2014-11-26 03:39:21 +00:00
Kp
d63be88eb0
Propagate use of vsegptridx_t
2014-11-23 04:58:45 +00:00
Kp
a17cf6f808
Avoid slicing into objnum_t local
2014-11-20 03:00:41 +00:00
Kp
2c349136cc
Avoid slicing into segnum_t local
2014-11-20 03:00:36 +00:00
Kp
ad527a7551
Use unique_ptr for MVEFILE
2014-11-01 15:04:30 +00:00
Kp
a42e7c3db1
Use unique_ptr for MVESTREAM
2014-11-01 15:00:48 +00:00
Kp
279233cf24
Use std::vector for MVE buffer
2014-11-01 15:00:04 +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
5bb9c88979
Add vm_vec_sub that returns result
2014-10-29 03:24:31 +00:00
Kp
fb1704780b
Move pMovie into local data structures
2014-10-29 03:01:18 +00:00
Kp
d8024d4d26
Use RAII to manage MVESTREAM
2014-10-29 02:59:08 +00:00
Kp
19bb554f31
Move MVESTREAM pointer up one layer
2014-10-29 02:57:52 +00:00
Kp
53aa70cecb
Use vsegptridx_t
2014-10-28 03:08:51 +00:00
Kp
b871228f92
Pass create_morph_robot vector by const &
2014-10-28 01:47:18 +00:00
Kp
8a0582766a
Pass drop_powerup vector by const &
2014-10-28 01:46:07 +00:00
Kp
d14c0ba71c
Pass do_snipe_frame vector by &
2014-10-28 01:45:53 +00:00
Kp
ad717e59e8
Pass laser vectors as const &
2014-10-26 21:37:27 +00:00
Kp
a32547af16
Pass position-related vms_vector arg by &
2014-10-22 02:46:03 +00:00
Kp
019b572c0e
Remove #define Segment2s Segments
2014-10-21 03:15:12 +00:00
Kp
e7e23eb92e
Make unused_window_userdata_t const
2014-10-16 02:30:29 +00:00
Kp
6934dc863c
Fix gcc 4.6 build of libmve
2014-10-16 01:40:48 +00:00
Kp
7f648c0f5f
Wrap segment iteration idiom
2014-10-12 23:10:05 +00:00
Kp
fb641b3250
Wrap object iteration idiom
2014-10-12 23:05:46 +00:00
Kp
4e368ac946
Make mve args const
2014-10-10 02:57:07 +00:00
Kp
6943024647
Fix signaure of mve_cb_Alloc
2014-10-10 02:43:40 +00:00
Kp
a8f853aa7a
Pass d_event arg by const&
2014-10-04 22:36:13 +00:00
Kp
ec1eb03cc2
Move d2x-rebirth/main/segment.cpp -> similar/main/segment.cpp
2014-10-04 17:53:09 +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
5b97433ce5
Make various ai functions take const vms_vector&
2014-10-02 03:02:36 +00:00
Kp
1fff2db9a8
Pass vm_vec_dist_quick arg by &
2014-10-01 02:28:41 +00:00
Kp
0b2636d535
Pass vm_vec_add2 arguments by &
2014-09-28 21:43:00 +00:00
Kp
00b59c3058
Pass vm_vec_dot arguments by &
2014-09-28 21:11:48 +00:00
Kp
321bbe37d8
Pass vm_vec_sub arguments by &
2014-09-28 21:11:45 +00:00
Kp
a620a59bda
Pass vm_vec_normalize_quick v by &
2014-09-28 21:11:04 +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
afd995aa22
Centralize N_D2_* constants in bm.h
2014-09-27 15:42:45 +00:00
Kp
22b836147d
Propagate for variables in d2x-rebirth/main/movie.cpp
2014-09-26 02:42:16 +00:00
Kp
c58d9c72a8
Propagate for variables in d2x-rebirth/main/escort.cpp
2014-09-26 02:42:16 +00:00
Kp
2d7ce50951
Propagate for variables in d2x-rebirth/libmve/mveplay.cpp
2014-09-26 02:42:16 +00:00
Kp
301629be91
Propagate for variables in d2x-rebirth/libmve/mve_audio.cpp
2014-09-26 02:42:16 +00:00
Kp
c79281de1e
Propagate for variables in d2x-rebirth/libmve/decoder8.cpp
2014-09-26 02:42:15 +00:00
Kp
9eda412dff
Use symbolic constant wall_none
2014-09-21 23:05:14 +00:00
Kp
703f60ac3f
Fix -Wtype-limits warnings
2014-09-21 21:41:55 +00:00
Kp
039bf2f0b7
Fix crash on failure to create afterburner blob
...
Fix crash on failure to recreate thief.
2014-09-13 22:01:17 +00:00
Kp
e8f4b20d1d
Use special type for PHYSFSX_fgets
2014-09-07 20:07:20 +00:00
Kp
a02f78a171
Move saving window pointer into helper
2014-09-07 19:04:07 +00:00
Kp
fea751bc62
Use std::string for mission path
2014-08-24 17:45:30 +00:00
Kp
b95759aecc
Propagate use of objptridx
2014-08-23 23:53:56 +00:00
Kp
54da3b386b
Copy bmread strings to local storage
2014-08-23 17:06:44 +00:00
Kp
66cb80c343
Propagate use of objptridx
2014-08-17 20:31:18 +00:00
Kp
414cf3b29b
Remove useless buddy rediscovery loop
...
Assume Buddy_objnum will be set right.
2014-08-14 02:03:27 +00:00
Kp
bf8d29b348
Remove useless buddy bot checks
...
These are only hit after the condition is assumed true.
2014-08-13 22:17:38 +00:00
Kp
d6b81d2fe3
Deduce create_bfs_list max_segs
2014-08-13 03:19:13 +00:00
Kp
125d9257be
Use special type names for segment/object numbers
2014-08-13 02:57:12 +00:00
Kp
4acbb40ad7
Use enum for window event result
2014-08-07 02:47:48 +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
0f7e561775
Add helper to iterate over objects in segment
2014-07-30 03:06:40 +00:00
Kp
13b233b7d7
Fix Windows build
2014-07-26 22:53:41 +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