Cube  Diff

Differences From Artifact [7d18bd49dc]:

To Artifact [173411f8b2]:


18
19
20
21
22
23
24

25

26
27
28
29

30

31
32
33
34
35

36
37
38
39
40
41

42

43
44
45
46
47

48

49
50
51
52
53
54

55

56
57
58
59
60

61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76

77
78
79
80
81
82
83

84
85
86
87
88
89
90
91
92
93
94
95
96
97

98


99
100
101
102
103
104
105
18
19
20
21
22
23
24
25

26
27
28
29
30
31

32
33
34
35
36

37
38
39
40
41
42
43
44

45
46
47
48
49
50
51

52
53
54
55
56
57
58
59

60
61
62
63
64

65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80

81
82
83
84
85
86
87

88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103

104
105
106
107
108
109
110
111
112







+
-
+




+
-
+




-
+






+
-
+





+
-
+






+
-
+




-
+















-
+






-
+














+
-
+
+








void startdemo();

void
gzput(int i)
{
	gzputc(f, i);
}
};

void
gzputi(int i)
{
	gzwrite(f, &i, sizeof(int));
}
};

void
gzputv(vec &v)
{
	gzwrite(f, &v, sizeof(vec));
};
}

void
gzcheck(int a, int b)
{
	if (a != b)
		fatal("savegame file corrupt (short)");
}
};

int
gzget()
{
	char c = gzgetc(f);
	return c;
}
};

int
gzgeti()
{
	int i;
	gzcheck(gzread(f, &i, sizeof(int)), sizeof(int));
	return i;
}
};

void
gzgetv(vec &v)
{
	gzcheck(gzread(f, &v, sizeof(vec)), sizeof(vec));
};
}

void
stop()
{
	if (f) {
		if (demorecording)
			gzputi(-1);
		gzclose(f);
	};
	f = NULL;
	demorecording = false;
	demoplayback = false;
	demoloading = false;
	loopv(playerhistory) zapdynent(playerhistory[i]);
	playerhistory.setsize(0);
};
}

void
stopifrecording()
{
	if (demorecording)
		stop();
};
}

void
savestate(char *fn)
{
	stop();
	f = gzopen(fn, "wb9");
	if (!f) {
		conoutf(@"could not write %s", fn);
		return;
	};
	gzwrite(f, (void *)"CUBESAVE", 8);
	gzputc(f, islittleendian);
	gzputi(SAVEGAMEVERSION);
	gzputi(sizeof(dynent));
	@autoreleasepool {
	gzwrite(f, getclientmap(), _MAXDEFSTR);
		gzwrite(f, getclientmap().UTF8String, _MAXDEFSTR);
	}
	gzputi(gamemode);
	gzputi(ents.length());
	loopv(ents) gzputc(f, ents[i].spawned);
	gzwrite(f, player1, sizeof(dynent));
	dvector &monsters = getmonsters();
	gzputi(monsters.length());
	loopv(monsters) gzwrite(f, monsters[i], sizeof(dynent));
119
120
121
122
123
124
125

126
127
128
129
130
131
132
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140







+







		return;
	}
	sprintf_sd(fn)("savegames/%s.csgz", name);
	savestate(fn);
	stop();
	conoutf(@"wrote %s", fn);
}
COMMAND(savegame, ARG_1CSTR)

void
loadstate(char *fn)
{
	stop();
	if (multiplayer())
		return;
144
145
146
147
148
149
150


151
152



153
154
155
156
157
158
159
160
161
162
163
164
165

166
167
168
169
170
171
172
152
153
154
155
156
157
158
159
160


161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184







+
+
-
-
+
+
+













+







		goto out; // not supporting save->load accross incompatible
		          // architectures simpifies things a LOT
	if (gzgeti() != SAVEGAMEVERSION || gzgeti() != sizeof(dynent))
		goto out;
	string mapname;
	gzread(f, mapname, _MAXDEFSTR);
	nextmode = gzgeti();
	@autoreleasepool {
		changemap(
	changemap(mapname); // continue below once map has been loaded and
	                    // client & server have updated
		    @(mapname)); // continue below once map has been loaded and
		                 // client & server have updated
	}
	return;
out:
	conoutf(@"aborting: savegame/demo from a different version of cube or "
	        @"cpu architecture");
	stop();
}

void
loadgame(char *name)
{
	sprintf_sd(fn)("savegames/%s.csgz", name);
	loadstate(fn);
}
COMMAND(loadgame, ARG_1CSTR)

void
loadgameout()
{
	stop();
	conoutf(@"loadgame incomplete: savegame from a different version of "
	        @"this map");
243
244
245
246
247
248
249
250


251
252
253
254
255
256
257
255
256
257
258
259
260
261

262
263
264
265
266
267
268
269
270







-
+
+







	sprintf_sd(fn)("demos/%s.cdgz", name);
	savestate(fn);
	gzputi(cn);
	conoutf(@"started recording demo to %s", fn);
	demorecording = true;
	starttime = lastmillis;
	ddamage = bdamage = 0;
};
}
COMMAND(record, ARG_1CSTR)

void
demodamage(int damage, vec &o)
{
	ddamage = damage;
	dorig = o;
};
295
296
297
298
299
300
301

302
303
304
305
306
307
308
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322







+







void
demo(char *name)
{
	sprintf_sd(fn)("demos/%s.cdgz", name);
	loadstate(fn);
	demoloading = true;
}
COMMAND(demo, ARG_1CSTR)

void
stopreset()
{
	conoutf(@"demo stopped (%d msec elapsed)", lastmillis - starttime);
	stop();
	loopv(players) zapdynent(players[i]);
484
485
486
487
488
489
490
491
492

493
494
495

496
497
498
498
499
500
501
502
503
504


505



506










-
-
+
-
-
-
+
-
-
-
stopn()
{
	if (demoplayback)
		stopreset();
	else
		stop();
	conoutf(@"demo stopped");
};

}
COMMAND(record, ARG_1STR);
COMMAND(demo, ARG_1STR);
COMMANDN(stop, stopn, ARG_NONE);
COMMANDN(stop, stopn, ARG_NONE)

COMMAND(savegame, ARG_1STR);
COMMAND(loadgame, ARG_1STR);