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

Clean up file handling

Browse source 
FossilOrigin-Name: 3d55e077f74fc1c036e856cc4fdf0ae3c308c58f7d37eb9392f1a15f10cc237d
This commit is contained in:
Jonathan Schleifer 2025-03-05 21:29:54 +00:00
parent c6eebefd77
commit ab582d3745
14 changed files with 278 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/Cube.mm
View file

@ -9,6 +9,7 @@ VARP(minmillis, 0, 5, 1000);
@implementation Cube {
int _width, _height;
OFIRI *_userDataIRI;
}
+ (Cube *)sharedInstance
@ -116,16 +117,43 @@ VARP(minmillis, 0, 5, 1000);
gl_init(_width, _height);
log("basetex");
_gameDataIRI = [OFFileManager.defaultManager currentDirectoryIRI];
_userDataIRI = [OFFileManager.defaultManager currentDirectoryIRI];
int xs, ys;
if (!installtex(2, path(newstring("data/newchars.png")), xs, ys) ||
!installtex(3, path(newstring("data/martin/base.png")), xs, ys) ||
!installtex(6, path(newstring("data/martin/ball1.png")), xs, ys) ||
!installtex(7, path(newstring("data/martin/smoke.png")), xs, ys) ||
!installtex(8, path(newstring("data/martin/ball2.png")), xs, ys) ||
!installtex(9, path(newstring("data/martin/ball3.png")), xs, ys) ||
!installtex(4, path(newstring("data/explosion.jpg")), xs, ys) ||
!installtex(5, path(newstring("data/items.png")), xs, ys) ||
!installtex(1, path(newstring("data/crosshair.png")), xs, ys))
if (!installtex(2,
[_userDataIRI IRIByAppendingPathComponent:@"data/newchars.png"],
&xs, &ys, false) ||
!installtex(3,
[_userDataIRI
IRIByAppendingPathComponent:@"data/martin/base.png"],
&xs, &ys, false) ||
!installtex(6,
[_userDataIRI
IRIByAppendingPathComponent:@"data/martin/ball1.png"],
&xs, &ys, false) ||
!installtex(7,
[_userDataIRI
IRIByAppendingPathComponent:@"data/martin/smoke.png"],
&xs, &ys, false) ||
!installtex(8,
[_userDataIRI
IRIByAppendingPathComponent:@"data/martin/ball2.png"],
&xs, &ys, false) ||
!installtex(9,
[_userDataIRI
IRIByAppendingPathComponent:@"data/martin/ball3.png"],
&xs, &ys, false) ||
!installtex(4,
[_userDataIRI
IRIByAppendingPathComponent:@"data/explosion.jpg"],
&xs, &ys, false) ||
!installtex(5,
[_userDataIRI IRIByAppendingPathComponent:@"data/items.png"],
&xs, &ys, false) ||
!installtex(1,
[_userDataIRI
IRIByAppendingPathComponent:@"data/crosshair.png"],
&xs, &ys, false))
fatal(@"could not find core textures (hint: run cube from the "
@"parent of the bin directory)");
@ -269,9 +297,16 @@ VARP(minmillis, 0, 5, 1000);
endianswap(dest, 3, _width);
}
sprintf_sd(buf)(
"screenshots/screenshot_%d.bmp", lastmillis);
SDL_SaveBMP(temp, path(buf));
@autoreleasepool {
OFString *path = [OFString
stringWithFormat:
@"screenshots/screenshot_%d.bmp",
lastmillis];
SDL_SaveBMP(temp,
[_userDataIRI
IRIByAppendingPathComponent:path]
.fileSystemRepresentation.UTF8String);
}
SDL_FreeSurface(temp);
}

12
src/clientextras.mm
View file

