Overview
| Comment: | Some cleanups in clientextras.mm |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
62d66029002055c67734e9b584beb9b7 |
| User & Date: | js on 2025-03-06 01:42:11 |
| Other Links: | manifest | tags |
Context
|
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 | |
| 01:17 | Remove cvector and ivector check-in: 5bbd6d8ddd user: js tags: trunk | |
Changes
Modified src/clientextras.mm from [bbd34586be] to [bd809a3634].
| ︙ | ︙ | |||
88 89 90 91 92 93 94 |
bool scoreson = false;
void
showscores(bool on)
{
scoreson = on;
menuset(((int)on) - 1);
| < | | | < < > | | > | | | | > > > > > | | | | < < | > > > > | | > | | > > | | | | > | < > > | | | | | | | | < | | | | 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 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 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
bool scoreson = false;
void
showscores(bool on)
{
scoreson = on;
menuset(((int)on) - 1);
}
static OFMutableArray<OFString *> *scoreLines;
void
renderscore(dynent *d)
{
@autoreleasepool {
OFString *lag = [OFString stringWithFormat:@"%d", d->plag];
OFString *name = [OFString stringWithFormat:@"(%s)", d->name];
OFString *line = [OFString
stringWithFormat:@"%d\t%@\t%d\t%s\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];
menumanual(0, scoreLines.count - 1, line);
}
}
static const int maxTeams = 4;
static OFString *teamName[maxTeams];
static int teamScore[maxTeams], teamsUsed;
void
addteamscore(dynent *d)
{
if (d == NULL)
return;
@autoreleasepool {
OFString *team = @(d->team);
loopi(teamsUsed)
{
if ([teamName[i] isEqual:team]) {
teamScore[i] += d->frags;
return;
}
}
if (teamsUsed == maxTeams)
return;
teamName[teamsUsed] = @(d->team);
teamScore[teamsUsed++] = d->frags;
}
}
void
renderscores()
{
if (!scoreson)
return;
[scoreLines removeAllObjects];
if (!demoplayback)
renderscore(player1);
loopv(players) if (players[i]) renderscore(players[i]);
sortmenu();
if (m_teammode) {
teamsUsed = 0;
loopv(players) addteamscore(players[i]);
if (!demoplayback)
addteamscore(player1);
OFMutableString *teamScores = [[OFMutableString alloc] init];
loopj(teamsUsed)
{
[teamScores appendFormat:@"[ %@: %d ]", teamName[j],
teamScore[j]];
}
menumanual(0, scoreLines.count, @"");
@autoreleasepool {
menumanual(0, scoreLines.count + 1, teamScores);
}
}
}
// sendmap/getmap commands, should be replaced by more intuitive map downloading
void
sendmap(OFString *mapname)
{
@autoreleasepool {
if (mapname.length > 0)
save_world(mapname);
changemap(mapname);
mapname = getclientmap();
OFData *mapdata = readmap(mapname);
if (mapdata == nil)
return;
ENetPacket *packet = enet_packet_create(
NULL, MAXTRANS + mapdata.count, ENET_PACKET_FLAG_RELIABLE);
uchar *start = packet->data;
uchar *p = start + 2;
putint(p, SV_SENDMAP);
sendstring(mapname.UTF8String, p);
putint(p, mapdata.count);
if (65535 - (p - start) < mapdata.count) {
conoutf(@"map %@ is too large to send", mapname);
enet_packet_destroy(packet);
return;
}
memcpy(p, mapdata.items, mapdata.count);
p += mapdata.count;
*(ushort *)start = ENET_HOST_TO_NET_16(p - start);
enet_packet_resize(packet, p - start);
sendpackettoserv(packet);
conoutf(@"sending map %@ to server...", mapname);
sprintf_sd(msg)(
"[map %@ uploaded to server, \"getmap\" to receive it]",
mapname);
|
| ︙ | ︙ |