[ScriptError]: Use dvar in runtime error internal (#723)
This commit is contained in:
parent
899caeb357
commit
341ee49b23
@ -7,8 +7,8 @@ namespace Components
|
|||||||
|
|
||||||
int Elevators::PM_CorrectAllSolid(Game::pmove_s* pm, Game::pml_t* pml, Game::trace_t* trace)
|
int Elevators::PM_CorrectAllSolid(Game::pmove_s* pm, Game::pml_t* pml, Game::trace_t* trace)
|
||||||
{
|
{
|
||||||
assert(pm != nullptr);
|
assert(pm);
|
||||||
assert(pm->ps != nullptr);
|
assert(pm->ps);
|
||||||
|
|
||||||
Game::vec3_t point;
|
Game::vec3_t point;
|
||||||
auto* ps = pm->ps;
|
auto* ps = pm->ps;
|
||||||
|
@ -563,8 +563,7 @@ namespace Components
|
|||||||
{
|
{
|
||||||
Friends::LoggedOn = false;
|
Friends::LoggedOn = false;
|
||||||
|
|
||||||
if (Dedicated::IsEnabled() || ZoneBuilder::IsEnabled())
|
if (Dedicated::IsEnabled() || ZoneBuilder::IsEnabled()) return;
|
||||||
return;
|
|
||||||
|
|
||||||
Friends::UIStreamFriendly = Dvar::Register<bool>("ui_streamFriendly", false, Game::DVAR_ARCHIVE, "Stream friendly UI");
|
Friends::UIStreamFriendly = Dvar::Register<bool>("ui_streamFriendly", false, Game::DVAR_ARCHIVE, "Stream friendly UI");
|
||||||
Friends::CLAnonymous = Dvar::Register<bool>("cl_anonymous", false, Game::DVAR_ARCHIVE, "Enable invisible mode for Steam");
|
Friends::CLAnonymous = Dvar::Register<bool>("cl_anonymous", false, Game::DVAR_ARCHIVE, "Enable invisible mode for Steam");
|
||||||
|
@ -403,7 +403,7 @@ namespace Components
|
|||||||
if (!developer_)
|
if (!developer_)
|
||||||
{
|
{
|
||||||
assert(Scr_IsInOpcodeMemory(codePos));
|
assert(Scr_IsInOpcodeMemory(codePos));
|
||||||
if (!Game::scrVmPub->terminal_error)
|
if (!(*Game::com_developer)->current.enabled)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -845,10 +845,10 @@ namespace Components
|
|||||||
return filePosId;
|
return filePosId;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScriptError::Scr_Settings_Hk(int developer, int developer_script, int abort_on_error)
|
void ScriptError::Scr_Settings_Hk([[maybe_unused]] int developer, int developer_script, int abort_on_error)
|
||||||
{
|
{
|
||||||
assert(!abort_on_error || developer);
|
assert(!abort_on_error || developer);
|
||||||
developer_ = developer != 0;
|
developer_ = (*Game::com_developer)->current.enabled;
|
||||||
Game::scrVarPub->developer_script = developer_script != 0;
|
Game::scrVarPub->developer_script = developer_script != 0;
|
||||||
Game::scrVmPub->abort_on_error = abort_on_error != 0;
|
Game::scrVmPub->abort_on_error = abort_on_error != 0;
|
||||||
}
|
}
|
||||||
|
@ -1993,7 +1993,9 @@ namespace Components
|
|||||||
Command::Add("togglescores", Scores_Toggle_f);
|
Command::Add("togglescores", Scores_Toggle_f);
|
||||||
|
|
||||||
if (Dedicated::IsEnabled())
|
if (Dedicated::IsEnabled())
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Gamepad on frame hook
|
// Gamepad on frame hook
|
||||||
Utils::Hook(0x475E9E, IN_Frame_Hk, HOOK_CALL).install()->quick();
|
Utils::Hook(0x475E9E, IN_Frame_Hk, HOOK_CALL).install()->quick();
|
||||||
|
@ -18,7 +18,7 @@ namespace Components
|
|||||||
if (*Game::s_havePlaylists) return;
|
if (*Game::s_havePlaylists) return;
|
||||||
|
|
||||||
// Don't load playlists when dedi and no party
|
// Don't load playlists when dedi and no party
|
||||||
if (Dedicated::IsEnabled() && !Dvar::Var("party_enable").get<bool>())
|
if (Dedicated::IsEnabled() && !Party::IsEnabled())
|
||||||
{
|
{
|
||||||
*Game::s_havePlaylists = true;
|
*Game::s_havePlaylists = true;
|
||||||
Dvar::Var("xblive_privateserver").set(true);
|
Dvar::Var("xblive_privateserver").set(true);
|
||||||
|
@ -429,7 +429,7 @@ namespace Components
|
|||||||
// vid_restart when ingame
|
// vid_restart when ingame
|
||||||
Utils::Hook::Nop(0x4CA1FA, 6);
|
Utils::Hook::Nop(0x4CA1FA, 6);
|
||||||
|
|
||||||
// Filter log (initially com_logFilter, but I don't see why that dvar is needed)
|
// Filter log (initially com_logFilter, but I don't see why that dvar print is needed)
|
||||||
// Seems like it's needed for B3, so there is a separate handling for dedicated servers in Dedicated.cpp
|
// Seems like it's needed for B3, so there is a separate handling for dedicated servers in Dedicated.cpp
|
||||||
if (!Dedicated::IsEnabled())
|
if (!Dedicated::IsEnabled())
|
||||||
{
|
{
|
||||||
|
@ -422,7 +422,7 @@ namespace Components
|
|||||||
// Feeder
|
// Feeder
|
||||||
UIFeeder::Add(10.0f, GetDemoCount, GetDemoText, SelectDemo);
|
UIFeeder::Add(10.0f, GetDemoCount, GetDemoText, SelectDemo);
|
||||||
|
|
||||||
// set the configstrings stuff to load the default (empty) string table; this should allow demo recording on all gametypes/maps
|
// Set the configstrings stuff to load the default (empty) string table; this should allow demo recording on all gametypes/maps
|
||||||
if (!Dedicated::IsEnabled()) Utils::Hook::Set<const char*>(0x47440B, "mp/defaultStringTable.csv");
|
if (!Dedicated::IsEnabled()) Utils::Hook::Set<const char*>(0x47440B, "mp/defaultStringTable.csv");
|
||||||
|
|
||||||
// Change font size
|
// Change font size
|
||||||
|
Loading…
x
Reference in New Issue
Block a user