Cube  Diff

Differences From Artifact [0953ab5d2b]:

To Artifact [5e922bff35]:


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







-
+
+

+
-
+

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

+
-
+

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


+
-
+

-
-
+
+
+


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

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

+
-
+

-
-
+
+
+
+








+
-
+

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


-
+
+

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


-




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

+
-
+

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


-
-
-
// misc useful functions used by the server

#include "cube.h"

// all network traffic is in 32bit ints, which are then compressed using the following simple scheme (assumes that most values are small).
// all network traffic is in 32bit ints, which are then compressed using the
// following simple scheme (assumes that most values are small).

void
void putint(uchar *&p, int n)
putint(uchar *&p, int n)
{
	if (n < 128 && n > -127) {
    if(n<128 && n>-127) { *p++ = n; }
    else if(n<0x8000 && n>=-0x8000) { *p++ = 0x80; *p++ = n; *p++ = n>>8;  }
    else { *p++ = 0x81; *p++ = n; *p++ = n>>8; *p++ = n>>16; *p++ = n>>24; };
};
		*p++ = n;
	} else if (n < 0x8000 && n >= -0x8000) {
		*p++ = 0x80;
		*p++ = n;
		*p++ = n >> 8;
	} else {
		*p++ = 0x81;
		*p++ = n;
		*p++ = n >> 8;
		*p++ = n >> 16;
		*p++ = n >> 24;
	};
};

int
int getint(uchar *&p)
getint(uchar *&p)
{
    int c = *((char *)p);
    p++;
    if(c==-128) { int n = *p++; n |= *((char *)p)<<8; p++; return n;}
    else if(c==-127) { int n = *p++; n |= *p++<<8; n |= *p++<<16; return n|(*p++<<24); } 
    else return c;
	int c = *((char *)p);
	p++;
	if (c == -128) {
		int n = *p++;
		n |= *((char *)p) << 8;
		p++;
		return n;
	} else if (c == -127) {
		int n = *p++;
		n |= *p++ << 8;
		n |= *p++ << 16;
		return n | (*p++ << 24);
	} else
		return c;
};

void
void sendstring(char *t, uchar *&p)
sendstring(char *t, uchar *&p)
{
    while(*t) putint(p, *t++);
    putint(p, 0);
	while (*t)
		putint(p, *t++);
	putint(p, 0);
};

