More conversion
This commit is contained in:
+14
-13
@@ -628,6 +628,7 @@ void Key_SetBinding (int keynum, const char *binding)
|
||||
// allocate memory for new binding
|
||||
if (binding)
|
||||
keybindings[keynum] = Z_Strdup(binding);
|
||||
printf("%d is now %s\n", keynum, keybindings[keynum]);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -639,16 +640,16 @@ void Key_Unbind_f (void)
|
||||
{
|
||||
int b;
|
||||
|
||||
if (Cmd_Argc() != 2)
|
||||
if (command::argc() != 2)
|
||||
{
|
||||
Con_Printf ("unbind <key> : remove commands from a key\n");
|
||||
return;
|
||||
}
|
||||
|
||||
b = Key_StringToKeynum (Cmd_Argv(1));
|
||||
b = Key_StringToKeynum (command::argv(1)->c_str());
|
||||
if (b == -1)
|
||||
{
|
||||
Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
|
||||
Con_Printf ("\"%s\" isn't a valid key\n", command::argv(1)->c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -697,26 +698,26 @@ void Key_Bind_f (void)
|
||||
int i, c, b;
|
||||
char cmd[1024];
|
||||
|
||||
c = Cmd_Argc();
|
||||
c = command::argc();
|
||||
|
||||
if (c != 2 && c != 3)
|
||||
{
|
||||
Con_Printf ("bind <key> [command] : attach a command to a key\n");
|
||||
return;
|
||||
}
|
||||
b = Key_StringToKeynum (Cmd_Argv(1));
|
||||
b = Key_StringToKeynum (command::argv(1)->c_str());
|
||||
if (b == -1)
|
||||
{
|
||||
Con_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
|
||||
Con_Printf ("\"%s\" isn't a valid key\n", command::argv(1)->c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
if (c == 2)
|
||||
{
|
||||
if (keybindings[b])
|
||||
Con_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv(1), keybindings[b] );
|
||||
Con_Printf ("\"%s\" = \"%s\"\n", command::argv(1)->c_str(), keybindings[b] );
|
||||
else
|
||||
Con_Printf ("\"%s\" is not bound\n", Cmd_Argv(1) );
|
||||
Con_Printf ("\"%s\" is not bound\n", command::argv(1)->c_str() );
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -724,7 +725,7 @@ void Key_Bind_f (void)
|
||||
cmd[0] = 0;
|
||||
for (i = 2; i < c; i++)
|
||||
{
|
||||
q_strlcat (cmd, Cmd_Argv(i), sizeof(cmd));
|
||||
q_strlcat (cmd, command::argv(i)->c_str(), sizeof(cmd));
|
||||
if (i != (c-1))
|
||||
q_strlcat (cmd, " ", sizeof(cmd));
|
||||
}
|
||||
@@ -890,10 +891,10 @@ void Key_Init (void)
|
||||
//
|
||||
// register our functions
|
||||
//
|
||||
Cmd_AddCommand ("bindlist",Key_Bindlist_f); //johnfitz
|
||||
Cmd_AddCommand ("bind",Key_Bind_f);
|
||||
Cmd_AddCommand ("unbind",Key_Unbind_f);
|
||||
Cmd_AddCommand ("unbindall",Key_Unbindall_f);
|
||||
command::add ("bindlist",Key_Bindlist_f); //johnfitz
|
||||
command::add ("bind",Key_Bind_f);
|
||||
command::add ("unbind",Key_Unbind_f);
|
||||
command::add ("unbindall",Key_Unbindall_f);
|
||||
}
|
||||
|
||||
static struct {
|
||||
|
||||
Reference in New Issue
Block a user