js/Cube
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make execute() take an OFString

Browse source 
FossilOrigin-Name: acc50da079501c3c301f3a742f14cdfe7ac4b6fd56a6ee46acb32cfbaa059dcf
This commit is contained in:
Jonathan Schleifer 2025-03-07 22:44:37 +00:00
parent 039efe612d
commit e4c1890a25
8 changed files with 79 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/console.mm
View file

@ -3,7 +3,6 @@
#include "cube.h"
#include <ctype.h>
#include <memory>
#import "KeyMapping.h"
@ -173,9 +172,7 @@ history(int n)
if (!rec && n >= 0 && n < vhistory.count) {
rec = true;
OFString *cmd = vhistory[vhistory.count - n - 1];
std::unique_ptr<char> copy(strdup(cmd.UTF8String));
execute(copy.get());
execute(vhistory[vhistory.count - n - 1]);
rec = false;
}
}
@ -249,12 +246,9 @@ keypress(int code, bool isdown, int cooked)
}
}
histpos = vhistory.count;
if ([commandbuf hasPrefix:@"/"]) {
std::unique_ptr<char> copy(
strdup(
commandbuf.UTF8String));
execute(copy.get(), true);
} else
if ([commandbuf hasPrefix:@"/"])
execute(commandbuf, true);
else
toserver(commandbuf);
}
saycommand(NULL);
@ -269,9 +263,7 @@ keypress(int code, bool isdown, int cooked)
if (mapping.code == code) {
// keystrokes go to game, lookup in keymap and
// execute
string temp;
strcpy_s(temp, mapping.action.UTF8String);
execute(temp, isdown);
execute(mapping.action, isdown);
return;
}
}