const char *modenames[] =
const char *modenames[] = {
{
    "SP", "DMSP", "ffa/default", "coopedit", "ffa/duel", "teamplay",
    "instagib", "instagib team", "efficiency", "efficiency team",
    "insta arena", "insta clan arena", "tactics arena", "tactics clan arena",
    "SP",
    "DMSP",
    "ffa/default",
    "coopedit",
    "ffa/duel",
    "teamplay",
    "instagib",
    "instagib team",
    "efficiency",
    "efficiency team",
    "insta arena",
    "insta clan arena",
    "tactics arena",
    "tactics clan arena",
};
      
const char *modestr(int n) { return (n>=-2 && n<12) ? modenames[n+2] : "unknown"; };


const char *
modestr(int n)
{
char msgsizesl[] =               // size inclusive message token, 0 for variable or not-checked sizes
{ 
    SV_INITS2C, 4, SV_INITC2S, 0, SV_POS, 12, SV_TEXT, 0, SV_SOUND, 2, SV_CDIS, 2,
    SV_EDITH, 7, SV_EDITT, 7, SV_EDITS, 6, SV_EDITD, 6, SV_EDITE, 6,
    SV_DIED, 2, SV_DAMAGE, 4, SV_SHOT, 8, SV_FRAGS, 2,
    SV_MAPCHANGE, 0, SV_ITEMSPAWN, 2, SV_ITEMPICKUP, 3, SV_DENIED, 2,
    SV_PING, 2, SV_PONG, 2, SV_CLIENTPING, 2, SV_GAMEMODE, 2,
    SV_TIMEUP, 2, SV_EDITENT, 10, SV_MAPRELOAD, 2, SV_ITEMACC, 2,
    SV_SENDMAP, 0, SV_RECVMAP, 1, SV_SERVMSG, 0, SV_ITEMLIST, 0,
	return (n >= -2 && n < 12) ? modenames[n + 2] : "unknown";
};

char msgsizesl[] = // size inclusive message token, 0 for variable or
                   // not-checked sizes
    {SV_INITS2C, 4, SV_INITC2S, 0, SV_POS, 12, SV_TEXT, 0, SV_SOUND, 2, SV_CDIS,
        2, SV_EDITH, 7, SV_EDITT, 7, SV_EDITS, 6, SV_EDITD, 6, SV_EDITE, 6,
        SV_DIED, 2, SV_DAMAGE, 4, SV_SHOT, 8, SV_FRAGS, 2, SV_MAPCHANGE, 0,
        SV_ITEMSPAWN, 2, SV_ITEMPICKUP, 3, SV_DENIED, 2, SV_PING, 2, SV_PONG, 2,
        SV_CLIENTPING, 2, SV_GAMEMODE, 2, SV_TIMEUP, 2, SV_EDITENT, 10,
        SV_MAPRELOAD, 2, SV_ITEMACC, 2, SV_SENDMAP, 0, SV_RECVMAP, 1,
        SV_SERVMSG, 0, SV_ITEMLIST, 0, SV_EXT, 0, -1};
    SV_EXT, 0,
    -1
};

char
char msgsizelookup(int msg)
msgsizelookup(int msg)
{
    for(char *p = msgsizesl; *p>=0; p += 2) if(*p==msg) return p[1];
    return -1;
	for (char *p = msgsizesl; *p >= 0; p += 2)
		if (*p == msg)
			return p[1];
	return -1;
};

// sending of maps between clients

string copyname;
int copysize;
uchar *copydata = NULL;

void
void sendmaps(int n, string mapname, int mapsize, uchar *mapdata)
sendmaps(int n, string mapname, int mapsize, uchar *mapdata)
{
    if(mapsize <= 0 || mapsize > 256*256) return;
    strcpy_s(copyname, mapname);
    copysize = mapsize;
    if(copydata) free(copydata);
    copydata = (uchar *)alloc(mapsize);
    memcpy(copydata, mapdata, mapsize);
	if (mapsize <= 0 || mapsize > 256 * 256)
		return;
	strcpy_s(copyname, mapname);
	copysize = mapsize;
	if (copydata)
		free(copydata);
	copydata = (uchar *)alloc(mapsize);
	memcpy(copydata, mapdata, mapsize);
}

ENetPacket *recvmap(int n)
ENetPacket *
recvmap(int n)
{
	if (!copydata)
    if(!copydata) return NULL;
    ENetPacket *packet = enet_packet_create(NULL, MAXTRANS + copysize, ENET_PACKET_FLAG_RELIABLE);
    uchar *start = packet->data;
    uchar *p = start+2;
    putint(p, SV_RECVMAP);
    sendstring(copyname, p);
    putint(p, copysize);
    memcpy(p, copydata, copysize);
    p += copysize;
    *(ushort *)start = ENET_HOST_TO_NET_16(p-start);
    enet_packet_resize(packet, p-start);
		return NULL;
	ENetPacket *packet = enet_packet_create(
	    NULL, MAXTRANS + copysize, ENET_PACKET_FLAG_RELIABLE);
	uchar *start = packet->data;
	uchar *p = start + 2;
	putint(p, SV_RECVMAP);
	sendstring(copyname, p);
	putint(p, copysize);
	memcpy(p, copydata, copysize);
	p += copysize;
	*(ushort *)start = ENET_HOST_TO_NET_16(p - start);
	enet_packet_resize(packet, p - start);
	return packet;
}


#ifdef STANDALONE

void localservertoclient(uchar *buf, int len) {};
void
fatal(char *s, char *o)
{
	cleanupserver();
void fatal(char *s, char *o) { cleanupserver(); printf("servererror: %s\n", s); exit(1); };
void *alloc(int s) { void *b = calloc(1,s); if(!b) fatal("no memory!"); return b; };
	printf("servererror: %s\n", s);
	exit(1);
};
void *
alloc(int s)
{
	void *b = calloc(1, s);
	if (!b)
		fatal("no memory!");
	return b;
};

int
int main(int argc, char* argv[])
main(int argc, char *argv[])
{
    int uprate = 0, maxcl = 4;
    char *sdesc = "", *ip = "", *master = NULL, *passwd = "";
    
    for(int i = 1; i<argc; i++)
	int uprate = 0, maxcl = 4;
	char *sdesc = "", *ip = "", *master = NULL, *passwd = "";

	for (int i = 1; i < argc; i++) {
    {
        char *a = &argv[i][2];
        if(argv[i][0]=='-') switch(argv[i][1])
		char *a = &argv[i][2];
		if (argv[i][0] == '-')
			switch (argv[i][1]) {
        {
            case 'u': uprate = atoi(a); break;
            case 'n': sdesc  = a; break;
            case 'i': ip     = a; break;
            case 'm': master = a; break;
            case 'p': passwd = a; break;
            case 'c': maxcl  = atoi(a); break;
            default: printf("WARNING: unknown commandline option\n");
        };
    };
    
    if(enet_initialize()<0) fatal("Unable to initialise network module");
    initserver(true, uprate, sdesc, ip, master, passwd, maxcl);
    return 0;
			case 'u':
				uprate = atoi(a);
				break;
			case 'n':
				sdesc = a;
				break;
			case 'i':
				ip = a;
				break;
			case 'm':
				master = a;
				break;
			case 'p':
				passwd = a;
				break;
			case 'c':
				maxcl = atoi(a);
				break;
			default:
				printf("WARNING: unknown commandline option\n");
			};
	};

	if (enet_initialize() < 0)
		fatal("Unable to initialise network module");
	initserver(true, uprate, sdesc, ip, master, passwd, maxcl);
	return 0;
};
#endif