OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Let puke and pukename take up to four script parameters.

Browse source 
- Pass ACS_ExecuteWithResult's fifth argument as a fourth script parameter.
- Simplify P_StartScript()'s usage.

SVN r3394 (trunk)
This commit is contained in:
Randy Heit 2012-02-26 03:36:05 +00:00
commit 1e21ebad5d
10 changed files with 117 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/c_cmds.cpp
View file

@ -451,9 +451,9 @@ CCMD (puke)
{
int argc = argv.argc();
if (argc < 2 || argc > 5)
if (argc < 2 || argc > 6)
{
Printf ("Usage: puke <script> [arg1] [arg2] [arg3]\n");
Printf ("Usage: puke <script> [arg1] [arg2] [arg3] [arg4]\n");
}
else
{
@ -463,8 +463,8 @@ CCMD (puke)
{ // Script 0 is reserved for Strife support. It is not pukable.
return;
}
int arg[3] = { 0, 0, 0 };
int argn = MIN (argc - 2, 3), i;
int arg[4] = { 0, 0, 0, 0 };
int argn = MIN<int>(argc - 2, countof(arg)), i;
for (i = 0; i < argn; ++i)
{
@ -493,15 +493,15 @@ CCMD (pukename)
{
int argc = argv.argc();
if (argc < 2 || argc > 6)
if (argc < 2 || argc > 7)
{
Printf ("Usage: pukename \"<script>\" [\"always\"] [arg1] [arg2] [arg3]\n");
Printf ("Usage: pukename \"<script>\" [\"always\"] [arg1] [arg2] [arg3] [arg4]\n");
}
else
{
bool always = false;
int argstart = 2;
int arg[3] = { 0, 0, 0 };
int arg[4] = { 0, 0, 0, 0 };
int argn = 0, i;
if (argc > 2)
@ -511,7 +511,7 @@ CCMD (pukename)
always = true;
argstart = 3;
}
argn = MIN(argc - argstart, 3);
argn = MIN<int>(argc - argstart, countof(arg));
for (i = 0; i < argn; ++i)
{
arg[i] = atoi(argv[argstart + i]);