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

16
src/worldio.mm
View file

@ -128,12 +128,12 @@ writemap(char *mname, int msize, uchar *mdata)
backup(cgzname, bakname);
FILE *f = fopen(cgzname, "wb");
if (!f) {
conoutf("could not write map to %s", cgzname);
conoutf(@"could not write map to %s", cgzname);
return;
};
fwrite(mdata, 1, msize, f);
fclose(f);
conoutf("wrote map %s as file %s", mname, cgzname);
conoutf(@"wrote map %s as file %s", mname, cgzname);
}
uchar *
@ -142,7 +142,7 @@ readmap(char *mname, int *msize)
setnames(mname);
uchar *mdata = (uchar *)loadfile(cgzname, msize);
if (!mdata) {
conoutf("could not read map %s", cgzname);
conoutf(@"could not read map %s", cgzname);
return NULL;
};
return mdata;
@ -165,7 +165,7 @@ save_world(char *mname)
backup(cgzname, bakname);
gzFile f = gzopen(cgzname, "wb9");
if (!f) {
conoutf("could not write map to %s", cgzname);
conoutf(@"could not write map to %s", cgzname);
return;
};
hdr.version = MAPVERSION;
@ -237,7 +237,7 @@ save_world(char *mname)
};
spurge;
gzclose(f);
conoutf("wrote map file %s", cgzname);
conoutf(@"wrote map file %s", cgzname);
settagareas();
};
@ -251,7 +251,7 @@ load_world(char *mname) // still supports all map formats that have existed
setnames(mname);
gzFile f = gzopen(cgzname, "rb9");
if (!f) {
conoutf("could not read map %s", cgzname);
conoutf(@"could not read map %s", cgzname);
return;
};
gzread(f, &hdr, sizeof(header) - sizeof(int) * 16);
@ -357,9 +357,9 @@ load_world(char *mname) // still supports all map formats that have existed
settagareas();
int xs, ys;
loopi(256) if (texuse) lookuptexture(i, xs, ys);
conoutf("read map %s (%d milliseconds)", cgzname,
conoutf(@"read map %s (%d milliseconds)", cgzname,
SDL_GetTicks() - lastmillis);
conoutf("%s", hdr.maptitle);
conoutf(@"%s", hdr.maptitle);
startmap(mname);
loopl(256)
{