@ -169,8 +169,8 @@ sendmap(OFString *mapname)
changemap(mapname);
mapname = getclientmap();
int mapsize;
uchar *mapdata = readmap(mapname.UTF8String, &mapsize);
if (!mapdata)
OFData *mapdata = readmap(mapname);
if (mapdata == nil)
return;
ENetPacket *packet = enet_packet_create(
NULL, MAXTRANS + mapsize, ENET_PACKET_FLAG_RELIABLE);
@ -179,16 +179,14 @@ sendmap(OFString *mapname)
putint(p, SV_SENDMAP);
sendstring(mapname.UTF8String, p);
putint(p, mapsize);
if (65535 - (p - start) < mapsize) {
if (65535 - (p - start) < mapdata.count) {
conoutf(
@"map %s is too large to send", mapname.UTF8String);
free(mapdata);
enet_packet_destroy(packet);
return;
};
memcpy(p, mapdata, mapsize);
}
memcpy(p, mapdata.items, mapdata.count);
p += mapsize;
free(mapdata);
*(ushort *)start = ENET_HOST_TO_NET_16(p - start);
enet_packet_resize(packet, p - start);
sendpackettoserv(packet);

16
src/command.mm
View file

@ -557,13 +557,17 @@ bool
execfile(OFString *cfgfile)
{
@autoreleasepool {
string s;
strcpy_s(s, cfgfile.UTF8String);
char *buf = loadfile(path(s), NULL);
if (!buf)
OFMutableData *data;
@try {
data = [OFMutableData dataWithContentsOfFile:cfgfile];
} @catch (id e) {
return false;
execute(buf);
free(buf);
}
// Ensure \0 termination.
[data addItem:""];
execute((char *)data.mutableItems);
return true;
}
}

1
src/cube.h
View file

@ -11,6 +11,7 @@
@interface Cube : OFObject <OFApplicationDelegate>
@property (class, readonly, nonatomic) Cube *sharedInstance;
@property (readonly, nonatomic) SDL_Window *window;
@property (readonly, nonatomic) OFIRI *gameDataIRI;
@property (nonatomic) bool repeatsKeys;
@property (nonatomic) int framesInMap;
@end

7
src/protos.h
View file

@ -44,12 +44,11 @@ extern void writeservercfg();
extern void gl_init(int w, int h);
extern void cleangl();
extern void gl_drawframe(int w, int h, float curfps);
extern bool installtex(
int tnum, char *texname, int &xs, int &ys, bool clamp = false);
extern bool installtex(int tnum, OFIRI *IRI, int *xs, int *ys, bool clamp);
extern void mipstats(int a, int b, int c);
extern void vertf(float v1, float v2, float v3, sqr *ls, float t1, float t2);
extern void addstrip(int tex, int start, int n);
extern int lookuptexture(int tex, int &xs, int &ys);
extern int lookuptexture(int tex, int *xs, int *ys);
// rendercubes
extern void resetcubes();
@ -185,7 +184,7 @@ extern void render_particles(int time);
extern void save_world(OFString *fname);
extern void load_world(char *mname);
extern void writemap(char *mname, int msize, uchar *mdata);
extern uchar *readmap(const char *mname, int *msize);
extern OFData *readmap(OFString *mname);
extern void loadgamerest();
extern void incomingdemodata(uchar *buf, int len, bool extras = false);
extern void demoplaybackstep();

12
src/rendercubes.mm
View file

