Cube  Diff

Differences From Artifact [89ccbf227a]:

To Artifact [d459541c88]:


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
113
114
115
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
145
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
113



114
115
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







-
+

-
+

-
-
+
+

-
-
+
+

-
+

-
+

-
+




















-
-
-
-
-
+
+
+
+
+
-
-
-
+
+


















-
-
-
+
+
+






-
+













-
+







			}
		}
		if (mz < -1000)
			return;
		// mdl = (((int)d>>6)&1)+1;
		// mz = d.o.z-d.eyeHeight+0.2f;
		// scale = 1.2f;
	} else if (d.state == CS_EDITING) {
	} else if (d.state == CS_EDITING)
		n = 16;
	} else if (d.state == CS_LAGGED) {
	else if (d.state == CS_LAGGED)
		n = 17;
	} else if ([d isKindOfClass:Monster.class] &&
	    ((Monster *)d).monsterState == M_ATTACKING) {
	else if ([d isKindOfClass: Monster.class] &&
	    ((Monster *)d).monsterState == M_ATTACKING)
		n = 8;
	} else if ([d isKindOfClass:Monster.class] &&
	    ((Monster *)d).monsterState == M_PAIN) {
	else if ([d isKindOfClass: Monster.class] &&
	    ((Monster *)d).monsterState == M_PAIN)
		n = 10;
	} else if ((!d.move && !d.strafe) || !d.moving) {
	else if ((!d.move && !d.strafe) || !d.moving)
		n = 12;
	} else if (!d.onFloor && d.timeInAir > 100) {
	else if (!d.onFloor && d.timeInAir > 100)
		n = 18;
	} else {
	else {
		n = 14;
		speed = 1200 / d.maxSpeed * scale;
		if (hellpig)
			speed = 300 / d.maxSpeed;
	}
	if (hellpig) {
		n++;
		scale *= 32;
		mz -= 1.9f;
	}
	rendermodel(mdlname, frame[n], range[n], 0, 1.5f,
	    OFMakeVector3D(d.origin.x, mz, d.origin.y), d.yaw + 90, d.pitch / 2,
	    team, scale, speed, 0, basetime);
}

extern int democlientnum;

void
renderclients()
{
	[players
	    enumerateObjectsUsingBlock:^(Player *player, size_t i, bool *stop) {
		    if ([player isKindOfClass:Player.class] &&
		        (!demoplayback || i != democlientnum))
			    renderclient(player,
	[players enumerateObjectsUsingBlock: ^ (Player *player, size_t i,
	    bool *stop) {
		if ([player isKindOfClass: Player.class] &&
		    (!demoplayback || i != democlientnum))
			renderclient(player, isteam(Player.player1.team,
			        isteam(Player.player1.team, [player team]),
			        @"monster/ogro", false, 1.0f);
	    }];
			    [player team]), @"monster/ogro", false, 1.0f);
	}];
}

// creation of scoreboard pseudo-menu

bool scoreson = false;

void
showscores(bool on)
{
	scoreson = on;
	menuset(((int)on) - 1);
}

static OFMutableArray<OFString *> *scoreLines;

static void
renderscore(Player *d)
{
	OFString *lag = [OFString stringWithFormat:@"%d", d.lag];
	OFString *name = [OFString stringWithFormat:@"(%@)", d.name];
	OFString *line = [OFString stringWithFormat:@"%d\t%@\t%d\t%@\t%@",
	OFString *lag = [OFString stringWithFormat: @"%d", d.lag];
	OFString *name = [OFString stringWithFormat: @"(%@)", d.name];
	OFString *line = [OFString stringWithFormat: @"%d\t%@\t%d\t%@\t%@",
	    d.frags, (d.state == CS_LAGGED ? @"LAG" : lag), d.ping, d.team,
	    (d.state == CS_DEAD ? name : d.name)];

	if (scoreLines == nil)
		scoreLines = [[OFMutableArray alloc] init];

	[scoreLines addObject:line];
	[scoreLines addObject: line];

	menumanual(0, scoreLines.count - 1, line);
}

#define maxTeams 4
static OFString *teamName[maxTeams];
static int teamScore[maxTeams];
static size_t teamsUsed;

static void
addteamscore(Player *d)
{
	for (size_t i = 0; i < teamsUsed; i++) {
		if ([teamName[i] isEqual:d.team]) {
		if ([teamName[i] isEqual: d.team]) {
			teamScore[i] += d.frags;
			return;
		}
	}

	if (teamsUsed == maxTeams)
		return;
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
185
186
187
188
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
185
186
187







-
+





-
+





-
-
+
+







-
+







{
	if (!scoreson)
		return;
	[scoreLines removeAllObjects];
	if (!demoplayback)
		renderscore(Player.player1);
	for (Player *player in players)
		if ([player isKindOfClass:Player.class])
		if ([player isKindOfClass: Player.class])
			renderscore(player);
	sortmenu();
	if (m_teammode) {
		teamsUsed = 0;
		for (Player *player in players)
			if ([player isKindOfClass:Player.class])
			if ([player isKindOfClass: Player.class])
				addteamscore(player);
		if (!demoplayback)
			addteamscore(Player.player1);
		OFMutableString *teamScores = [OFMutableString string];
		for (size_t j = 0; j < teamsUsed; j++)
			[teamScores appendFormat:@"[ %@: %d ]", teamName[j],
			    teamScore[j]];
			[teamScores appendFormat:
			    @"[ %@: %d ]", teamName[j], teamScore[j]];
		menumanual(0, scoreLines.count, @"");
		menumanual(0, scoreLines.count + 1, teamScores);
	}
}

// sendmap/getmap commands, should be replaced by more intuitive map downloading

COMMAND(sendmap, ARG_1STR, (^(OFString *mapname) {
COMMAND(sendmap, ARG_1STR, (^ (OFString *mapname) {
	if (mapname.length > 0)
		save_world(mapname);
	changemap(mapname);
	mapname = getclientmap();
	OFData *mapdata = readmap(mapname);
	if (mapdata == nil)
		return;
200
201
202
203
204
205
206
207

208
209

210
211
212
213
214

215
216
217
218
219
220
221
222
223
224
199
200
201
202
203
204
205

206


207

208
209
210

211
212
213
214
215
216
217
218
219
220
221







-
+
-
-
+
-



-
+










	}
	memcpy(p, mapdata.items, mapdata.count);
	p += mapdata.count;
	*(unsigned short *)start = ENET_HOST_TO_NET_16(p - start);
	enet_packet_resize(packet, p - start);
	sendpackettoserv(packet);
	conoutf(@"sending map %@ to server...", mapname);
	OFString *msg =
	OFString *msg = [OFString stringWithFormat:
	    [OFString stringWithFormat:@"[map %@ uploaded to server, "
	                               @"\"getmap\" to receive it]",
	    @"[map %@ uploaded to server, \"getmap\" to receive it]", mapname];
	        mapname];
	toserver(msg);
}))

COMMAND(getmap, ARG_NONE, ^{
COMMAND(getmap, ARG_NONE, ^ {
	ENetPacket *packet =
	    enet_packet_create(NULL, MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
	unsigned char *start = packet->data;
	unsigned char *p = start + 2;
	putint(&p, SV_RECVMAP);
	*(unsigned short *)start = ENET_HOST_TO_NET_16(p - start);
	enet_packet_resize(packet, p - start);
	sendpackettoserv(packet);
	conoutf(@"requesting map from server...");
})