pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

Browse Source
This commit is contained in:
Akkadius 2020-05-25 23:06:14 -05:00
commit 01d326ef83
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/scripts/eqemu_server.pl
View File

@ -705,7 +705,7 @@ sub get_windows_wget {
if (!-d "bin") { if (!-d "bin") {
mkdir("bin"); mkdir("bin");
} }
`powershell -Command "\$ProgressPreference = 'SilentlyContinue'; Invoke-RestMethod -ContentType \"application/octet-stream\" -Uri https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/windows/wget.exe -OutFile bin/wget.exe"` `powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/windows/wget.exe', 'bin\\wget.exe') "`
} }
} }

7
zone/embparser_api.cpp
View File

@ -1619,11 +1619,12 @@ XS(XS__ChooseRandom) {
if (items < 1) if (items < 1)
Perl_croak(aTHX_ "Usage: quest::ChooseRandom(option1, option2, option3, option4, option5...[no limit])"); Perl_croak(aTHX_ "Usage: quest::ChooseRandom(option1, option2, option3, option4, option5...[no limit])");
dXSTARG;
int index = zone->random.Int(0, items - 1); int index = zone->random.Int(0, items - 1);
SV *RETVAL = ST(index);
SV *tmp = ST(0); XSprePUSH;
ST(0) = ST(index); PUSHs(RETVAL);
ST(index) = tmp;
XSRETURN(1); //return 1 element from the stack (ST(0)) XSRETURN(1); //return 1 element from the stack (ST(0))
} }