Cube  Diff

Differences From Artifact [5cec2369de]:

To Artifact [217fc4ecf8]:


1
2
3
4
5
6
7
8
9
10
11



12

13

14
15
16

17
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


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
210
211


212
213
214
215
216
217


218
219
220
221


222
223
224
225
226
227

228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249

250
251

252
253
254
255
256
257
258
259
260
261
262
263
264
265

266


267
268
269

270
271

272
273
274
275

276
277
278
279
280
281
282
283
284
285
286
287

288
289
290
291
292
293
294
295
296
297

298

299

300
301
302
303
304


305
306
307
308
309
// client.cpp, mostly network related client game code

#include "cube.h"

ENetHost *clienthost = NULL;
int connecting = 0;
int connattempts = 0;
int disconnecting = 0;
int clientnum = -1;         // our client id in the game
bool c2sinit = false;       // whether we need to tell the other clients our stats




int getclientnum() { return clientnum; };



bool multiplayer()
{
    // check not correct on listen server?

    if(clienthost) conoutf("operation not available in multiplayer");
    return clienthost!=NULL;
};


bool allowedittoggle()
{
    bool allow = !clienthost || gamemode==1;

    if(!allow) conoutf("editing in multiplayer requires coopedit mode (1)");
    return allow; 
};

VARF(rate, 0, 0, 25000, if(clienthost && (!rate || rate>1000)) enet_host_bandwidth_limit (clienthost, rate, rate));



void throttle();

VARF(throttle_interval, 0, 5, 30, throttle());
VARF(throttle_accel,    0, 2, 32, throttle());
VARF(throttle_decel,    0, 2, 32, throttle());


void throttle()
{
    if(!clienthost || connecting) return;

    assert(ENET_PEER_PACKET_THROTTLE_SCALE==32);
    enet_peer_throttle_configure(clienthost->peers, throttle_interval*1000, throttle_accel, throttle_decel);

};





void newname(char *name) { c2sinit = false; strn0cpy(player1->name, name, 16); };





void newteam(char *name) { c2sinit = false; strn0cpy(player1->team, name, 5); };


COMMANDN(team, newteam, ARG_1STR);
COMMANDN(name, newname, ARG_1STR);


void writeclientinfo(FILE *f)
{
    fprintf(f, "name \"%s\"\nteam \"%s\"\n", player1->name, player1->team);
};


void connects(char *servername)
{   
    disconnect(1);  // reset state
    addserver(servername);

    conoutf("attempting to connect to %s", servername);
    ENetAddress address = { ENET_HOST_ANY, CUBE_SERVER_PORT };
    if(enet_address_set_host(&address, servername) < 0)
    {
        conoutf("could not resolve server %s", servername);
        return;
    };

    clienthost = enet_host_create(NULL, 1, rate, rate);

    if(clienthost)
    {
        enet_host_connect(clienthost, &address, 1); 
        enet_host_flush(clienthost);
        connecting = lastmillis;
        connattempts = 0;
    }
    else
    {
        conoutf("could not connect to server");
        disconnect();
    };
};


void disconnect(int onlyclean, int async)
{
    if(clienthost) 
    {
        if(!connecting && !disconnecting) 
        {
            enet_peer_disconnect(clienthost->peers);
            enet_host_flush(clienthost);
            disconnecting = lastmillis;
        };
        if(clienthost->peers->state != ENET_PEER_STATE_DISCONNECTED)
        {

            if(async) return;
            enet_peer_reset(clienthost->peers);
        };
        enet_host_destroy(clienthost);
    };

    if(clienthost && !connecting) conoutf("disconnected");

    clienthost = NULL;
    connecting = 0;
    connattempts = 0;
    disconnecting = 0;
    clientnum = -1;
    c2sinit = false;
    player1->lifesequence = 0;
    loopv(players) zapdynent(players[i]);
    
    localdisconnect();



    if(!onlyclean) { stop(); localconnect(); };
};



void trydisconnect()
{
    if(!clienthost)
    {
        conoutf("not connected");
        return;
    };
    if(connecting) 
    {
        conoutf("aborting connection attempt");
        disconnect();
        return;
    };
    conoutf("attempting to disconnect...");
    disconnect(0, !disconnecting);
};

string ctext;



void toserver(char *text) { conoutf("%s:\f %s", player1->name, text); strn0cpy(ctext, text, 80); };





void echo(char *text) { conoutf("%s", text); };


