TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
dxx-rebirth/similar/main/gameseq.cpp

2426 lines
75 KiB
C++
Raw Normal View History

initial import
2006-03-20 17:12:09 +00:00
/*
Changed custom D1X license to GPLv3
2014-06-01 17:55:23 +00:00
* Portions of this file are copyright Rebirth contributors and licensed as
* described in COPYING.txt.
* Portions of this file are copyright Parallax Software and licensed
* according to the Parallax license below.
* See COPYING.txt for license details.
initial import
2006-03-20 17:12:09 +00:00
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
/*
*
* Routines for EndGame, EndLevel, etc.
*
*/
Include dxxsconf.h explicitly and earlier
2016-09-24 18:06:10 +00:00
#include "dxxsconf.h"
Use C++ <cinclude> style
2015-09-09 03:27:52 +00:00
#include <cctype>
Implement secluded spawns
2015-07-04 21:01:18 +00:00
#include <utility>
initial import
2006-03-20 17:12:09 +00:00
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if !defined(_MSC_VER) && !defined(macintosh)
#include <unistd.h>
#endif
#include <time.h>
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
#if DXX_USE_OGL
initial import
2006-03-20 17:12:09 +00:00
#include "ogl_init.h"
#endif
#include "inferno.h"
#include "game.h"
#include "player.h"
#include "key.h"
#include "object.h"
Rename include/error.h to include/dxxerror.h Avoid conflict with generic system header.
2012-07-07 18:35:06 +00:00
#include "dxxerror.h"
initial import
2006-03-20 17:12:09 +00:00
#include "joy.h"
#include "timer.h"
#include "laser.h"
Add fwd-event.h with forward declarations of event.h
2015-10-09 02:46:10 +00:00
#include "event.h"
initial import
2006-03-20 17:12:09 +00:00
#include "screens.h"
#include "textures.h"
#include "gauges.h"
#include "3d.h"
#include "effects.h"
#include "menu.h"
#include "gameseg.h"
#include "wall.h"
#include "ai.h"
#include "fuelcen.h"
#include "switch.h"
#include "digi.h"
#include "gamesave.h"
#include "scores.h"
#include "u_mem.h"
#include "palette.h"
#include "morph.h"
#include "newdemo.h"
#include "titles.h"
#include "weapon.h"
#include "sounds.h"
#include "args.h"
#include "gameseq.h"
#include "gamefont.h"
#include "newmenu.h"
Reduce gauges.h includes
2015-04-19 04:18:51 +00:00
#include "hudmsg.h"
initial import
2006-03-20 17:12:09 +00:00
#include "endlevel.h"
Use enum for kmatrix_view result
2015-03-24 02:07:42 +00:00
#include "kmatrix.h"
Convert multi_do_protocol_frame to dispatch through a vtable
2020-12-20 20:39:07 +00:00
#include "net_udp.h"
initial import
2006-03-20 17:12:09 +00:00
#include "playsave.h"
#include "fireball.h"
#include "kconfig.h"
#include "robot.h"
#include "automap.h"
#include "cntrlcen.h"
#include "powerup.h"
#include "text.h"
#include "piggy.h"
#include "mission.h"
#include "state.h"
#include "songs.h"
#include "gamepal.h"
#include "controls.h"
#include "credits.h"
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
#if DXX_USE_EDITOR
initial import
2006-03-20 17:12:09 +00:00
#include "editor/editor.h"
#endif
#include "strutil.h"
Like in BigEndian builds do netmisc_calc_checksum() only with expected items of segment/side struct to prevent different checksums in case these structs change; Fixed several issues when building with editor; Fixed compiler warning regarding set but unused variable
2011-05-22 17:54:47 +00:00
#include "segment.h"
#include "gameseg.h"
Use do_screen_message instead of do_screen_message_fmt where possible
2013-12-08 23:37:40 +00:00
#include "fmtcheck.h"
initial import
2006-03-20 17:12:09 +00:00
Wrap object iteration idiom
2014-10-12 23:05:46 +00:00
#include "compiler-range_for.h"
Log a diagnostic when D1 cannot find target secret level A level can have a secret exit without having a mission entry describing where to go when the secret exit is used. Switch from an assertion failure in that case to a log message.
2022-01-08 17:48:09 +00:00
#include "d_enumerate.h"
Move d_level_unique_object_state to a separate header This is required to untangle the cross-inclusion of object.h and morph.h.
2020-08-10 03:45:14 +00:00
#include "d_levelstate.h"
Use range_for for NumNetPlayerPositions
2014-12-23 04:20:27 +00:00
#include "partial_range.h"
Add range helper zip()
2019-05-04 18:27:36 +00:00
#include "d_range.h"
Add convenience function underlying_value Add a helper to deduce the enum type of a value, and use an appropriate std::underlying_type<T> expression for that enum type. This avoids the need to repeat the type of the enum at the site of each cast, and moves the casts into the helper to make the callers easier to read.
2021-09-04 12:17:14 +00:00
#include "d_underlying_value.h"
Replace uses of enumerate with zip where appropriate In some places, enumerate was used only to get an index value because zip was not available. Switch those sites to use zip directly.
2020-07-05 23:34:33 +00:00
#include "d_zip.h"
Wrap object iteration idiom
2014-10-12 23:05:46 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
#include "custom.h"
#define GLITZ_BACKGROUND Menu_pcx_name
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
Log a diagnostic when D1 cannot find target secret level A level can have a secret exit without having a mission entry describing where to go when the secret exit is used. Switch from an assertion failure in that case to a log message.
2022-01-08 17:48:09 +00:00
namespace d1x {
namespace {
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
static int8_t find_next_level(const next_level_request_secret_flag secret_flag, const int current_level_num, const Mission &mission)
Log a diagnostic when D1 cannot find target secret level A level can have a secret exit without having a mission entry describing where to go when the secret exit is used. Switch from an assertion failure in that case to a log message.
2022-01-08 17:48:09 +00:00
{
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
if (secret_flag != next_level_request_secret_flag::only_normal_level)
{ //go to secret level instead
Log a diagnostic when D1 cannot find target secret level A level can have a secret exit without having a mission entry describing where to go when the secret exit is used. Switch from an assertion failure in that case to a log message.
2022-01-08 17:48:09 +00:00
for (const auto &&[idx, table_entry] : enumerate(
unchecked_partial_range(
mission.secret_level_table.get(),
static_cast<unsigned>(-mission.last_secret_level)
)
))
if (table_entry == current_level_num)
return -(idx + 1);
//couldn't find which secret level
LevelError("secret exit from level %u failed to find secret level; continuing to next normal level", current_level_num);
}
else if (current_level_num < 0)
{ //on secret level, where to go?
//shouldn't be going to secret level
assert(current_level_num <= -1 && current_level_num >= mission.last_secret_level);
return mission.secret_level_table[(-current_level_num) - 1] + 1;
}
return current_level_num + 1; //assume go to next normal level
}
}
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#elif defined(DXX_BUILD_DESCENT_II)
#include "movie.h"
#define GLITZ_BACKGROUND STARS_BACKGROUND
some fixes for menus and automap; new aspect code; improved code to scale window for cockpits; introducing new variable in playsave.c to store game resolution and saving Game_window_h/h again properly - fixes bugs with screwed resolutions; making menus in game-resolution as default and re-activating old command-line arg '-menu<X>x<Y>' to scale menus
2006-08-30 18:12:04 +00:00
Uninline namespace dsx
2015-12-13 18:00:49 +00:00
namespace dsx {
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Mark various functions static
2013-09-22 22:26:27 +00:00
static void StartNewLevelSecret(int level_num, int page_in_textures);
Pass valptridx factories to static functions
2017-07-26 03:15:59 +00:00
static void InitPlayerPosition(fvmobjptridx &vmobjptridx, fvmsegptridx &vmsegptridx, int random_flag);
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
static void DoEndGame();
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
PHYSFSX_gets_line_t<FILENAME_LEN> Current_level_palette;
int First_secret_visit = 1;
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Widen scope of player_info preservation
2016-03-19 19:08:11 +00:00
namespace {
class preserve_player_object_info
{
player_info plr_info;
fix plr_shields;
/* Cache the reference, not the value. This class is designed
* to be alive across a call to LoadLevel, which may change the
* value of the object number.
*/
const objnum_t &objnum;
public:
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
preserve_player_object_info(fvcobjptr &vcobjptr, const objnum_t &o) :
Widen scope of player_info preservation
2016-03-19 19:08:11 +00:00
objnum(o)
{
Eliminate some uses of valptridx::operator->
2018-06-24 05:06:15 +00:00
auto &plr = *vcobjptr(objnum);
plr_shields = plr.shields;
plr_info = plr.ctype.player_info;
Widen scope of player_info preservation
2016-03-19 19:08:11 +00:00
}
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
void restore(fvmobjptr &vmobjptr) const
Widen scope of player_info preservation
2016-03-19 19:08:11 +00:00
{
Eliminate some uses of valptridx::operator->
2018-06-24 05:06:15 +00:00
auto &plr = *vmobjptr(objnum);
plr.shields = plr_shields;
plr.ctype.player_info = plr_info;
Widen scope of player_info preservation
2016-03-19 19:08:11 +00:00
}
};
}
Uninline namespace dcx
2015-12-13 18:00:49 +00:00
namespace dcx {
initial import
2006-03-20 17:12:09 +00:00
//Current_level_num starts at 1 for the first level
//-1,-2,-3 are secret levels
Never set Current_level_num to 0 This will be required when proper game state editing is implemented. Also remove hacks that check Current_level_num == 0.
2016-11-15 03:13:23 +00:00
//0 used to mean not a real level loaded (i.e. editor generated level), but this hack has been removed
Move Next_level_num to local scope It does not need to be a global. For each function that uses it, it is assigned earlier in that same function.
2021-11-01 03:37:19 +00:00
int Current_level_num=1;
Use PHYSFSX_gets_line_t for Current_level_name
2014-12-20 04:36:07 +00:00
PHYSFSX_gets_line_t<LEVEL_NAME_LEN> Current_level_name;
initial import
2006-03-20 17:12:09 +00:00
// Global variables describing the player
Fix -Wtype-limits warnings
2014-09-20 23:47:27 +00:00
unsigned N_players=1; // Number of players ( >1 means a net game, eh?)
Use typedef for player number
2014-09-21 22:10:12 +00:00
playernum_t Player_num; // The player number who is on the console.
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
fix StartingShields=INITIAL_SHIELDS;
Use alias template per_player_array for arrays that are MAX_PLAYERS long This removes the need to repeat MAX_PLAYERS in every usage, and prepares for a future change to use enumerated_array instead of std::array.
2022-09-24 17:47:53 +00:00
per_player_array<obj_position> Player_init;
initial import
2006-03-20 17:12:09 +00:00
// Global variables telling what sort of game we have
Use range_for for NumNetPlayerPositions
2014-12-23 04:20:27 +00:00
unsigned NumNetPlayerPositions;
initial import
2006-03-20 17:12:09 +00:00
int Do_appearance_effect=0;
Factor out count_number_of_objects_of_type predicate count_number_of_objects_of_type is dsx due to object differences, but the predicate can be dcx.
2018-04-30 05:31:16 +00:00
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Factor out count_number_of_objects_of_type predicate count_number_of_objects_of_type is dsx due to object differences, but the predicate can be dcx.
2018-04-30 05:31:16 +00:00
template <object_type_t type>
static bool is_object_of_type(const object_base &o)
{
return o.type == type;
}
Move Difficulty_level to GameUniqueState
2019-06-27 03:26:20 +00:00
static unsigned get_starting_concussion_missile_count()
{
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
return 2 + NDL - underlying_value(GameUniqueState.Difficulty_level);
Move Difficulty_level to GameUniqueState
2019-06-27 03:26:20 +00:00
}
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Uninline namespace dsx
2015-12-13 18:00:49 +00:00
namespace dsx {
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
static void init_player_stats_ship(object &, fix GameTime64);
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
static window_event_result AdvanceLevel(
#if defined(DXX_BUILD_DESCENT_I)
#undef AdvanceLevel
next_level_request_secret_flag secret_flag
#elif defined(DXX_BUILD_DESCENT_II)
#define AdvanceLevel(secret_flag) ((void)secret_flag,AdvanceLevel())
#endif
);
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
static void StartLevel(int random_flag);
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
static void copy_defaults_to_robot_all(const d_robot_info_array &Robot_info);
initial import
2006-03-20 17:12:09 +00:00
//--------------------------------------------------------------------
Mark private functions static
2013-10-27 22:00:14 +00:00
static void verify_console_object()
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
Adjust Player_num checks for unsigned Player_num
2014-09-27 22:57:15 +00:00
Assert(Player_num < Players.size());
Always qualify valptridx type/factory Previously, valptridx used PREFIX for allow-invalid+mutable, c#PREFIX for allow-invalid+const, v#PREFIX for require-valid+mutable, vc#PREFIX for require-valid+const. Convert the types, factories, and all usage sites to specify a qualifier for all four combinations: im#PREFIX -> allow-invalid+mutable ic#PREFIX -> allow-invalid+const vm#PREFIX -> require-valid+mutable vc#PREFIX -> require-valid+const Changes to common/include/valptridx.h and common/include/fwd-valptridx.h are manual. All other changes are generated by: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\(v\?\)\(\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/\1m\2/g' for the 'm' prefix and: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\([cm]\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/i&/g' for the 'i' prefix.
2017-06-10 03:31:02 +00:00
const auto &&console = vmobjptr(get_local_player().objnum);
Use valptr for gameseq.cpp
2015-07-12 01:04:20 +00:00
ConsoleObject = console;
Assert(console->type == OBJ_PLAYER);
Assert(get_player_id(console) == Player_num);
initial import
2006-03-20 17:12:09 +00:00
}
Combine count_number_of_{robots,hostages} into template
2016-03-17 03:34:24 +00:00
template <object_type_t type>
Factor out count_number_of_objects_of_type predicate count_number_of_objects_of_type is dsx due to object differences, but the predicate can be dcx.
2018-04-30 05:31:16 +00:00
static unsigned count_number_of_objects_of_type(fvcobjptr &vcobjptr)
initial import
2006-03-20 17:12:09 +00:00
{
Factor out count_number_of_objects_of_type predicate count_number_of_objects_of_type is dsx due to object differences, but the predicate can be dcx.
2018-04-30 05:31:16 +00:00
return std::count_if(vcobjptr.begin(), vcobjptr.end(), is_object_of_type<type>);
initial import
2006-03-20 17:12:09 +00:00
}
Combine count_number_of_{robots,hostages} into template
2016-03-17 03:34:24 +00:00
#define count_number_of_robots count_number_of_objects_of_type<OBJ_ROBOT>
#define count_number_of_hostages count_number_of_objects_of_type<OBJ_HOSTAGE>
initial import
2006-03-20 17:12:09 +00:00
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
constexpr constant_xrange<sidenum_t, sidenum_t::WRIGHT, sidenum_t::WFRONT> displacement_sides{};
Qualify references to sidenum_t members
2022-02-19 14:52:17 +00:00
static_assert(static_cast<uint8_t>(sidenum_t::WBACK) + 1 == static_cast<uint8_t>(sidenum_t::WFRONT), "side ordering error");
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
Use alias template per_player_array for arrays that are MAX_PLAYERS long This removes the need to repeat MAX_PLAYERS in every usage, and prepares for a future change to use enumerated_array instead of std::array.
2022-09-24 17:47:53 +00:00
static unsigned generate_extra_starts_by_copying(object_array &Objects, valptridx<player>::array_managed_type &Players, segment_array &Segments, const xrange<unsigned, std::integral_constant<unsigned, 0>> preplaced_start_range, const per_player_array<sidemask_t> &player_init_segment_capacity_flag, const unsigned total_required_num_starts, unsigned synthetic_player_idx)
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
{
for (const auto side : displacement_sides)
{
for (const auto old_player_idx : preplaced_start_range)
{
auto &old_player_ref = *Players.vcptr(old_player_idx);
const auto &&old_player_ptridx = Objects.vcptridx(old_player_ref.objnum);
auto &old_player_obj = *old_player_ptridx;
Use dedicated type for mask of segment side numbers
2022-02-19 14:52:17 +00:00
if (player_init_segment_capacity_flag[old_player_idx] & build_sidemask(side))
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
{
auto &&segp = Segments.vmptridx(old_player_obj.segnum);
/* Copy the start exactly. The next loop in the caller will
* fix the collisions caused by placing the clone on top of the
* original.
*
* Currently, there is no handling for the case that the
* level author already put two players too close together.
* If this is a problem, more logic can be added to suppress
* cloning in that case.
*/
const auto &&extra_player_ptridx = obj_create_copy(old_player_obj, segp);
if (extra_player_ptridx == object_none)
{
con_printf(CON_URGENT, "%s:%u: warning: failed to copy start object %hu", __FILE__, __LINE__, old_player_ptridx.get_unchecked_index());
continue;
}
Players.vmptr(synthetic_player_idx)->objnum = extra_player_ptridx;
auto &extra_player_obj = *extra_player_ptridx;
set_player_id(extra_player_obj, synthetic_player_idx);
con_printf(CON_NORMAL, "Copied player %u (object %hu at {%i, %i, %i}) to create player %u (object %hu).", old_player_idx, old_player_ptridx.get_unchecked_index(), old_player_obj.pos.x, old_player_obj.pos.y, old_player_obj.pos.z, synthetic_player_idx, extra_player_ptridx.get_unchecked_index());
if (++ synthetic_player_idx >= total_required_num_starts)
return synthetic_player_idx;
}
}
}
return synthetic_player_idx;
}
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
static unsigned generate_extra_starts_by_displacement_within_segment(const unsigned preplaced_starts, const unsigned total_required_num_starts)
{
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
const auto &&preplaced_start_range = xrange(preplaced_starts);
Move LevelSharedVertexState into d_level_shared_segment_state
2020-05-17 23:35:25 +00:00
auto &LevelSharedVertexState = LevelSharedSegmentState.get_vertex_state();
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
Move LevelSharedVertexState into d_level_shared_segment_state
2020-05-17 23:35:25 +00:00
auto &Vertices = LevelSharedVertexState.get_vertices();
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &vcobjptr = Objects.vcptr;
auto &vmobjptr = Objects.vmptr;
Use alias template per_player_array for arrays that are MAX_PLAYERS long This removes the need to repeat MAX_PLAYERS in every usage, and prepares for a future change to use enumerated_array instead of std::array.
2022-09-24 17:47:53 +00:00
per_player_array<sidemask_t> player_init_segment_capacity_flag{};
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
DXX_MAKE_VAR_UNDEFINED(player_init_segment_capacity_flag);
Qualify references to sidenum_t members
2022-02-19 14:52:17 +00:00
static_assert(static_cast<uint8_t>(sidenum_t::WRIGHT) + 1 == static_cast<uint8_t>(sidenum_t::WBOTTOM), "side ordering error");
static_assert(static_cast<uint8_t>(sidenum_t::WBOTTOM) + 1 == static_cast<uint8_t>(sidenum_t::WBACK), "side ordering error");
constexpr auto capacity_x = build_sidemask(sidenum_t::WRIGHT);
constexpr auto capacity_y = build_sidemask(sidenum_t::WBOTTOM);
constexpr auto capacity_z = build_sidemask(sidenum_t::WBACK);
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
/* When players are displaced, they are moved by their size
* multiplied by this constant. Larger values provide more
* separation between the player starts, but increase the chance
* that the player will be too close to a wall or that the segment
* will be deemed too small to support displacement.
*/
constexpr fix size_scalar = 0x18000; // 1.5 in fixed point
unsigned segments_with_spare_capacity = 0;
Move Vertices out of global scope
2018-12-30 00:43:57 +00:00
auto &vcvertptr = Vertices.vcptr;
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
for (const auto i : preplaced_start_range)
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
{
/* For each existing Player_init, compute whether the segment is
* large enough in each dimension to support adding more ships.
*/
const auto &pi = Player_init[i];
const auto segnum = pi.segnum;
Convert `segment &` to `susegment` where possible
2019-12-22 05:34:08 +00:00
const shared_segment &seg = *vcsegptr(segnum);
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
auto &plr = *Players.vcptr(i);
auto &old_player_obj = *vcobjptr(plr.objnum);
const vm_distance_squared size2(fixmul64(old_player_obj.size * old_player_obj.size, size_scalar));
Use enum class for segment_relative_vertnum
2022-01-09 15:25:42 +00:00
auto &v0 = *vcvertptr(seg.verts[segment_relative_vertnum::_0]);
Use dedicated type for mask of segment side numbers
2022-02-19 14:52:17 +00:00
sidemask_t capacity_flag{};
Use enum class for segment_relative_vertnum
2022-01-09 15:25:42 +00:00
if (vm_vec_dist2(v0, vcvertptr(seg.verts[segment_relative_vertnum::_1])) > size2)
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
capacity_flag |= capacity_x;
Use enum class for segment_relative_vertnum
2022-01-09 15:25:42 +00:00
if (vm_vec_dist2(v0, vcvertptr(seg.verts[segment_relative_vertnum::_3])) > size2)
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
capacity_flag |= capacity_y;
Use enum class for segment_relative_vertnum
2022-01-09 15:25:42 +00:00
if (vm_vec_dist2(v0, vcvertptr(seg.verts[segment_relative_vertnum::_4])) > size2)
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
capacity_flag |= capacity_z;
player_init_segment_capacity_flag[i] = capacity_flag;
Use dedicated type for mask of segment side numbers
2022-02-19 14:52:17 +00:00
con_printf(CON_NORMAL, "Original player %u has size %u, starts in segment #%hu, and has segment capacity flags %x.", i, old_player_obj.size, static_cast<segnum_t>(segnum), underlying_value(capacity_flag));
if (capacity_flag != sidemask_t{})
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
++segments_with_spare_capacity;
}
if (!segments_with_spare_capacity)
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
/* Every segment checked was too small to add an extra start. Give up
* early.
*/
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
return preplaced_starts;
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
unsigned k = generate_extra_starts_by_copying(Objects, Players, Segments, preplaced_start_range, player_init_segment_capacity_flag, total_required_num_starts, preplaced_starts);
for (const auto old_player_idx : preplaced_start_range)
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
{
auto &old_player_init = Player_init[old_player_idx];
const auto old_player_pos = old_player_init.pos;
auto &old_player_obj = *vmobjptr(Players.vcptr(old_player_idx)->objnum);
Qualify uses of std::array
2020-05-02 21:18:42 +00:00
std::array<vms_vector, 3> vec_displacement{};
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
DXX_MAKE_VAR_UNDEFINED(vec_displacement);
Convert `segment &` to `susegment` where possible
2019-12-22 05:34:08 +00:00
const shared_segment &seg = *vcsegptr(old_player_init.segnum);
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
/* For each of [right, bottom, back], compute the vector between
* the center of that side and the reference player's start
* point. This will be used in the next loop.
*/
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
for (auto &&[side, displacement] : zip(displacement_sides, vec_displacement))
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
{
const auto &&center_on_side = compute_center_point_on_side(vcvertptr, seg, side);
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
displacement = vm_vec_sub(center_on_side, old_player_init.pos);
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
}
const auto displace_player = [&](const unsigned plridx, object_base &plrobj, const unsigned displacement_direction) {
vms_vector disp{};
unsigned dimensions = 0;
Split player start generation Move some of the logic to a separate function to enable use of `return` instead of a `break` from a composite loop.
2022-02-19 14:52:17 +00:00
for (const auto &&[i, side] : enumerate(displacement_sides))
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
{
Use dedicated type for mask of segment side numbers
2022-02-19 14:52:17 +00:00
if (!(player_init_segment_capacity_flag[old_player_idx] & build_sidemask(side)))
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
{
Change `enum sidenum_t` to `enum class sidenum_t`
2022-06-05 17:44:52 +00:00
con_printf(CON_NORMAL, "Cannot displace player %u at {%i, %i, %i}: not enough room in dimension %u.", plridx, plrobj.pos.x, plrobj.pos.y, plrobj.pos.z, underlying_value(side));
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
continue;
}
const auto &v = vec_displacement[i];
const auto &va = (displacement_direction & (1 << i)) ? v : vm_vec_negated(v);
Change `enum sidenum_t` to `enum class sidenum_t`
2022-06-05 17:44:52 +00:00
con_printf(CON_NORMAL, "Add displacement of {%i, %i, %i} for dimension %u for player %u.", va.x, va.y, va.z, underlying_value(side), plridx);
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
++ dimensions;
vm_vec_add2(disp, va);
}
if (!dimensions)
return;
vm_vec_normalize(disp);
vm_vec_scale(disp, fixmul(old_player_obj.size, size_scalar >> 1));
Fix displacing players when synthesizing player start positions TORRaven reported an issue where `Descent: First Strike` level 4 in cooperative games would cause the player 0 ship to be unable to move. On investigation, this occurs when the host has enabled extra player starts, and the resulting synthesis of new player start positions moves the player 0 start out of its origin segment. The physics engine reacts poorly to this situation, causing the object to be unable to move and to report HIT_BAD_P0 in debug builds. Add a test to cancel the displacement if get_seg_masks reports that the center point would move outside the origin segment. More clever logic might be appropriate, but since this is the first report of problems with the feature since its introduction in 5a64ee5132fb, this commit just eliminates the immediate problem. Possible future improvements if the existing displacement causes collisions: - Reduce the magnitude of the existing displacement, instead of abandoning it entirely. - Move the player start to the segment's center before displacing it. - Add logic to move the player into a nearby logically connected segment. Reported-by: TORRaven <https://github.com/dxx-rebirth/dxx-rebirth/issues/483> Fixes: 5a64ee5132fb6028f987bf46f5ab125fcda0a735 ("Add experimental support for larger cooperative games")
2020-01-06 01:25:35 +00:00
const auto target_position = vm_vec_add(Player_init[plridx].pos, disp);
Use dedicated type for mask of segment side numbers
2022-02-19 14:52:17 +00:00
if (const auto sidemask = get_seg_masks(vcvertptr, target_position, vcsegptr(plrobj.segnum), 1).sidemask; sidemask != sidemask_t{})
Fix displacing players when synthesizing player start positions TORRaven reported an issue where `Descent: First Strike` level 4 in cooperative games would cause the player 0 ship to be unable to move. On investigation, this occurs when the host has enabled extra player starts, and the resulting synthesis of new player start positions moves the player 0 start out of its origin segment. The physics engine reacts poorly to this situation, causing the object to be unable to move and to report HIT_BAD_P0 in debug builds. Add a test to cancel the displacement if get_seg_masks reports that the center point would move outside the origin segment. More clever logic might be appropriate, but since this is the first report of problems with the feature since its introduction in 5a64ee5132fb, this commit just eliminates the immediate problem. Possible future improvements if the existing displacement causes collisions: - Reduce the magnitude of the existing displacement, instead of abandoning it entirely. - Move the player start to the segment's center before displacing it. - Add logic to move the player into a nearby logically connected segment. Reported-by: TORRaven <https://github.com/dxx-rebirth/dxx-rebirth/issues/483> Fixes: 5a64ee5132fb6028f987bf46f5ab125fcda0a735 ("Add experimental support for larger cooperative games")
2020-01-06 01:25:35 +00:00
{
Use dedicated type for mask of segment side numbers
2022-02-19 14:52:17 +00:00
con_printf(CON_NORMAL, "Cannot displace player %u at {%i, %i, %i} to {%i, %i, %i}: would be outside segment for sides %x.", plridx, plrobj.pos.x, plrobj.pos.y, plrobj.pos.z, target_position.x, target_position.y, target_position.z, underlying_value(sidemask));
Fix displacing players when synthesizing player start positions TORRaven reported an issue where `Descent: First Strike` level 4 in cooperative games would cause the player 0 ship to be unable to move. On investigation, this occurs when the host has enabled extra player starts, and the resulting synthesis of new player start positions moves the player 0 start out of its origin segment. The physics engine reacts poorly to this situation, causing the object to be unable to move and to report HIT_BAD_P0 in debug builds. Add a test to cancel the displacement if get_seg_masks reports that the center point would move outside the origin segment. More clever logic might be appropriate, but since this is the first report of problems with the feature since its introduction in 5a64ee5132fb, this commit just eliminates the immediate problem. Possible future improvements if the existing displacement causes collisions: - Reduce the magnitude of the existing displacement, instead of abandoning it entirely. - Move the player start to the segment's center before displacing it. - Add logic to move the player into a nearby logically connected segment. Reported-by: TORRaven <https://github.com/dxx-rebirth/dxx-rebirth/issues/483> Fixes: 5a64ee5132fb6028f987bf46f5ab125fcda0a735 ("Add experimental support for larger cooperative games")
2020-01-06 01:25:35 +00:00
return;
}
con_printf(CON_NORMAL, "Displace player %u at {%i, %i, %i} by {%i, %i, %i} to {%i, %i, %i}.", plridx, plrobj.pos.x, plrobj.pos.y, plrobj.pos.z, disp.x, disp.y, disp.z, target_position.x, target_position.y, target_position.z);
Player_init[plridx].pos = target_position;
Move object::last_pos to LevelUniqueObjectState Only the console player's last position needs to be remembered across frames. Copy the console player's position out before processsing object movement. For all other objects, retain a temporary for use by the position recovery code.
2019-12-22 05:34:08 +00:00
plrobj.pos = Player_init[plridx].pos;
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
};
for (unsigned extra_player_idx = preplaced_starts, displacements = 0; extra_player_idx < k; ++extra_player_idx)
{
auto &extra_player_obj = *vmobjptr(Players.vcptr(extra_player_idx)->objnum);
if (old_player_pos != extra_player_obj.pos)
/* This clone is associated with some other player.
* Skip it here. It will be handled in a different pass
* of the loop.
*/
continue;
auto &extra_player_init = Player_init[extra_player_idx];
extra_player_init = old_player_init;
if (!displacements++)
displace_player(old_player_idx, old_player_obj, 0);
displace_player(extra_player_idx, extra_player_obj, displacements);
}
}
return k;
}
initial import
2006-03-20 17:12:09 +00:00
//added 10/12/95: delete buddy bot if coop game. Probably doesn't really belong here. -MT
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
#if defined(DXX_BUILD_DESCENT_I)
#define gameseq_init_network_players(Robot_info,Objects) gameseq_init_network_players(Objects)
#elif defined(DXX_BUILD_DESCENT_II)
#undef gameseq_init_network_players
#endif
static void gameseq_init_network_players(const d_robot_info_array &Robot_info, object_array &Objects)
initial import
2006-03-20 17:12:09 +00:00
{
// Initialize network player start locations and object numbers
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
ConsoleObject = &Objects.front();
Cache player references
2017-08-13 20:38:31 +00:00
unsigned j = 0, k = 0;
Add experimental support for guidebot in multiplayer This was requested by a user in early 2018. However, the proposed prototype was susceptible to various forms of desynchronization, and was unsuitable for merging. No further revisions were proposed, and the feature languished. This commit enables the guidebot in cooperative games and addresses the known synchronization problems, as well as some other bugs that were uncovered during light testing. This is classified as an experimental feature because it has not been heavily tested in complicated games. Requested-by: cfeuersaenger <https://github.com/dxx-rebirth/dxx-rebirth/issues/364>
2019-06-27 03:26:20 +00:00
const auto multiplayer_coop = Game_mode & GM_MULTI_COOP;
Allow players to remove thief at level start Commit f4b21088a039 ("Track vulcan ammo explicitly") fixed an original retail bug that prevented the thief from stealing energy weapons, because the thief could only steal weapons for which the player had ammo and energy weapons never have ammo. This went unremarked for several years, until a recent report of the new semantics as a game-breaking regression because the thief is now "ridiculously potent". Address this report, as well as an intermittently raised issue from various users over time, by adding two new knobs to both the single player "Gameplay" menu and the multiplayer setup screen: "Remove Thief at level start" and "Prevent Thief Stealing Energy Weapons". "Remove Thief" deletes the thief object during level load. It has no impact on save games, and changing it after entering a level has no effect on any thief already in the level. "Prevent Thief Stealing" is checked at the moment of theft and, when enabled, prevents stealing primary weapons other than Vulcan/Gauss. This can be changed at will in single player and is immediately effective. In multiplayer, this option can only be changed by the game host in the pre-game setup. For both knobs, there is one pair of checkboxes to control this as a player preference, which applies in single player games. There is a second pair of checkboxes in the multiplayer setup, which applies only to multiplayer games. Therefore, in multiplayer, the host chooses thief settings and all clients use the host's choice. The host may configure the thief differently in multiplayer from how the host plays in single player. For users who wanted to remove the thief, no specific tally has been kept for who requested it or when. Now that the code is being updated, this is thrown in as an easy addition. Reported-by: MegaDescent <http://forum.dxx-rebirth.com/showthread.php?tid=980> (for the thief stealing energy weapons as a game-breaking regression)
2017-08-26 19:47:52 +00:00
#if defined(DXX_BUILD_DESCENT_II)
const auto remove_thief = Netgame.ThiefModifierFlags & ThiefModifier::Absent;
Shorten gameseq_init_network_players
2016-03-17 03:34:23 +00:00
const auto multiplayer = Game_mode & GM_MULTI;
Add experimental support for guidebot in multiplayer This was requested by a user in early 2018. However, the proposed prototype was susceptible to various forms of desynchronization, and was unsuitable for merging. No further revisions were proposed, and the feature languished. This commit enables the guidebot in cooperative games and addresses the known synchronization problems, as well as some other bugs that were uncovered during light testing. This is classified as an experimental feature because it has not been heavily tested in complicated games. Requested-by: cfeuersaenger <https://github.com/dxx-rebirth/dxx-rebirth/issues/364>
2019-06-27 03:26:20 +00:00
const auto retain_guidebot = Netgame.AllowGuidebot;
Allow players to remove thief at level start Commit f4b21088a039 ("Track vulcan ammo explicitly") fixed an original retail bug that prevented the thief from stealing energy weapons, because the thief could only steal weapons for which the player had ammo and energy weapons never have ammo. This went unremarked for several years, until a recent report of the new semantics as a game-breaking regression because the thief is now "ridiculously potent". Address this report, as well as an intermittently raised issue from various users over time, by adding two new knobs to both the single player "Gameplay" menu and the multiplayer setup screen: "Remove Thief at level start" and "Prevent Thief Stealing Energy Weapons". "Remove Thief" deletes the thief object during level load. It has no impact on save games, and changing it after entering a level has no effect on any thief already in the level. "Prevent Thief Stealing" is checked at the moment of theft and, when enabled, prevents stealing primary weapons other than Vulcan/Gauss. This can be changed at will in single player and is immediately effective. In multiplayer, this option can only be changed by the game host in the pre-game setup. For both knobs, there is one pair of checkboxes to control this as a player preference, which applies in single player games. There is a second pair of checkboxes in the multiplayer setup, which applies only to multiplayer games. Therefore, in multiplayer, the host chooses thief settings and all clients use the host's choice. The host may configure the thief differently in multiplayer from how the host plays in single player. For users who wanted to remove the thief, no specific tally has been kept for who requested it or when. Now that the code is being updated, this is thrown in as an easy addition. Reported-by: MegaDescent <http://forum.dxx-rebirth.com/showthread.php?tid=980> (for the thief stealing energy weapons as a game-breaking regression)
2017-08-26 19:47:52 +00:00
#endif
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &vmobjptridx = Objects.vmptridx;
Always qualify valptridx type/factory Previously, valptridx used PREFIX for allow-invalid+mutable, c#PREFIX for allow-invalid+const, v#PREFIX for require-valid+mutable, vc#PREFIX for require-valid+const. Convert the types, factories, and all usage sites to specify a qualifier for all four combinations: im#PREFIX -> allow-invalid+mutable ic#PREFIX -> allow-invalid+const vm#PREFIX -> require-valid+mutable vc#PREFIX -> require-valid+const Changes to common/include/valptridx.h and common/include/fwd-valptridx.h are manual. All other changes are generated by: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\(v\?\)\(\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/\1m\2/g' for the 'm' prefix and: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\([cm]\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/i&/g' for the 'i' prefix.
2017-06-10 03:31:02 +00:00
range_for (const auto &&o, vmobjptridx)
Wrap object iteration idiom
2014-10-12 23:05:46 +00:00
{
Shorten gameseq_init_network_players
2016-03-17 03:34:23 +00:00
const auto type = o->type;
if (type == OBJ_PLAYER || type == OBJ_GHOST || type == OBJ_COOP)
initial import
2006-03-20 17:12:09 +00:00
{
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
if (likely(k < Player_init.size()) &&
multiplayer_coop
Shorten gameseq_init_network_players
2016-03-17 03:34:23 +00:00
? (j == 0 || type == OBJ_COOP)
: (type == OBJ_PLAYER || type == OBJ_GHOST)
)
initial import
2006-03-20 17:12:09 +00:00
{
Fix various -Wnarrowing errors
2014-11-26 03:39:21 +00:00
o->type=OBJ_PLAYER;
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
auto &pi = Player_init[k];
pi.pos = o->pos;
pi.orient = o->orient;
pi.segnum = o->segnum;
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
vmplayerptr(k)->objnum = o;
Fix various -Wnarrowing errors
2014-11-26 03:39:21 +00:00
set_player_id(o, k);
initial import
2006-03-20 17:12:09 +00:00
k++;
}
else
Rename ObjectState to LevelUniqueObjectState for consistency
2018-12-30 00:43:57 +00:00
obj_delete(LevelUniqueObjectState, Segments, o);
initial import
2006-03-20 17:12:09 +00:00
j++;
}
Allow players to remove thief at level start Commit f4b21088a039 ("Track vulcan ammo explicitly") fixed an original retail bug that prevented the thief from stealing energy weapons, because the thief could only steal weapons for which the player had ammo and energy weapons never have ammo. This went unremarked for several years, until a recent report of the new semantics as a game-breaking regression because the thief is now "ridiculously potent". Address this report, as well as an intermittently raised issue from various users over time, by adding two new knobs to both the single player "Gameplay" menu and the multiplayer setup screen: "Remove Thief at level start" and "Prevent Thief Stealing Energy Weapons". "Remove Thief" deletes the thief object during level load. It has no impact on save games, and changing it after entering a level has no effect on any thief already in the level. "Prevent Thief Stealing" is checked at the moment of theft and, when enabled, prevents stealing primary weapons other than Vulcan/Gauss. This can be changed at will in single player and is immediately effective. In multiplayer, this option can only be changed by the game host in the pre-game setup. For both knobs, there is one pair of checkboxes to control this as a player preference, which applies in single player games. There is a second pair of checkboxes in the multiplayer setup, which applies only to multiplayer games. Therefore, in multiplayer, the host chooses thief settings and all clients use the host's choice. The host may configure the thief differently in multiplayer from how the host plays in single player. For users who wanted to remove the thief, no specific tally has been kept for who requested it or when. Now that the code is being updated, this is thrown in as an easy addition. Reported-by: MegaDescent <http://forum.dxx-rebirth.com/showthread.php?tid=980> (for the thief stealing energy weapons as a game-breaking regression)
2017-08-26 19:47:52 +00:00
#if defined(DXX_BUILD_DESCENT_II)
else if (type == OBJ_ROBOT && multiplayer)
{
auto &ri = Robot_info[get_robot_id(o)];
Add experimental support for guidebot in multiplayer This was requested by a user in early 2018. However, the proposed prototype was susceptible to various forms of desynchronization, and was unsuitable for merging. No further revisions were proposed, and the feature languished. This commit enables the guidebot in cooperative games and addresses the known synchronization problems, as well as some other bugs that were uncovered during light testing. This is classified as an experimental feature because it has not been heavily tested in complicated games. Requested-by: cfeuersaenger <https://github.com/dxx-rebirth/dxx-rebirth/issues/364>
2019-06-27 03:26:20 +00:00
if ((!retain_guidebot && robot_is_companion(ri)) ||
(remove_thief && robot_is_thief(ri)))
Make thief bot drop any map-specified items if option to suppress it is enabled
2020-01-09 03:19:58 +00:00
{
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
object_create_robot_egg(Robot_info, o);
Rename ObjectState to LevelUniqueObjectState for consistency
2018-12-30 00:43:57 +00:00
obj_delete(LevelUniqueObjectState, Segments, o); //kill the buddy in netgames
Make thief bot drop any map-specified items if option to suppress it is enabled
2020-01-09 03:19:58 +00:00
}
Allow players to remove thief at level start Commit f4b21088a039 ("Track vulcan ammo explicitly") fixed an original retail bug that prevented the thief from stealing energy weapons, because the thief could only steal weapons for which the player had ammo and energy weapons never have ammo. This went unremarked for several years, until a recent report of the new semantics as a game-breaking regression because the thief is now "ridiculously potent". Address this report, as well as an intermittently raised issue from various users over time, by adding two new knobs to both the single player "Gameplay" menu and the multiplayer setup screen: "Remove Thief at level start" and "Prevent Thief Stealing Energy Weapons". "Remove Thief" deletes the thief object during level load. It has no impact on save games, and changing it after entering a level has no effect on any thief already in the level. "Prevent Thief Stealing" is checked at the moment of theft and, when enabled, prevents stealing primary weapons other than Vulcan/Gauss. This can be changed at will in single player and is immediately effective. In multiplayer, this option can only be changed by the game host in the pre-game setup. For both knobs, there is one pair of checkboxes to control this as a player preference, which applies in single player games. There is a second pair of checkboxes in the multiplayer setup, which applies only to multiplayer games. Therefore, in multiplayer, the host chooses thief settings and all clients use the host's choice. The host may configure the thief differently in multiplayer from how the host plays in single player. For users who wanted to remove the thief, no specific tally has been kept for who requested it or when. Now that the code is being updated, this is thrown in as an easy addition. Reported-by: MegaDescent <http://forum.dxx-rebirth.com/showthread.php?tid=980> (for the thief stealing energy weapons as a game-breaking regression)
2017-08-26 19:47:52 +00:00
}
#endif
initial import
2006-03-20 17:12:09 +00:00
}
Suppress cooperative start report if not multiplayer coop The value is only correct when the game is cooperative multiplayer. Hide it when it would be incorrect.
2019-02-02 18:36:39 +00:00
if (multiplayer_coop)
{
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
const unsigned total_required_num_starts = Netgame.max_numplayers;
if (k < total_required_num_starts)
{
Remove macro Current_mission_filename
2020-01-18 21:57:39 +00:00
con_printf(CON_NORMAL, "Insufficient cooperative starts found in mission \"%s\" level %u (need %u, found %u). Generating extra starts...", Current_mission->path.c_str(), Current_level_num, total_required_num_starts, k);
Add experimental support for larger cooperative games - Raise the player limit to 8. - Remove the logic that forces player counts up/down when switching between cooperative and deathmatch game modes. - Add heuristics to add start positions for the extra players, since standard maps will not have the required number of starts.
2018-12-03 04:25:11 +00:00
/*
* First, try displacing the starts within the existing segment.
*/
const unsigned preplaced_starts = k;
k = generate_extra_starts_by_displacement_within_segment(preplaced_starts, total_required_num_starts);
con_printf(CON_NORMAL, "Generated %u starts by displacement within the original segment.", k - preplaced_starts);
}
else
Remove macro Current_mission_filename
2020-01-18 21:57:39 +00:00
con_printf(CON_NORMAL, "Found %u cooperative starts in mission \"%s\" level %u.", k, Current_mission->path.c_str(), Current_level_num);
Suppress cooperative start report if not multiplayer coop The value is only correct when the game is cooperative multiplayer. Hide it when it would be incorrect.
2019-02-02 18:36:39 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
NumNetPlayerPositions = k;
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
void gameseq_remove_unused_players(const d_robot_info_array &Robot_info)
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptridx = Objects.vmptridx;
initial import
2006-03-20 17:12:09 +00:00
// 'Remove' the unused players
if (Game_mode & GM_MULTI)
{
Fix some -Wshadow warnings
2016-02-12 04:02:28 +00:00
for (unsigned i = 0; i < NumNetPlayerPositions; ++i)
initial import
2006-03-20 17:12:09 +00:00
{
Use enum class for player connected status
2022-07-16 15:26:12 +00:00
if (vcplayerptr(i)->connected == player_connection_status::disconnected || i >= N_players)
initial import
2006-03-20 17:12:09 +00:00
{
multi_make_player_ghost(i);
}
}
}
else
{ // Note link to above if!!!
Use partial_const_range
2016-02-12 04:02:28 +00:00
range_for (auto &i, partial_const_range(Players, 1u, NumNetPlayerPositions))
initial import
2006-03-20 17:12:09 +00:00
{
Rename ObjectState to LevelUniqueObjectState for consistency
2018-12-30 00:43:57 +00:00
obj_delete(LevelUniqueObjectState, Segments, vmobjptridx(i.objnum));
initial import
2006-03-20 17:12:09 +00:00
}
Allow players to remove thief at level start Commit f4b21088a039 ("Track vulcan ammo explicitly") fixed an original retail bug that prevented the thief from stealing energy weapons, because the thief could only steal weapons for which the player had ammo and energy weapons never have ammo. This went unremarked for several years, until a recent report of the new semantics as a game-breaking regression because the thief is now "ridiculously potent". Address this report, as well as an intermittently raised issue from various users over time, by adding two new knobs to both the single player "Gameplay" menu and the multiplayer setup screen: "Remove Thief at level start" and "Prevent Thief Stealing Energy Weapons". "Remove Thief" deletes the thief object during level load. It has no impact on save games, and changing it after entering a level has no effect on any thief already in the level. "Prevent Thief Stealing" is checked at the moment of theft and, when enabled, prevents stealing primary weapons other than Vulcan/Gauss. This can be changed at will in single player and is immediately effective. In multiplayer, this option can only be changed by the game host in the pre-game setup. For both knobs, there is one pair of checkboxes to control this as a player preference, which applies in single player games. There is a second pair of checkboxes in the multiplayer setup, which applies only to multiplayer games. Therefore, in multiplayer, the host chooses thief settings and all clients use the host's choice. The host may configure the thief differently in multiplayer from how the host plays in single player. For users who wanted to remove the thief, no specific tally has been kept for who requested it or when. Now that the code is being updated, this is thrown in as an easy addition. Reported-by: MegaDescent <http://forum.dxx-rebirth.com/showthread.php?tid=980> (for the thief stealing energy weapons as a game-breaking regression)
2017-08-26 19:47:52 +00:00
#if defined(DXX_BUILD_DESCENT_II)
if (PlayerCfg.ThiefModifierFlags & ThiefModifier::Absent)
{
range_for (const auto &&o, vmobjptridx)
{
const auto type = o->type;
if (type == OBJ_ROBOT)
{
auto &ri = Robot_info[get_robot_id(o)];
if (robot_is_thief(ri))
Make thief bot drop any map-specified items if option to suppress it is enabled
2020-01-09 03:19:58 +00:00
{
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
object_create_robot_egg(Robot_info, o);
Rename ObjectState to LevelUniqueObjectState for consistency
2018-12-30 00:43:57 +00:00
obj_delete(LevelUniqueObjectState, Segments, o);
Make thief bot drop any map-specified items if option to suppress it is enabled
2020-01-09 03:19:58 +00:00
}
Allow players to remove thief at level start Commit f4b21088a039 ("Track vulcan ammo explicitly") fixed an original retail bug that prevented the thief from stealing energy weapons, because the thief could only steal weapons for which the player had ammo and energy weapons never have ammo. This went unremarked for several years, until a recent report of the new semantics as a game-breaking regression because the thief is now "ridiculously potent". Address this report, as well as an intermittently raised issue from various users over time, by adding two new knobs to both the single player "Gameplay" menu and the multiplayer setup screen: "Remove Thief at level start" and "Prevent Thief Stealing Energy Weapons". "Remove Thief" deletes the thief object during level load. It has no impact on save games, and changing it after entering a level has no effect on any thief already in the level. "Prevent Thief Stealing" is checked at the moment of theft and, when enabled, prevents stealing primary weapons other than Vulcan/Gauss. This can be changed at will in single player and is immediately effective. In multiplayer, this option can only be changed by the game host in the pre-game setup. For both knobs, there is one pair of checkboxes to control this as a player preference, which applies in single player games. There is a second pair of checkboxes in the multiplayer setup, which applies only to multiplayer games. Therefore, in multiplayer, the host chooses thief settings and all clients use the host's choice. The host may configure the thief differently in multiplayer from how the host plays in single player. For users who wanted to remove the thief, no specific tally has been kept for who requested it or when. Now that the code is being updated, this is thrown in as an easy addition. Reported-by: MegaDescent <http://forum.dxx-rebirth.com/showthread.php?tid=980> (for the thief stealing energy weapons as a game-breaking regression)
2017-08-26 19:47:52 +00:00
}
}
}
#endif
initial import
2006-03-20 17:12:09 +00:00
}
}
// Setup player for new game
Cache player references
2017-08-13 20:38:31 +00:00
void init_player_stats_game(const playernum_t pnum)
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
auto &plr = *vmplayerptr(pnum);
Cache player references
2017-08-13 20:38:31 +00:00
plr.lives = INITIAL_LIVES;
plr.level = 1;
plr.time_level = 0;
plr.time_total = 0;
plr.hours_level = 0;
plr.hours_total = 0;
plr.num_kills_level = 0;
plr.num_kills_total = 0;
const auto &&plobj = vmobjptr(plr.objnum);
Move player::score to player_info
2016-10-15 00:53:19 +00:00
auto &player_info = plobj->ctype.player_info;
player_info.powerup_flags = {};
Move player::net_killed_total to player_info
2016-11-12 18:10:07 +00:00
player_info.net_killed_total = 0;
Move player::net_kills_total to player_info
2016-11-12 18:10:07 +00:00
player_info.net_kills_total = 0;
Move player::KillGoalCount to player_info
2016-11-12 18:10:07 +00:00
player_info.KillGoalCount = 0;
Move player::score to player_info
2016-10-15 00:53:19 +00:00
player_info.mission.score = 0;
Move player::last_score to player_info
2016-10-15 00:53:19 +00:00
player_info.mission.last_score = 0;
Move player::hostages_rescued_total to player_info
2016-10-15 00:53:19 +00:00
player_info.mission.hostages_rescued_total = 0;
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
init_player_stats_new_ship(pnum);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
if (pnum == Player_num)
First_secret_visit = 1;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Pass player object to init_ammo_and_energy
2016-10-28 03:39:42 +00:00
static void init_ammo_and_energy(object &plrobj)
initial import
2006-03-20 17:12:09 +00:00
{
Pass player object to init_ammo_and_energy
2016-10-28 03:39:42 +00:00
auto &player_info = plrobj.ctype.player_info;
Cache reference to local player energy
2016-07-03 00:54:16 +00:00
{
Expand get_local_player_energy 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-09-11 18:49:13 +00:00
auto &energy = player_info.energy;
Recharge omega cannon on entering new level
2016-11-26 22:51:49 +00:00
#if defined(DXX_BUILD_DESCENT_II)
if (player_info.primary_weapon_flags & HAS_PRIMARY_FLAG(OMEGA_INDEX))
{
const auto old_omega_charge = player_info.Omega_charge;
if (old_omega_charge < MAX_OMEGA_CHARGE)
{
const auto energy_used = get_omega_energy_consumption((player_info.Omega_charge = MAX_OMEGA_CHARGE) - old_omega_charge);
energy -= energy_used;
}
}
#endif
Cache reference to local player energy
2016-07-03 00:54:16 +00:00
if (energy < INITIAL_ENERGY)
energy = INITIAL_ENERGY;
}
Cache reference to local player shields
2016-07-03 00:54:16 +00:00
{
Pass player object to init_ammo_and_energy
2016-10-28 03:39:42 +00:00
auto &shields = plrobj.shields;
Cache reference to local player shields
2016-07-03 00:54:16 +00:00
if (shields < StartingShields)
shields = StartingShields;
}
Move Difficulty_level to GameUniqueState
2019-06-27 03:26:20 +00:00
const unsigned minimum_missiles = get_starting_concussion_missile_count();
Expand get_local_player_energy 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-09-11 18:49:13 +00:00
auto &concussion = player_info.secondary_ammo[CONCUSSION_INDEX];
Move Difficulty_level to GameUniqueState
2019-06-27 03:26:20 +00:00
if (concussion < minimum_missiles)
concussion = minimum_missiles;
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
extern ubyte Last_afterburner_state;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
initial import
2006-03-20 17:12:09 +00:00
// Setup player for new level (After completion of previous level)
Make init_player_stats_level static
2019-07-16 04:00:50 +00:00
static void init_player_stats_level(player &plr, object &plrobj, const secret_restore secret_flag)
initial import
2006-03-20 17:12:09 +00:00
{
Move player::hostages_level to d_level_unique_object_state The number of hostages on a level is a function of the level, not any particular player. Move it to d_level_unique_object_state and rename it to total_hostages.
2019-07-16 04:00:50 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vcobjptridx = Objects.vcptridx;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Cache get_local_player in init_player_stats_level
2016-03-18 02:05:16 +00:00
plr.level = Current_level_num;
initial import
2006-03-20 17:12:09 +00:00
if (!Network_rejoined) {
Cache get_local_player in init_player_stats_level
2016-03-18 02:05:16 +00:00
plr.time_level = 0;
plr.hours_level = 0;
initial import
2006-03-20 17:12:09 +00:00
}
Move player::score to player_info
2016-10-15 00:53:19 +00:00
auto &player_info = plrobj.ctype.player_info;
Move player::last_score to player_info
2016-10-15 00:53:19 +00:00
player_info.mission.last_score = player_info.mission.score;
initial import
2006-03-20 17:12:09 +00:00
Cache get_local_player in init_player_stats_level
2016-03-18 02:05:16 +00:00
plr.num_kills_level = 0;
initial import
2006-03-20 17:12:09 +00:00
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
if (secret_flag == secret_restore::none) {
Pass player object to init_ammo_and_energy
2016-10-28 03:39:42 +00:00
init_ammo_and_energy(plrobj);
initial import
2006-03-20 17:12:09 +00:00
Expand get_local_player_invulnerable_time 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-08-28 22:41:49 +00:00
auto &powerup_flags = player_info.powerup_flags;
Combine count_number_of_{robots,hostages} into template
2016-03-17 03:34:24 +00:00
powerup_flags &= ~(PLAYER_FLAGS_INVULNERABLE | PLAYER_FLAGS_CLOAKED);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Combine count_number_of_{robots,hostages} into template
2016-03-17 03:34:24 +00:00
powerup_flags &= ~(PLAYER_FLAGS_MAP_ALL);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Expand get_local_player_cloak_time 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:39 +00:00
DXX_MAKE_VAR_UNDEFINED(player_info.cloak_time);
Expand get_local_player_invulnerable_time 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-08-28 22:41:49 +00:00
DXX_MAKE_VAR_UNDEFINED(player_info.invulnerable_time);
initial import
2006-03-20 17:12:09 +00:00
Use type safe player flags
2015-10-30 02:52:55 +00:00
const auto all_keys = PLAYER_FLAGS_BLUE_KEY | PLAYER_FLAGS_GOLD_KEY | PLAYER_FLAGS_RED_KEY;
initial import
2006-03-20 17:12:09 +00:00
if ((Game_mode & GM_MULTI) && !(Game_mode & GM_MULTI_COOP))
Combine count_number_of_{robots,hostages} into template
2016-03-17 03:34:24 +00:00
powerup_flags |= all_keys;
Use type safe player flags
2015-10-30 02:52:55 +00:00
else
Combine count_number_of_{robots,hostages} into template
2016-03-17 03:34:24 +00:00
powerup_flags &= ~all_keys;
initial import
2006-03-20 17:12:09 +00:00
}
Use enum class for Player_dead_state (formerly Player_is_dead)
2015-12-15 04:09:35 +00:00
Player_dead_state = player_dead_state::no; // Added by RH
Correction for rev1009: Do not need to delete object Dead_player_camera since it's a new level with new objects to begin with
2011-01-18 19:02:04 +00:00
Dead_player_camera = NULL;
initial import
2006-03-20 17:12:09 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move Controls ubyte values into substructure
2013-11-26 22:46:48 +00:00
Controls.state.afterburner = 0;
initial import
2006-03-20 17:12:09 +00:00
Last_afterburner_state = 0;
Cache get_local_player in init_player_stats_level
2016-03-18 02:05:16 +00:00
digi_kill_sound_linked_to_object(vcobjptridx(plr.objnum));
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
init_gauges();
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
Missile_viewer = NULL;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Make init_player_stats_ship static
2019-07-07 22:00:02 +00:00
init_player_stats_ship(plrobj, GameTime64);
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
// Setup player for a brand-new ship
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
void init_player_stats_new_ship(const playernum_t pnum)
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptridx = Objects.vmptridx;
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
auto &plr = *vcplayerptr(pnum);
Always qualify valptridx type/factory Previously, valptridx used PREFIX for allow-invalid+mutable, c#PREFIX for allow-invalid+const, v#PREFIX for require-valid+mutable, vc#PREFIX for require-valid+const. Convert the types, factories, and all usage sites to specify a qualifier for all four combinations: im#PREFIX -> allow-invalid+mutable ic#PREFIX -> allow-invalid+const vm#PREFIX -> require-valid+mutable vc#PREFIX -> require-valid+const Changes to common/include/valptridx.h and common/include/fwd-valptridx.h are manual. All other changes are generated by: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\(v\?\)\(\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/\1m\2/g' for the 'm' prefix and: git grep -lz -e '\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\>' | xargs -0 sed -i -e 's/\<\([cm]\(obj\|seg\|clwall\|wall\|actdoor\|trg\)\(ptridx\|ptr\|idx\)\(_t\)\?\)\>/i&/g' for the 'i' prefix.
2017-06-10 03:31:02 +00:00
const auto &&plrobj = vmobjptridx(plr.objnum);
Move player shields to struct object
2015-11-07 21:55:58 +00:00
plrobj->shields = StartingShields;
Move player energy to object.ctype.player_info
2015-11-07 21:55:58 +00:00
auto &player_info = plrobj->ctype.player_info;
player_info.energy = INITIAL_ENERGY;
Move player secondary_ammo to object.ctype.player_info
2015-11-07 21:55:58 +00:00
player_info.secondary_ammo = {{
Move Difficulty_level to GameUniqueState
2019-06-27 03:26:20 +00:00
static_cast<uint8_t>(get_starting_concussion_missile_count())
Move player secondary_ammo to object.ctype.player_info
2015-11-07 21:55:58 +00:00
}};
Allow granting items at player spawn
2015-03-28 17:18:02 +00:00
const auto GrantedItems = (Game_mode & GM_MULTI) ? Netgame.SpawnGrantedItems : 0;
Move player vulcan_ammo to object.ctype.player_info
2015-11-07 21:55:59 +00:00
player_info.vulcan_ammo = map_granted_flags_to_vulcan_ammo(GrantedItems);
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
const auto granted_laser_level = map_granted_flags_to_laser_level(GrantedItems);
Move player laser_level to object.ctype.player_info
2015-11-07 21:55:59 +00:00
player_info.laser_level = granted_laser_level;
Move player primary_weapon_flags to object.ctype.player_info
2015-11-07 21:55:59 +00:00
const auto granted_primary_weapon_flags = HAS_LASER_FLAG | map_granted_flags_to_primary_weapon_flags(GrantedItems);
player_info.primary_weapon_flags = granted_primary_weapon_flags;
Move FakingInvul to player_info Every player can fake invulnerability independently. In preparation for host tracking, store FakingInvul as a player property, not a static global.
2016-02-27 19:02:21 +00:00
player_info.powerup_flags &= ~(PLAYER_FLAGS_QUAD_LASERS | PLAYER_FLAGS_CLOAKED | PLAYER_FLAGS_INVULNERABLE);
#if defined(DXX_BUILD_DESCENT_II)
player_info.powerup_flags &= ~(PLAYER_FLAGS_AFTERBURNER | PLAYER_FLAGS_MAP_ALL | PLAYER_FLAGS_CONVERTER | PLAYER_FLAGS_AMMO_RACK | PLAYER_FLAGS_HEADLIGHT | PLAYER_FLAGS_HEADLIGHT_ON | PLAYER_FLAGS_FLAG);
Always initialize Omega_charge in init_player_stats_new_ship Some gauges views show the current Omega_charge even when the player does not have an Omega cannon. Initialize Omega_charge to 0 if the Omega cannon is not granted.
2016-11-19 18:09:26 +00:00
player_info.Omega_charge = (granted_primary_weapon_flags & HAS_OMEGA_FLAG)
? MAX_OMEGA_CHARGE
: 0;
Move Omega_recharge_delay to player_info
2016-11-12 18:10:08 +00:00
player_info.Omega_recharge_delay = 0;
Fix score getting mangled after new ship
2022-10-29 18:03:08 +00:00
if (game_mode_hoard())
player_info.hoard.orbs = 0;
Move FakingInvul to player_info Every player can fake invulnerability independently. In preparation for host tracking, store FakingInvul as a player property, not a static global.
2016-02-27 19:02:21 +00:00
#endif
player_info.powerup_flags |= map_granted_flags_to_player_flags(GrantedItems);
DXX_MAKE_VAR_UNDEFINED(player_info.cloak_time);
DXX_MAKE_VAR_UNDEFINED(player_info.invulnerable_time);
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
if (pnum == Player_num)
{
Check for GM_MULTI together with Netgame.InvulAppear in init_player_stats_new_ship(). Otherwise going into Singleplayer after starting a Multiplayer match with this option set can translate this effect into Singleplayer.
2016-05-30 13:00:07 +00:00
if (Game_mode & GM_MULTI && Netgame.InvulAppear)
Move FakingInvul to player_info Every player can fake invulnerability independently. In preparation for host tracking, store FakingInvul as a player property, not a static global.
2016-02-27 19:02:21 +00:00
{
player_info.powerup_flags |= PLAYER_FLAGS_INVULNERABLE;
player_info.invulnerable_time = GameTime64 - (i2f(58 - Netgame.InvulAppear) >> 1);
player_info.FakingInvul = 1;
}
Fix uninitialized value usage during init_player_stats_new_ship init_player_stats_new_ship used select_primary_weapon and select_secondary_weapon to assign the player's weapons. However, those functions read the current weapon and jumped according to its value. A new ship has no defined value for current weapons, so the jump triggered an uninitialized value warning from Valgrind. Add new functions set_primary_weapon, set_secondary_weapon that work like the previous select_* functions, but always take the path used for weapons not equal, without checking. This prevents the warnings from Valgrind, as well as a theoretical risk of initializing the ship improperly.
2016-12-25 00:33:25 +00:00
set_primary_weapon(player_info, [=]{
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
range_for (auto i, PlayerCfg.PrimaryOrder)
{
if (i >= MAX_PRIMARY_WEAPONS)
break;
if (i == primary_weapon_index_t::LASER_INDEX)
break;
#if defined(DXX_BUILD_DESCENT_II)
if (i == primary_weapon_index_t::SUPER_LASER_INDEX)
{
Use enum class for laser_level Remove stored_laser_level, which existed primarily to enforce type separate. `enum class` can do that without the need for a separate class type.
2020-08-24 01:31:28 +00:00
if (granted_laser_level <= laser_level::_4)
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
/* Granted lasers are not super lasers */
continue;
/* Super lasers still set LASER_INDEX, not
* SUPER_LASER_INDEX
*/
break;
}
#endif
if (HAS_PRIMARY_FLAG(i) & static_cast<unsigned>(granted_primary_weapon_flags))
return static_cast<primary_weapon_index_t>(i);
}
return primary_weapon_index_t::LASER_INDEX;
Fix uninitialized value usage during init_player_stats_new_ship init_player_stats_new_ship used select_primary_weapon and select_secondary_weapon to assign the player's weapons. However, those functions read the current weapon and jumped according to its value. A new ship has no defined value for current weapons, so the jump triggered an uninitialized value warning from Valgrind. Add new functions set_primary_weapon, set_secondary_weapon that work like the previous select_* functions, but always take the path used for weapons not equal, without checking. This prevents the warnings from Valgrind, as well as a theoretical risk of initializing the ship improperly.
2016-12-25 00:33:25 +00:00
}());
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Use mask for Primary_last_was_super
2017-02-19 19:33:44 +00:00
auto primary_last_was_super = player_info.Primary_last_was_super;
for (uint_fast32_t i = primary_weapon_index_t::VULCAN_INDEX, mask = 1 << i; i != primary_weapon_index_t::SUPER_LASER_INDEX; ++i, mask <<= 1)
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
{
/* If no super granted, force to non-super. */
if (!(HAS_PRIMARY_FLAG(i + 5) & granted_primary_weapon_flags))
Use mask for Primary_last_was_super
2017-02-19 19:33:44 +00:00
primary_last_was_super &= ~mask;
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
/* If only super granted, force to super. */
else if (!(HAS_PRIMARY_FLAG(i) & granted_primary_weapon_flags))
Use mask for Primary_last_was_super
2017-02-19 19:33:44 +00:00
primary_last_was_super |= mask;
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
/* else both granted, so leave as-is. */
else
continue;
}
Use mask for Primary_last_was_super
2017-02-19 19:33:44 +00:00
player_info.Primary_last_was_super = primary_last_was_super;
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
#endif
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
if (Newdemo_state == ND_STATE_RECORDING)
{
Use enum class for laser_level Remove stored_laser_level, which existed primarily to enforce type separate. `enum class` can do that without the need for a separate class type.
2020-08-24 01:31:28 +00:00
newdemo_record_laser_level(player_info.laser_level, laser_level::_1);
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
}
Fix uninitialized value usage during init_player_stats_new_ship init_player_stats_new_ship used select_primary_weapon and select_secondary_weapon to assign the player's weapons. However, those functions read the current weapon and jumped according to its value. A new ship has no defined value for current weapons, so the jump triggered an uninitialized value warning from Valgrind. Add new functions set_primary_weapon, set_secondary_weapon that work like the previous select_* functions, but always take the path used for weapons not equal, without checking. This prevents the warnings from Valgrind, as well as a theoretical risk of initializing the ship improperly.
2016-12-25 00:33:25 +00:00
set_secondary_weapon_to_concussion(player_info);
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
dead_player_end(); //player no longer dead
Use enum class for Player_dead_state (formerly Player_is_dead)
2015-12-15 04:09:35 +00:00
Player_dead_state = player_dead_state::no;
Move Player_eggs_dropped to player_info
2016-12-10 17:51:09 +00:00
player_info.Player_eggs_dropped = false;
fixed two bugs caused by recent Multiplayer cleanup: Set more player-death-related veriables outside of dead_player_end() when creating new ship as not covered in subfunction is Palyer_is_dead is not true; also init my own inventory properly in multi_prep_level to get our inventory straight after receiving netgame information
2012-04-15 23:13:29 +00:00
Dead_player_camera = 0;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move Secondary_last_was_super into player_info
2016-08-28 22:41:48 +00:00
auto &Secondary_last_was_super = player_info.Secondary_last_was_super;
Respect autoselect order for granted items Additionally, improve handling of Primary_last_was_super. Previously, it was cleared to 0, which made sense if the ship starts with only lasers. Now that the ship can start with other weapons, clearing Primary_last_was_super to 0 may override a player's choice. Preserve player's last-was-super choice when the grant gives both the base and super forms of a weapon. Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140> [for the Primary_weapon part]
2015-09-26 21:17:14 +00:00
Secondary_last_was_super = {};
Pack spawn granted items in D1
2015-04-19 04:18:53 +00:00
Afterburner_charge = GrantedItems.has_afterburner() ? F1_0 : 0;
Move Controls ubyte values into substructure
2013-11-26 22:46:48 +00:00
Controls.state.afterburner = 0;
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
Last_afterburner_state = 0;
Wrap object signature in subtype
2015-03-22 18:49:21 +00:00
Missile_viewer = nullptr; //reset missile camera if out there
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Unify AI cloak setup - Initialize AI cloak data in D1, too. - Initialize reactor's idea of player position from init_ai_for_ship
2017-07-08 18:17:49 +00:00
init_ai_for_ship();
initial import
2006-03-20 17:12:09 +00:00
}
Recharge omega cannon on entering new level
2016-11-26 22:51:49 +00:00
digi_kill_sound_linked_to_object(plrobj);
Make init_player_stats_ship static
2019-07-07 22:00:02 +00:00
init_player_stats_ship(plrobj, GameTime64);
Recharge omega cannon on entering new level
2016-11-26 22:51:49 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Make init_player_stats_ship static
2019-07-07 22:00:02 +00:00
void init_player_stats_ship(object &plrobj, const fix GameTime64)
Recharge omega cannon on entering new level
2016-11-26 22:51:49 +00:00
{
auto &player_info = plrobj.ctype.player_info;
Initialize lavafall_hiss_playing for each ship
2016-12-25 00:33:24 +00:00
player_info.lavafall_hiss_playing = false;
player_info.missile_gun = 0;
Move spreadfire,helix orientation to player_info
2019-05-04 18:27:36 +00:00
player_info.Spreadfire_toggle = 0;
Recharge omega cannon on entering new level
2016-11-26 22:51:49 +00:00
player_info.killer_objnum = object_none;
#if defined(DXX_BUILD_DESCENT_II)
player_info.Omega_recharge_delay = 0;
Move spreadfire,helix orientation to player_info
2019-05-04 18:27:36 +00:00
player_info.Helix_orientation = 0;
Recharge omega cannon on entering new level
2016-11-26 22:51:49 +00:00
#endif
Move player::hostages_on_board to player_info
2016-10-15 00:53:19 +00:00
player_info.mission.hostages_on_board = 0;
Move homing_object_dist to object.ctype.player_info
2015-11-14 18:17:22 +00:00
player_info.homing_object_dist = -F1_0; // Added by RH
Recharge omega cannon on entering new level
2016-11-26 22:51:49 +00:00
player_info.Next_flare_fire_time = player_info.Next_laser_fire_time = player_info.Next_missile_fire_time = GameTime64;
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
//update various information about the player
void update_player_stats()
{
Cache player references
2017-08-13 20:38:31 +00:00
auto &plr = get_local_player();
plr.time_level += FrameTime; //the never-ending march of time...
if (plr.time_level > i2f(3600))
Use get_local_player to compute reference to local player
2015-07-25 23:10:46 +00:00
{
Cache player references
2017-08-13 20:38:31 +00:00
plr.time_level -= i2f(3600);
++ plr.hours_level;
Normalize comments and whitespace to match D1X
2013-02-21 00:20:26 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
Cache player references
2017-08-13 20:38:31 +00:00
plr.time_total += FrameTime; //the never-ending march of time...
if (plr.time_total > i2f(3600))
Use get_local_player to compute reference to local player
2015-07-25 23:10:46 +00:00
{
Cache player references
2017-08-13 20:38:31 +00:00
plr.time_total -= i2f(3600);
++ plr.hours_total;
Normalize comments and whitespace to match D1X
2013-02-21 00:20:26 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
}
//go through this level and start any eclip sounds
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
namespace dsx {
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Pass valptridx factories to static functions
2017-07-26 03:15:59 +00:00
Pass vcvertptr as context
2018-12-30 00:43:57 +00:00
static void set_sound_sources(fvcsegptridx &vcsegptridx, fvcvertptr &vcvertptr)
initial import
2006-03-20 17:12:09 +00:00
{
Move Effects to d_level_unique_effects_clip_state
2019-03-03 00:31:09 +00:00
auto &Effects = LevelUniqueEffectsClipState.Effects;
Move TmapInfo to d_level_unique_tmap_info_state
2018-12-30 00:43:59 +00:00
auto &TmapInfo = LevelUniqueTmapInfoState.TmapInfo;
initial import
2006-03-20 17:12:09 +00:00
digi_init_sounds(); //clear old sounds
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move Walls into d_level_unique_wall_state
2018-12-30 00:43:58 +00:00
auto &Walls = LevelUniqueWallSubsystemState.Walls;
auto &vcwallptr = Walls.vcptr;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Backport D2's Dont_start_sound_objects to D1 Descent 2 has a hack, present as far back as I can trace, that suppresses starting sounds during level load. The original reason was not recorded, but this hack has the useful side effect that it avoids using uninitialized data when set_sound_sources tries to use a Viewer that has not been reset for the objects of the new level. Descent 1 lacks this hack, so an invalid Viewer is used, which may trigger a valptridx trap if the undefined data has an invalid segment number, and could cause memory corruption in builds which do not validate the segment index. The valptridx trap: ``` terminate called after throwing an instance of 'valptridx<dcx::segment>::index_range_exception' what(): similar/main/digiobj.cpp:389: invalid index used in array subscript: base=(nil) size=9000 index=65021 ``` The backtrace leading to the trap: ``` d1x::digi_link_sound_common (viewer=..., so=..., pos=..., forever=<optimized out>, max_volume=<optimized out>, max_distance=..., soundnum=42, segnum=...) at similar/main/digiobj.cpp:389 0x00005555555a4e2d in d1x::digi_link_sound_to_pos2 (vcobjptr=..., max_distance=..., max_volume=32768, forever=1, pos=..., sidenum=4, segnum=..., org_soundnum=121) at similar/main/digiobj.cpp:483 d1x::digi_link_sound_to_pos (soundnum=soundnum@entry=121, segnum=..., sidenum=sidenum@entry=4, pos=..., forever=forever@entry=1, max_volume=32768) at similar/main/digiobj.cpp:490 0x00005555555c140d in d1x::set_sound_sources (vcsegptridx=..., vcvertptr=...) at similar/main/gameseq.cpp:817 d1x::LoadLevel (level_num=<optimized out>, page_in_textures=1) at similar/main/gameseq.cpp:1022 0x00005555555c2654 in d1x::StartNewLevelSub (level_num=-1, page_in_textures=<optimized out>) at similar/main/gameseq.cpp:1865 ``` Backport this hack into Descent 1. Ultimately, the hack should go away and data should be loaded in an order that does not access undefined memory. Reported-by: Spacecpp <https://github.com/dxx-rebirth/dxx-rebirth/issues/463>
2019-10-26 23:13:14 +00:00
Dont_start_sound_objects = 1;
initial import
2006-03-20 17:12:09 +00:00
Move TmapInfo to d_level_unique_tmap_info_state
2018-12-30 00:43:59 +00:00
const auto get_eclip_for_tmap = [](const d_level_unique_tmap_info_state::TmapInfo_array &TmapInfo, const unique_side &side) {
Use enum class for tmap_num2 Define separate enum values for rotation data in both the high bits, where it is usually kept, and the low bits, where it is sometimes used for math or comparisons. Define an enum value to represent the composite of the index and the rotation, since the composite is not suitable for use as an array subscript. Add helper functions to extract the component pieces.
2020-08-24 01:31:28 +00:00
if (const auto tm2 = side.tmap_num2; tm2 != texture2_value::None)
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
{
Use enum class for tmap_num2 Define separate enum values for rotation data in both the high bits, where it is usually kept, and the low bits, where it is sometimes used for math or comparisons. Define an enum value to represent the composite of the index and the rotation, since the composite is not suitable for use as an array subscript. Add helper functions to extract the component pieces.
2020-08-24 01:31:28 +00:00
const auto ec = TmapInfo[get_texture_index(tm2)].eclip_num;
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
#if defined(DXX_BUILD_DESCENT_II)
if (ec != eclip_none)
#endif
return ec;
}
#if defined(DXX_BUILD_DESCENT_I)
return eclip_none.value;
#elif defined(DXX_BUILD_DESCENT_II)
Use enum class for texture1_value
2020-09-11 03:08:02 +00:00
return TmapInfo[get_texture_index(side.tmap_num)].eclip_num;
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
#endif
};
Remove highest_valid
2016-02-12 04:02:28 +00:00
range_for (const auto &&seg, vcsegptridx)
Wrap segment iteration idiom
2014-10-12 23:10:05 +00:00
{
Make MAX_SIDES_PER_SEGMENT an iterable range Iterating over it returns each side number in turn. This allows converting many loops of the form: ``` for (int i = 0; i < MAX_SIDES_PER_SEGMENT; ++i) ``` to the compact form: ``` for (const auto i : MAX_SIDES_PER_SEGMENT) ``` The compact form brings the usual benefit of range-based for: delegating iteration to the compiler prevents the loop body from skipping a step, and makes clear in the code that this is the case.
2022-01-09 15:25:42 +00:00
for (const auto sidenum : MAX_SIDES_PER_SEGMENT)
Add range helper zip()
2019-05-04 18:27:36 +00:00
{
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
int sn;
initial import
2006-03-20 17:12:09 +00:00
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Use susegment for WALL_IS_DOORWAY
2019-12-27 02:02:23 +00:00
const auto wid = WALL_IS_DOORWAY(GameBitmaps, Textures, vcwallptr, seg, sidenum);
Use enum class for WALL_IS_DOORWAY_FLAG This reduces the size of the debug information substantially.
2020-12-19 16:13:26 +00:00
if (!(wid & WALL_IS_DOORWAY_FLAG::render))
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
continue;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
const auto ec = get_eclip_for_tmap(TmapInfo, seg->unique_segment::sides[sidenum]);
if (ec != eclip_none)
{
initial import
2006-03-20 17:12:09 +00:00
if ((sn=Effects[ec].sound_num)!=-1) {
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Avoid slicing into segnum_t local
2014-11-20 03:00:36 +00:00
auto csegnum = seg->children[sidenum];
initial import
2006-03-20 17:12:09 +00:00
//check for sound on other side of wall. Don't add on
//both walls if sound travels through wall. If sound
//does travel through wall, add sound for lower-numbered
//segment.
Use v*ptr* factories with highest_valid
2015-12-22 04:18:51 +00:00
if (IS_CHILD(csegnum) && csegnum < seg) {
Use enum class for WALL_IS_DOORWAY_FLAG This reduces the size of the debug information substantially.
2020-12-19 16:13:26 +00:00
if (wid & (WALL_IS_DOORWAY_FLAG::fly | WALL_IS_DOORWAY_FLAG::rendpast)) {
Pass vcsegptridx/vcsegptr to find_point_seg
2015-07-18 21:01:55 +00:00
const auto &&csegp = vcsegptr(seg->children[sidenum]);
Return int_fast32_t from find_connect_side
2014-09-06 04:06:18 +00:00
auto csidenum = find_connect_side(seg, csegp);
initial import
2006-03-20 17:12:09 +00:00
Move unique_side to unique_segment
2018-12-13 02:31:38 +00:00
if (csegp->unique_segment::sides[csidenum].tmap_num2 == seg->unique_segment::sides[sidenum].tmap_num2)
initial import
2006-03-20 17:12:09 +00:00
continue; //skip this one
}
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Pass vertex factory to compute_center_point_on_side
2018-03-12 03:43:47 +00:00
const auto &&pnt = compute_center_point_on_side(vcvertptr, seg, sidenum);
Use v*ptr* factories with highest_valid
2015-12-22 04:18:51 +00:00
digi_link_sound_to_pos(sn, seg, sidenum, pnt, 1, F1_0/2);
initial import
2006-03-20 17:12:09 +00:00
}
Unify D1/D2 set_sound_sources eclip lookup
2018-12-30 00:43:59 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
}
Wrap segment iteration idiom
2014-10-12 23:10:05 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
Dont_start_sound_objects = 0;
}
Pass object_base &to create_player_appearance_effect
2016-10-02 19:35:34 +00:00
constexpr fix flash_dist=fl2f(.9);
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
//create flash for player appearance
Pass Vclip as context
2018-10-21 00:24:07 +00:00
void create_player_appearance_effect(const d_vclip_array &Vclip, const object_base &player_obj)
initial import
2006-03-20 17:12:09 +00:00
{
Pass object_base &to create_player_appearance_effect
2016-10-02 19:35:34 +00:00
const auto pos = (&player_obj == Viewer)
? vm_vec_scale_add(player_obj.pos, player_obj.orient.fvec, fixmul(player_obj.size, flash_dist))
: player_obj.pos;
initial import
2006-03-20 17:12:09 +00:00
Fix player appearance sound truncation The player appearance sound was tied to the player appearance vclip, but this is wrong because the vclip has a shorter lifetime than the sound. This mistake was previously hidden by the hack that caused non-permanent sounds to be routed off to a separate queue that lost the association between object and sound. Commit 4a98e79 eliminated that hack because it complicated the work of that commit. However, without the hack, object sound effects cannot outlive their host object. Fix this by binding the sound to the position of the appearance effect, not to the appearance object. This works since the appearance effect cannot move, so there was no value to binding the sound to the object. This solution could not be used for objects that move and terminate before their associated sound effect. Reported-by: Ryusei117 <https://github.com/dxx-rebirth/dxx-rebirth/issues/88#issuecomment-390054173> Fixes: 4a98e796abb099eb4c592d9520e4edbef7a15d7e ("Prevent stacking weapon rotation sounds")
2018-07-14 17:23:15 +00:00
const auto &&seg = vmsegptridx(player_obj.segnum);
const auto &&effect_obj = object_create_explosion(seg, pos, player_obj.size, VCLIP_PLAYER_APPEARANCE);
initial import
2006-03-20 17:12:09 +00:00
if (effect_obj) {
Pass object_base &to create_player_appearance_effect
2016-10-02 19:35:34 +00:00
effect_obj->orient = player_obj.orient;
initial import
2006-03-20 17:12:09 +00:00
Fix player appearance sound truncation The player appearance sound was tied to the player appearance vclip, but this is wrong because the vclip has a shorter lifetime than the sound. This mistake was previously hidden by the hack that caused non-permanent sounds to be routed off to a separate queue that lost the association between object and sound. Commit 4a98e79 eliminated that hack because it complicated the work of that commit. However, without the hack, object sound effects cannot outlive their host object. Fix this by binding the sound to the position of the appearance effect, not to the appearance object. This works since the appearance effect cannot move, so there was no value to binding the sound to the object. This solution could not be used for objects that move and terminate before their associated sound effect. Reported-by: Ryusei117 <https://github.com/dxx-rebirth/dxx-rebirth/issues/88#issuecomment-390054173> Fixes: 4a98e796abb099eb4c592d9520e4edbef7a15d7e ("Prevent stacking weapon rotation sounds")
2018-07-14 17:23:15 +00:00
const auto sound_num = Vclip[VCLIP_PLAYER_APPEARANCE].sound_num;
if (sound_num > -1)
Change `enum sidenum_t` to `enum class sidenum_t`
2022-06-05 17:44:52 +00:00
digi_link_sound_to_pos(sound_num, seg, sidenum_t::WLEFT, effect_obj->pos, 0, F0_5);
initial import
2006-03-20 17:12:09 +00:00
}
}
Pass object_base &to create_player_appearance_effect
2016-10-02 19:35:34 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
//
// New Game sequencing functions
//
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
//get level filename. level numbers start at 1. Secret levels are -1,-2,-3
Use d_fname for DOS filenames
2014-07-23 02:27:22 +00:00
static const d_fname &get_level_file(int level_num)
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
{
if (level_num<0) //secret level
Expand macro Secret_level_names
2021-11-01 03:37:19 +00:00
return Current_mission->secret_level_names[-level_num - 1];
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
else //normal level
Expand macro Level_names
2021-11-01 03:37:19 +00:00
return Current_mission->level_names[level_num - 1];
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
}
Like in BigEndian builds do netmisc_calc_checksum() only with expected items of segment/side struct to prevent different checksums in case these structs change; Fixed several issues when building with editor; Fixed compiler warning regarding set but unused variable
2011-05-22 17:54:47 +00:00
// routine to calculate the checksum of the segments.
Enable -Wcast-qual
2015-06-13 22:42:21 +00:00
static void do_checksum_calc(const uint8_t *b, int len, unsigned int *s1, unsigned int *s2)
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
{
while(len--) {
*s1 += *b++;
if (*s1 >= 255) *s1 -= 255;
*s2 += *s1;
}
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
namespace dsx {
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Mark private functions static
2013-10-27 22:00:14 +00:00
static ushort netmisc_calc_checksum()
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
{
unsigned int sum1,sum2;
short s;
int t;
sum1 = sum2 = 0;
Use range_for to iterate segment checksum
2016-10-15 00:53:16 +00:00
range_for (auto &&segp, vcsegptr)
{
Convert `segment &` to `susegment` where possible
2019-12-22 05:34:08 +00:00
const cscusegment i = *segp;
Replace uses of enumerate with zip where appropriate In some places, enumerate was used only to get an index value because zip was not available. Switch those sites to use zip directly.
2020-07-05 23:34:33 +00:00
for (auto &&[sside, uside] : zip(i.s.sides, i.u.sides))
Convert various loops to range_for
2015-02-14 22:48:27 +00:00
{
Replace uses of enumerate with zip where appropriate In some places, enumerate was used only to get an index value because zip was not available. Switch those sites to use zip directly.
2020-07-05 23:34:33 +00:00
do_checksum_calc(reinterpret_cast<const uint8_t *>(&(sside.get_type())), 1, &sum1, &sum2);
Add convenience function underlying_value Add a helper to deduce the enum type of a value, and use an appropriate std::underlying_type<T> expression for that enum type. This avoids the need to repeat the type of the enum at the site of each cast, and moves the casts into the helper to make the callers easier to read.
2021-09-04 12:17:14 +00:00
s = INTEL_SHORT(underlying_value(sside.wall_num));
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&s), 2, &sum1, &sum2);
Add convenience function underlying_value Add a helper to deduce the enum type of a value, and use an appropriate std::underlying_type<T> expression for that enum type. This avoids the need to repeat the type of the enum at the site of each cast, and moves the casts into the helper to make the callers easier to read.
2021-09-04 12:17:14 +00:00
s = underlying_value(uside.tmap_num);
Use enum class for texture1_value
2020-09-11 03:08:02 +00:00
s = INTEL_SHORT(s);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&s), 2, &sum1, &sum2);
Add convenience function underlying_value Add a helper to deduce the enum type of a value, and use an appropriate std::underlying_type<T> expression for that enum type. This avoids the need to repeat the type of the enum at the site of each cast, and moves the casts into the helper to make the callers easier to read.
2021-09-04 12:17:14 +00:00
s = underlying_value(uside.tmap_num2);
Use enum class for tmap_num2 Define separate enum values for rotation data in both the high bits, where it is usually kept, and the low bits, where it is sometimes used for math or comparisons. Define an enum value to represent the composite of the index and the rotation, since the composite is not suitable for use as an array subscript. Add helper functions to extract the component pieces.
2020-08-24 01:31:28 +00:00
s = INTEL_SHORT(s);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&s), 2, &sum1, &sum2);
Move unique_side to unique_segment
2018-12-13 02:31:38 +00:00
range_for (auto &k, uside.uvls)
Convert various loops to range_for
2015-02-14 22:48:27 +00:00
{
Remove useless cast in gameseq.cpp
2016-07-15 03:43:03 +00:00
t = INTEL_INT(k.u);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&t), 4, &sum1, &sum2);
Remove useless cast in gameseq.cpp
2016-07-15 03:43:03 +00:00
t = INTEL_INT(k.v);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&t), 4, &sum1, &sum2);
Remove useless cast in gameseq.cpp
2016-07-15 03:43:03 +00:00
t = INTEL_INT(k.l);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&t), 4, &sum1, &sum2);
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
}
Replace uses of enumerate with zip where appropriate In some places, enumerate was used only to get an index value because zip was not available. Switch those sites to use zip directly.
2020-07-05 23:34:33 +00:00
range_for (auto &k, sside.normals)
Convert various loops to range_for
2015-02-14 22:48:27 +00:00
{
Remove useless cast in gameseq.cpp
2016-07-15 03:43:03 +00:00
t = INTEL_INT(k.x);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&t), 4, &sum1, &sum2);
Remove useless cast in gameseq.cpp
2016-07-15 03:43:03 +00:00
t = INTEL_INT(k.y);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&t), 4, &sum1, &sum2);
Remove useless cast in gameseq.cpp
2016-07-15 03:43:03 +00:00
t = INTEL_INT(k.z);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&t), 4, &sum1, &sum2);
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
}
}
Use enum for segnum_t Add checked conversions for sites which load from external integers.
2022-07-02 18:10:45 +00:00
for (const typename std::underlying_type<segnum_t>::type j : i.s.children)
Convert various loops to range_for
2015-02-14 22:48:27 +00:00
{
Use enum for segnum_t Add checked conversions for sites which load from external integers.
2022-07-02 18:10:45 +00:00
const auto s = INTEL_SHORT(j);
do_checksum_calc(reinterpret_cast<const uint8_t *>(&s), 2, &sum1, &sum2);
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
}
Use enum class for vertnum_t
2020-12-26 21:17:29 +00:00
range_for (const auto vn, i.s.verts)
Convert various loops to range_for
2015-02-14 22:48:27 +00:00
{
Add convenience function underlying_value Add a helper to deduce the enum type of a value, and use an appropriate std::underlying_type<T> expression for that enum type. This avoids the need to repeat the type of the enum at the site of each cast, and moves the casts into the helper to make the callers easier to read.
2021-09-04 12:17:14 +00:00
const auto j{underlying_value(vn)};
Use enum class for vertnum_t
2020-12-26 21:17:29 +00:00
static_assert(MAX_VERTICES <= UINT16_MAX);
s = INTEL_SHORT(static_cast<uint16_t>(j));
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&s), 2, &sum1, &sum2);
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
}
Convert `segment &` to `susegment` where possible
2019-12-22 05:34:08 +00:00
s = INTEL_SHORT(i.u.objects);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&s), 2, &sum1, &sum2);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
Use enum class for segment_special
2021-11-01 03:37:19 +00:00
const auto special = underlying_value(i.s.special);
do_checksum_calc(&special, 1, &sum1, &sum2);
Convert `segment &` to `susegment` where possible
2019-12-22 05:34:08 +00:00
do_checksum_calc(reinterpret_cast<const uint8_t *>(&i.s.matcen_num), 1, &sum1, &sum2);
t = INTEL_INT(i.u.static_light);
Rewrite simple pointer casts from C style to reinterpret_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*)\s*(/reinterpret_cast<\1>(/g
2016-06-05 01:04:26 +00:00
do_checksum_calc(reinterpret_cast<uint8_t *>(&t), 4, &sum1, &sum2);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Use enum class for station_number
2021-11-01 03:37:20 +00:00
{
const auto station_idx = underlying_value(i.s.station_idx);
do_checksum_calc(&station_idx, 1, &sum1, &sum2);
}
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
}
sum2 %= 255;
return ((sum1<<8)+ sum2);
}
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Abstracting networking protocols - Step 2: Introducing new structure to hold protocol-dependend and -independend information about Netgame and it's Players; Further isolation of the IPX code and renaming the netdrv_* code to ipxdrv_* as this is now actually IPX-only; Next up: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup
2009-03-20 12:10:38 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Uninline namespace dsx
2015-12-13 18:00:49 +00:00
namespace dsx {
Move N_polygon_models into d_level_shared_polygon_model_state
2020-08-24 01:31:28 +00:00
Add endian converter for demos, read shareware demos, various bugfixes to demo system
2009-11-15 08:22:08 +00:00
void load_level_robots(int level_num)
{
Use d_fname for DOS filenames
2014-07-23 02:27:22 +00:00
const d_fname &level_name = get_level_file(level_num);
Move N_polygon_models into d_level_shared_polygon_model_state
2020-08-24 01:31:28 +00:00
load_level_robots(level_name);
}
// load just the hxm file
void load_level_robots(const d_fname &level_name)
{
Add endian converter for demos, read shareware demos, various bugfixes to demo system
2009-11-15 08:22:08 +00:00
if (Robot_replacements_loaded) {
Move Exit_models_loaded into d_level_shared_polygon_model_state
2020-08-24 01:31:28 +00:00
free_polygon_models(LevelSharedPolygonModelState);
Add new mission type with support for HAM-by-reference If a mission starts with !name instead of name/yname/zname, then enable two new behaviors. Any other lines which start with an exclamation point are considered critical and must be recognized or the mission is rejected. This allows the addition of mandatory lines without revising the name= line every time. Also, add support for one such critical directive, which reads a HAM by reference, allowing well known HAMs to be used without being shipped every time. Syntax: !name = My extra-extended mission !ham = d2x.ham ... regular mn2 directives ...
2013-04-06 21:24:40 +00:00
load_mission_ham();
Add endian converter for demos, read shareware demos, various bugfixes to demo system
2009-11-15 08:22:08 +00:00
Robot_replacements_loaded = 0;
}
load_robot_replacements(level_name);
}
Move N_polygon_models into d_level_shared_polygon_model_state
2020-08-24 01:31:28 +00:00
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Add endian converter for demos, read shareware demos, various bugfixes to demo system
2009-11-15 08:22:08 +00:00
initial import
2006-03-20 17:12:09 +00:00
//load a level off disk. level numbers start at 1. Secret levels are -1,-2,-3
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
namespace dsx {
initial import
2006-03-20 17:12:09 +00:00
void LoadLevel(int level_num,int page_in_textures)
{
Move LevelSharedVertexState into d_level_shared_segment_state
2020-05-17 23:35:25 +00:00
auto &LevelSharedVertexState = LevelSharedSegmentState.get_vertex_state();
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
Move LevelSharedVertexState into d_level_shared_segment_state
2020-05-17 23:35:25 +00:00
auto &Vertices = LevelSharedVertexState.get_vertices();
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &vcobjptr = Objects.vcptr;
auto &vmobjptr = Objects.vmptr;
preserve_player_object_info p(vcobjptr, vcplayerptr(Player_num)->objnum);
initial import
2006-03-20 17:12:09 +00:00
Cache player references
2017-08-13 20:38:31 +00:00
auto &plr = get_local_player();
auto save_player = plr;
initial import
2006-03-20 17:12:09 +00:00
Expand macro Last_level
2021-11-01 03:37:19 +00:00
assert(level_num <= Current_mission->last_level && level_num >= Current_mission->last_secret_level && level_num != 0);
Use d_fname for DOS filenames
2014-07-23 02:27:22 +00:00
const d_fname &level_name = get_level_file(level_num);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
if (!load_level(level_name))
Current_level_num=level_num;
gr_use_palette_table( "palette.256" );
#elif defined(DXX_BUILD_DESCENT_II)
Simplify calls to gr_set_default_canvas Rather than use an inline wrapper and rely on the compiler optimizer to redirect gr_set_current_canvas(nullptr) to gr_set_default_canvas, rewrite all relevant calls directly in the source. git grep -l 'gr_set_current_canvas' | xargs sed -i -e 's:gr_set_current_canvas(\s*NULL\|nullptr\s*);:gr_set_default_canvas();:'
2017-11-05 20:49:08 +00:00
gr_set_default_canvas();
Pass canvas to gr_clear_canvas
2017-01-01 00:45:45 +00:00
gr_clear_canvas(*grd_curcanv, BM_XRGB(0, 0, 0)); //so palette switching is less obvious
initial import
2006-03-20 17:12:09 +00:00
Move N_polygon_models into d_level_shared_polygon_model_state
2020-08-24 01:31:28 +00:00
load_level_robots(level_name);
Load robot customizations before use AlexanderBorisov reported[1] a broken demo that ultimately traced to incorrect reuse of stale data. The campaign[2] includes per-level robot definitions for level 3. Descent incorrectly accessed Robot_info before reloading it for the new level, so it used the level 3 data on level 4 robots during a warm start of level 4 for regular play, but used only the level 4 data for a cold start of level 4 for regular play and for playback of a demo recorded solely on level 4. The particular customizations applied on level 3 caused a level 4 demo recorded with level 3 robot customizations to use different record lengths than a level 4 demo recorded with level 4 robot customizations. Since demos do not record their record lengths, mismatched record lengths lead to effectively corrupt demos. In this case, it manifested as writing 8 anim_angles (per model_num 108, the model incorrectly inherited from level 3) instead of 1 anim_angles (per model_num 37, used only on cold starts). The extra anim_angles were then misinterpreted as a run of 42 ND_EVENT_EOF, because the extra angles were unused and the newdemo code defines the null byte as EOF (separate from receiving an actual EOF indicator from the file I/O library). That run of spurious EOF caused the demo playback code to refuse to play past the spurious EOF, resulting in a seemingly broken demo. As an unfortunate, but unavoidable, consequence, this change modifies the common path (warm playthrough of every level in the campaign) to work like the uncommon path (cold start of each level). Further, the affected robot triggers a trap in d2x::do_silly_animation[3] when using the correct model_num, because that polygon model has too few models for the joints used by the robot. When using the incorrect level 3 data, the robot animates without trapping. [1] https://forum.dxx-rebirth.com/showthread.php?tid=1023 [2] http://www.enspiar.com/dmdb/viewMission.php?id=212 ``` sha1sum ENTROPY.HOG ENTROPY.MN2 7bc7a12d00a1ddd3ae92ce90eb67d581ecab004a ENTROPY.HOG f2688a634f22b30a02c43d8fa1a049deb5a03f70 ENTROPY.MN2 stat -c '%s %Y %n' ENTROPY.HOG ENTROPY.MN2 2402638 875757712 ENTROPY.HOG 511 875757164 ENTROPY.MN2 ``` [3] ``` 799 if (jointnum >= Polygon_models[objp.rtype.pobj_info.model_num].n_models) { 800 Int3(); // Contact Mike: incompatible data, illegal jointnum, problem in pof file? 801 continue; 802 } ```
2017-12-31 21:11:25 +00:00
Move Dl_indices into d_level_shared_destructible_light_state
2018-12-30 00:43:58 +00:00
auto &LevelSharedDestructibleLightState = LevelSharedSegmentState.DestructibleLights;
Move Delta_lights into d_level_shared_destructible_light_state
2018-12-30 00:43:58 +00:00
int load_ret = load_level(LevelSharedDestructibleLightState, level_name); //actually load the data from disk!
initial import
2006-03-20 17:12:09 +00:00
if (load_ret)
Change all occurrences of "Couldn't" to "Could not" for consistency ("Could not" is more common and wins). Not touching TXT_COULDNT because it's stored separately in hog file.
2016-11-13 05:27:18 +00:00
Error("Could not load level file <%s>, error = %d",static_cast<const char *>(level_name),load_ret);
initial import
2006-03-20 17:12:09 +00:00
Current_level_num=level_num;
Pass std::span to load_palette
2022-09-24 17:47:52 +00:00
load_palette(Current_level_palette.line(), 1, 1); //don't change screen
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
When switching to the editor in a game, use a proper saved game This preserves virtually all game information, including active fire. The saved game 'gamesave.sge' can also be loaded with File->Restore Game State. The level can still be saved as usual (but it warns the user if there's an unsaved game state). This functionality may be useful for testing (or cheating! ;) )
2016-11-15 08:18:56 +00:00
#if DXX_USE_EDITOR
if (!EditorWindow)
#endif
Propagate up show_boxed_message RenderFlag It is always constant. Explicitly propagate its effects into callers, then remove the argument.
2021-09-12 16:20:52 +00:00
{
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
gr_set_default_canvas();
show_boxed_message(*grd_curcanv, TXT_LOADING);
Propagate up show_boxed_message RenderFlag It is always constant. Explicitly propagate its effects into callers, then remove the argument.
2021-09-12 16:20:52 +00:00
gr_flip();
}
When starting, leaving or changing a level in any way, use more ordered approach to set Game_wind visible or invisible. Fixing timer-issues after level-change and makes hiding of Game_wind obsolete for certain messageboxes; Moved GameTime and weapon timer variables out of reset_time since this function is not appropriate for this and is not needed between levels anymore due to window management handling start/stop_time properly
2010-06-27 11:28:26 +00:00
#ifdef RELEASE
timer_delay(F1_0);
#endif
Simplification of palette code; Properly screen clearing in SDL-only build when palette changes; Removed obsolete functions like gr_update (replaced by gr_flip), gr_palette_fade_in/out, gr_palette_clear; Added functionality to render Automap while menu display as well; Improved blocking of some controls code while Automap active; Fixed some compiler warnings
2008-03-20 23:23:46 +00:00
initial import
2006-03-20 17:12:09 +00:00
load_endlevel_data(level_num);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
load_custom_data(level_name);
#elif defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
if (EMULATING_D1)
load_d1_bitmap_replacements();
else
load_bitmap_replacements(level_name);
if ( page_in_textures )
piggy_load_level_data();
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Like in BigEndian builds do netmisc_calc_checksum() only with expected items of segment/side struct to prevent different checksums in case these structs change; Fixed several issues when building with editor; Fixed compiler warning regarding set but unused variable
2011-05-22 17:54:47 +00:00
my_segments_checksum = netmisc_calc_checksum();
initial import
2006-03-20 17:12:09 +00:00
reset_network_objects();
Cache player references
2017-08-13 20:38:31 +00:00
plr = save_player;
initial import
2006-03-20 17:12:09 +00:00
Move Vertices out of global scope
2018-12-30 00:43:57 +00:00
auto &vcvertptr = Vertices.vcptr;
Pass vcvertptr as context
2018-12-30 00:43:57 +00:00
set_sound_sources(vcsegptridx, vcvertptr);
initial import
2006-03-20 17:12:09 +00:00
When switching to the editor in a game, use a proper saved game This preserves virtually all game information, including active fire. The saved game 'gamesave.sge' can also be loaded with File->Restore Game State. The level can still be saved as usual (but it warns the user if there's an unsaved game state). This functionality may be useful for testing (or cheating! ;) )
2016-11-15 08:18:56 +00:00
#if DXX_USE_EDITOR
if (!EditorWindow)
#endif
songs_play_level_song( Current_level_num, 0 );
initial import
2006-03-20 17:12:09 +00:00
gr_palette_load(gr_palette); //actually load the palette
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
if ( page_in_textures )
piggy_load_level_data();
#endif
Move gameseq_init_network_players call into LoadLevel gameseq_init_network_players updates the Players array after loading a level. This should always be done, since players may change their object number across levels. Move the call into LoadLevel since some callers failed to do it.
2016-03-19 19:08:10 +00:00
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
gameseq_init_network_players(LevelSharedRobotInfoState.Robot_info, Objects);
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
p.restore(vmobjptr);
initial import
2006-03-20 17:12:09 +00:00
}
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
//sets up Player_num & ConsoleObject
void InitPlayerObject()
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
Use typedef for player number
2014-09-21 22:10:12 +00:00
Assert(Player_num<MAX_PLAYERS);
initial import
2006-03-20 17:12:09 +00:00
if (Player_num != 0 ) {
Cache player references
2017-08-13 20:38:31 +00:00
Players[0u] = get_local_player();
initial import
2006-03-20 17:12:09 +00:00
Player_num = 0;
}
Cache player references
2017-08-13 20:38:31 +00:00
auto &plr = get_local_player();
plr.objnum = object_first;
const auto &&console = vmobjptr(plr.objnum);
Use valptr for gameseq.cpp
2015-07-12 01:04:20 +00:00
ConsoleObject = console;
console->type = OBJ_PLAYER;
set_player_id(console, Player_num);
Rename object::control_type to control_source gcc and clang disagree about how to disambiguate when an identifier is both a typename and a member. Avoid the disagreement by renaming the member. Reported-by: Kreeblah <https://github.com/dxx-rebirth/dxx-rebirth/issues/532>
2020-08-10 03:45:13 +00:00
console->control_source = object::control_type::flying;
Rename object::movement_type to movement_source gcc and clang disagree about how to disambiguate when an identifier is both a typename and a member. Avoid the disagreement by renaming the member.
2020-08-10 03:45:13 +00:00
console->movement_source = object::movement_type::physics;
initial import
2006-03-20 17:12:09 +00:00
}
//starts a new game on the given level
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
namespace dsx {
Reset definedness of per-game globals on new game
2019-06-27 03:26:20 +00:00
void StartNewGame(const int start_level)
initial import
2006-03-20 17:12:09 +00:00
{
Use enumerated constant for save slot indexes
2020-04-26 17:26:23 +00:00
GameUniqueState.quicksave_selection = d_game_unique_state::save_slot::None; // for first blind save, pick slot to save in
Reset definedness of per-game globals on new game
2019-06-27 03:26:20 +00:00
reset_globals_for_new_game();
Put fast save back, using Alt-F1 instead of F6
2010-02-25 03:08:10 +00:00
initial import
2006-03-20 17:12:09 +00:00
Game_mode = GM_NORMAL;
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
initial import
2006-03-20 17:12:09 +00:00
InitPlayerObject(); //make sure player's object set up
Move player::num_robots_level to d_level_unique_object_state The number of robots accumulated on a level is a function of the level, not any particular player. Move it to d_level_unique_object_state and rename it to accumulated_robots.
2019-07-16 04:00:50 +00:00
LevelUniqueObjectState.accumulated_robots = 0;
Move player::hostages_level to d_level_unique_object_state The number of hostages on a level is a function of the level, not any particular player. Move it to d_level_unique_object_state and rename it to total_hostages.
2019-07-16 04:00:50 +00:00
LevelUniqueObjectState.total_hostages = 0;
Move player::num_robots_total to d_game_unique_state The number of robots accumulated in a game is a function of the the game's levels, not any particular player. Move it to d_game_unique_state and rename it to accumulated_robots.
2019-07-16 04:00:50 +00:00
GameUniqueState.accumulated_robots = 0;
Move player::hostages_total to d_game_unique_state The number of hostages in a game is a function of the the game's levels, not any particular player. Move it to d_game_unique_state and rename it to total_hostages.
2019-07-16 04:00:50 +00:00
GameUniqueState.total_hostages = 0;
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
init_player_stats_game(Player_num); //clear all stats
initial import
2006-03-20 17:12:09 +00:00
N_players = 1;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
if (start_level < 0)
Add experimental support for autosaves Set autosave interval to 10 minutes, unless specified in the player's configuration file. Players can change the autosave to 0 minutes to disable it.
2020-04-19 20:47:07 +00:00
{
/* Allow an autosave as soon as the user exits the secret level.
*/
state_set_immediate_autosave(GameUniqueState);
initial import
2006-03-20 17:12:09 +00:00
StartNewLevelSecret(start_level, 0);
Add experimental support for autosaves Set autosave interval to 10 minutes, unless specified in the player's configuration file. Players can change the autosave to 0 minutes to disable it.
2020-04-19 20:47:07 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
else
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Add experimental support for autosaves Set autosave interval to 10 minutes, unless specified in the player's configuration file. Players can change the autosave to 0 minutes to disable it.
2020-04-19 20:47:07 +00:00
{
Remove unused StartNewLevel parameter 'secret_flag'
2013-03-23 20:50:35 +00:00
StartNewLevel(start_level);
Add experimental support for autosaves Set autosave interval to 10 minutes, unless specified in the player's configuration file. Players can change the autosave to 0 minutes to disable it.
2020-04-19 20:47:07 +00:00
/* Override Next_autosave to avoid creating an autosave
* immediately after starting a new game. No state can be lost
* at that point, so there is no reason to save.
*/
state_set_next_autosave(GameUniqueState, PlayerCfg.SPGameplayOptions.AutosaveInterval);
}
initial import
2006-03-20 17:12:09 +00:00
Set player name in Players[] at single-player game start Single player games relied on the quirk that the pilot's name was always kept in Players[], even outside a game. Commit 0c7de1051210 removed that quirk, which had the unintended consequence that single player games are now played by the anonymous pilot. Set the player's callsign during game setup so that the high score entry can be attributed correctly. Fixes: 0c7de10512101ee70ae3acae30e8a5d469565489 ("Track chosen pilot name outside Players[]") Reported-by: Neurochild247 <https://github.com/dxx-rebirth/dxx-rebirth/issues/443> Bisected-by: zicodxx <https://github.com/dxx-rebirth/dxx-rebirth/issues/443#issuecomment-523827234>
2019-08-25 17:53:57 +00:00
auto &plr = get_local_player();
plr.starting_level = start_level; // Mark where they started
plr.callsign = InterfaceUniqueState.PilotName;
initial import
2006-03-20 17:12:09 +00:00
game_disable_cheats();
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
init_seismic_disturbances();
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
initial import
2006-03-20 17:12:09 +00:00
// -----------------------------------------------------------------------------
// Does the bonus scoring.
// Call with dead_flag = 1 if player died, but deserves some portion of bonus (only skill points), anyway.
Propagate DoEndLevelScoreGlitz argument network All callers pass 0. Remove the argument and update the logic that tested it.
2016-10-15 00:53:14 +00:00
static void DoEndLevelScoreGlitz()
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
initial import
2006-03-20 17:12:09 +00:00
int level_points, skill_points, energy_points, shield_points, hostage_points;
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
#define N_GLITZITEMS 9
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
char m_str[N_GLITZITEMS][32];
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
newmenu_item m[N_GLITZITEMS];
Push partial_range construction to newmenu callers In some cases, callers know the length of the range and can apply better checks than the called code.
2020-09-11 03:08:02 +00:00
int i;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
gr_palette_load( gr_palette );
#elif defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
int mine_level;
// Compute level player is on, deal with secret levels (negative numbers)
Use get_local_player to compute reference to local player
2015-07-25 23:10:46 +00:00
mine_level = get_local_player().level;
initial import
2006-03-20 17:12:09 +00:00
if (mine_level < 0)
Expand macro Last_level
2021-11-01 03:37:19 +00:00
mine_level *= -(Current_mission->last_level / Current_mission->n_secret_levels);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Cache player object in DoEndLevelScoreGlitz
2016-10-28 03:39:42 +00:00
auto &plrobj = get_local_plrobj();
auto &player_info = plrobj.ctype.player_info;
Move player::last_score to player_info
2016-10-15 00:53:19 +00:00
level_points = player_info.mission.score - player_info.mission.last_score;
initial import
2006-03-20 17:12:09 +00:00
Move Difficulty_level to GameUniqueState
2019-06-27 03:26:20 +00:00
const auto Difficulty_level = GameUniqueState.Difficulty_level;
Moved all these unsorted global cheat variables to a handy structure; Simplified reading of the cheats without trying to make it complicated so no one finds them (everyone can get the source); Removed one or two cheats which carry more garbage than they are worth; Added replacement for the bittersweet cheat; Made FPS Counter an option of Graphics menu
2011-02-14 21:27:07 +00:00
if (!cheats.enabled) {
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
const auto d = underlying_value(Difficulty_level);
switch (Difficulty_level)
{
default:
case Difficulty_level_type::_0:
case Difficulty_level_type::_1:
skill_points = 0;
break;
case Difficulty_level_type::_2:
case Difficulty_level_type::_3:
case Difficulty_level_type::_4:
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
skill_points = level_points * (d - 1) / 2;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#elif defined(DXX_BUILD_DESCENT_II)
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
skill_points = level_points * d / 4;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
skill_points -= skill_points % 100;
break;
}
initial import
2006-03-20 17:12:09 +00:00
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
hostage_points = player_info.mission.hostages_on_board * 500 * (d + 1);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
shield_points = f2i(plrobj.shields) * 10 * (d + 1);
energy_points = f2i(player_info.energy) * 5 * (d + 1);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#elif defined(DXX_BUILD_DESCENT_II)
Cache player object in DoEndLevelScoreGlitz
2016-10-28 03:39:42 +00:00
shield_points = f2i(plrobj.shields) * 5 * mine_level;
Expand get_local_player_energy 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-09-11 18:49:13 +00:00
energy_points = f2i(player_info.energy) * 2 * mine_level;
initial import
2006-03-20 17:12:09 +00:00
shield_points -= shield_points % 50;
energy_points -= energy_points % 50;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
} else {
skill_points = 0;
shield_points = 0;
energy_points = 0;
hostage_points = 0;
}
Cache player references
2017-08-13 20:38:31 +00:00
auto &plr = get_local_player();
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
Push partial_range construction to newmenu callers In some cases, callers know the length of the range and can apply better checks than the called code.
2020-09-11 03:08:02 +00:00
unsigned c = 0;
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
snprintf(m_str[c++], sizeof(m_str[0]), "%s%i", TXT_SHIELD_BONUS, shield_points); // Return at start to lower menu...
snprintf(m_str[c++], sizeof(m_str[0]), "%s%i", TXT_ENERGY_BONUS, energy_points);
snprintf(m_str[c++], sizeof(m_str[0]), "%s%i", TXT_HOSTAGE_BONUS, hostage_points);
snprintf(m_str[c++], sizeof(m_str[0]), "%s%i", TXT_SKILL_BONUS, skill_points);
const unsigned hostages_on_board = player_info.mission.hostages_on_board;
unsigned all_hostage_points = 0;
unsigned endgame_points = 0;
uint8_t is_last_level = 0;
auto &hostage_text = m_str[c++];
if (cheats.enabled)
snprintf(hostage_text, sizeof(hostage_text), "Hostages saved: \t%u", hostages_on_board);
Ignore excess hostages during scoring Descent 2 secret levels allow a player to rescue hostages that are not counted in `total_hostages`, so a player can exit with more hostages saved than were in the mine. Change the scoring logic not to penalize a player for saving these unaccounted hostages.
2022-08-22 01:24:49 +00:00
else if (LevelUniqueObjectState.total_hostages > hostages_on_board)
{
const auto hostages_lost = LevelUniqueObjectState.total_hostages - hostages_on_board;
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
snprintf(hostage_text, sizeof(hostage_text), "Hostages lost: \t%u", hostages_lost);
Ignore excess hostages during scoring Descent 2 secret levels allow a player to rescue hostages that are not counted in `total_hostages`, so a player can exit with more hostages saved than were in the mine. Change the scoring logic not to penalize a player for saving these unaccounted hostages.
2022-08-22 01:24:49 +00:00
}
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
else
Cache player references
2017-08-13 20:38:31 +00:00
{
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
all_hostage_points = hostages_on_board * 1000 * (underlying_value(Difficulty_level) + 1);
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
snprintf(hostage_text, sizeof(hostage_text), "%s%i\n", TXT_FULL_RESCUE_BONUS, all_hostage_points);
}
initial import
2006-03-20 17:12:09 +00:00
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
auto &endgame_text = m_str[c++];
endgame_text[0] = 0;
if (cheats.enabled)
{
/* Nothing */
}
Expand macro Last_level
2021-11-01 03:37:19 +00:00
else if (!(Game_mode & GM_MULTI) && plr.lives && Current_level_num == Current_mission->last_level)
Cache player references
2017-08-13 20:38:31 +00:00
{ //player has finished the game!
endgame_points = plr.lives * 10000;
Remove sprintf from gameseq.cpp
2016-01-03 20:21:36 +00:00
snprintf(endgame_text, sizeof(endgame_text), "%s%i\n", TXT_SHIP_BONUS, endgame_points);
initial import
2006-03-20 17:12:09 +00:00
is_last_level=1;
Enable -Wformat-truncation Add macro cf_assert ("control flow" assert) to hint to gcc that certain conditions are impossible. Use it to avoid generating range checks for situations that never happen. If the event did happen, the only consequence would be truncated UI text, rather than a correctness problem.
2018-08-26 18:10:36 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
Pass Game_mode as a parameter to gauges functions Avoid reloading it from the global.
2021-09-12 16:20:52 +00:00
add_bonus_points_to_score(player_info, skill_points + energy_points + shield_points + hostage_points + all_hostage_points + endgame_points, Game_mode);
initial import
2006-03-20 17:12:09 +00:00
Remove sprintf from gameseq.cpp
2016-01-03 20:21:36 +00:00
snprintf(m_str[c++], sizeof(m_str[0]), "%s%i\n", TXT_TOTAL_BONUS, shield_points + energy_points + hostage_points + skill_points + all_hostage_points + endgame_points);
Move player::score to player_info
2016-10-15 00:53:19 +00:00
snprintf(m_str[c++], sizeof(m_str[0]), "%s%i", TXT_TOTAL_SCORE, player_info.mission.score);
initial import
2006-03-20 17:12:09 +00:00
for (i=0; i<c; i++) {
Add helper nm_item_text
2015-01-18 01:58:31 +00:00
nm_set_item_text(m[i], m_str[i]);
initial import
2006-03-20 17:12:09 +00:00
}
Combine secret/non-secret level glitz
2014-12-18 04:12:39 +00:00
auto current_level_num = Current_level_num;
const auto txt_level = (current_level_num < 0) ? (current_level_num = -current_level_num, TXT_SECRET_LEVEL) : TXT_LEVEL;
Add type-specific tag wrappers for newmenu calls Make the compiler check that title, subtitle, and filename are passed in the right places.
2020-12-19 16:13:26 +00:00
char subtitle[128];
snprintf(subtitle, sizeof(subtitle), "%s%s %d %s\n%s %s", is_last_level?"\n\n\n":"\n", txt_level, current_level_num, TXT_COMPLETE, static_cast<const char *>(Current_level_name), TXT_DESTROYED);
initial import
2006-03-20 17:12:09 +00:00
Assert(c <= N_GLITZITEMS);
Convert glitz menu to inherit from newmenu Add a static method to block until the menu closes, so that the glitz menu can continue to block its caller.
2020-12-27 22:03:09 +00:00
struct glitz_menu : passive_newmenu
{
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
glitz_menu(grs_canvas &canvas, menu_subtitle subtitle, partial_range_t<newmenu_item *> items) :
passive_newmenu(menu_title{nullptr}, subtitle, menu_filename{GLITZ_BACKGROUND}, tiny_mode_flag::normal, tab_processing_flag::ignore, adjusted_citem::create(items, 0), canvas, draw_box_flag::none)
Convert glitz menu to inherit from newmenu Add a static method to block until the menu closes, so that the glitz menu can continue to block its caller.
2020-12-27 22:03:09 +00:00
{
}
};
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
run_blocking_newmenu<glitz_menu>(*grd_curcanv, menu_subtitle{subtitle}, partial_range(m, c));
initial import
2006-03-20 17:12:09 +00:00
}
Push partial_range construction to newmenu callers In some cases, callers know the length of the range and can apply better checks than the called code.
2020-09-11 03:08:02 +00:00
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
initial import
2006-03-20 17:12:09 +00:00
// -----------------------------------------------------------------------------------------------------
//called when the player is starting a level (new game or new ship)
Mark private functions static
2013-10-27 22:00:14 +00:00
static void StartSecretLevel()
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptridx = Objects.vmptridx;
Use enum class for Player_dead_state (formerly Player_is_dead)
2015-12-15 04:09:35 +00:00
Assert(Player_dead_state == player_dead_state::no);
initial import
2006-03-20 17:12:09 +00:00
Pass valptridx factories to static functions
2017-07-26 03:15:59 +00:00
InitPlayerPosition(vmobjptridx, vmsegptridx, 0);
initial import
2006-03-20 17:12:09 +00:00
verify_console_object();
Rename object::control_type to control_source gcc and clang disagree about how to disambiguate when an identifier is both a typename and a member. Avoid the disagreement by renaming the member. Reported-by: Kreeblah <https://github.com/dxx-rebirth/dxx-rebirth/issues/532>
2020-08-10 03:45:13 +00:00
ConsoleObject->control_source = object::control_type::flying;
Rename object::movement_type to movement_source gcc and clang disagree about how to disambiguate when an identifier is both a typename and a member. Avoid the disagreement by renaming the member.
2020-08-10 03:45:13 +00:00
ConsoleObject->movement_source = object::movement_type::physics;
initial import
2006-03-20 17:12:09 +00:00
// -- WHY? -- disable_matcens();
clear_transient_objects(0); //0 means leave proximity bombs
// create_player_appearance_effect(ConsoleObject);
Do_appearance_effect = 1;
ai_reset_all_paths();
// -- NO? -- reset_time();
reset_rear_view();
Move Fusion_charge to player_info This eliminates some ugly hacks regarding remotely generated fusion shots.
2016-12-10 17:51:09 +00:00
auto &player_info = ConsoleObject->ctype.player_info;
Move Auto_fire_fusion_cannon_time to player_info
2016-12-10 17:51:09 +00:00
player_info.Auto_fire_fusion_cannon_time = 0;
Move Fusion_charge to player_info This eliminates some ugly hacks regarding remotely generated fusion shots.
2016-12-10 17:51:09 +00:00
player_info.Fusion_charge = 0;
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
// Returns true if secret level has been destroyed.
int p_secret_level_destroyed(void)
{
if (First_secret_visit) {
return 0; // Never been there, can't have been destroyed.
} else {
Got rid of cfile code: Renamed cfile-functions to use PHYSFSX-naming convention, Replaced cfile-macros with proper PHYSFS(X) calls; Introduced PHYSFSX_exists() which can check case-sensitive or case-insensitive to give more flexibility with game content
2011-06-01 07:59:55 +00:00
if (PHYSFSX_exists(SECRETC_FILENAME,0))
initial import
2006-03-20 17:12:09 +00:00
{
return 0;
} else {
return 1;
}
}
}
// -----------------------------------------------------------------------------------------------------
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
#define TXT_SECRET_RETURN "Returning to level %i", Entered_from_level
#define TXT_SECRET_ADVANCE "Base level destroyed.\nAdvancing to level %i", Entered_from_level+1
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
namespace {
Use do_screen_message instead of do_screen_message_fmt where possible
2013-12-08 23:37:40 +00:00
static void do_screen_message(const char *msg) __attribute_nonnull();
static void do_screen_message(const char *msg)
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
{
if (Game_mode & GM_MULTI)
return;
Make do_screen_message menu inherit from newmenu
2020-12-27 22:03:09 +00:00
using items_type = std::array<newmenu_item, 1>;
struct glitz_menu : items_type, passive_newmenu
{
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
glitz_menu(grs_canvas &canvas, menu_subtitle subtitle) :
Make do_screen_message menu inherit from newmenu
2020-12-27 22:03:09 +00:00
items_type{{
Construct nm_item_menu in place
2021-06-28 03:37:49 +00:00
newmenu_item::nm_item_menu{TXT_OK},
Make do_screen_message menu inherit from newmenu
2020-12-27 22:03:09 +00:00
}},
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
passive_newmenu(menu_title{nullptr}, subtitle, menu_filename{GLITZ_BACKGROUND}, tiny_mode_flag::normal, tab_processing_flag::ignore, adjusted_citem::create(*static_cast<items_type *>(this), 0), canvas, draw_box_flag::menu_background)
Make do_screen_message menu inherit from newmenu
2020-12-27 22:03:09 +00:00
{
}
};
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
run_blocking_newmenu<glitz_menu>(*grd_curcanv, menu_subtitle{msg});
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Uninline namespace dsx
2015-12-13 18:00:49 +00:00
namespace dsx {
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Use do_screen_message instead of do_screen_message_fmt where possible
2013-12-08 23:37:40 +00:00
static void do_screen_message_fmt(const char *fmt, ...) __attribute_format_printf(1, 2);
static void do_screen_message_fmt(const char *fmt, ...)
{
va_list arglist;
char msg[1024];
va_start(arglist, fmt);
vsnprintf(msg, sizeof(msg), fmt, arglist);
va_end(arglist);
do_screen_message(msg);
}
#define do_screen_message(F,...) dxx_call_printf_checked(do_screen_message_fmt,do_screen_message,(),F,##__VA_ARGS__)
initial import
2006-03-20 17:12:09 +00:00
// -----------------------------------------------------------------------------------------------------
// called when the player is starting a new level for normal game mode and restore state
// Need to deal with whether this is the first time coming to this level or not. If not the
// first time, instead of initializing various things, need to do a game restore for all the
// robots, powerups, walls, doors, etc.
Mark various functions static
2013-09-22 22:26:27 +00:00
static void StartNewLevelSecret(int level_num, int page_in_textures)
initial import
2006-03-20 17:12:09 +00:00
{
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
auto &LevelUniqueControlCenterState = LevelUniqueObjectState.ControlCenterState;
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
initial import
2006-03-20 17:12:09 +00:00
Use enum class for cockpit_mode_t
2022-02-12 18:57:12 +00:00
last_drawn_cockpit = cockpit_mode_t{UINT8_MAX};
initial import
2006-03-20 17:12:09 +00:00
if (Newdemo_state == ND_STATE_PAUSED)
Newdemo_state = ND_STATE_RECORDING;
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
initial import
2006-03-20 17:12:09 +00:00
if (Newdemo_state == ND_STATE_RECORDING) {
newdemo_set_new_level(level_num);
Giving credits function ability to use custom creditfile (again); Made laser-offset for laser exclusive so Prox mines won't go tru doors; Preventing cycling tru cockpit modes while dead, but allowing to load a state; Implemented D2X' lighting code to D1X (faster, better, sexier - weeee); Try to hop over some errors regarding walls/doors in levels instead of using -1 indexes for arrays; Made the briefing text ptr a bit more failsafe in case the file is corrupt/non-standard; Made scores use the menu screen even in GAME OVER; Fixed bug in neighbour fields of Weapon Keys table; Added the Weapon Keys stuff to TABLE_CREATION; Fixed bug where D2X did not recall applied resolution in the resolutions menu; Simpler check to create DEMO_DIR; Seperated X/Y sensitivity for mouse and joystick; Flush controls when Automap toggles so keypress won't deactivate it again; Made FrameCount in Demos aligned to the Dropframe condition; Added KEy to ttoggle playback text off; Gracefully exit demo code if demo is corrupt; Removed that new percent counter because many old demos seem to have corrupted last frames; Closing endlevel data file if IFF error so the mission still can be freed; Fixed Cruising for keyboard which was not aligned to FPS correctly; Used mouse delta scaling in kconfig.c instead of mouse.c to not screw up when delta is requested in non-ingame situations - it actually belongs to the controls IMHO; Now support up to 8 joysticks; Changed some leftover malloc's to d_malloc and free to d_free
2008-10-16 17:27:02 +00:00
newdemo_record_start_frame(FrameTime );
initial import
2006-03-20 17:12:09 +00:00
} else if (Newdemo_state != ND_STATE_PLAYBACK) {
set_screen_mode(SCREEN_MENU);
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
initial import
2006-03-20 17:12:09 +00:00
if (First_secret_visit) {
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_EXIT);
initial import
2006-03-20 17:12:09 +00:00
} else {
Got rid of cfile code: Renamed cfile-functions to use PHYSFSX-naming convention, Replaced cfile-macros with proper PHYSFS(X) calls; Introduced PHYSFSX_exists() which can check case-sensitive or case-insensitive to give more flexibility with game content
2011-06-01 07:59:55 +00:00
if (PHYSFSX_exists(SECRETC_FILENAME,0))
initial import
2006-03-20 17:12:09 +00:00
{
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_EXIT);
initial import
2006-03-20 17:12:09 +00:00
} else {
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message("Secret level already destroyed.\nAdvancing to level %i.", Current_level_num+1);
initial import
2006-03-20 17:12:09 +00:00
}
}
}
LoadLevel(level_num,page_in_textures);
Fixed set but unused variables
2011-09-26 23:31:19 +00:00
Assert(Current_level_num == level_num); // make sure level set right
initial import
2006-03-20 17:12:09 +00:00
HUD_clear_messages();
Pass LevelUniqueAutomapState to automap_clear_visited
2020-08-28 00:18:45 +00:00
automap_clear_visited(LevelUniqueAutomapState);
initial import
2006-03-20 17:12:09 +00:00
Use get_local_plrobj to compute reference to object of local player
2015-07-25 23:10:45 +00:00
Viewer = &get_local_plrobj();
initial import
2006-03-20 17:12:09 +00:00
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
gameseq_remove_unused_players(LevelSharedRobotInfoState.Robot_info);
initial import
2006-03-20 17:12:09 +00:00
Game_suspended = 0;
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
LevelUniqueControlCenterState.Control_center_destroyed = 0;
initial import
2006-03-20 17:12:09 +00:00
init_cockpit();
reset_palette_add();
if (First_secret_visit || (Newdemo_state == ND_STATE_PLAYBACK)) {
init_robots_for_level();
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
init_ai_objects(LevelSharedRobotInfoState.Robot_info);
initial import
2006-03-20 17:12:09 +00:00
init_smega_detonates();
init_morphs();
init_all_matcens();
reset_special_effects();
StartSecretLevel();
} else {
Got rid of cfile code: Renamed cfile-functions to use PHYSFSX-naming convention, Replaced cfile-macros with proper PHYSFS(X) calls; Introduced PHYSFSX_exists() which can check case-sensitive or case-insensitive to give more flexibility with game content
2011-06-01 07:59:55 +00:00
if (PHYSFSX_exists(SECRETC_FILENAME,0))
initial import
2006-03-20 17:12:09 +00:00
{
Move Secondary_weapon to player_info
2016-08-28 22:41:48 +00:00
auto &player_info = get_local_plrobj().ctype.player_info;
Move Primary_weapon to player_info
2016-08-28 22:41:49 +00:00
const auto pw_save = player_info.Primary_weapon;
Move Secondary_weapon to player_info
2016-08-28 22:41:48 +00:00
const auto sw_save = player_info.Secondary_weapon;
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
state_restore_all(1, secret_restore::survived, SECRETC_FILENAME, blind_save::no);
Move Primary_weapon to player_info
2016-08-28 22:41:49 +00:00
player_info.Primary_weapon = pw_save;
Move Secondary_weapon to player_info
2016-08-28 22:41:48 +00:00
player_info.Secondary_weapon = sw_save;
initial import
2006-03-20 17:12:09 +00:00
reset_special_effects();
StartSecretLevel();
// -- No: This is only for returning to base level: set_pos_from_return_segment();
} else {
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message("Secret level already destroyed.\nAdvancing to level %i.", Current_level_num+1);
initial import
2006-03-20 17:12:09 +00:00
return;
}
}
if (First_secret_visit) {
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
copy_defaults_to_robot_all(LevelSharedRobotInfoState.Robot_info);
initial import
2006-03-20 17:12:09 +00:00
}
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
init_controlcen_for_level(LevelSharedRobotInfoState.Robot_info);
initial import
2006-03-20 17:12:09 +00:00
Fixed set but unused variables
2011-09-26 23:31:19 +00:00
// Say player can use FLASH cheat to mark path to exit.
Move Last_level_path_created to LevelUniqueObjectState.Level_path_created Change it from the level number on which the path was created to a true/false flag. The previous logic only tested whether the number was equal to the current level number. This also fixes a bug where the action was not available on the first secret level, since that level is `-1`, and the value was set to `-1` to indicate that it should be enabled.
2021-11-01 03:37:19 +00:00
LevelUniqueObjectState.Level_path_created = 0;
initial import
2006-03-20 17:12:09 +00:00
First_secret_visit = 0;
}
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
static int Entered_from_level;
initial import
2006-03-20 17:12:09 +00:00
Pass Powerup_info to multi_prep_level_objects, filter_objects_from_level
2021-09-19 10:53:48 +00:00
static void filter_objects_from_level(const d_powerup_info_array &Powerup_info, const d_vclip_array &Vclip, fvmobjptr &vmobjptr)
{
for (const auto &&objp : vmobjptr)
{
object_base &obj = *objp;
if (obj.type == OBJ_POWERUP)
{
const auto powerup_id = get_powerup_id(obj);
if (powerup_id == POW_FLAG_RED || powerup_id == POW_FLAG_BLUE)
bash_to_shield(Powerup_info, Vclip, obj);
}
}
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
// ---------------------------------------------------------------------------------------------------------------
// Called from switch.c when player is on a secret level and hits exit to return to base level.
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
window_event_result ExitSecretLevel()
initial import
2006-03-20 17:12:09 +00:00
{
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
auto &LevelUniqueControlCenterState = LevelUniqueObjectState.ControlCenterState;
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
auto result = window_event_result::handled;
initial import
2006-03-20 17:12:09 +00:00
if (Newdemo_state == ND_STATE_PLAYBACK)
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
return window_event_result::ignored;
initial import
2006-03-20 17:12:09 +00:00
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
const auto g = Game_wind;
if (g)
g->set_visible(0);
When starting, leaving or changing a level in any way, use more ordered approach to set Game_wind visible or invisible. Fixing timer-issues after level-change and makes hiding of Game_wind obsolete for certain messageboxes; Moved GameTime and weapon timer variables out of reset_time since this function is not appropriate for this and is not needed between levels anymore due to window management handling start/stop_time properly
2010-06-27 11:28:26 +00:00
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
if (!LevelUniqueControlCenterState.Control_center_destroyed)
{
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
state_save_all(secret_save::c, blind_save::no);
initial import
2006-03-20 17:12:09 +00:00
}
Got rid of cfile code: Renamed cfile-functions to use PHYSFSX-naming convention, Replaced cfile-macros with proper PHYSFS(X) calls; Introduced PHYSFSX_exists() which can check case-sensitive or case-insensitive to give more flexibility with game content
2011-06-01 07:59:55 +00:00
if (PHYSFSX_exists(SECRETB_FILENAME,0))
initial import
2006-03-20 17:12:09 +00:00
{
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_RETURN);
Move Secondary_weapon to player_info
2016-08-28 22:41:48 +00:00
auto &player_info = get_local_plrobj().ctype.player_info;
Move Primary_weapon to player_info
2016-08-28 22:41:49 +00:00
const auto pw_save = player_info.Primary_weapon;
Move Secondary_weapon to player_info
2016-08-28 22:41:48 +00:00
const auto sw_save = player_info.Secondary_weapon;
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
state_restore_all(1, secret_restore::survived, SECRETB_FILENAME, blind_save::no);
Move Primary_weapon to player_info
2016-08-28 22:41:49 +00:00
player_info.Primary_weapon = pw_save;
Move Secondary_weapon to player_info
2016-08-28 22:41:48 +00:00
player_info.Secondary_weapon = sw_save;
initial import
2006-03-20 17:12:09 +00:00
} else {
// File doesn't exist, so can't return to base level. Advance to next one.
Expand macro Last_level
2021-11-01 03:37:19 +00:00
if (Entered_from_level == Current_mission->last_level)
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
{
initial import
2006-03-20 17:12:09 +00:00
DoEndGame();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
result = window_event_result::close;
}
initial import
2006-03-20 17:12:09 +00:00
else {
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_ADVANCE);
Remove unused StartNewLevel parameter 'secret_flag'
2013-03-23 20:50:35 +00:00
StartNewLevel(Entered_from_level+1);
initial import
2006-03-20 17:12:09 +00:00
}
}
When starting, leaving or changing a level in any way, use more ordered approach to set Game_wind visible or invisible. Fixing timer-issues after level-change and makes hiding of Game_wind obsolete for certain messageboxes; Moved GameTime and weapon timer variables out of reset_time since this function is not appropriate for this and is not needed between levels anymore due to window management handling start/stop_time properly
2010-06-27 11:28:26 +00:00
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
if (g)
g->set_visible(1);
Since time is not suspended between levels in Multiplayer, call reset_time after level change. Apply this in Singleplayer, too since it should always be safe - and appropriate - to reset timer_value soon as a new level begins
2010-07-04 13:12:08 +00:00
reset_time();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
return result;
initial import
2006-03-20 17:12:09 +00:00
}
// ---------------------------------------------------------------------------------------------------------------
// Set invulnerable_time and cloak_time in player struct to preserve amount of time left to
// be invulnerable or cloaked.
Pass player_info to do_cloak_invul_secret_stuff
2016-10-28 03:39:42 +00:00
void do_cloak_invul_secret_stuff(fix64 old_gametime, player_info &player_info)
initial import
2006-03-20 17:12:09 +00:00
{
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
auto &pl_flags = player_info.powerup_flags;
Cache reference to local player flags
2016-07-03 00:54:15 +00:00
if (pl_flags & PLAYER_FLAGS_INVULNERABLE)
{
Made GameTime to GameTime64 using fix64; Changed all structures saving GameTime64 for internal timer purposes to store fix64 and added converting functions to save such times in fix; For Savegames/Demos always reset GameTime64 to 0 while saving and putting all timer values to safe limits, Multiplayer objects are sent in similar fashion
2010-12-22 00:17:59 +00:00
fix64 time_used;
initial import
2006-03-20 17:12:09 +00:00
Expand get_local_player_invulnerable_time 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-08-28 22:41:49 +00:00
auto &t = player_info.invulnerable_time;
Cache reference to local player invulnerable time
2016-07-03 00:54:15 +00:00
time_used = old_gametime - t;
t = GameTime64 - time_used;
initial import
2006-03-20 17:12:09 +00:00
}
Cache reference to local player flags
2016-07-03 00:54:15 +00:00
if (pl_flags & PLAYER_FLAGS_CLOAKED)
{
initial import
2006-03-20 17:12:09 +00:00
fix time_used;
Expand get_local_player_cloak_time 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:39 +00:00
auto &t = player_info.cloak_time;
Cache reference to local player cloak time
2016-07-03 00:54:15 +00:00
time_used = old_gametime - t;
t = GameTime64 - time_used;
initial import
2006-03-20 17:12:09 +00:00
}
}
// ---------------------------------------------------------------------------------------------------------------
// Called from switch.c when player passes through secret exit. That means he was on a non-secret level and he
// is passing to the secret level.
// Do a savegame.
void EnterSecretLevel(void)
{
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
auto &LevelUniqueControlCenterState = LevelUniqueObjectState.ControlCenterState;
Fixed set but unused variables
2011-09-26 23:31:19 +00:00
int i;
initial import
2006-03-20 17:12:09 +00:00
Assert(! (Game_mode & GM_MULTI) );
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
const auto g = Game_wind;
if (g)
g->set_visible(0);
When starting, leaving or changing a level in any way, use more ordered approach to set Game_wind visible or invisible. Fixing timer-issues after level-change and makes hiding of Game_wind obsolete for certain messageboxes; Moved GameTime and weapon timer variables out of reset_time since this function is not appropriate for this and is not needed between levels anymore due to window management handling start/stop_time properly
2010-06-27 11:28:26 +00:00
Don't let the teleport sound get cut out by Game_wind being hidden when going to a secret level
2010-09-17 11:09:57 +00:00
digi_play_sample( SOUND_SECRET_EXIT, F1_0 ); // after above call which stops all sounds
initial import
2006-03-20 17:12:09 +00:00
Entered_from_level = Current_level_num;
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
if (LevelUniqueControlCenterState.Control_center_destroyed)
Propagate DoEndLevelScoreGlitz argument network All callers pass 0. Remove the argument and update the logic that tested it.
2016-10-15 00:53:14 +00:00
DoEndLevelScoreGlitz();
initial import
2006-03-20 17:12:09 +00:00
if (Newdemo_state != ND_STATE_PLAYBACK)
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
state_save_all(secret_save::b, blind_save::no); // Not between levels (ie, save all), IS a secret level, NO filename override
initial import
2006-03-20 17:12:09 +00:00
// Find secret level number to go to, stuff in Next_level_num.
Move Next_level_num to local scope It does not need to be a global. For each function that uses it, it is assigned earlier in that same function.
2021-11-01 03:37:19 +00:00
int8_t Next_level_num{};
Expand macro Last_secret_level
2021-11-01 03:37:19 +00:00
for (i = 0; i < -Current_mission->last_secret_level; ++i)
Expand macro Secret_level_table
2021-11-01 03:37:19 +00:00
if (Current_mission->secret_level_table[i] == Current_level_num)
{
initial import
2006-03-20 17:12:09 +00:00
Next_level_num = -(i+1);
break;
Expand macro Secret_level_table
2021-11-01 03:37:19 +00:00
}
else if (Current_mission->secret_level_table[i] > Current_level_num)
{ // Allows multiple exits in same group.
initial import
2006-03-20 17:12:09 +00:00
Next_level_num = -i;
break;
}
Expand macro Last_secret_level
2021-11-01 03:37:19 +00:00
if (! (i < -Current_mission->last_secret_level)) //didn't find level, so must be last
Next_level_num = Current_mission->last_secret_level;
initial import
2006-03-20 17:12:09 +00:00
fixing D1 Secret Level routines (thanks to xatmes)
2007-04-14 20:44:09 +00:00
// NMN 04/09/07 Do a REAL start level routine if we are playing a D1 level so we have
// briefings
if (EMULATING_D1)
{
set_screen_mode(SCREEN_MENU);
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message("Alternate Exit Found!\n\nProceeding to Secret Level!");
Remove unused StartNewLevel parameter 'secret_flag'
2013-03-23 20:50:35 +00:00
StartNewLevel(Next_level_num);
fixing D1 Secret Level routines (thanks to xatmes)
2007-04-14 20:44:09 +00:00
} else {
StartNewLevelSecret(Next_level_num, 1);
}
// END NMN
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
initial import
2006-03-20 17:12:09 +00:00
// do_cloak_invul_stuff();
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
if (g)
g->set_visible(1);
Since time is not suspended between levels in Multiplayer, call reset_time after level change. Apply this in Singleplayer, too since it should always be safe - and appropriate - to reset timer_value soon as a new level begins
2010-07-04 13:12:08 +00:00
reset_time();
initial import
2006-03-20 17:12:09 +00:00
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
//called when the player has finished a level
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
window_event_result (PlayerFinishedLevel)(
#if defined(DXX_BUILD_DESCENT_I)
const next_level_request_secret_flag secret_flag
#endif
)
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
const auto g = Game_wind;
if (g)
g->set_visible(0);
When starting, leaving or changing a level in any way, use more ordered approach to set Game_wind visible or invisible. Fixing timer-issues after level-change and makes hiding of Game_wind obsolete for certain messageboxes; Moved GameTime and weapon timer variables out of reset_time since this function is not appropriate for this and is not needed between levels anymore due to window management handling start/stop_time properly
2010-06-27 11:28:26 +00:00
initial import
2006-03-20 17:12:09 +00:00
//credit the player for hostages
Move player::hostages_on_board to player_info
2016-10-15 00:53:19 +00:00
auto &player_info = get_local_plrobj().ctype.player_info;
Move player::hostages_rescued_total to player_info
2016-10-15 00:53:19 +00:00
player_info.mission.hostages_rescued_total += player_info.mission.hostages_on_board;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
if (!(Game_mode & GM_MULTI) && secret_flag != next_level_request_secret_flag::only_normal_level) {
Make PlayerFinishedLevel menu inherit from newmenu
2020-12-27 22:03:09 +00:00
using items_type = std::array<newmenu_item, 1>;
struct message_menu : items_type, passive_newmenu
{
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
message_menu(grs_canvas &canvas) :
Make PlayerFinishedLevel menu inherit from newmenu
2020-12-27 22:03:09 +00:00
items_type{{
Construct nm_item_text in place
2021-06-28 03:37:49 +00:00
newmenu_item::nm_item_text{" "}, //TXT_SECRET_EXIT;
Make PlayerFinishedLevel menu inherit from newmenu
2020-12-27 22:03:09 +00:00
}},
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
passive_newmenu(menu_title{nullptr}, menu_subtitle{TXT_SECRET_EXIT}, menu_filename{Menu_pcx_name}, tiny_mode_flag::normal, tab_processing_flag::ignore, adjusted_citem::create(*static_cast<items_type *>(this), 0), canvas, draw_box_flag::none)
Make PlayerFinishedLevel menu inherit from newmenu
2020-12-27 22:03:09 +00:00
{
}
};
Propagate canvas through more layers
2021-09-12 16:20:52 +00:00
run_blocking_newmenu<message_menu>(*grd_curcanv);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
}
#elif defined(DXX_BUILD_DESCENT_II)
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
constexpr auto secret_flag = next_level_request_secret_flag::only_normal_level;
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
if (Game_mode & GM_NETWORK)
Use enum class for player connected status
2022-07-16 15:26:12 +00:00
get_local_player().connected = player_connection_status::waiting; // Finished but did not die
initial import
2006-03-20 17:12:09 +00:00
Use enum class for cockpit_mode_t
2022-02-12 18:57:12 +00:00
last_drawn_cockpit = cockpit_mode_t{UINT8_MAX};
initial import
2006-03-20 17:12:09 +00:00
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
auto result = AdvanceLevel(secret_flag); //now go on to the next one (if one)
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
if (g)
g->set_visible(1);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
reset_time();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
return result;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#if defined(DXX_BUILD_DESCENT_II)
#define MOVIE_REQUIRED 1
initial import
2006-03-20 17:12:09 +00:00
#define ENDMOVIE "end"
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
initial import
2006-03-20 17:12:09 +00:00
//called when the player has finished the last level
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
static void DoEndGame()
initial import
2006-03-20 17:12:09 +00:00
{
if ((Newdemo_state == ND_STATE_RECORDING) || (Newdemo_state == ND_STATE_PAUSED))
newdemo_stop_recording();
set_screen_mode( SCREEN_MENU );
Simplify calls to gr_set_default_canvas Rather than use an inline wrapper and rely on the compiler optimizer to redirect gr_set_current_canvas(nullptr) to gr_set_default_canvas, rewrite all relevant calls directly in the source. git grep -l 'gr_set_current_canvas' | xargs sed -i -e 's:gr_set_current_canvas(\s*NULL\|nullptr\s*);:gr_set_default_canvas();:'
2017-11-05 20:49:08 +00:00
gr_set_default_canvas();
initial import
2006-03-20 17:12:09 +00:00
key_flush();
if (PLAYING_BUILTIN_MISSION && !(Game_mode & GM_MULTI))
{ //only built-in mission, & not multi
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Use enum class for PlayMovie flag must_have
2022-07-23 20:58:10 +00:00
auto played = PlayMovie(ENDMOVIE ".tex", ENDMOVIE ".mve", play_movie_warn_missing::urgent);
Use enum class for PlayMovie result
2021-01-17 22:23:23 +00:00
if (played == movie_play_status::skipped)
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#endif
In Endlevel sequence, re-align big explosion to draw in front of exit model, relative to viewer; Re-organized tex files for Briefings and Endings and created more general code to play them; Re-aligned Dravis' head
2010-03-25 23:37:19 +00:00
{
Expand macro Ending_text_filename
2021-11-01 03:37:19 +00:00
do_end_briefing_screens(Current_mission->ending_text_filename);
initial import
2006-03-20 17:12:09 +00:00
}
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
}
else if (!(Game_mode & GM_MULTI)) //not multi
{
initial import
2006-03-20 17:12:09 +00:00
char tname[FILENAME_LEN];
In Endlevel sequence, re-align big explosion to draw in front of exit model, relative to viewer; Re-organized tex files for Briefings and Endings and created more general code to play them; Re-aligned Dravis' head
2010-03-25 23:37:19 +00:00
Expand macro Ending_text_filename
2021-11-01 03:37:19 +00:00
do_end_briefing_screens (Current_mission->ending_text_filename);
initial import
2006-03-20 17:12:09 +00:00
//try doing special credits
Remove macro Current_mission_filename
2020-01-18 21:57:39 +00:00
snprintf(tname, sizeof(tname), "%s.ctb", &*Current_mission->filename);
initial import
2006-03-20 17:12:09 +00:00
credits_show(tname);
}
key_flush();
if (Game_mode & GM_MULTI)
multi_endlevel_score();
else
// NOTE LINK TO ABOVE
Propagate DoEndLevelScoreGlitz argument network All callers pass 0. Remove the argument and update the logic that tested it.
2016-10-15 00:53:14 +00:00
DoEndLevelScoreGlitz();
initial import
2006-03-20 17:12:09 +00:00
if (PLAYING_BUILTIN_MISSION && !((Game_mode & GM_MULTI) && !(Game_mode & GM_MULTI_COOP))) {
Simplify calls to gr_set_default_canvas Rather than use an inline wrapper and rely on the compiler optimizer to redirect gr_set_current_canvas(nullptr) to gr_set_default_canvas, rewrite all relevant calls directly in the source. git grep -l 'gr_set_current_canvas' | xargs sed -i -e 's:gr_set_current_canvas(\s*NULL\|nullptr\s*);:gr_set_default_canvas();:'
2017-11-05 20:49:08 +00:00
gr_set_default_canvas();
Pass canvas to gr_clear_canvas
2017-01-01 00:45:45 +00:00
gr_clear_canvas(*grd_curcanv, BM_XRGB(0,0,0));
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#if defined(DXX_BUILD_DESCENT_II)
fixed more compiler warnings
2007-06-11 15:54:09 +00:00
load_palette(D2_DEFAULT_PALETTE,0,1);
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#endif
Propagate scores_maybe_add_player argument
2016-12-10 17:51:08 +00:00
scores_maybe_add_player();
initial import
2006-03-20 17:12:09 +00:00
}
}
//called to go to the next level (if there is one)
//if secret_flag is true, advance to secret level, else next normal one
// Return true if game over.
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
static window_event_result (AdvanceLevel)(
#if defined(DXX_BUILD_DESCENT_I)
next_level_request_secret_flag secret_flag
#endif
)
initial import
2006-03-20 17:12:09 +00:00
{
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
auto &LevelUniqueControlCenterState = LevelUniqueObjectState.ControlCenterState;
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
auto rval = window_event_result::handled;
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Add back homing weapons cheat for D2 Kreator proposed restoring the Descent 2 cheat that grants homing capability to all weapons. This commit implements that proposition, with some changes to the implementation details. Based-on-patch-by: Chris Taylor <chris@icculus.org> Requested-by: Chris Taylor <https://github.com/dxx-rebirth/dxx-rebirth/pull/318>
2017-01-29 21:02:48 +00:00
// Loading a level can write over homing_flag.
// So for simplicity, reset the homing weapon cheat here.
if (cheats.homingfire)
{
cheats.homingfire = 0;
weapons_homing_all_reset();
}
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#endif
Expand macro Last_level
2021-11-01 03:37:19 +00:00
if (Current_level_num != Current_mission->last_level)
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
{
initial import
2006-03-20 17:12:09 +00:00
if (Game_mode & GM_MULTI)
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
{
const auto result = multi_endlevel_score();
if (result == kmatrix_result::abort)
return window_event_result::close; // Exit out of game loop
}
initial import
2006-03-20 17:12:09 +00:00
else
// NOTE LINK TO ABOVE!!!
Propagate DoEndLevelScoreGlitz argument network All callers pass 0. Remove the argument and update the logic that tested it.
2016-10-15 00:53:14 +00:00
DoEndLevelScoreGlitz(); //give bonuses
initial import
2006-03-20 17:12:09 +00:00
}
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
LevelUniqueControlCenterState.Control_center_destroyed = 0;
initial import
2006-03-20 17:12:09 +00:00
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
if (Game_mode & GM_MULTI)
{
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
int result;
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
result = multi::dispatch->end_current_level(
#if defined(DXX_BUILD_DESCENT_I)
&secret_flag
#endif
); // Wait for other players to reach this point
initial import
2006-03-20 17:12:09 +00:00
if (result) // failed to sync
{
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
// check if player has finished the game
Expand macro Last_level
2021-11-01 03:37:19 +00:00
return Current_level_num == Current_mission->last_level ? window_event_result::close : rval;
initial import
2006-03-20 17:12:09 +00:00
}
}
Expand macro Last_level
2021-11-01 03:37:19 +00:00
if (Current_level_num == Current_mission->last_level)
{ //player has finished the game!
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
initial import
2006-03-20 17:12:09 +00:00
DoEndGame();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
rval = window_event_result::close;
initial import
2006-03-20 17:12:09 +00:00
} else {
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#if defined(DXX_BUILD_DESCENT_I)
Log a diagnostic when D1 cannot find target secret level A level can have a secret exit without having a mission entry describing where to go when the secret exit is used. Switch from an assertion failure in that case to a log message.
2022-01-08 17:48:09 +00:00
const auto Next_level_num = find_next_level(secret_flag, Current_level_num, *Current_mission.get());
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#elif defined(DXX_BUILD_DESCENT_II)
Move Next_level_num to local scope It does not need to be a global. For each function that uses it, it is assigned earlier in that same function.
2021-11-01 03:37:19 +00:00
int8_t Next_level_num;
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
fixing D1 Secret Level routines (thanks to xatmes)
2007-04-14 20:44:09 +00:00
//NMN 04/08/07 If we are in a secret level and playing a D1
// level, then use Entered_from_level # instead
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
if (Current_level_num < 0 && EMULATING_D1)
fixing D1 Secret Level routines (thanks to xatmes)
2007-04-14 20:44:09 +00:00
{
Next_level_num = Entered_from_level+1; //assume go to next normal level
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
} else {
fixing D1 Secret Level routines (thanks to xatmes)
2007-04-14 20:44:09 +00:00
Next_level_num = Current_level_num+1; //assume go to next normal level
}
// END NMN
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#endif
Remove call to window_close(Game_wind) when multiplayer level syncing fails Replace call to window_close(Game_wind) with returning window_event_result::close to game_handler. Applies to when there is a failure in net_udp_level_sync(). Closing a window within its handler is problematic - it can result in an unstable state.
2017-01-10 05:02:59 +00:00
rval = std::max(StartNewLevel(Next_level_num), rval);
initial import
2006-03-20 17:12:09 +00:00
}
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
return rval;
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
window_event_result DoPlayerDead()
initial import
2006-03-20 17:12:09 +00:00
{
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
auto &LevelUniqueControlCenterState = LevelUniqueObjectState.ControlCenterState;
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
start_time() time when game over After getting game over, the game would be stopped when playing a demo or loading a saved game. This is now fixed.
2017-02-09 08:31:49 +00:00
const bool pause = !(((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK)) && (!Endlevel_sequence));
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
auto result = window_event_result::handled;
start_time() time when game over After getting game over, the game would be stopped when playing a demo or loading a saved game. This is now fixed.
2017-02-09 08:31:49 +00:00
if (pause)
Replace calls to window_set_visible in DoPlayerDead() with stop/start_time() This is so game_flush_inputs() isn't called - part of change allowing player to respawn and begin moving with the same keypress. With this commit, you can use this feature with the 'when dead, respawn by pressing the Fire key' option - i.e. hold down movement key, then press fire key to respawn.
2017-02-07 05:22:30 +00:00
stop_time();
When starting, leaving or changing a level in any way, use more ordered approach to set Game_wind visible or invisible. Fixing timer-issues after level-change and makes hiding of Game_wind obsolete for certain messageboxes; Moved GameTime and weapon timer variables out of reset_time since this function is not appropriate for this and is not needed between levels anymore due to window management handling start/stop_time properly
2010-06-27 11:28:26 +00:00
initial import
2006-03-20 17:12:09 +00:00
reset_palette_add();
gr_palette_load (gr_palette);
dead_player_end(); //terminate death sequence (if playing)
Cache player references
2017-08-13 20:38:31 +00:00
auto &plr = get_local_player();
initial import
2006-03-20 17:12:09 +00:00
if ( Game_mode&GM_MULTI )
{
}
else
{ //Note link to above else!
Cache player references
2017-08-13 20:38:31 +00:00
-- plr.lives;
if (plr.lives == 0)
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
{
Move DoGameOver inline Delete the backward comment. This function is used for single player, not multiplayer.
2020-12-20 20:39:07 +00:00
if (PLAYING_BUILTIN_MISSION)
scores_maybe_add_player();
start_time() time when game over After getting game over, the game would be stopped when playing a demo or loading a saved game. This is now fixed.
2017-02-09 08:31:49 +00:00
if (pause)
start_time();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
return window_event_result::close;
initial import
2006-03-20 17:12:09 +00:00
}
}
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
if (LevelUniqueControlCenterState.Control_center_destroyed)
{
initial import
2006-03-20 17:12:09 +00:00
//clear out stuff so no bonus
Cache player references
2017-08-13 20:38:31 +00:00
auto &plrobj = get_local_plrobj();
auto &player_info = plrobj.ctype.player_info;
Move player::hostages_on_board to player_info
2016-10-15 00:53:19 +00:00
player_info.mission.hostages_on_board = 0;
Expand get_local_player_energy 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-09-11 18:49:13 +00:00
player_info.energy = 0;
Cache player references
2017-08-13 20:38:31 +00:00
plrobj.shields = 0;
Use enum class for player connected status
2022-07-16 15:26:12 +00:00
plr.connected = player_connection_status::died_in_mine;
initial import
2006-03-20 17:12:09 +00:00
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_DIED_IN_MINE); // Give them some indication of what happened
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#if defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
if (Current_level_num < 0) {
Got rid of cfile code: Renamed cfile-functions to use PHYSFSX-naming convention, Replaced cfile-macros with proper PHYSFS(X) calls; Introduced PHYSFSX_exists() which can check case-sensitive or case-insensitive to give more flexibility with game content
2011-06-01 07:59:55 +00:00
if (PHYSFSX_exists(SECRETB_FILENAME,0))
initial import
2006-03-20 17:12:09 +00:00
{
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_RETURN);
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
state_restore_all(1, secret_restore::died, SECRETB_FILENAME, blind_save::no); // 2 means you died
initial import
2006-03-20 17:12:09 +00:00
set_pos_from_return_segment();
Cache player references
2017-08-13 20:38:31 +00:00
plr.lives--; // re-lose the life, get_local_player().lives got written over in restore.
initial import
2006-03-20 17:12:09 +00:00
} else {
Expand macro Last_level
2021-11-01 03:37:19 +00:00
if (Entered_from_level == Current_mission->last_level)
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
{
Fixed logical code flow error when player dies in a secret level entered after base level destroyed which is also the last level
2008-11-26 01:19:26 +00:00
DoEndGame();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
result = window_event_result::close;
}
Fixed logical code flow error when player dies in a secret level entered after base level destroyed which is also the last level
2008-11-26 01:19:26 +00:00
else {
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_ADVANCE);
Remove unused StartNewLevel parameter 'secret_flag'
2013-03-23 20:50:35 +00:00
StartNewLevel(Entered_from_level+1);
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
init_player_stats_new_ship(Player_num); // New, MK, 05/29/96!, fix bug with dying in secret level, advance to next level, keep powerups!
Fixed logical code flow error when player dies in a secret level entered after base level destroyed which is also the last level
2008-11-26 01:19:26 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
}
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
} else
#endif
{
initial import
2006-03-20 17:12:09 +00:00
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
const auto g = Game_wind;
if (g)
g->set_visible(0);
Use enum class for `next_level_request_secret_flag` Instead of passing a bare `int` named `secret_flag`, define it as an `enum class : uint8_t` to name the two special values. Rework the passing of this value, to deal with some confusing inconsistencies when reading the code. Before this change: In D1: - Multiplayer will always go to the secret level, regardless of which exit door the player used. In D2: - Flying through a D1 secret exit in multiplayer shows the on-HUD error "Secret Level Teleporter disabled in multiplayer!", and does not exit the level. This is at best confusing, and at worst dangerous, since D1 secret exits are only available during the countdown, so the player has little time to realize that the normal exit must be used instead. - Like D1, multiplayer will request to go to the secret level regardless of the exit used. Unlike D1, the caller ignores the flag and always advances to the next regular level. After this change: - No observable differences for the player in-game. The questionable D2 secret exit handling for D1 is retained. - The code makes clearer that secret exits do not work in D2 multiplayer, by way of `#if defined(DXX_BUILD_DESCENT_I)` guarding the existence of the parameter and all updates to it.
2022-07-16 15:26:12 +00:00
result = AdvanceLevel(next_level_request_secret_flag::only_normal_level); //if finished, go on to next level
initial import
2006-03-20 17:12:09 +00:00
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
init_player_stats_new_ship(Player_num);
Use enum class for cockpit_mode_t
2022-02-12 18:57:12 +00:00
last_drawn_cockpit = cockpit_mode_t{UINT8_MAX};
Move window_is_visible,window_set_visible to be window methods Shrink w_visible to uint8_t. Move it to pack better.
2021-11-01 03:37:18 +00:00
if (g)
g->set_visible(1);
initial import
2006-03-20 17:12:09 +00:00
}
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#if defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
} else if (Current_level_num < 0) {
Got rid of cfile code: Renamed cfile-functions to use PHYSFSX-naming convention, Replaced cfile-macros with proper PHYSFS(X) calls; Introduced PHYSFSX_exists() which can check case-sensitive or case-insensitive to give more flexibility with game content
2011-06-01 07:59:55 +00:00
if (PHYSFSX_exists(SECRETB_FILENAME,0))
initial import
2006-03-20 17:12:09 +00:00
{
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_RETURN);
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
if (!LevelUniqueControlCenterState.Control_center_destroyed)
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
state_save_all(secret_save::c, blind_save::no);
state_restore_all(1, secret_restore::died, SECRETB_FILENAME, blind_save::no);
initial import
2006-03-20 17:12:09 +00:00
set_pos_from_return_segment();
Cache player references
2017-08-13 20:38:31 +00:00
plr.lives--; // re-lose the life, get_local_player().lives got written over in restore.
initial import
2006-03-20 17:12:09 +00:00
} else {
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_DIED_IN_MINE); // Give them some indication of what happened
Expand macro Last_level
2021-11-01 03:37:19 +00:00
if (Entered_from_level == Current_mission->last_level)
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
{
Fixed logical code flow error when player dies in a secret level entered after base level destroyed which is also the last level
2008-11-26 01:19:26 +00:00
DoEndGame();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
result = window_event_result::close;
}
Fixed logical code flow error when player dies in a secret level entered after base level destroyed which is also the last level
2008-11-26 01:19:26 +00:00
else {
Show stars background for died in mine and secret level messageboxes; equalise fuelcen.h and cntrlcen.h
2010-07-27 11:41:43 +00:00
do_screen_message(TXT_SECRET_ADVANCE);
Remove unused StartNewLevel parameter 'secret_flag'
2013-03-23 20:50:35 +00:00
StartNewLevel(Entered_from_level+1);
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
init_player_stats_new_ship(Player_num); // New, MK, 05/29/96!, fix bug with dying in secret level, advance to next level, keep powerups!
Fixed logical code flow error when player dies in a secret level entered after base level destroyed which is also the last level
2008-11-26 01:19:26 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
}
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
} else {
Further Multiplayer cleanup: moved gobal variable resets from multi_new_game() to proper function calls; added pnum variable to init_player_stats_game() and init_player_stats_new_ship() so these can be set for each player when starting match; added multi_new_level() calls when setting up game as well when trying to join game; cleaned multi_reset_stuff() from variable resetting that happen in general game code; when being dumped from game, made sure no packets are sent during messagebox dispaly; replaced MAX_NUM_NET_PLAYERS by MAX_PLAYERS as it's the same definition
2012-04-15 13:32:48 +00:00
init_player_stats_new_ship(Player_num);
initial import
2006-03-20 17:12:09 +00:00
StartLevel(1);
}
digi_sync_sounds();
When starting, leaving or changing a level in any way, use more ordered approach to set Game_wind visible or invisible. Fixing timer-issues after level-change and makes hiding of Game_wind obsolete for certain messageboxes; Moved GameTime and weapon timer variables out of reset_time since this function is not appropriate for this and is not needed between levels anymore due to window management handling start/stop_time properly
2010-06-27 11:28:26 +00:00
start_time() time when game over After getting game over, the game would be stopped when playing a demo or loading a saved game. This is now fixed.
2017-02-09 08:31:49 +00:00
if (pause)
Replace calls to window_set_visible in DoPlayerDead() with stop/start_time() This is so game_flush_inputs() isn't called - part of change allowing player to respawn and begin moving with the same keypress. With this commit, you can use this feature with the 'when dead, respawn by pressing the Fire key' option - i.e. hold down movement key, then press fire key to respawn.
2017-02-07 05:22:30 +00:00
start_time();
Since time is not suspended between levels in Multiplayer, call reset_time after level change. Apply this in Singleplayer, too since it should always be safe - and appropriate - to reset timer_value soon as a new level begins
2010-07-04 13:12:08 +00:00
reset_time();
Remove calls to window_close(Game_wind) when game finished or over Replace calls to window_close(Game_wind) with returning window_event_result::close to game handler. Applies to when DoEndGame() is called, DoGameOver() is called, aborting in the kmatrix screen (multiplayer game) during AdvanceLevel() and playing one demo frame causes playback to stop in GameProcessFrame(). Closing a window within its handler is problematic - it can result in an unstable state.
2016-12-24 08:50:29 +00:00
return result;
initial import
2006-03-20 17:12:09 +00:00
}
//called when the player is starting a new level for normal game mode and restore state
// secret_flag set if came from a secret level
Inline away D1 secret_restore values
2015-04-02 02:36:53 +00:00
#if defined(DXX_BUILD_DESCENT_I)
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
window_event_result StartNewLevelSub(const d_robot_info_array &Robot_info, const int level_num, const int page_in_textures)
Inline away D1 secret_restore values
2015-04-02 02:36:53 +00:00
#elif defined(DXX_BUILD_DESCENT_II)
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
window_event_result StartNewLevelSub(const d_robot_info_array &Robot_info, const int level_num, const int page_in_textures, const secret_restore secret_flag)
Inline away D1 secret_restore values
2015-04-02 02:36:53 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
{
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
auto &LevelUniqueControlCenterState = LevelUniqueObjectState.ControlCenterState;
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
initial import
2006-03-20 17:12:09 +00:00
if (!(Game_mode & GM_MULTI)) {
Use enum class for cockpit_mode_t
2022-02-12 18:57:12 +00:00
last_drawn_cockpit = cockpit_mode_t{UINT8_MAX};
initial import
2006-03-20 17:12:09 +00:00
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
Expand tt:: indirection to std:: All supported compilers have an acceptable <type_traits>. Commit 4cb3d4614874 ("Move <type_traits> test to Cxx11RequiredFeature") made <type_traits> support mandatory in August and no one has objected. Remove the indirection and use namespace std directly for type_traits members.
2017-06-25 20:46:03 +00:00
static constexpr std::integral_constant<secret_restore, secret_restore::none> secret_flag{};
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#elif defined(DXX_BUILD_DESCENT_II)
made code for level progression more similar between D1X and D2X
2015-03-23 01:43:31 +00:00
BigWindowSwitch=0;
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
if (Newdemo_state == ND_STATE_PAUSED)
Newdemo_state = ND_STATE_RECORDING;
if (Newdemo_state == ND_STATE_RECORDING) {
newdemo_set_new_level(level_num);
Giving credits function ability to use custom creditfile (again); Made laser-offset for laser exclusive so Prox mines won't go tru doors; Preventing cycling tru cockpit modes while dead, but allowing to load a state; Implemented D2X' lighting code to D1X (faster, better, sexier - weeee); Try to hop over some errors regarding walls/doors in levels instead of using -1 indexes for arrays; Made the briefing text ptr a bit more failsafe in case the file is corrupt/non-standard; Made scores use the menu screen even in GAME OVER; Fixed bug in neighbour fields of Weapon Keys table; Added the Weapon Keys stuff to TABLE_CREATION; Fixed bug where D2X did not recall applied resolution in the resolutions menu; Simpler check to create DEMO_DIR; Seperated X/Y sensitivity for mouse and joystick; Flush controls when Automap toggles so keypress won't deactivate it again; Made FrameCount in Demos aligned to the Dropframe condition; Added KEy to ttoggle playback text off; Gracefully exit demo code if demo is corrupt; Removed that new percent counter because many old demos seem to have corrupted last frames; Closing endlevel data file if IFF error so the mission still can be freed; Fixed Cruising for keyboard which was not aligned to FPS correctly; Used mouse delta scaling in kconfig.c instead of mouse.c to not screw up when delta is requested in non-ingame situations - it actually belongs to the controls IMHO; Now support up to 8 joysticks; Changed some leftover malloc's to d_malloc and free to d_free
2008-10-16 17:27:02 +00:00
newdemo_record_start_frame(FrameTime );
initial import
2006-03-20 17:12:09 +00:00
}
LoadLevel(level_num,page_in_textures);
Assert(Current_level_num == level_num); //make sure level set right
Use get_local_plrobj to compute reference to object of local player
2015-07-25 23:10:45 +00:00
Viewer = &get_local_plrobj();
initial import
2006-03-20 17:12:09 +00:00
Assert(N_players <= NumNetPlayerPositions);
//If this assert fails, there's not enough start positions
if (Game_mode & GM_NETWORK)
{
Pass Powerup_info to multi_prep_level_objects, filter_objects_from_level
2021-09-19 10:53:48 +00:00
multi_prep_level_objects(Powerup_info, Vclip);
Convert multi_level_sync to dispatch through a vtable
2020-12-20 20:39:07 +00:00
if (multi::dispatch->level_sync() == window_event_result::close) // After calling this, Player_num is set
If multi_level_sync() fails, restart menu music since level music is playing already
2010-06-29 21:14:30 +00:00
{
songs_play_song( SONG_TITLE, 1 ); // level song already plays but we fail to start level...
Remove call to window_close(Game_wind) when multiplayer level syncing fails Replace call to window_close(Game_wind) with returning window_event_result::close to game_handler. Applies to when there is a failure in net_udp_level_sync(). Closing a window within its handler is problematic - it can result in an unstable state.
2017-01-10 05:02:59 +00:00
return window_event_result::close;
If multi_level_sync() fails, restart menu music since level music is playing already
2010-06-29 21:14:30 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
}
HUD_clear_messages();
Pass LevelUniqueAutomapState to automap_clear_visited
2020-08-28 00:18:45 +00:00
automap_clear_visited(LevelUniqueAutomapState);
initial import
2006-03-20 17:12:09 +00:00
Move player::num_robots_level to d_level_unique_object_state The number of robots accumulated on a level is a function of the level, not any particular player. Move it to d_level_unique_object_state and rename it to accumulated_robots.
2019-07-16 04:00:50 +00:00
LevelUniqueObjectState.accumulated_robots = count_number_of_robots(Objects.vcptr);
Move player::num_robots_total to d_game_unique_state The number of robots accumulated in a game is a function of the the game's levels, not any particular player. Move it to d_game_unique_state and rename it to accumulated_robots.
2019-07-16 04:00:50 +00:00
GameUniqueState.accumulated_robots += LevelUniqueObjectState.accumulated_robots;
Move player::hostages_level to d_level_unique_object_state The number of hostages on a level is a function of the level, not any particular player. Move it to d_level_unique_object_state and rename it to total_hostages.
2019-07-16 04:00:50 +00:00
LevelUniqueObjectState.total_hostages = count_number_of_hostages(Objects.vcptr);
Move player::hostages_total to d_game_unique_state The number of hostages in a game is a function of the the game's levels, not any particular player. Move it to d_game_unique_state and rename it to total_hostages.
2019-07-16 04:00:50 +00:00
GameUniqueState.total_hostages += LevelUniqueObjectState.total_hostages;
Pass player to init_player_stats_level
2017-04-30 16:25:16 +00:00
init_player_stats_level(get_local_player(), get_local_plrobj(), secret_flag);
initial import
2006-03-20 17:12:09 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
gr_use_palette_table( "palette.256" );
#elif defined(DXX_BUILD_DESCENT_II)
Pass std::span to load_palette
2022-09-24 17:47:52 +00:00
load_palette(Current_level_palette.line(), 0, 1);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
moved load_palette() call in StartNewLevelSub() to show HOARD textures and bitmaps correctly in OGL
2007-05-10 08:53:35 +00:00
gr_palette_load(gr_palette);
initial import
2006-03-20 17:12:09 +00:00
if ((Game_mode & GM_MULTI_COOP) && Network_rejoined)
{
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
for (playernum_t i = 0; i < N_players; ++i)
Move player powerup_flags to object.ctype.player_info
2015-11-07 21:55:59 +00:00
{
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
const auto &&plobj = vmobjptr(vcplayerptr(i)->objnum);
Move player powerup_flags to object.ctype.player_info
2015-11-07 21:55:59 +00:00
plobj->ctype.player_info.powerup_flags |= Netgame.net_player_flags[i];
}
initial import
2006-03-20 17:12:09 +00:00
}
if (Game_mode & GM_MULTI)
{
New powerup management code: Addeed functions and packet type to keep track of original and current level inventory as well as player and thief inventories. Calling maybe_drop_net_powerup() for all ammo based weapons except Concussion missiles. Limiting maybe_drop_net_powerup() to only spawn items missing from initial level inventory. Added function to let host respawn items that were lost for whatever reason. Expanded maybe_drop_net_powerup() and child functions to be able to drop item based on a random player. Changed back maybe_drop_secondary_weapon_egg() to its original behavior, dropping 3 of each type max.
2016-02-25 13:11:08 +00:00
multi_prep_level_player();
initial import
2006-03-20 17:12:09 +00:00
}
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
gameseq_remove_unused_players(Robot_info);
initial import
2006-03-20 17:12:09 +00:00
Game_suspended = 0;
Move Control_center_destroyed to d_level_unique_control_center_state
2019-08-15 01:34:22 +00:00
LevelUniqueControlCenterState.Control_center_destroyed = 0;
initial import
2006-03-20 17:12:09 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
initial import
2006-03-20 17:12:09 +00:00
set_screen_mode(SCREEN_GAME);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
close menu with boxed message; improved palette reloading; fixed selected item for restore game dialog
2007-04-04 17:18:17 +00:00
initial import
2006-03-20 17:12:09 +00:00
init_cockpit();
init_robots_for_level();
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
init_ai_objects(Robot_info);
initial import
2006-03-20 17:12:09 +00:00
init_morphs();
init_all_matcens();
reset_palette_add();
Consolidate stuck object state Move it to a structure. Make all the modifiers methods. Change all callers of those methods to pass the structure. This makes the stuck object handling free of direct access to global game data.
2018-08-04 17:52:57 +00:00
LevelUniqueStuckObjectState.init_stuck_objects();
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Restructure gameseq.c for merging
2013-11-10 03:31:22 +00:00
init_smega_detonates();
initial import
2006-03-20 17:12:09 +00:00
init_thief_for_level();
if (!(Game_mode & GM_MULTI))
Pass Powerup_info to multi_prep_level_objects, filter_objects_from_level
2021-09-19 10:53:48 +00:00
filter_objects_from_level(Powerup_info, Vclip, vmobjptr);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Moved all these unsorted global cheat variables to a handy structure; Simplified reading of the cheats without trying to make it complicated so no one finds them (everyone can get the source); Removed one or two cheats which carry more garbage than they are worth; Added replacement for the bittersweet cheat; Made FPS Counter an option of Graphics menu
2011-02-14 21:27:07 +00:00
if (!(Game_mode & GM_MULTI) && !cheats.enabled)
initial import
2006-03-20 17:12:09 +00:00
set_highest_level(Current_level_num);
else
read_player_file(); //get window sizes
reset_special_effects();
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
#if DXX_USE_OGL
initial import
2006-03-20 17:12:09 +00:00
ogl_cache_level_textures();
#endif
if (Network_rejoined == 1)
{
Network_rejoined = 0;
StartLevel(1);
}
else
StartLevel(0); // Note link to above if!
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
copy_defaults_to_robot_all(Robot_info);
init_controlcen_for_level(Robot_info);
initial import
2006-03-20 17:12:09 +00:00
// Say player can use FLASH cheat to mark path to exit.
Move Last_level_path_created to LevelUniqueObjectState.Level_path_created Change it from the level number on which the path was created to a true/false flag. The previous logic only tested whether the number was equal to the current level number. This also fixes a bug where the action was not available on the first secret level, since that level is `-1`, and the value was set to `-1` to indicate that it should be enabled.
2021-11-01 03:37:19 +00:00
LevelUniqueObjectState.Level_path_created = 0;
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
Put the full_palette_save and palette_restore calls in the game handler for tidiness; remove leftover redundant digi_resume_digi_sounds calls
2010-02-05 02:31:36 +00:00
// Initialise for palette_restore()
// Also takes care of nm_draw_background() possibly being called
if (!((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK)))
full_palette_save();
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
Don't make another Game_wind when advancing a level, fixing failed asserts / slow turning
2010-02-08 05:34:43 +00:00
if (!Game_wind)
game();
Remove call to window_close(Game_wind) when multiplayer level syncing fails Replace call to window_close(Game_wind) with returning window_event_result::close to game_handler. Applies to when there is a failure in net_udp_level_sync(). Closing a window within its handler is problematic - it can result in an unstable state.
2017-01-10 05:02:59 +00:00
return window_event_result::handled;
initial import
2006-03-20 17:12:09 +00:00
}
Pass Vclip as context
2018-10-21 00:24:07 +00:00
void bash_to_shield(const d_powerup_info_array &Powerup_info, const d_vclip_array &Vclip, object_base &i)
initial import
2006-03-20 17:12:09 +00:00
{
Pass context to set_powerup_id
2018-10-08 03:58:48 +00:00
set_powerup_id(Powerup_info, Vclip, i, POW_SHIELD_BOOST);
initial import
2006-03-20 17:12:09 +00:00
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
Move similar/main/gameseq.c -> similar/main/gameseq.cpp
2012-11-11 22:12:51 +00:00
struct intro_movie_t {
initial import
2006-03-20 17:12:09 +00:00
int level_num;
Remove PlayMovie special case for `.MVE` Only one caller needed this special case. Remove the special case, and adjust that caller to include the `.MVE` as a static suffix on its inputs.
2021-09-19 10:53:48 +00:00
char movie_name[8];
Move similar/main/gameseq.c -> similar/main/gameseq.cpp
2012-11-11 22:12:51 +00:00
};
Remove PlayMovie special case for `.MVE` Only one caller needed this special case. Remove the special case, and adjust that caller to include the `.MVE` as a static suffix on its inputs.
2021-09-19 10:53:48 +00:00
constexpr std::array<intro_movie_t, 7> intro_movie{{
{ 1, "PLA.MVE"},
{ 5, "PLB.MVE"},
{ 9, "PLC.MVE"},
{13, "PLD.MVE"},
{17, "PLE.MVE"},
{21, "PLF.MVE"},
{24, "PLG.MVE"}
Use range_for for intro movies
2015-01-29 04:27:36 +00:00
}};
initial import
2006-03-20 17:12:09 +00:00
Mark private functions static
2013-10-27 22:00:14 +00:00
static void ShowLevelIntro(int level_num)
initial import
2006-03-20 17:12:09 +00:00
{
//if shareware, show a briefing?
if (!(Game_mode & GM_MULTI)) {
Factor out do_briefing_screens calls in ShowLevelIntro The special cases do not need to be quite so special.
2021-09-19 10:53:48 +00:00
palette_array_t save_pal = gr_palette;
initial import
2006-03-20 17:12:09 +00:00
if (PLAYING_BUILTIN_MISSION) {
if (is_SHAREWARE || is_MAC_SHARE)
{
Factor out do_briefing_screens calls in ShowLevelIntro The special cases do not need to be quite so special.
2021-09-19 10:53:48 +00:00
if (level_num != 1)
return;
initial import
2006-03-20 17:12:09 +00:00
}
else if (is_D2_OEM)
{
Factor out do_briefing_screens calls in ShowLevelIntro The special cases do not need to be quite so special.
2021-09-19 10:53:48 +00:00
if (level_num != 1)
return;
if (intro_played)
return;
initial import
2006-03-20 17:12:09 +00:00
}
else // full version
{
Use range_for for intro movies
2015-01-29 04:27:36 +00:00
range_for (auto &i, intro_movie)
initial import
2006-03-20 17:12:09 +00:00
{
Use range_for for intro movies
2015-01-29 04:27:36 +00:00
if (i.level_num == level_num)
initial import
2006-03-20 17:12:09 +00:00
{
Screen_mode = -1;
Use std::span for PlayMovie argument `subtitles`
2022-10-02 19:51:35 +00:00
PlayMovie({}, i.movie_name, play_movie_warn_missing::urgent);
initial import
2006-03-20 17:12:09 +00:00
break;
}
}
}
}
Factor out do_briefing_screens calls in ShowLevelIntro The special cases do not need to be quite so special.
2021-09-19 10:53:48 +00:00
//else not the built-in mission (maybe d1, too).
/* Play a level-appropriate briefing, whether built-in, add-on,
* or Descent 1.
*/
Expand macro Briefing_text_filename
2021-11-01 03:37:19 +00:00
do_briefing_screens(Current_mission->briefing_text_filename, level_num);
initial import
2006-03-20 17:12:09 +00:00
Use array for palette_array_t
2013-01-06 21:11:53 +00:00
gr_palette = save_pal;
initial import
2006-03-20 17:12:09 +00:00
}
}
// ---------------------------------------------------------------------------
Expand macro Secret_level_table
2021-11-01 03:37:19 +00:00
// If starting a level which appears in the Current_mission->secret_level_table, then set First_secret_visit.
initial import
2006-03-20 17:12:09 +00:00
// Reason: On this level, if player goes to a secret level, he will be going to a different
// secret level than he's ever been to before.
// Sets the global First_secret_visit if necessary. Otherwise leaves it unchanged.
Mark private functions static
2013-10-27 22:00:14 +00:00
static void maybe_set_first_secret_visit(int level_num)
initial import
2006-03-20 17:12:09 +00:00
{
Expand macro N_secret_levels
2021-11-01 03:37:19 +00:00
range_for (auto &i, unchecked_partial_range(Current_mission->secret_level_table.get(), Current_mission->n_secret_levels))
Use range_for for intro movies
2015-01-29 04:27:36 +00:00
{
if (i == level_num)
{
initial import
2006-03-20 17:12:09 +00:00
First_secret_visit = 1;
Use range_for for intro movies
2015-01-29 04:27:36 +00:00
break;
initial import
2006-03-20 17:12:09 +00:00
}
}
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
//called when the player is starting a new level for normal game model
// secret_flag if came from a secret level
Remove call to window_close(Game_wind) when multiplayer level syncing fails Replace call to window_close(Game_wind) with returning window_event_result::close to game_handler. Applies to when there is a failure in net_udp_level_sync(). Closing a window within its handler is problematic - it can result in an unstable state.
2017-01-10 05:02:59 +00:00
window_event_result StartNewLevel(int level_num)
initial import
2006-03-20 17:12:09 +00:00
{
Hide mission dialog before the level intro screens are shown, make sure it doesn't try to show it again after it was closed - fixing bad memory access
2010-03-27 03:24:14 +00:00
hide_menus();
Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
2010-06-14 08:13:16 +00:00
Made GameTime to GameTime64 using fix64; Changed all structures saving GameTime64 for internal timer purposes to store fix64 and added converting functions to save such times in fix; For Savegames/Demos always reset GameTime64 to 0 while saving and putting all timer values to safe limits, Multiplayer objects are sent in similar fashion
2010-12-22 00:17:59 +00:00
GameTime64 = 0;
Add experimental support for autosaves Set autosave interval to 10 minutes, unless specified in the player's configuration file. Players can change the autosave to 0 minutes to disable it.
2020-04-19 20:47:07 +00:00
/* Autosave is permitted immediately on entering a new level */
state_set_immediate_autosave(GameUniqueState);
Use std::chrono::duration for ThisLevelTime, PlayTimeAllowed Store PlayTimeAllowed in ticks since it is frequently accessed for logic tests, but only rarely accessed for display.
2020-04-19 20:47:07 +00:00
ThisLevelTime = {};
initial import
2006-03-20 17:12:09 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_I)
if (!(Game_mode & GM_MULTI)) {
Expand macro Briefing_text_filename
2021-11-01 03:37:19 +00:00
do_briefing_screens(Current_mission->briefing_text_filename, level_num);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
}
#elif defined(DXX_BUILD_DESCENT_II)
Remove unused StartNewLevel parameter 'secret_flag'
2013-03-23 20:50:35 +00:00
if (level_num > 0) {
initial import
2006-03-20 17:12:09 +00:00
maybe_set_first_secret_visit(level_num);
}
ShowLevelIntro(level_num);
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
initial import
2006-03-20 17:12:09 +00:00
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
return StartNewLevelSub(LevelSharedRobotInfoState.Robot_info, level_num, 1, secret_restore::none);
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
Implement secluded spawns
2015-07-04 21:01:18 +00:00
class respawn_locations
{
typedef std::pair<int, fix> site;
unsigned max_usable_spawn_sites;
Use alias template per_player_array for arrays that are MAX_PLAYERS long This removes the need to repeat MAX_PLAYERS in every usage, and prepares for a future change to use enumerated_array instead of std::array.
2022-09-24 17:47:53 +00:00
per_player_array<site> sites;
Implement secluded spawns
2015-07-04 21:01:18 +00:00
public:
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
respawn_locations(fvmobjptr &vmobjptr, fvcsegptridx &vcsegptridx)
Implement secluded spawns
2015-07-04 21:01:18 +00:00
{
const auto player_num = Player_num;
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
const auto find_closest_player = [player_num, &vmobjptr, &vcsegptridx](const obj_position &candidate) {
Use stdint constants for some INT*_MAX clang becomes confused trying to determine which vm_distance_squared constructor to use for a literal input of 0x7fffffffffffffff, even though the size of the input requires it to be `long` and only one constructor can take a `long`. Switch from an explicit 0x7fffffffffffffff to the symbolic constant INT64_MAX, which has the same value, but a platform-appropriate suffix to force the compiler to pick the right type. For general clarity, switch some other instances of integer maximum literals to symbolic constants of the same value. This commit has no effect on the generated code (except for changes to line numbers). Reported-by: kreatordxx <https://github.com/dxx-rebirth/dxx-rebirth/pull/324> Fixes: 17208cca79769286374316707c74483713598c76 ("Disallow int for vm_distance_squared")
2017-02-22 03:05:43 +00:00
fix closest_dist = INT32_MAX;
Remove default argument for basic_ptridx(index)
2016-01-09 16:38:14 +00:00
const auto &&candidate_segp = vcsegptridx(candidate.segnum);
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
for (playernum_t i = N_players; i--;)
Implement secluded spawns
2015-07-04 21:01:18 +00:00
{
if (i == player_num)
continue;
Use valptridx for Players Currently, N_players is still a free variable and Players.count is unused. Future work will replace N_players with Players.count.
2017-08-13 20:38:32 +00:00
const auto &&objp = vmobjptr(vcplayerptr(i)->objnum);
Implement secluded spawns
2015-07-04 21:01:18 +00:00
if (objp->type != OBJ_PLAYER)
continue;
Use enum class for WALL_IS_DOORWAY_FLAG This reduces the size of the debug information substantially.
2020-12-19 16:13:26 +00:00
const auto dist = find_connected_distance(objp->pos, candidate_segp.absolute_sibling(objp->segnum), candidate.pos, candidate_segp, -1, WALL_IS_DOORWAY_FLAG::None);
Implement secluded spawns
2015-07-04 21:01:18 +00:00
if (dist >= 0 && closest_dist > dist)
closest_dist = dist;
}
return closest_dist;
};
Add workaround for Win32 array::size() triggering -Wuseless-cast As described in commit 674a921 ("Add workaround for Win32 wrong type for size_t"), std::array on Win32 returns type std::size_t, which is `unsigned int` instead of the `unsigned long` seen on Linux. Calling std::min requires both arguments to have the same type. On Linux, this required casting the result of size() to `unsigned` to match the other input. On Win32, that cast provokes a -Wuseless-cast warning. Add a workaround by removing the cast and instead explicitly setting the type of std::min's arguments to `unsigned`, then relying on the compiler to perform an implicit conversion from `unsigned long` to `unsigned int` on Linux. The value is always small enough to fit in an `unsigned int`, so no precision loss will occur.
2016-08-19 03:41:42 +00:00
const auto max_spawn_sites = std::min<unsigned>(NumNetPlayerPositions, sites.size());
Use alias template per_player_array for arrays that are MAX_PLAYERS long This removes the need to repeat MAX_PLAYERS in every usage, and prepares for a future change to use enumerated_array instead of std::array.
2022-09-24 17:47:53 +00:00
for (playernum_t i = max_spawn_sites; i--;)
Implement secluded spawns
2015-07-04 21:01:18 +00:00
{
auto &s = sites[i];
s.first = i;
s.second = find_closest_player(Player_init[i]);
}
const unsigned SecludedSpawns = Netgame.SecludedSpawns + 1;
if (max_spawn_sites > SecludedSpawns)
{
max_usable_spawn_sites = SecludedSpawns;
Fix some -Wshadow warnings
2016-02-12 04:02:28 +00:00
const auto &&predicate = [](const site &a, const site &b) {
Implement secluded spawns
2015-07-04 21:01:18 +00:00
return a.second > b.second;
};
const auto b = sites.begin();
const auto m = std::next(b, SecludedSpawns);
const auto e = std::next(b, max_spawn_sites);
Fix some -Wshadow warnings
2016-02-12 04:02:28 +00:00
std::partial_sort(b, m, e, predicate);
Implement secluded spawns
2015-07-04 21:01:18 +00:00
}
else
max_usable_spawn_sites = max_spawn_sites;
}
unsigned get_usable_sites() const
{
return max_usable_spawn_sites;
}
Use alias template per_player_array for arrays that are MAX_PLAYERS long This removes the need to repeat MAX_PLAYERS in every usage, and prepares for a future change to use enumerated_array instead of std::array.
2022-09-24 17:47:53 +00:00
const site &operator[](const playernum_t i) const
Implement secluded spawns
2015-07-04 21:01:18 +00:00
{
return sites[i];
}
};
initial import
2006-03-20 17:12:09 +00:00
//initialize the player object position & orientation (at start of game, or new ship)
Pass valptridx factories to static functions
2017-07-26 03:15:59 +00:00
static void InitPlayerPosition(fvmobjptridx &vmobjptridx, fvmsegptridx &vmsegptridx, int random_flag)
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
Implement secluded spawns
2015-07-04 21:01:18 +00:00
reset_cruise();
initial import
2006-03-20 17:12:09 +00:00
int NewPlayer=0;
if (! ((Game_mode & GM_MULTI) && !(Game_mode&GM_MULTI_COOP)) ) // If not deathmatch
NewPlayer = Player_num;
else if (random_flag == 1)
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
const respawn_locations locations(vmobjptr, vcsegptridx);
Implement secluded spawns
2015-07-04 21:01:18 +00:00
if (!locations.get_usable_sites())
return;
Fix -Wtype-limits warnings
2014-09-20 23:47:27 +00:00
uint_fast32_t trys=0;
Return timer_query() from timer_update() Most timer_update sites immediately query the timer, so return it to save them the call.
2015-02-05 03:03:48 +00:00
d_srand(static_cast<fix>(timer_update()));
initial import
2006-03-20 17:12:09 +00:00
do {
trys++;
Implement secluded spawns
2015-07-04 21:01:18 +00:00
NewPlayer = d_rand() % locations.get_usable_sites();
const auto closest_dist = locations[NewPlayer].second;
if (closest_dist >= i2f(15*20))
break;
} while (trys < MAX_PLAYERS * 2);
NewPlayer = locations[NewPlayer].first;
initial import
2006-03-20 17:12:09 +00:00
}
else {
Little more smoothness for Multiplayer: Before dropping Powerups in random segment, make sure it's accessible by the player who drops it; Got rid of goto in InitPlayerPositions() and made code more D2-ish; Allow host to send 50 object/extra packets per second which does not overload network stack, yet but speeds up joining
2011-02-02 22:51:34 +00:00
// If deathmatch and not random, positions were already determined by sync packet
Pass player object to reset_player_object
2022-06-05 17:44:52 +00:00
reset_player_object(*ConsoleObject);
Little more smoothness for Multiplayer: Before dropping Powerups in random segment, make sure it's accessible by the player who drops it; Got rid of goto in InitPlayerPositions() and made code more D2-ish; Allow host to send 50 object/extra packets per second which does not overload network stack, yet but speeds up joining
2011-02-02 22:51:34 +00:00
return;
initial import
2006-03-20 17:12:09 +00:00
}
Assert(NewPlayer >= 0);
Assert(NewPlayer < NumNetPlayerPositions);
ConsoleObject->pos = Player_init[NewPlayer].pos;
ConsoleObject->orient = Player_init[NewPlayer].orient;
Pass valptridx factories to obj_relink
2018-03-12 03:43:46 +00:00
obj_relink(vmobjptr, vmsegptr, vmobjptridx(ConsoleObject), vmsegptridx(Player_init[NewPlayer].segnum));
Pass player object to reset_player_object
2022-06-05 17:44:52 +00:00
reset_player_object(*ConsoleObject);
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
// -----------------------------------------------------------------------------------------------------
// Initialize default parameters for one robot, copying from Robot_info to *objp.
// What about setting size!? Where does that come from?
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
void copy_defaults_to_robot(const d_robot_info_array &Robot_info, object_base &objp)
initial import
2006-03-20 17:12:09 +00:00
{
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
assert(objp.type == OBJ_ROBOT);
const unsigned objid = get_robot_id(objp);
initial import
2006-03-20 17:12:09 +00:00
Use reference for robot_info
2017-08-26 19:47:51 +00:00
auto &robptr = Robot_info[objid];
initial import
2006-03-20 17:12:09 +00:00
// Boost shield for Thief and Buddy based on level.
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
fix shields = robptr.strength;
initial import
2006-03-20 17:12:09 +00:00
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#if defined(DXX_BUILD_DESCENT_II)
Move Difficulty_level to GameUniqueState
2019-06-27 03:26:20 +00:00
const auto &Difficulty_level = GameUniqueState.Difficulty_level;
Use helper to test for thief flag
2013-11-03 22:27:28 +00:00
if ((robot_is_thief(robptr)) || (robot_is_companion(robptr))) {
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
shields = (shields * (abs(Current_level_num)+7))/8;
initial import
2006-03-20 17:12:09 +00:00
Use helper to test for guidebot flag
2013-11-03 22:27:28 +00:00
if (robot_is_companion(robptr)) {
initial import
2006-03-20 17:12:09 +00:00
// Now, scale guide-bot hits by skill level
switch (Difficulty_level) {
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
case Difficulty_level_type::_0:
shields = i2f(20000);
break; // Trainee, basically unkillable
case Difficulty_level_type::_1:
shields *= 3;
break; // Rookie, pretty dang hard
case Difficulty_level_type::_2:
shields *= 2;
break; // Hotshot, a bit tough
initial import
2006-03-20 17:12:09 +00:00
default: break;
}
}
Use reference for robot_info
2017-08-26 19:47:51 +00:00
} else if (robptr.boss_flag) // MK, 01/16/95, make boss shields lower on lower diff levels.
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
{
initial import
2006-03-20 17:12:09 +00:00
// Additional wimpification of bosses at Trainee
Use enum class for Difficulty_level_type
2022-07-16 15:26:12 +00:00
shields = shields / (NDL + 3) * (Difficulty_level != Difficulty_level_type::_0 ? underlying_value(Difficulty_level) + 4 : 2);
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
}
Move */main/gameseq.c -> similar/main/gameseq.c
2013-03-03 01:03:33 +00:00
#endif
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
objp.shields = shields;
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
namespace {
initial import
2006-03-20 17:12:09 +00:00
// -----------------------------------------------------------------------------------------------------
// Copy all values from the robot info structure to all instances of robots.
// This allows us to change bitmaps.tbl and have these changes manifested in existing robots.
// This function should be called at level load time.
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
static void copy_defaults_to_robot_all(const d_robot_info_array &Robot_info)
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptr = Objects.vmptr;
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
range_for (object_base &objp, vmobjptr)
Use valptr for gameseq highest_valid
2015-06-13 22:42:17 +00:00
{
Simplify copy_defaults_to_robot Write the shields once at the end.
2019-03-03 00:31:07 +00:00
if (objp.type == OBJ_ROBOT)
Pass LevelSharedRobotInfoState to various functions that need it
2022-07-09 13:39:29 +00:00
copy_defaults_to_robot(Robot_info, objp);
Use valptr for gameseq highest_valid
2015-06-13 22:42:17 +00:00
}
initial import
2006-03-20 17:12:09 +00:00
}
// -----------------------------------------------------------------------------------------------------
//called when the player is starting a level (new game or new ship)
Mark various functions static
2013-09-22 22:26:27 +00:00
static void StartLevel(int random_flag)
initial import
2006-03-20 17:12:09 +00:00
{
Move Objects to d_level_unique_object_state
2019-03-03 00:31:08 +00:00
auto &Objects = LevelUniqueObjectState.Objects;
auto &vmobjptridx = Objects.vmptridx;
Use enum class for Player_dead_state (formerly Player_is_dead)
2015-12-15 04:09:35 +00:00
assert(Player_dead_state == player_dead_state::no);
initial import
2006-03-20 17:12:09 +00:00
Pass valptridx factories to static functions
2017-07-26 03:15:59 +00:00
InitPlayerPosition(vmobjptridx, vmsegptridx, random_flag);
initial import
2006-03-20 17:12:09 +00:00
verify_console_object();
Rename object::control_type to control_source gcc and clang disagree about how to disambiguate when an identifier is both a typename and a member. Avoid the disagreement by renaming the member. Reported-by: Kreeblah <https://github.com/dxx-rebirth/dxx-rebirth/issues/532>
2020-08-10 03:45:13 +00:00
ConsoleObject->control_source = object::control_type::flying;
Rename object::movement_type to movement_source gcc and clang disagree about how to disambiguate when an identifier is both a typename and a member. Avoid the disagreement by renaming the member.
2020-08-10 03:45:13 +00:00
ConsoleObject->movement_source = object::movement_type::physics;
initial import
2006-03-20 17:12:09 +00:00
// create_player_appearance_effect(ConsoleObject);
Do_appearance_effect = 1;
if (Game_mode & GM_MULTI)
{
if (Game_mode & GM_MULTI_COOP)
multi_send_score();
multi_send_reappear();
Convert multi_do_protocol_frame to dispatch through a vtable
2020-12-20 20:39:07 +00:00
multi::dispatch->do_protocol_frame(1, 1);
in StartLevel() only call disable_matcens() and clear_transient_objects() in Singleplayer to keep consistency with remote clients
2012-05-24 10:46:35 +00:00
}
else // in Singleplayer, after we died ...
{
disable_matcens(); // ... disable matcens and ...
clear_transient_objects(0); // ... clear all transient objects.
}
initial import
2006-03-20 17:12:09 +00:00
ai_reset_all_paths();
ai_init_boss_for_ship();
reset_rear_view();
Move Fusion_charge to player_info This eliminates some ugly hacks regarding remotely generated fusion shots.
2016-12-10 17:51:09 +00:00
auto &player_info = ConsoleObject->ctype.player_info;
Move Auto_fire_fusion_cannon_time to player_info
2016-12-10 17:51:09 +00:00
player_info.Auto_fire_fusion_cannon_time = 0;
Move Fusion_charge to player_info This eliminates some ugly hacks regarding remotely generated fusion shots.
2016-12-10 17:51:09 +00:00
player_info.Fusion_charge = 0;
initial import
2006-03-20 17:12:09 +00:00
}
Move more symbols into namespaces
2020-12-26 21:17:29 +00:00
}
Move conditionally compiled code into namespace dsx
2016-08-25 04:05:32 +00:00
}
Reference in a new issue Copy permalink