Commit graph

2392 commits

Author SHA1 Message Date
Kp e7b881e5e6 Move Secondary_last_was_super into player_info 2016-08-28 22:41:48 +00:00
Kp adf5e57b47 Move Primary_last_was_super into player_info 2016-08-28 22:41:47 +00:00
Kp 8248438ffa Move Omega_charge to player_info 2016-08-28 22:41:47 +00:00
Kp 198cb4e449 Allow rvalue references for some serial.h process_buffer overloads 2016-08-28 22:41:47 +00:00
Kp 4ed57bf70b Simplify multiplayer_command_t truncation check 2016-08-28 22:41:47 +00:00
Kp 0a2676315d Flatten serial.h type constructor pad() 2016-08-28 22:41:46 +00:00
Kp ee1003f29f Move conditionally compiled code into namespace dsx 2016-08-25 04:05:32 +00:00
Kp c8ffe5d1ce Move various trigger functions into namespace dsx 2016-08-25 04:05:32 +00:00
Kp 7c348056c1 Inline triggers_frame_process 2016-08-25 04:05:32 +00:00
Kp 3693b2317d Move HUD_render_message_frame into namespace dsx 2016-08-25 04:05:32 +00:00
Kp 854907aa1b Move find_hitpoint_uv into namespace dsx 2016-08-25 04:05:32 +00:00
Kp dca790584f Remove non-ASCII characters in newmenu.h
Some parsing scripts react badly to finding byte sequences that are not
valid UTF8 characters.
2016-08-25 04:05:31 +00:00
Kp 16318e7c9e Remove empty #if/#endif in loadgl.h
Prior rewrites left empty conditionals.  Remove those conditionals.
2016-08-22 00:31:15 +00:00
Kp 655d0e6714 Remove unused loadgl typedefs
Per request from Mako88, remove unused loadgl typedefs.  loadgl.h
was imported from elsewhere and defines typedefs for many functions
that Descent does not use.  Some of these are guarded by WINVER
conditionals and, in Mako88's unspecified environment, defining WINVER
to expose these results in a build failure because the guarded typedef
requires a type that is not defined by the environment.

Compensate for that by removing all unused gl typedefs.

    # Save the results to a file, then run the file separately.  This
    # avoids any chance that sed might try to edit the file while later
    # searches are still running.
    git grep 'typedef .*OGLFUNCCALL \*' common/include/loadgl.h | sed -e 's/^.*OGLFUNCCALL \*//' -e 's/).*$//' | while read f; do
        if ! git grep -q 'DEFVAR\s'"$f"'\>' -- common/include/loadgl.h; then
            echo "/\\<$f\\>/d"
        fi
    done > unused.sed
    sed -i common/include/loadgl.h -f unused.sed
2016-08-22 00:31:15 +00:00
Kp f50aef0241 Remove unused loadgl indirections
Per request from Mako88, remove unused loadgl indirections.  loadgl.h
was imported from elsewhere and defines indirections for many functions
that Descent does not use.  Some of these are guarded by WINVER
conditionals and, in Mako88's unspecified environment, defining WINVER
to expose these results in a build failure because the guarded typedef
requires a type that is not defined by the environment.

Compensate for that, and likely improve the generated code, by removing
all unused gl symbols.

    # Save the results to a file, then run the file separately.  This
    # avoids any chance that sed might try to edit the file while later
    # searches are still running.
    s=( `git ls-files '*.h' '*.cpp' | grep -v -F common/include/loadgl.h` )
    git grep '#define w\?gl[A-Z]\w\+ dw\?gl' common/include/loadgl.h |
	    gawk '{print $2;}' | while read f; do
	    if ! git grep -q -l '\<d\?'"$f"'\>' -- "${s[@]}"; then
		    echo "/\\<d\?$f\\>/d"
	    fi
    done > unused.sed
    sed -i common/include/loadgl.h -f unused.sed