COMMAND(echo, ARG_VARI);
COMMANDN(say, toserver, ARG_VARI);
COMMANDN(connect, connects, ARG_1STR);
COMMANDN(disconnect, trydisconnect, ARG_NONE);

// collect c2s messages conveniently

vector<ivector> messages;


void addmsg(int rel, int num, int type, ...)
{
    if(demoplayback) return;


    if(num!=msgsizelookup(type)) { sprintf_sd(s)("inconsistant msg size for %d (%d != %d)", type, num, msgsizelookup(type)); fatal(s); };




    if(messages.length()==100) { conoutf("command flood protection (type %d)", type); return; };


    ivector &msg = messages.add();
    msg.add(num);
    msg.add(rel);
    msg.add(type);
    va_list marker;
    va_start(marker, type); 
    loopi(num-1) msg.add(va_arg(marker, int));
    va_end(marker);  
};


void server_err()
{
    conoutf("server network error, disconnecting...");
    disconnect();
};

int lastupdate = 0, lastping = 0;
string toservermap;

bool senditemstoserver = false;     // after a map change, since server doesn't have map data

string clientpassword;



void password(char *p) { strcpy_s(clientpassword, p); };

COMMAND(password, ARG_1STR);




bool netmapstart() { senditemstoserver = true; return clienthost!=NULL; };




void initclientnet()
{
    ctext[0] = 0;
    toservermap[0] = 0;
    clientpassword[0] = 0;
    newname("unnamed");
    newteam("red");
};


void sendpackettoserv(void *packet)
{

    if(clienthost) { enet_host_broadcast(clienthost, 0, (ENetPacket *)packet); enet_host_flush(clienthost); }


    else localclienttoserver((ENetPacket *)packet);
}


void c2sinfo(dynent *d)                     // send update to the server
{

    if(clientnum<0) return;                 // we haven't had a welcome message from the server yet

    if(lastmillis-lastupdate<40) return;    // don't update faster than 25fps
    ENetPacket *packet = enet_packet_create (NULL, MAXTRANS, 0);
    uchar *start = packet->data;
    uchar *p = start+2;
    bool serveriteminitdone = false;
    if(toservermap[0])                      // suggest server to change map
    {                                       // do this exclusively as map change may invalidate rest of update
        packet->flags = ENET_PACKET_FLAG_RELIABLE;
        putint(p, SV_MAPCHANGE);
        sendstring(toservermap, p);
        toservermap[0] = 0;
        putint(p, nextmode);
    }
    else
    {
        putint(p, SV_POS);
        putint(p, clientnum);


        putint(p, (int)(d->o.x*DMF));       // quantize coordinates to 1/16th of a cube, between 1 and 3 bytes
        putint(p, (int)(d->o.y*DMF));
        putint(p, (int)(d->o.z*DMF));
        putint(p, (int)(d->yaw*DAF));
        putint(p, (int)(d->pitch*DAF));
        putint(p, (int)(d->roll*DAF));


        putint(p, (int)(d->vel.x*DVF));     // quantize to 1/100, almost always 1 byte
        putint(p, (int)(d->vel.y*DVF));
        putint(p, (int)(d->vel.z*DVF));
        // pack rest in 1 byte: strafe:2, move:2, onfloor:1, state:3


        putint(p, (d->strafe&3) | ((d->move&3)<<2) | (((int)d->onfloor)<<4) | ((editmode ? CS_EDITING : d->state)<<5) );
 
        if(senditemstoserver)
        {
            packet->flags = ENET_PACKET_FLAG_RELIABLE;
            putint(p, SV_ITEMLIST);

            if(!m_noitems) putitems(p);
            putint(p, -1);
            senditemstoserver = false;
            serveriteminitdone = true;
        };
        if(ctext[0])    // player chat, not flood protected for now
        {
            packet->flags = ENET_PACKET_FLAG_RELIABLE;
            putint(p, SV_TEXT);
            sendstring(ctext, p);
            ctext[0] = 0;
        };
        if(!c2sinit)    // tell other clients who I am
        {
            packet->flags = ENET_PACKET_FLAG_RELIABLE;
            c2sinit = true;
            putint(p, SV_INITC2S);
            sendstring(player1->name, p);
            sendstring(player1->team, p);
            putint(p, player1->lifesequence);
        };
        loopv(messages)     // send messages collected during the previous frames

        {
            ivector &msg = messages[i];

            if(msg[1]) packet->flags = ENET_PACKET_FLAG_RELIABLE;
            loopi(msg[0]) putint(p, msg[i+2]);
        };
        messages.setsize(0);
        if(lastmillis-lastping>250)
        {
            putint(p, SV_PING);
            putint(p, lastmillis);
            lastping = lastmillis;
        };
    };
    *(ushort *)start = ENET_HOST_TO_NET_16(p-start);
    enet_packet_resize(packet, p-start);
    incomingdemodata(start, p-start, true);

    if(clienthost) { enet_host_broadcast(clienthost, 0, packet); enet_host_flush(clienthost); }


    else localclienttoserver(packet);
    lastupdate = lastmillis;
    if(serveriteminitdone) loadgamerest();  // hack

};


void gets2c()           // get updates from the server
{
    ENetEvent event;
    if(!clienthost) return;

    if(connecting && lastmillis/3000 > connecting/3000)
    {
        conoutf("attempting to connect...");
        connecting = lastmillis;
        ++connattempts; 
        if(connattempts > 3)
        {
            conoutf("could not connect to server");
            disconnect();
            return;
        };
    };

    while(clienthost!=NULL && enet_host_service(clienthost, &event, 0)>0)
    switch(event.type)
    {
        case ENET_EVENT_TYPE_CONNECT:
            conoutf("connected to server");
            connecting = 0;
            throttle();
            break;
         
        case ENET_EVENT_TYPE_RECEIVE:

            if(disconnecting) conoutf("attempting to disconnect...");

            else localservertoclient(event.packet->data, event.packet->dataLength);

            enet_packet_destroy(event.packet);
            break;

        case ENET_EVENT_TYPE_DISCONNECT:
            if(disconnecting) disconnect();


            else server_err();
            return;
    }
};









|
|

>
>
>
|
>

>
|

|
>
|
|


>
|

|
>
|
|


|
>
>




|
|

>
|

|
>
|
|
>


>
>
>
>
|
>
>
>
>
>
|
>




>
|

|


>
|
|
|
|

|
|
|
<
|
|
|

|

|
<
|
|
|
|
<
|
<
|
|
|


>
|

|
<
|
<
|
|
|
|
|
<
>
|
|
|
|
|

|
>
|
|
|
|
|
|
|
|
|
|

>
>
|
|
>

>
|

|
<
|
|
|
|
<
|
|
|
|
|
|



>
>
>
|
>
>
>
>
>
|
>










>
|

|
>
>
|
>
>
>
>
|
>
>
|
|
|
|
|
|
|
|


>
|

|
|




>
|


>
>
>
|
>


>
>
>
|
>
>

>
|

|
|
|
|
|


>
|

>
|
>
>
|


>
|

>
|
>
|
|
|
|
|
|
|
|
|
|
|
|
<
|
<
|
|
>
>
|
|
|
|
|
|
>
>
|
|
|
|
>
>
|
|
|
<
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
>
|
|
>
|
|
|
|
|
<
|
|
|
|
|
|
|
|
>
|
>
>
|
|
|
>


>
|

|
|
>
|
<
|
|
|
|
<
|
|
|
|
|
>
|
|
<
|
|
|
|
|
|
|
>
|
>
|
>
|
|

|
|
>
>
|
|
|

<
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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
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
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266

267

268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288

289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322

323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347

348
349
350
351

352
353
354
355
356
357
358
359

360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382

// client.cpp, mostly network related client game code

#include "cube.h"

ENetHost *clienthost = NULL;
int connecting = 0;
int connattempts = 0;
int disconnecting = 0;
int clientnum = -1;   // our client id in the game
bool c2sinit = false; // whether we need to tell the other clients our stats

int
getclientnum()
{
	return clientnum;
};

bool
multiplayer()
{
	// check not correct on listen server?
	if (clienthost)
		conoutf("operation not available in multiplayer");
	return clienthost != NULL;
};

bool
allowedittoggle()
{
	bool allow = !clienthost || gamemode == 1;
	if (!allow)
		conoutf("editing in multiplayer requires coopedit mode (1)");
	return allow;
};

VARF(rate, 0, 0, 25000,
    if (clienthost && (!rate || rate > 1000))
        enet_host_bandwidth_limit(clienthost, rate, rate));

void throttle();

VARF(throttle_interval, 0, 5, 30, throttle());
VARF(throttle_accel, 0, 2, 32, throttle());
VARF(throttle_decel, 0, 2, 32, throttle());

void
throttle()
{
	if (!clienthost || connecting)
		return;
	assert(ENET_PEER_PACKET_THROTTLE_SCALE == 32);
	enet_peer_throttle_configure(clienthost->peers,
	    throttle_interval * 1000, throttle_accel, throttle_decel);
};

