Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
sourcemod
empfun
Commits
c4160af4
Commit
c4160af4
authored
Jul 04, 2020
by
Mikleo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix scenariovote command
parent
393f0763
Pipeline
#10137
passed with stages
in 24 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
dist/addons/sourcemod/plugins/empfun.smx
dist/addons/sourcemod/plugins/empfun.smx
+0
-0
dist/addons/sourcemod/scripting/empfun.sp
dist/addons/sourcemod/scripting/empfun.sp
+5
-5
dist/updater.txt
dist/updater.txt
+1
-1
No files found.
dist/addons/sourcemod/plugins/empfun.smx
View file @
c4160af4
No preview for this file type
dist/addons/sourcemod/scripting/empfun.sp
View file @
c4160af4
...
...
@@ -10,7 +10,7 @@
#include <SteamWorks>
#define PluginVersion "1.1
4
"
#define PluginVersion "1.1
5
"
float pVersion;
// note linearmap field is unstable
...
...
@@ -246,7 +246,7 @@ public void SetScenarioName(char[] scenarioName)
{
strcopy(currentScenario,sizeof(currentScenario),scenarioName);
if(sc_gamedesc_scenario != INVALID_HANDLE)
if(sc_gamedesc_scenario != INVALID_HANDLE
&& StrContains(currentScenario, "override", true) == -1
)
{
sc_gamedesc_scenario.SetString(scenarioName);
}
...
...
@@ -488,7 +488,6 @@ bool StartDefaultScenarioVote()
GetActingVoteListPath(path,sizeof(path));
kv.ImportFromFile(path);
kv.JumpToKey("scenarios");
kv.GotoFirstSubKey();
StartScenarioVote(kv);
delete kv;
}
...
...
@@ -520,6 +519,8 @@ public bool StartScenarioVote(KeyValues kv)
int numOptions = 0;
int numPlayers = GetClientCount(true);
kv.GotoFirstSubKey();
do
{
...
...
@@ -3710,8 +3711,7 @@ public Action Command_Scenario_Vote(int client, int args)
{
GetCmdArg(i, arg, sizeof(arg));
kv.JumpToKey(arg,true);
kv.SetString("tags_override","-");
kv.Rewind();
kv.GoBack();
}
StartScenarioVote(kv);
delete kv;
...
...
dist/updater.txt
View file @
c4160af4
...
...
@@ -4,7 +4,7 @@
{
"Version"
{
"Latest" "1.1
4
"
"Latest" "1.1
5
"
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment