Cube  Diff

void
backup(OFString *name, OFString *backupname)
{
	[OFFileManager.defaultManager removeItemAtPath: backupname];
	[OFFileManager.defaultManager moveItemAtPath: name toPath: backupname];
}

// FIXME: Should be OFIRI
static OFString *cgzname, *bakname, *pcfname, *mcfname;

static void
setnames(OFString *name)
{
	OFCharacterSet *cs =
	    [OFCharacterSet characterSetWithCharactersInString: @"/\\"];

void
writemap(OFString *mname, int msize, unsigned char *mdata)
{
	setnames(mname);
	backup(cgzname, bakname);

	@try {
		OFIRI *IRI = [Cube.sharedInstance.gameDataIRI
		    IRIByAppendingPathComponent: cgzname];
		OFStream *stream = [OFIRIHandler openItemAtIRI: IRI mode: @"w"];
		[stream writeBuffer: mdata length: msize];
		[stream close];
	} @catch (id e) {
		conoutf(@"could not write map to %@", cgzname);
		return;
	}


	conoutf(@"wrote map %@ as file %@", mname, cgzname);
}

OFData *
readmap(OFString *mname)
{
	setnames(mname);

})

// still supports all map formats that have existed since the earliest cube
// betas!
void
load_world(OFString *mname)
{
	OFGZIPStream *stream;

	stopifrecording();
	cleardlights();
	pruneundos(0);
	setnames(mname);

	@try {
		OFIRI *IRI = [Cube.sharedInstance.gameDataIRI
		    IRIByAppendingPathComponent: cgzname];
		OFStream *compressedStream = [OFIRIHandler openItemAtIRI: IRI
								    mode: @"r"];
		stream = [OFGZIPStream streamWithStream: compressedStream
						   mode: @"r"];
		[stream readIntoBuffer: &hdr
			   exactLength: sizeof(struct header) -
					sizeof(int) * 16];
	} @catch (id e) {
		conoutf(@"could not read map %@", cgzname);
		return;
	}

	endianswap(&hdr.version, sizeof(int), 4);
	if (strncmp(hdr.head, "CUBE", 4) != 0)
		fatal(@"while reading map: header malformatted");
	if (hdr.version > MAPVERSION)
		fatal(@"this map requires a newer version of cube");
	if (sfactor < SMALLEST_FACTOR || sfactor > LARGEST_FACTOR)
		fatal(@"illegal map size");
	if (hdr.version >= 4) {
		[stream readIntoBuffer: &hdr.waterlevel
			   exactLength: sizeof(int) * 16];
		endianswap(&hdr.waterlevel, sizeof(int), 16);
	} else {
		hdr.waterlevel = -100000;
	}
	[ents removeAllObjects];
	for (int i = 0; i < hdr.numents; i++) {
		struct persistent_entity tmp;
		[stream readIntoBuffer: &tmp
			   exactLength: sizeof(struct persistent_entity)];
		endianswap(&tmp, sizeof(short), 4);

		Entity *e = [Entity entity];
		e.x = tmp.x;
		e.y = tmp.y;
		e.z = tmp.z;
		e.attr1 = tmp.attr1;

	setupworld(hdr.sfactor);
	char texuse[256];
	for (int i = 0; i < 256; i++)
		texuse[i] = 0;
	struct sqr *t = NULL;
	for (int k = 0; k < cubicsize; k++) {
		struct sqr *s = &world[k];
		int type = [stream readInt8];
		switch (type) {
		case 255: {
			int n = [stream readInt8];
			for (int i = 0; i < n; i++, k++)
				memcpy(&world[k], t, sizeof(struct sqr));
			k--;
			break;
		}
		case 254: // only in MAPVERSION<=2
		{
			memcpy(s, t, sizeof(struct sqr));
			s->r = s->g = s->b = [stream readInt8];
			[stream readInt8];
			break;
		}
		case SOLID: {
			s->type = SOLID;
			s->wtex = [stream readInt8];
			s->vdelta = [stream readInt8];
			if (hdr.version <= 2) {
				[stream readInt8];
				[stream readInt8];
			}
			s->ftex = DEFAULT_FLOOR;
			s->ctex = DEFAULT_CEIL;
			s->utex = s->wtex;
			s->tag = 0;
			s->floor = 0;
			s->ceil = 16;
			break;
		}
		default: {
			if (type < 0 || type >= MAXTYPE)
				fatal(@"while reading map: type out of range: "
				      @"%d @ %d",
				    type, k);
			s->type = type;
			s->floor = [stream readInt8];
			s->ceil = [stream readInt8];
			if (s->floor >= s->ceil)
				s->floor = s->ceil - 1; // for pre 12_13
			s->wtex = [stream readInt8];
			s->ftex = [stream readInt8];
			s->ctex = [stream readInt8];
			if (hdr.version <= 2) {
				[stream readInt8];
				[stream readInt8];
			}
			s->vdelta = [stream readInt8];
			s->utex = (hdr.version >= 2
			    ? [stream readInt8] : s->wtex);
			s->tag = (hdr.version >= 5 ? [stream readInt8] : 0);
			s->type = type;
		}
		}
		s->defer = 0;
		t = s;
		texuse[s->wtex] = 1;
		if (!SOLID(s))
			texuse[s->utex] = texuse[s->ftex] = texuse[s->ctex] = 1;
	}
	[stream close];
	calclight();
	settagareas();
	int xs, ys;
	for (int i = 0; i < 256; i++)
		if (texuse[i])
			lookuptexture(i, &xs, &ys);
	conoutf(@"read map %@ (%d milliseconds)", cgzname,