void
newname(char *name)
{
	c2sinit = false;
	strn0cpy(player1->name, name, 16);
};
void
newteam(char *name)
{
	c2sinit = false;
	strn0cpy(player1->team, name, 5);
};

COMMANDN(team, newteam, ARG_1STR);
COMMANDN(name, newname, ARG_1STR);

void
writeclientinfo(FILE *f)
{
	fprintf(f, "name \"%s\"\nteam \"%s\"\n", player1->name, player1->team);
};

void
connects(char *servername)
{
	disconnect(1); // reset state
	addserver(servername);

	conoutf("attempting to connect to %s", servername);
	ENetAddress address = {ENET_HOST_ANY, CUBE_SERVER_PORT};
	if (enet_address_set_host(&address, servername) < 0) {

		conoutf("could not resolve server %s", servername);
		return;
	};

	clienthost = enet_host_create(NULL, 1, rate, rate);

	if (clienthost) {

		enet_host_connect(clienthost, &address, 1);
		enet_host_flush(clienthost);
		connecting = lastmillis;
		connattempts = 0;

	} else {

		conoutf("could not connect to server");
		disconnect();
	};
};

void
disconnect(int onlyclean, int async)
{
	if (clienthost) {

		if (!connecting && !disconnecting) {

			enet_peer_disconnect(clienthost->peers);
			enet_host_flush(clienthost);
			disconnecting = lastmillis;
		};
		if (clienthost->peers->state != ENET_PEER_STATE_DISCONNECTED) {

			if (async)
				return;
			enet_peer_reset(clienthost->peers);
		};
		enet_host_destroy(clienthost);
	};

	if (clienthost && !connecting)
		conoutf("disconnected");
	clienthost = NULL;
	connecting = 0;
	connattempts = 0;
	disconnecting = 0;
	clientnum = -1;
	c2sinit = false;
	player1->lifesequence = 0;
	loopv(players) zapdynent(players[i]);

	localdisconnect();

	if (!onlyclean) {
		stop();
		localconnect();
	};
};

void
trydisconnect()
{
	if (!clienthost) {

		conoutf("not connected");
		return;
	};
	if (connecting) {

		conoutf("aborting connection attempt");
		disconnect();
		return;
	};
	conoutf("attempting to disconnect...");
	disconnect(0, !disconnecting);
};

string ctext;
void
toserver(char *text)
{
	conoutf("%s:\f %s", player1->name, text);
	strn0cpy(ctext, text, 80);
};
void
echo(char *text)
{
	conoutf("%s", text);
};

COMMAND(echo, ARG_VARI);
COMMANDN(say, toserver, ARG_VARI);
COMMANDN(connect, connects, ARG_1STR);
COMMANDN(disconnect, trydisconnect, ARG_NONE);

// collect c2s messages conveniently

vector<ivector> messages;

void
addmsg(int rel, int num, int type, ...)
{
	if (demoplayback)
		return;
	if (num != msgsizelookup(type)) {
		sprintf_sd(s)("inconsistant msg size for %d (%d != %d)", type,
		    num, msgsizelookup(type));
		fatal(s);
	};
	if (messages.length() == 100) {
		conoutf("command flood protection (type %d)", type);
		return;
	};
	ivector &msg = messages.add();
	msg.add(num);
	msg.add(rel);
	msg.add(type);
	va_list marker;
	va_start(marker, type);
	loopi(num - 1) msg.add(va_arg(marker, int));
	va_end(marker);
};

void
server_err()
{
	conoutf("server network error, disconnecting...");
	disconnect();
};

int lastupdate = 0, lastping = 0;
string toservermap;
bool senditemstoserver =
    false; // after a map change, since server doesn't have map data

string clientpassword;
void
password(char *p)
{
	strcpy_s(clientpassword, p);
};
COMMAND(password, ARG_1STR);

bool
netmapstart()
{
	senditemstoserver = true;
	return clienthost != NULL;
};

void
initclientnet()
{
	ctext[0] = 0;
	toservermap[0] = 0;
	clientpassword[0] = 0;
	newname("unnamed");
	newteam("red");
};

void
sendpackettoserv(void *packet)
{
	if (clienthost) {
		enet_host_broadcast(clienthost, 0, (ENetPacket *)packet);
		enet_host_flush(clienthost);
	} else
		localclienttoserver((ENetPacket *)packet);
}