@ -103,7 +103,7 @@ render_flat(int wtex, int x, int y, int size, int h, sqr *l1, sqr *l2, sqr *l3,
};
int sx, sy;
int gltex = lookuptexture(wtex, sx, sy);
int gltex = lookuptexture(wtex, &sx, &sy);
float xf = TEXTURESCALE / sx;
float yf = TEXTURESCALE / sy;
float xs = size * xf;
@ -184,7 +184,7 @@ render_flatdelta(int wtex, int x, int y, int size, float h1, float h2, float h3,
};
int sx, sy;
int gltex = lookuptexture(wtex, sx, sy);
int gltex = lookuptexture(wtex, &sx, &sy);
float xf = TEXTURESCALE / sx;
float yf = TEXTURESCALE / sy;
float xs = size * xf;
@ -238,7 +238,7 @@ render_2tris(sqr *h, sqr *s, int x1, int y1, int x2, int y2, int x3, int y3,
vertcheck();
int sx, sy;
int gltex = lookuptexture(h->ftex, sx, sy);
int gltex = lookuptexture(h->ftex, &sx, &sy);
float xf = TEXTURESCALE / sx;
float yf = TEXTURESCALE / sy;
@ -247,7 +247,7 @@ render_2tris(sqr *h, sqr *s, int x1, int y1, int x2, int y2, int x3, int y3,
vertf((float)x3, h->floor, (float)y3, l3, xf * x3, yf * y3);
addstrip(gltex, curvert - 3, 3);
gltex = lookuptexture(h->ctex, sx, sy);
gltex = lookuptexture(h->ctex, &sx, &sy);
xf = TEXTURESCALE / sx;
yf = TEXTURESCALE / sy;
@ -292,7 +292,7 @@ render_square(int wtex, float floor1, float floor2, float ceil1, float ceil2,
};
int sx, sy;
int gltex = lookuptexture(wtex, sx, sy);
int gltex = lookuptexture(wtex, &sx, &sy);
float xf = TEXTURESCALE / sx;
float yf = TEXTURESCALE / sy;
float xs = size * xf;
@ -352,7 +352,7 @@ renderwater(float hf)
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_SRC_COLOR);
int sx, sy;
glBindTexture(GL_TEXTURE_2D, lookuptexture(DEFAULT_LIQUID, sx, sy));
glBindTexture(GL_TEXTURE_2D, lookuptexture(DEFAULT_LIQUID, &sx, &sy));
wx1 &= ~(watersubdiv - 1);
wy1 &= ~(watersubdiv - 1);

17
src/renderextras.mm
View file

@ -206,18 +206,27 @@ loadsky(OFString *basename)
{
@autoreleasepool {
static OFString *lastsky = @"";
if ([lastsky isEqual:basename])
return;
char *side[] = {"ft", "bk", "lf", "rt", "dn", "up"};
static const OFString *side[] = {
@"ft", @"bk", @"lf", @"rt", @"dn", @"up"};
int texnum = 14;
loopi(6)
{
sprintf_sd(name)(
"packages/%s_%s.jpg", basename.UTF8String, side[i]);
OFString *path =
[OFString stringWithFormat:@"packages/%@_%@.jpg",
basename, side[i]];
int xs, ys;
if (!installtex(texnum + i, path(name), xs, ys, true))
if (!installtex(texnum + i,
[Cube.sharedInstance.gameDataIRI
IRIByAppendingPathComponent:path],
&xs, &ys, true))
conoutf(@"could not load sky textures");
}
lastsky = basename;
}
}

93
src/rendergl.mm
View file

@ -73,11 +73,14 @@ cleangl()
}
bool
installtex(int tnum, char *texname, int &xs, int &ys, bool clamp)
installtex(int tnum, OFIRI *IRI, int *xs, int *ys, bool clamp)
{
SDL_Surface *s = IMG_Load(texname);
@autoreleasepool {
SDL_Surface *s =
IMG_Load(IRI.fileSystemRepresentation.UTF8String);
if (s == NULL) {
conoutf(@"couldn't load texture %s", texname);
conoutf(
@"couldn't load texture %s", IRI.string.UTF8String);
return false;
}
@ -85,8 +88,9 @@ installtex(int tnum, char *texname, int &xs, int &ys, bool clamp)
SDL_PixelFormat *format =
SDL_AllocFormat(SDL_PIXELFORMAT_RGB24);
if (format == NULL) {
conoutf(@"texture cannot be converted to 24bpp: %s",
texname);
conoutf(
@"texture cannot be converted to 24bpp: %s",
IRI.string.UTF8String);
return false;
}
@ -94,9 +98,9 @@ installtex(int tnum, char *texname, int &xs, int &ys, bool clamp)
SDL_Surface *converted =
SDL_ConvertSurface(s, format, 0);
if (converted == NULL) {
conoutf(
@"texture cannot be converted to 24bpp: %s",
texname);
conoutf(@"texture cannot be converted "
@"to 24bpp: %s",
IRI.string.UTF8String);
return false;
}
@ -107,46 +111,50 @@ installtex(int tnum, char *texname, int &xs, int &ys, bool clamp)
}
}
// loopi(s->w*s->h*3) { uchar *p = (uchar *)s->pixels+i; *p = 255-*p; };
// loopi(s->w*s->h*3) { uchar *p = (uchar *)s->pixels+i; *p =
// 255-*p; };
glBindTexture(GL_TEXTURE_2D, tnum);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
clamp ? GL_CLAMP_TO_EDGE : GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
clamp ? GL_CLAMP_TO_EDGE : GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(
GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
GL_LINEAR_MIPMAP_LINEAR); // NEAREST);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
xs = s->w;
ys = s->h;
while (xs > glmaxtexsize || ys > glmaxtexsize) {
xs /= 2;
ys /= 2;
*xs = s->w;
*ys = s->h;
while (*xs > glmaxtexsize || *ys > glmaxtexsize) {
*xs /= 2;
*ys /= 2;
}
void *scaledimg = s->pixels;
if (xs != s->w) {
if (*xs != s->w) {
conoutf(@"warning: quality loss: scaling %s",
texname); // for voodoo cards under linux
scaledimg = alloc(xs * ys * 3);
gluScaleImage(GL_RGB, s->w, s->h, GL_UNSIGNED_BYTE, s->pixels,
xs, ys, GL_UNSIGNED_BYTE, scaledimg);
IRI.string
.UTF8String); // for voodoo cards under linux
scaledimg = alloc(*xs * *ys * 3);
gluScaleImage(GL_RGB, s->w, s->h, GL_UNSIGNED_BYTE,
s->pixels, *xs, *ys, GL_UNSIGNED_BYTE, scaledimg);
}
if (gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, xs, ys, GL_RGB,
if (gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, *xs, *ys, GL_RGB,
GL_UNSIGNED_BYTE, scaledimg))
fatal(@"could not build mipmaps");
if (xs != s->w)
if (*xs != s->w)
free(scaledimg);
SDL_FreeSurface(s);
return true;
}
}
// management of texture slots
// each texture slot can have multople texture frames, of which currently only
@ -189,36 +197,35 @@ texture(OFString *aframe, OFString *name)
mapping[num][frame] = 1;
char *n = mapname[num][frame];
strcpy_s(n, name.UTF8String);
path(n);
}
}
COMMAND(texture, ARG_2STR)
int
lookuptexture(int tex, int &xs, int &ys)
lookuptexture(int tex, int *xs, int *ys)
{
int frame = 0; // other frames?
int tid = mapping[tex][frame];
if (tid >= FIRSTTEX) {
xs = texx[tid - FIRSTTEX];
ys = texy[tid - FIRSTTEX];
*xs = texx[tid - FIRSTTEX];
*ys = texy[tid - FIRSTTEX];
return tid;
};
}
xs = ys = 16;
if (!tid)
*xs = *ys = 16;
if (tid == 0)
return 1; // crosshair :)
loopi(curtex) // lazily happens once per "texture" command, basically
{
if (strcmp(mapname[tex][frame], texname[i]) == 0) {
mapping[tex][frame] = tid = i + FIRSTTEX;
xs = texx[i];
ys = texy[i];
*xs = texx[i];
*ys = texy[i];
return tid;
};
};
}
}
if (curtex == MAXTEX)
fatal(@"loaded too many textures");
@ -226,18 +233,24 @@ lookuptexture(int tex, int &xs, int &ys)
int tnum = curtex + FIRSTTEX;
strcpy_s(texname[curtex], mapname[tex][frame]);
sprintf_sd(name)("packages%c%s", PATHDIV, texname[curtex]);
@autoreleasepool {
OFString *path =
[OFString stringWithFormat:@"packages/%s", texname[curtex]];
if (installtex(tnum, name, xs, ys)) {
if (installtex(tnum,
[Cube.sharedInstance.gameDataIRI
IRIByAppendingPathComponent:path],
xs, ys, false)) {
mapping[tex][frame] = tnum;
texx[curtex] = xs;
texy[curtex] = ys;
texx[curtex] = *xs;
texy[curtex] = *ys;
curtex++;
return tnum;
} else {
return mapping[tex][frame] = FIRSTTEX; // temp fix
};
};
}
}
}
void
setupworld()
@ -418,7 +431,7 @@ gl_drawframe(int w, int h, float curfps)
glEnable(GL_TEXTURE_2D);
int xs, ys;
skyoglid = lookuptexture(DEFAULT_SKY, xs, ys);
skyoglid = lookuptexture(DEFAULT_SKY, &xs, &ys);
resetcubes();

