Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update BYOND and spacemandmm versions, should fix more #6

Merged
merged 1 commit into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SpacemanDMM.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
environment = "lobotomy-corp13.dme"

[langserver]
dreamchecker = true

Expand Down
8 changes: 1 addition & 7 deletions code/__DEFINES/_tick.dm
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
/// Percentage of tick to leave for master controller to run
#define MAPTICK_MC_MIN_RESERVE 70
/// internal_tick_usage is updated every tick by extools
#if defined(USE_EXTOOLS) || DM_VERSION < 514
#define MAPTICK_LAST_INTERNAL_TICK_USAGE ((GLOB.internal_tick_usage / world.tick_lag) * 100)
#else
#define MAPTICK_LAST_INTERNAL_TICK_USAGE (world.map_cpu)
#endif

/// Tick limit while running normally
#define TICK_BYOND_RESERVE 2
#define TICK_LIMIT_RUNNING (max(100 - TICK_BYOND_RESERVE - MAPTICK_LAST_INTERNAL_TICK_USAGE, MAPTICK_MC_MIN_RESERVE))
#define TICK_LIMIT_RUNNING (max(100 - TICK_BYOND_RESERVE - world.map_cpu, MAPTICK_MC_MIN_RESERVE))
/// Tick limit used to resume things in stoplag
#define TICK_LIMIT_TO_RUN 70
/// Tick limit for MC while running
Expand Down
5 changes: 0 additions & 5 deletions code/_compile_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
#error You need version 513.1514 or higher
#endif

//Don't load extools on 514 and 513.1539+
#if DM_VERSION < 514 && DM_BUILD < 1540
#define USE_EXTOOLS
#endif

//Additional code for the above flags.
#ifdef TESTING
#warn compiling in TESTING mode. testing() debug messages will be visible.
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/statpanel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ SUBSYSTEM_DEF(statpanels)
list("World Time:", "[world.time]"),
list("Globals:", GLOB.stat_entry(), "\ref[GLOB]"),
list("[config]:", config.stat_entry(), "\ref[config]"),
list("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%)) (Internal Tick Usage: [round(MAPTICK_LAST_INTERNAL_TICK_USAGE,0.1)]%)"),
list("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%)) (Internal Tick Usage: [round(world.map_cpu,0.1)]%)"),
list("Master Controller:", Master.stat_entry(), "\ref[Master]"),
list("Failsafe Controller:", Failsafe.stat_entry(), "\ref[Failsafe]"),
list("","")
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/time_track.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ SUBSYSTEM_DEF(time_track)
time_dilation_avg_fast,
time_dilation_avg,
time_dilation_avg_slow,
MAPTICK_LAST_INTERNAL_TICK_USAGE,
world.map_cpu,
length(SStimer.timer_id_dict),
SSair.cost_turfs,
SSair.cost_groups,
Expand Down
5 changes: 0 additions & 5 deletions code/game/world.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ GLOBAL_VAR(restart_counter)
* All atoms in both compiled and uncompiled maps are initialized()
*/
/world/New()
#ifdef USE_EXTOOLS
var/extools = world.GetConfig("env", "EXTOOLS_DLL") || (world.system_type == MS_WINDOWS ? "./byond-extools.dll" : "./libbyond-extools.so")
if (fexists(extools))
call(extools, "maptick_initialize")()
#endif
enable_debugger()

log_world("World loaded at [time_stamp()]!")
Expand Down
2 changes: 1 addition & 1 deletion dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export NODE_VERSION=14
export NODE_VERSION_PRECISE=14.16.1

# SpacemanDMM git tag
export SPACEMAN_DMM_VERSION=suite-1.6
export SPACEMAN_DMM_VERSION=suite-1.7.3

# Extools git tag
export EXTOOLS_VERSION=v0.0.7
Expand Down
5 changes: 2 additions & 3 deletions tools/tgs4_scripts/PreCompile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ if ! ( [ -x "$has_git" ] && [ -x "$has_grep" ] && [ -f "/usr/lib/i386-linux-gnu/
fi
dpkg --add-architecture i386
apt-get update
#apt-get upgrade -y
apt-get install -y lib32z1 pkg-config libssl-dev:i386 libssl-dev
#update rust-g
apt-get install -y lib32z1 pkg-config libssl-dev:i386 libssl-dev libssl1.1:i386
# update rust-g
if [ ! -d "rust-g" ]; then
echo "Cloning rust-g..."
git clone https://github.com/tgstation/rust-g
Expand Down
Loading