Cube  Check-in [142095b08f]

Overview
Comment:Migrate more strings
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 142095b08fd68abd1fbe2f7849fc6add1d6c45b7bdcdc6e9135815d127be36e2
User & Date: js on 2025-03-06 01:56:11
Other Links: manifest | tags
Context
2025-03-07
19:55
Migrate more strings check-in: 5ef6284dcf user: js tags: trunk
2025-03-06
01:56
Migrate more strings check-in: 142095b08f user: js tags: trunk
01:42
Some cleanups in clientextras.mm check-in: 62d6602900 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/clientgame.mm from [810509b4e7] to [33b9c3010f]. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14

15
16
17
18
19
20
21

1
2
3
4
5
6
7
8
9
10
11
12
13

14
15
16
17
18
19
20
21














-
+








// clientgame.cpp: core game related stuff

#include "cube.h"

#include <memory>

int nextmode = 0; // nextmode becomes gamemode after next map load
VAR(gamemode, 1, 0, 0);

void
mode(int n)
{
	addmsg(1, 2, SV_GAMEMODE, nextmode = n);
};
}
COMMAND(mode, ARG_1INT)

bool intermission = false;

dynent *player1 = newdynent(); // our client
dvector players;               // other clients
︙
489
490
491
492
493
494
495
496

497
498
499
500
501
502
503
504
505
506
507
508
509
510
511

512
513
514
515
516
517
518
519
520
521
522
523
524

489
490
491
492
493
494
495

496
497
498
499
500
501
502
503
504
505
506
507
508
509


510

511
512
513
514
515
516
517
518
519
520
521
522








-
+













-
-
+
-













initclient()
{
	clientmap = @"";
	initclientnet();
}

void
startmap(char *name) // called just after a map load
startmap(OFString *name) // called just after a map load
{
	if (netmapstart() && m_sp) {
		gamemode = 0;
		conoutf(@"coop sp not supported yet");
	}
	sleepwait = 0;
	monsterclear();
	projreset();
	spawncycle = -1;
	spawnplayer(player1);
	player1->frags = 0;
	loopv(players) if (players[i]) players[i]->frags = 0;
	resetspawns();
	@autoreleasepool {
		clientmap = @(name);
	clientmap = name;
	}
	if (editmode)
		toggleedit();
	setvar(@"gamespeed", 100);
	setvar(@"fog", 180);
	setvar(@"fogcolour", 0x8099B3);
	showscores(false);
	intermission = false;
	Cube.sharedInstance.framesInMap = 0;
	conoutf(@"game mode is %s", modestr(gamemode));
}

COMMANDN(map, changemap, ARG_1STR)

Modified src/clients2c.mm from [8a230870d2] to [e48be73a93].

︙
14
15
16
17
18
19
20

21


22
23
24
25
26
27
28

14
15
16
17
18
19
20
21

22
23
24
25
26
27
28
29
30








+
-
+
+








	disconnect();
}

void
changemapserv(char *name, int mode) // forced map change from the server
{
	gamemode = mode;
	@autoreleasepool {
	load_world(name);
		load_world(@(name));
	}
}

void
changemap(OFString *name) // request map change, server may ignore
{
	toservermap = name;
}
︙
360
361
362
363
364
365
366

367


368
369
370
371
372
373
374

362
363
364
365
366
367
368
369

370
371
372
373
374
375
376
377
378








+
-
+
+








			break;

		case SV_RECVMAP: {
			sgetstr();
			conoutf(@"received map \"%s\" from server, reloading..",
			    text);
			int mapsize = getint(p);
			@autoreleasepool {
			writemap(text, mapsize, p);
				writemap(@(text), mapsize, p);
			}
			p += mapsize;
			changemapserv(text, gamemode);
			break;
		}

		case SV_SERVMSG:
			sgetstr();
︙

Modified src/protos.h from [9515834784] to [bd326cd759].

︙
84
85
86
87
88
89
90
91

92
93
94
95
96
97
98

84
85
86
87
88
89
90

91
92
93
94
95
96
97
98








-
+








extern int getclientnum();
extern void changemapserv(char *name, int mode);
extern void writeclientinfo(OFStream *stream);

// clientgame
extern void mousemove(int dx, int dy);
extern void updateworld(int millis);
extern void startmap(char *name);
extern void startmap(OFString *name);
extern void changemap(OFString *name);
extern void initclient();
extern void spawnplayer(dynent *d);
extern void selfdamage(int damage, int actor, dynent *act);
extern dynent *newdynent();
extern OFString *getclientmap();
extern const char *modestr(int n);
︙
179
180
181
182
183
184
185
186
187


188
189
190
191
192
193
194

179
180
181
182
183
184
185


186
187
188
189
190
191
192
193
194








-
-
+
+








extern void particle_splash(int type, int num, int fade, OFVector3D &p);
extern void particle_trail(
    int type, int fade, OFVector3D &from, OFVector3D &to);
extern void render_particles(int time);

