make -1 as bindmap argument also work, to mean "current bindmap" (same as leaving...

From: Rudolf Polzer <divverent@alientrap.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10271 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a84f88eb529439276164e7b544d275fac5199767

diff --git a/keys.c b/keys.c
index 981e2f24d7bf71d75e04167ac6185dd2fce3a77b..40ecfde2e25c3ccb6420fdf98e2bda0b1f9ac177 100644 (file)
--- 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 e1c44f04b9c8e61eb1a913abbba319ccb827f8b2..96f0b452c0e8ef8bfb0e58fa46aef8a5a94694d3 100644 (file)
--- 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;