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

Make conoutf take an OFString

Browse source 
FossilOrigin-Name: f8f97851f3ec3f0920a95912e7bfe58995f5ca1bcd4c5b5ee3532cb1809eab46
This commit is contained in:
Jonathan Schleifer 2024-08-03 17:02:33 +00:00
parent faf0a4096e
commit 7f42da935a
21 changed files with 240 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/monster.mm
View file

@ -5,7 +5,7 @@
dvector monsters;
int nextmonster, spawnremain, numkilled, monstertotal, mtimestart;
VARF(skill, 1, 3, 10, conoutf("skill is now %d", skill));
VARF(skill, 1, 3, 10, conoutf(@"skill is now %d", skill));
dvector &
getmonsters()
@ -52,7 +52,7 @@ dynent *
basicmonster(int type, int yaw, int state, int trigger, int move)
{
if (type >= NUMMONSTERTYPES) {
conoutf("warning: unknown monster in spawn: %d", type);
conoutf(@"warning: unknown monster in spawn: %d", type);
type = 0;
};
dynent *m = newdynent();
@ -340,7 +340,7 @@ monsterpain(dynent *m, int damage, dynent *d)
playsound(monstertypes[m->mtype].diesound, &m->o);
int remain = monstertotal - numkilled;
if (remain > 0 && remain <= 5)
conoutf("only %d monster(s) remaining", remain);
conoutf(@"only %d monster(s) remaining", remain);
} else {
playsound(monstertypes[m->mtype].painsound, &m->o);
};
@ -349,9 +349,9 @@ monsterpain(dynent *m, int damage, dynent *d)
void
endsp(bool allkilled)
{
conoutf(
allkilled ? "you have cleared the map!" : "you reached the exit!");
conoutf("score: %d kills in %d seconds", numkilled,
conoutf(allkilled ? @"you have cleared the map!"
: @"you reached the exit!");
conoutf(@"score: %d kills in %d seconds", numkilled,
(lastmillis - mtimestart) / 1000);
monstertotal = 0;
startintermission();
@ -362,7 +362,7 @@ monsterthink()
{
if (m_dmsp && spawnremain && lastmillis > nextmonster) {
if (spawnremain-- == monstertotal)
conoutf("The invasion has begun!");
conoutf(@"The invasion has begun!");
nextmonster = lastmillis + 1000;
spawnmonster();
};