Cube  Diff

Differences From Artifact [0dee11d744]:

To Artifact [bbd34586be]:


103
104
105
106
107
108
109

110
111


112
113
114
115
116
117
118
renderscore(dynent *d)
{
	sprintf_sd(lag)("%d", d->plag);
	sprintf_sd(name)("(%s)", d->name);
	sprintf_s(scorelines.add().s)("%d\t%s\t%d\t%s\t%s", d->frags,
	    d->state == CS_LAGGED ? "LAG" : lag, d->ping, d->team,
	    d->state == CS_DEAD ? name : d->name);

	menumanual(0, scorelines.length() - 1, scorelines.last().s);
};



const int maxteams = 4;
char *teamname[maxteams];
int teamscore[maxteams], teamsused;
string teamscores;
int timeremain = 0;








>
|
<
>
>







103
104
105
106
107
108
109
110
111

112
113
114
115
116
117
118
119
120
renderscore(dynent *d)
{
	sprintf_sd(lag)("%d", d->plag);
	sprintf_sd(name)("(%s)", d->name);
	sprintf_s(scorelines.add().s)("%d\t%s\t%d\t%s\t%s", d->frags,
	    d->state == CS_LAGGED ? "LAG" : lag, d->ping, d->team,
	    d->state == CS_DEAD ? name : d->name);
	@autoreleasepool {
		menumanual(0, scorelines.length() - 1, @(scorelines.last().s));

	}
}

const int maxteams = 4;
char *teamname[maxteams];
int teamscore[maxteams], teamsused;
string teamscores;
int timeremain = 0;

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
{
	if (!scoreson)
		return;
	scorelines.setsize(0);
	if (!demoplayback)
		renderscore(player1);
	loopv(players) if (players[i]) renderscore(players[i]);
	sortmenu(0, scorelines.length());
	if (m_teammode) {
		teamsused = 0;
		loopv(players) addteamscore(players[i]);
		if (!demoplayback)
			addteamscore(player1);
		teamscores[0] = 0;
		loopj(teamsused)
		{
			sprintf_sd(sc)("[ %s: %d ]", teamname[j], teamscore[j]);
			strcat_s(teamscores, sc);
		};

		menumanual(0, scorelines.length(), "");

		menumanual(0, scorelines.length() + 1, teamscores);
	};
};




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

void
sendmap(OFString *mapname)
{
	@autoreleasepool {







|










<
>
|
>
|
<
<
>
>
>







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
{
	if (!scoreson)
		return;
	scorelines.setsize(0);
	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);
		teamscores[0] = 0;
		loopj(teamsused)
		{
			sprintf_sd(sc)("[ %s: %d ]", teamname[j], teamscore[j]);
			strcat_s(teamscores, sc);

		}
		menumanual(0, scorelines.length(), @"");
		@autoreleasepool {
			menumanual(0, scorelines.length() + 1, @(teamscores));


		}
	}
}

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

void
sendmap(OFString *mapname)
{
	@autoreleasepool {