void
c2sinfo(dynent *d) // send update to the server
{
	if (clientnum < 0)
		return; // we haven't had a welcome message from the server yet
	if (lastmillis - lastupdate < 40)
		return; // don't update faster than 25fps
	ENetPacket *packet = enet_packet_create(NULL, MAXTRANS, 0);
	uchar *start = packet->data;
	uchar *p = start + 2;
	bool serveriteminitdone = false;
	if (toservermap[0]) // suggest server to change map
	{ // do this exclusively as map change may invalidate rest of update
		packet->flags = ENET_PACKET_FLAG_RELIABLE;
		putint(p, SV_MAPCHANGE);
		sendstring(toservermap, p);
		toservermap[0] = 0;
		putint(p, nextmode);

	} else {

		putint(p, SV_POS);
		putint(p, clientnum);
		putint(
		    p, (int)(d->o.x * DMF)); // quantize coordinates to 1/16th
		                             // of a cube, between 1 and 3 bytes
		putint(p, (int)(d->o.y * DMF));
		putint(p, (int)(d->o.z * DMF));
		putint(p, (int)(d->yaw * DAF));
		putint(p, (int)(d->pitch * DAF));
		putint(p, (int)(d->roll * DAF));
		putint(
		    p, (int)(d->vel.x *
		             DVF)); // quantize to 1/100, almost always 1 byte
		putint(p, (int)(d->vel.y * DVF));
		putint(p, (int)(d->vel.z * DVF));
		// pack rest in 1 byte: strafe:2, move:2, onfloor:1, state:3
		putint(p, (d->strafe & 3) | ((d->move & 3) << 2) |
		              (((int)d->onfloor) << 4) |
		              ((editmode ? CS_EDITING : d->state) << 5));

		if (senditemstoserver) {

			packet->flags = ENET_PACKET_FLAG_RELIABLE;
			putint(p, SV_ITEMLIST);
			if (!m_noitems)
				putitems(p);
			putint(p, -1);
			senditemstoserver = false;
			serveriteminitdone = true;
		};
		if (ctext[0]) // player chat, not flood protected for now
		{
			packet->flags = ENET_PACKET_FLAG_RELIABLE;
			putint(p, SV_TEXT);
			sendstring(ctext, p);
			ctext[0] = 0;
		};
		if (!c2sinit) // tell other clients who I am
		{
			packet->flags = ENET_PACKET_FLAG_RELIABLE;
			c2sinit = true;
			putint(p, SV_INITC2S);
			sendstring(player1->name, p);
			sendstring(player1->team, p);
			putint(p, player1->lifesequence);
		};
		loopv(messages) // send messages collected during the previous
		                // frames
		{
			ivector &msg = messages[i];
			if (msg[1])
				packet->flags = ENET_PACKET_FLAG_RELIABLE;
			loopi(msg[0]) putint(p, msg[i + 2]);
		};
		messages.setsize(0);
		if (lastmillis - lastping > 250) {

			putint(p, SV_PING);
			putint(p, lastmillis);
			lastping = lastmillis;
		};
	};
	*(ushort *)start = ENET_HOST_TO_NET_16(p - start);
	enet_packet_resize(packet, p - start);
	incomingdemodata(start, p - start, true);
	if (clienthost) {
		enet_host_broadcast(clienthost, 0, packet);
		enet_host_flush(clienthost);
	} else
		localclienttoserver(packet);
	lastupdate = lastmillis;
	if (serveriteminitdone)
		loadgamerest(); // hack
};

void
gets2c() // get updates from the server
{
	ENetEvent event;
	if (!clienthost)
		return;
	if (connecting && lastmillis / 3000 > connecting / 3000) {

		conoutf("attempting to connect...");
		connecting = lastmillis;
		++connattempts;
		if (connattempts > 3) {

			conoutf("could not connect to server");
			disconnect();
			return;
		};
	};
	while (
	    clienthost != NULL && enet_host_service(clienthost, &event, 0) > 0)
		switch (event.type) {

		case ENET_EVENT_TYPE_CONNECT:
			conoutf("connected to server");
			connecting = 0;
			throttle();
			break;

		case ENET_EVENT_TYPE_RECEIVE:
			if (disconnecting)
				conoutf("attempting to disconnect...");
			else
				localservertoclient(event.packet->data,
				    event.packet->dataLength);
			enet_packet_destroy(event.packet);
			break;

		case ENET_EVENT_TYPE_DISCONNECT:
			if (disconnecting)
				disconnect();
			else
				server_err();
			return;
		}
};