61
src/rendermd2.mm
View file

@ -42,7 +42,7 @@ struct md2_frame {
@property (nonatomic) int mdlnum;
@property (nonatomic) bool loaded;
- (bool)loadWithPath:(char *)filename;
- (bool)loadWithIRI:(OFIRI *)IRI;
- (void)renderWithLight:(OFVector3D &)light
frame:(int)frame
range:(int)range
@ -79,16 +79,24 @@ static OFMutableArray<MD2 *> *mapmodels = nil;
delete[] _frames;
}
- (bool)loadWithPath:(char *)filename
- (bool)loadWithIRI:(OFIRI *)IRI
{
FILE *file;
md2_header header;
@autoreleasepool {
OFSeekableStream *stream;
@try {
stream = (OFSeekableStream *)[[OFIRIHandler
handlerForIRI:IRI] openItemAtIRI:IRI mode:@"r"];
} @catch (id e) {
return false;
}
if ((file = fopen(filename, "rb")) == NULL)
if (![stream isKindOfClass:[OFSeekableStream class]])
return false;
fread(&header, sizeof(md2_header), 1, file);
endianswap(&header, sizeof(int), sizeof(md2_header) / sizeof(int));
md2_header header;
[stream readIntoBuffer:&header exactLength:sizeof(md2_header)];
endianswap(
&header, sizeof(int), sizeof(md2_header) / sizeof(int));
if (header.magic != 844121161 || header.version != 8)
return false;
@ -97,19 +105,21 @@ static OFMutableArray<MD2 *> *mapmodels = nil;
if (_frames == NULL)
return false;
fseek(file, header.offsetFrames, SEEK_SET);
fread(_frames, header.frameSize * header.numFrames, 1, file);
[stream seekToOffset:header.offsetFrames whence:OFSeekSet];
[stream readIntoBuffer:_frames
exactLength:header.frameSize * header.numFrames];
for (int i = 0; i < header.numFrames; ++i)
endianswap(_frames + i * header.frameSize, sizeof(float), 6);
endianswap(
_frames + i * header.frameSize, sizeof(float), 6);
_glCommands = new int[header.numGlCommands];
if (_glCommands == NULL)
return false;
fseek(file, header.offsetGlCommands, SEEK_SET);
fread(_glCommands, header.numGlCommands * sizeof(int), 1, file);
[stream seekToOffset:header.offsetGlCommands whence:OFSeekSet];
[stream readIntoBuffer:_glCommands
exactLength:header.numGlCommands * sizeof(int)];
endianswap(_glCommands, sizeof(int), header.numGlCommands);
_numFrames = header.numFrames;
@ -118,13 +128,14 @@ static OFMutableArray<MD2 *> *mapmodels = nil;
_numTriangles = header.numTriangles;
_numVerts = header.numVertices;
fclose(file);
[stream close];
_mverts = new OFVector3D *[_numFrames];
loopj(_numFrames) _mverts[j] = NULL;
return true;
}
}
float
snap(int sn, float f)
@ -235,14 +246,20 @@ delayedload(MD2 *m)
{
if (!m.loaded) {
@autoreleasepool {
sprintf_sd(name1)("packages/models/%s/tris.md2",
m.loadname.UTF8String);
if (![m loadWithPath:path(name1)])
fatal(@"loadmodel: ", @(name1));
sprintf_sd(name2)("packages/models/%s/skin.jpg",
m.loadname.UTF8String);
OFString *path = [OFString
stringWithFormat:@"packages/models/%@", m.loadname];
OFIRI *baseIRI = [Cube.sharedInstance.gameDataIRI
IRIByAppendingPathComponent:path];
OFIRI *IRI1 =
[baseIRI IRIByAppendingPathComponent:@"tris.md2"];
if (![m loadWithIRI:IRI1])
fatal(@"loadmodel: ", IRI1.string);
OFIRI *IRI2 =
[baseIRI IRIByAppendingPathComponent:@"skin.jpg"];
int xs, ys;
installtex(FIRSTMDL + m.mdlnum, path(name2), xs, ys);
installtex(FIRSTMDL + m.mdlnum, IRI2, &xs, &ys, false);
m.loaded = true;
}
}
@ -314,7 +331,7 @@ rendermodel(OFString *mdl, int frame, int range, int tex, float rad, float x,
int xs, ys;
glBindTexture(GL_TEXTURE_2D,
tex ? lookuptexture(tex, xs, ys) : FIRSTMDL + m.mdlnum);
tex ? lookuptexture(tex, &xs, &ys) : FIRSTMDL + m.mdlnum);
int ix = (int)x;
int iy = (int)z;

41
src/sound.mm
View file

@ -86,20 +86,25 @@ music(OFString *name)
stopsound();
if (soundvol && musicvol) {
@autoreleasepool {
string sn;
strcpy_s(sn, "packages/");
strcat_s(sn, name.UTF8String);
OFString *path =
[OFString stringWithFormat:@"packages/%@", name];
OFIRI *IRI = [Cube.sharedInstance.gameDataIRI
IRIByAppendingPathComponent:path];
#ifdef USE_MIXER
if (mod = Mix_LoadMUS(path(sn))) {
if (mod = Mix_LoadMUS(
IRI.fileSystemRepresentation.UTF8String)) {
Mix_PlayMusic(mod, -1);
Mix_VolumeMusic((musicvol * MAXVOL) / 255);
}
#else
if (mod = FMUSIC_LoadSong(path(sn))) {
if (mod = FMUSIC_LoadSong(
IRI.fileSystemRepresentation.UTF8String)) {
FMUSIC_PlaySong(mod);
FMUSIC_SetMasterVolume(mod, musicvol);
} else if (stream = FSOUND_Stream_Open(
path(sn), FSOUND_LOOP_NORMAL, 0, 0)) {
IRI.fileSystemRepresentation.UTF8String,
FSOUND_LOOP_NORMAL, 0, 0)) {
int chan =
FSOUND_Stream_Play(FSOUND_FREE, stream);
if (chan >= 0) {
@ -230,23 +235,29 @@ playsound(int n, OFVector3D *loc)
if (n < 0 || n >= samples.length()) {
conoutf(@"unregistered sound: %d", n);
return;
};
}
if (!samples[n]) {
sprintf_sd(buf)("packages/sounds/%s.wav", snames[n]);
OFString *path = [OFString
stringWithFormat:@"packages/sounds/%s.wav", snames[n]];
OFIRI *IRI = [Cube.sharedInstance.gameDataIRI
IRIByAppendingPathComponent:path];
#ifdef USE_MIXER
samples[n] = Mix_LoadWAV(path(buf));
#else
samples[n] =
FSOUND_Sample_Load(n, path(buf), FSOUND_LOOP_OFF, 0, 0);
Mix_LoadWAV(IRI.fileSystemRepresentation.UTF8String);
#else
samples[n] = FSOUND_Sample_Load(n,
IRI.fileSystemRepresentation.UTF8String, FSOUND_LOOP_OFF, 0,
0);
#endif
if (!samples[n]) {
conoutf(@"failed to load sample: %s", buf);
conoutf(@"failed to load sample: %s",
IRI.string.UTF8String);
return;
};
};
}
}
#ifdef USE_MIXER
int chan = Mix_PlayChannel(-1, samples[n], 0);
@ -261,7 +272,7 @@ playsound(int n, OFVector3D *loc)
#ifndef USE_MIXER
FSOUND_SetPaused(chan, false);
#endif
};
}
void
sound(int n)

2
src/tools.h
View file

@ -122,8 +122,6 @@ struct sprintf_s_f {
#define fast_f2nat(val) ((int)(val))
extern char *path(char *s);
extern char *loadfile(char *fn, int *size);
extern void endianswap(void *, int, int);
// memory pool that uses buckets and linear allocation for small objects

32
src/tools.mm
View file

@ -100,38 +100,6 @@ gp() // useful for global buffers that need to be initialisation order
///////////////////////// misc tools ///////////////////////
char *
path(char *s)
{
for (char *t = s; t = strpbrk(t, "/\\"); *t++ = PATHDIV)
;
return s;
};
char *
loadfile(char *fn, int *size)
{
FILE *f = fopen(fn, "rb");
if (!f)
return NULL;
fseek(f, 0, SEEK_END);
int len = ftell(f);
fseek(f, 0, SEEK_SET);
char *buf = (char *)malloc(len + 1);
if (!buf)
return NULL;
buf[len] = 0;
size_t rlen = fread(buf, 1, len, f);
fclose(f);
if (len != rlen || len <= 0) {
free(buf);
return NULL;
};
if (size != NULL)
*size = len;
return buf;
};
void
endianswap(
void *memory, int stride, int length) // little indians as storage format

10
src/weapon.mm
View file

@ -7,12 +7,12 @@ struct guninfo {
OFString *name;
};
const int MONSTERDAMAGEFACTOR = 4;
const int SGRAYS = 20;
const float SGSPREAD = 2;
OFVector3D sg[SGRAYS];
static const int MONSTERDAMAGEFACTOR = 4;
static const int SGRAYS = 20;
static const float SGSPREAD = 2;
static OFVector3D sg[SGRAYS];
guninfo guns[NUMGUNS] = {
static const guninfo guns[NUMGUNS] = {
{S_PUNCH1, 250, 50, 0, 0, 1, @"fist"},
{S_SG, 1400, 10, 0, 0, 20, @"shotgun"}, // *SGRAYS
{S_CG, 100, 30, 0, 0, 7, @"chaingun"},

18
src/worldio.mm
View file

@ -28,9 +28,6 @@ setnames(const char *name)
"packages/%s/%s_%d.BAK", pakname, mapname, lastmillis);
sprintf_s(pcfname)("packages/%s/package.cfg", pakname);
sprintf_s(mcfname)("packages/%s/%s.cfg", pakname, mapname);
path(cgzname);
path(bakname);
}
// the optimize routines below are here to reduce the detrimental effects of
@ -137,16 +134,13 @@ writemap(char *mname, int msize, uchar *mdata)
conoutf(@"wrote map %s as file %s", mname, cgzname);
}
uchar *
readmap(const char *mname, int *msize)
OFData *
readmap(OFString *mname)
{
setnames(mname);
uchar *mdata = (uchar *)loadfile(cgzname, msize);
if (!mdata) {
conoutf(@"could not read map %s", cgzname);
return NULL;
@autoreleasepool {
setnames(mname.UTF8String);
}
return mdata;
return [OFData dataWithContentsOfFile:mname];
}
// save map as .cgz file. uses 2 layers of compression: first does simple
@ -362,7 +356,7 @@ load_world(char *mname) // still supports all map formats that have existed
calclight();
settagareas();
int xs, ys;
loopi(256) if (texuse) lookuptexture(i, xs, ys);
loopi(256) if (texuse) lookuptexture(i, &xs, &ys);
conoutf(@"read map %s (%d milliseconds)", cgzname,
SDL_GetTicks() - lastmillis);
conoutf(@"%s", hdr.maptitle);