// worldio
extern void save_world(OFString *fname);
extern void load_world(char *mname);
extern void writemap(char *mname, int msize, uchar *mdata);
extern void load_world(OFString *mname);
extern void writemap(OFString *mname, int msize, uchar *mdata);
extern OFData *readmap(OFString *mname);
extern void loadgamerest();
extern void incomingdemodata(uchar *buf, int len, bool extras = false);
extern void demoplaybackstep();
extern void stop();
extern void stopifrecording();
extern void demodamage(int damage, OFVector3D &o);
︙

Modified src/world.mm from [dc3bab95c0] to [67fd387b5f].

︙
465
466
467
468
469
470
471
472

473
474
475
476
477
478
479
480
481
482
483
484

485
486
487
488
489

490
491
492
493
494
495
496
497
498
499


500
501

502
503
504
505
506
507


508
509
510
511
512

513

514
515
516
517
518

519
520
521
522
523
524

465
466
467
468
469
470
471

472
473
474
475
476
477
478
479
480
481
482
483

484
485
486
487
488

489
490
491
492
493
494
495
496
497


498
499
500

501
502
503
504
505


506
507
508
509
510
511
512
513

514
515
516
517
518

519
520
521
522
523
524
525








-
+











-
+




-
+








-
-
+
+

-
+




-
-
+
+





+
-
+




-
+







		s->ctex = DEFAULT_CEIL;
		s->wtex = s->utex = DEFAULT_WALL;
		s->type = SOLID;
		s->floor = 0;
		s->ceil = 16;
		s->vdelta = 0;
		s->defer = 0;
	};
	}

	strncpy(hdr.head, "CUBE", 4);
	hdr.version = MAPVERSION;
	hdr.headersize = sizeof(header);
	hdr.sfactor = sfactor;

	if (copy) {
		loop(x, ssize / 2) loop(y, ssize / 2)
		{
			*S(x + ssize / 4, y + ssize / 4) =
			    *SWS(oldworld, x, y, ssize / 2);
		};
		}
		loopv(ents)
		{
			ents[i].x += ssize / 4;
			ents[i].y += ssize / 4;
		};
		}
	} else {
		strn0cpy(hdr.maptitle, "Untitled Map by Unknown", 128);
		hdr.waterlevel = -100000;
		loopi(15) hdr.reserved[i] = 0;
		loopk(3) loopi(256) hdr.texlists[k][i] = i;
		ents.setsize(0);
		block b = {8, 8, ssize - 16, ssize - 16};
		edittypexy(SPACE, b);
	};

	}

	calclight();
	startmap("base/unnamed");
	startmap(@"base/unnamed");
	if (oldworld) {
		free(oldworld);
		toggleedit();
		execute("fullbright 1");
	};
};
	}
}

void
mapenlarge()
{
	empty_world(-1, false);
}
};

void
newmap(int i)
{
	empty_world(i, false);
};
}

COMMAND(mapenlarge, ARG_NONE)
COMMAND(newmap, ARG_1INT)
COMMANDN(recalc, calclight, ARG_NONE)
COMMAND(delent, ARG_NONE)
COMMAND(entproperty, ARG_2INT)

Modified src/worldio.mm from [96d53bd5cb] to [fcad2200c2].

︙
116
117
118
119
120
121
122
123

124

125


126

127
128
129
130
131
132
133
134

135
136
137
138
139
140
141

116
117
118
119
120
121
122

123
124
125

126
127
128
129
130
131
132
133
134
135
136

137
138
139
140
141
142
143
144








-
+

+
-
+
+

+







-
+








		}
	}
}

// these two are used by getmap/sendmap.. transfers compressed maps directly

void
writemap(char *mname, int msize, uchar *mdata)
writemap(OFString *mname, int msize, uchar *mdata)
{
	@autoreleasepool {
	setnames(mname);
		setnames(mname.UTF8String);
	}
	backup(cgzname, bakname);

	FILE *f = fopen(cgzname, "wb");
	if (!f) {
		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 %@ as file %s", mname, cgzname);
}

OFData *
readmap(OFString *mname)
{
	@autoreleasepool {
		setnames(mname.UTF8String);
︙
237
238
239
240
241
242
243
244
245


246
247
248
249

250


251
252
253
254
255
256
257

240
241
242
243
244
245
246


247
248
249
250
251
252
253

254
255
256
257
258
259
260
261
262








-
-
+
+




+
-
+
+








		conoutf(@"wrote map file %s", cgzname);
		settagareas();
	}
}
COMMANDN(savemap, save_world, ARG_1STR)

void
load_world(char *mname) // still supports all map formats that have existed
                        // since the earliest cube betas!
load_world(OFString *mname) // still supports all map formats that have existed
                            // since the earliest cube betas!
{
	stopifrecording();
	cleardlights();
	pruneundos();
	@autoreleasepool {
	setnames(mname);
		setnames(mname.UTF8String);
	}
	gzFile f = gzopen(cgzname, "rb9");
	if (!f) {
		conoutf(@"could not read map %s", cgzname);
		return;
	}
	gzread(f, &hdr, sizeof(header) - sizeof(int) * 16);
	endianswap(&hdr.version, sizeof(int), 4);
︙

Fossil 2.25 [8f798279d5] 2024-11-06 12:59:09
This page was generated in about 0.021s