From 7a2c32a2286a2c658725e051d8cd425fb7b255ea Mon Sep 17 00:00:00 2001 From: Resxt <55228336+Resxt@users.noreply.github.com> Date: Thu, 26 Jan 2023 03:06:23 +0100 Subject: [PATCH] mapvote 2.1.1 Code refactor Doesn't add or change anything --- mapvote/mapvote.gsc | Bin 20133 -> 20133 bytes mapvote/source/mapvote-source.gsc | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mapvote/mapvote.gsc b/mapvote/mapvote.gsc index 342ec22b8a28f61f4d89ec50164a8e2f10d5d6e9..11a6ed8ae809a96e27773e18a3fee329806e251f 100644 GIT binary patch delta 6701 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 diff --git a/mapvote/source/mapvote-source.gsc b/mapvote/source/mapvote-source.gsc index d2d7fc8..91c997b 100644 --- a/mapvote/source/mapvote-source.gsc +++ b/mapvote/source/mapvote-source.gsc @@ -20,7 +20,7 @@ Init() { if (GetDvarInt("mapvote_enable")) { - level.mapvote_rotate_function = ::DoRotation; + level.mapvote_rotate_function = ::StartRotation; InitMapvote(); } @@ -554,8 +554,7 @@ ListenForEndVote() Print("[MAPVOTE] Rotating to " + mapName + " | " + modeName + " (" + modeCfg + ".cfg)"); } - SetDvar("sv_maprotationcurrent", "exec " + modeCfg + ".cfg map " + mapName); - SetDvar("sv_maprotation", "exec " + modeCfg + ".cfg map " + mapName); + DoRotation(modeCfg, mapName); } SetMapvoteData(type) @@ -697,11 +696,16 @@ RotateDefault() mapName = GetMapCodeName(dataSplitted[0]); } + DoRotation(modeCfg, mapName); +} + +DoRotation(modeCfg, mapName) +{ SetDvar("sv_maprotationcurrent", "exec " + modeCfg + ".cfg map " + mapName); SetDvar("sv_maprotation", "exec " + modeCfg + ".cfg map " + mapName); } -DoRotation() +StartRotation() { if (ShouldRotateDefault()) {