2016-08-20 22:28:44 +00:00
Kp b7b37bc056 Switch valptridx error reporting size to DXX_PRI_size_type 2016-08-20 22:28:43 +00:00
Kp 6691a1ff33 Split credits_show special case into dedicated functions 2016-08-19 03:41:42 +00:00
Kp d554b01e45 Remove useless casts in similar/editor/meddraw.cpp 2016-08-19 03:41:41 +00:00
Kp 0c43357d85 Move HMP->MIDI magic numbers into magic_header[]
This removes some useless casts from the serializer.
2016-08-19 03:41:40 +00:00
zico dad3e953e9 Retored historically accurate versions of homing tracking and lifeleft calculations for D1X and D2X based on their original source code releases instead of mixing them together. Further encabsuled NEWHOMER code to disable unused functions and variables if NEWHOMER is disabled. 2016-08-17 13:43:01 +02:00
Kp 4cb3d46148 Move <type_traits> test to Cxx11RequiredFeature
Commit 957016621e ("Remove support for
Boost.TypeTraits") removed support for any alternative implementation of
<type_traits>, so C++11 <type_traits> is now required.  Move it to
the Cxx11RequiredFeature array to combine it with the other required
feature tests.
2016-08-08 00:07:20 +00:00
Kp 95a53ed820 Require C++11 range-based for
Fallback support for Boost.Foreach is broken and no one has reported it.
The minimum required gcc version supports range-based for.  Recent Clang
supports range-based for.  No Microsoft compilers are supported.  Remove
support for the fallback Boost.Foreach and move the C++11 range-based
for test to the Cxx11RequiredFeature array.
2016-08-08 00:07:19 +00:00
Kp a09dce6ead Remove char[N] overload for PHYSFSX_getRealPath 2016-08-06 19:55:25 +00:00
Kp a98510b17e Move CMLevelMusicTrack to CCfg 2016-08-06 19:55:25 +00:00
Kp 771665835d Move LastMission to CCfg 2016-08-06 19:55:25 +00:00
Kp ac8232caca Move CMMiscMusic to CCfg 2016-08-06 19:55:25 +00:00
Kp 50599c0dad Move CMLevelMusicPath to CCfg 2016-08-06 19:55:25 +00:00
Kp b449986ea8 Use make_unique to reset editor's Current_mission 2016-08-06 19:55:25 +00:00
Kp 53deef077a Prefer make_unique over raw new 2016-08-06 19:55:24 +00:00
Kp cbeb42e48c Flatten some newmenu type hierarchy 2016-08-06 19:55:24 +00:00
Kp 2e88fec559 Flatten some ui type hierarchy 2016-08-06 19:55:24 +00:00
Kp 5fb379430f Flatten some serial type hierarchy 2016-08-06 19:55:24 +00:00
Kp 6b4e639f65 Flatten newmenu_subfunction_t type 2016-08-06 19:55:24 +00:00
Kp c772385f81 Fix check_header_includes=1 Linux build 2016-08-06 19:55:24 +00:00
Kp 1774676571 Use class to wrap Primary_weapon+Delayed_primary 2016-08-06 19:55:23 +00:00
Kp 37ec5e25d4 Declare ~UI_GADGET as protected
UI_GADGET subclasses should always be deleted through the subtype
pointer.
2016-08-06 19:55:23 +00:00
Kp df8dc7cc46 Include fwd-partial_range.h in physfs_list.h
All users of physfs_list.h included fwd-partial_range.h or
partial_range.h; physfs_list.h did not include either, but assumed one
would be available.  Include fwd to fix check_header_includes=1 build.

Fixes: ff67afd440 ("Propagate partial_range up into PHYSFSX_findFiles family")
2016-08-06 19:55:23 +00:00
Kp 7128141c55 Use enum for newmenu item type 2016-08-05 04:12:21 +00:00
Kp 3f051100a5 Move newmenu_item text_len into union 2016-07-31 22:25:51 +00:00
Kp f5c6b0fbf6 Move newmenu_item min_value into union 2016-07-31 22:25:50 +00:00
Kp c9aba5b04e Move newmenu_item max_value into union 2016-07-31 22:25:50 +00:00
Kp 344a567d1b Move newmenu_item group into union 2016-07-31 22:25:50 +00:00
Kp 7d3c3288a9 Remove support for array other than std::array
Building with Boost.Array fails due to name lookup errors.  These could
be fixed, but since no one has reported them and they are fairly old,
Boost.Array appears to be unused.  Remove support for it.

Building with std::tr1::array fails due to missing features in
std::tr1:array relative to std::array.  No one has reported this either,
so remove support for std::tr1:array.

Move the test for std::array into the Cxx11RequiredFeature list so that
it is run as part of the group test, rather than as a separate
statement.
2016-07-31 22:25:49 +00:00
Kp 2f938a35d9 Rewrite parenthesized uses of old-style numeric casts to static_cast
s/(\(float\|\(unsigned \)\?\(int\|long\)\|double\|short\|unsigned\))\s*(/static_cast<\1>(/g
2016-07-31 22:25:49 +00:00
Kp a230d24226 Allow trailing comments after num_levels and num_secrets 2016-07-30 21:56:31 +00:00
Kp ea65c74ba9 Move last_player_bump into player_info.Last_bumped_local_player 2016-07-25 03:48:08 +00:00
Kp 8a46462846 Move lavafall_hiss_playing into player_info 2016-07-24 04:04:25 +00:00
Kp 8fef6a07b4 Pass const object_base to obj_unlink 2016-07-23 04:10:43 +00:00
Kp 139741ec40 Pass const object_base to Laser_render 2016-07-23 04:10:42 +00:00
Kp 99bbd0cf26 Mark global constants as constexpr
s/^const \([^*]*=.*;\)/constexpr \1/
2016-07-23 04:10:42 +00:00