From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 4 Jul 2010 19:48:56 +0000 (+0000)
Subject: make -1 as bindmap argument also work, to mean "current bindmap" (same as leaving... 
X-Git-Tag: xonotic-v0.1.0preview~230^2~207
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a84f88eb529439276164e7b544d275fac5199767;p=xonotic%2Fdarkplaces.git

make -1 as bindmap argument also work, to mean "current bindmap" (same as leaving out). Helps when the user wants to avoid the varargs declaration.

From: Rudolf Polzer <divverent@alientrap.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10271 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/keys.c b/keys.c
index 981e2f24..40ecfde2 100644
--- a/keys.c
+++ b/keys.c
@@ -1405,7 +1405,7 @@ void Key_FindKeysForCommand (const char *command, int *keys, int numkeys, int bi
 {
 	int		count;
 	int		j;
-	char	*b;
+	const char	*b;
 
 	for (j = 0;j < numkeys;j++)
 		keys[j] = -1;
diff --git a/prvm_cmds.c b/prvm_cmds.c
index 2ddf0afb..0781f0e2 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -3921,7 +3921,7 @@ void VM_findkeysforcommand(void)
 
 	cmd = PRVM_G_STRING(OFS_PARM0);
 	if(prog->argc == 2)
-		bindmap = bound(0, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
+		bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
 	else
 		bindmap = -1;
 
@@ -3962,7 +3962,7 @@ void VM_getkeybind (void)
 	int bindmap;
 	VM_SAFEPARMCOUNTRANGE(1, 2, VM_CL_getkeybind);
 	if(prog->argc == 2)
-		bindmap = bound(0, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
+		bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
 	else
 		bindmap = -1;