Migrate more strings
FossilOrigin-Name: e7b5d33cada1ff8db653655ab2c77ead76ab7625a5d2f793b9aee3ec21e3778b
This commit is contained in:
parent
b00de734e8
commit
2860953c0b
24 changed files with 692 additions and 556 deletions
|
@ -2,6 +2,8 @@
|
|||
|
||||
#include "cube.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
int nextmode = 0; // nextmode becomes gamemode after next map load
|
||||
VAR(gamemode, 1, 0, 0);
|
||||
|
||||
|
@ -231,13 +233,13 @@ respawn()
|
|||
}
|
||||
|
||||
int sleepwait = 0;
|
||||
string sleepcmd;
|
||||
static OFString *sleepcmd = nil;
|
||||
void
|
||||
sleepf(char *msec, char *cmd)
|
||||
sleepf(OFString *msec, OFString *cmd)
|
||||
{
|
||||
sleepwait = atoi(msec) + lastmillis;
|
||||
strcpy_s(sleepcmd, cmd);
|
||||
};
|
||||
sleepwait = (int)msec.longLongValue + lastmillis;
|
||||
sleepcmd = cmd;
|
||||
}
|
||||
COMMANDN(sleep, sleepf, ARG_2STR)
|
||||
|
||||
void
|
||||
|
@ -247,8 +249,12 @@ updateworld(int millis) // main game update loop
|
|||
curtime = millis - lastmillis;
|
||||
if (sleepwait && lastmillis > sleepwait) {
|
||||
sleepwait = 0;
|
||||
execute(sleepcmd);
|
||||
};
|
||||
@autoreleasepool {
|
||||
std::unique_ptr<char> cmd(
|
||||
strdup(sleepcmd.UTF8String));
|
||||
execute(cmd.get());
|
||||
}
|
||||
}
|
||||
physicsframe();
|
||||
checkquad(curtime);
|
||||
if (m_arena)
|
||||
|
@ -508,9 +514,9 @@ startmap(char *name) // called just after a map load
|
|||
}
|
||||
if (editmode)
|
||||
toggleedit();
|
||||
setvar("gamespeed", 100);
|
||||
setvar("fog", 180);
|
||||
setvar("fogcolour", 0x8099B3);
|
||||
setvar(@"gamespeed", 100);
|
||||
setvar(@"fog", 180);
|
||||
setvar(@"fogcolour", 0x8099B3);
|
||||
showscores(false);
|
||||
intermission = false;
|
||||
framesinmap = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue