ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.38 by root, Thu Dec 14 22:45:41 2006 UTC

1/*
2 * static char *rcsid_init_c =
3 * "$Id: request.C,v 1.8 2006/08/24 10:58:39 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2001 Mark Wedel 4 Copyright (C) 2001 Mark Wedel
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
27*/ 22*/
28 23
29/** 24/**
30 * \file 25 * \file
31 * Client handling. 26 * Client handling.
… …
46 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
47 * 42 *
48 * mapcellchanged, compactlayer, compactstack, perform the map compressing 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
49 * operations 44 * operations
50 * 45 *
51 * esrv_map_doneredraw finishes the map update, and ships across the
52 * map updates.
53 *
54 * esrv_map_scroll tells the client to scroll the map, and does similarily
55 * for the locally cached copy.
56 */ 46 */
57 47
58#include <global.h> 48#include <global.h>
59#include <sproto.h> 49#include <sproto.h>
60 50
… …
64#include <commands.h> 54#include <commands.h>
65 55
66/* This block is basically taken from socket.c - I assume if it works there, 56/* This block is basically taken from socket.c - I assume if it works there,
67 * it should work here. 57 * it should work here.
68 */ 58 */
69#ifndef WIN32 /* ---win32 exclude unix headers */
70#include <sys/types.h> 59#include <sys/types.h>
71#include <sys/time.h> 60#include <sys/time.h>
72#include <sys/socket.h> 61#include <sys/socket.h>
73#include <netinet/in.h> 62#include <netinet/in.h>
74#include <netdb.h> 63#include <netdb.h>
75#endif /* win32 */
76 64
77#ifdef HAVE_UNISTD_H
78#include <unistd.h> 65#include <unistd.h>
79#endif
80
81#ifdef HAVE_SYS_TIME_H
82#include <sys/time.h> 66#include <sys/time.h>
83#endif
84 67
85#include "sounds.h" 68#include "sounds.h"
86 69
87/** 70/**
88 * This table translates the attack numbers as used within the 71 * This table translates the attack numbers as used within the
89 * program to the value we use when sending STATS command to the 72 * program to the value we use when sending STATS command to the
90 * client. If a value is -1, then we don't send that to the 73 * client. If a value is -1, then we don't send that to the
91 * client. 74 * client.
92 */ 75 */
93short atnr_cs_stat[NROFATTACKS] = {CS_STAT_RES_PHYS, 76short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
94 CS_STAT_RES_MAG,CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 77 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
95 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 78 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
96 CS_STAT_RES_DRAIN, -1 /* weaponmagic */, 79 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
97 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 80 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
98 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 81 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
99 CS_STAT_RES_FEAR, -1 /* Cancellation */, 82 CS_STAT_RES_FEAR, -1 /* Cancellation */ ,
100 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 83 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,
101 -1 /* Chaos */, -1 /* Counterspell */, 84 -1 /* Chaos */ , -1 /* Counterspell */ ,
102 -1 /* Godpower */, CS_STAT_RES_HOLYWORD, 85 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD,
103 CS_STAT_RES_BLIND, 86 CS_STAT_RES_BLIND,
104 -1, /* Internal */ 87 -1, /* Internal */
105 -1, /* life stealing */ 88 -1, /* life stealing */
106 -1 /* Disease - not fully done yet */ 89 -1 /* Disease - not fully done yet */
107}; 90};
108 91
109static void 92static void
110socket_map_scroll (NewSocket *ns, int dx, int dy) 93socket_map_scroll (client_socket * ns, int dx, int dy)
111{ 94{
112 struct Map newmap; 95 struct Map newmap;
113 int x,y, mx, my; 96 int x, y, mx, my;
114 97
115 { 98 {
116 char buf[MAXSOCKBUF]; 99 packet sl;
117 100
118 sprintf(buf,"map_scroll %d %d", dx, dy); 101 sl.printf ("map_scroll %d %d", dx, dy);
119 Write_String_To_Socket(ns, buf, strlen (buf)); 102 ns->send_packet (sl);
120 } 103 }
121 104
122 /* If we are using the Map1aCmd, we may in fact send 105 /* If we are using the Map1aCmd, we may in fact send
123 * head information that is outside the viewable map. 106 * head information that is outside the viewable map.
124 * So set the mx,my to the max value we want to 107 * So set the mx,my to the max value we want to
125 * look for. Removed code to do so - it caused extra 108 * look for. Removed code to do so - it caused extra
126 * complexities for the client, and probably doesn't make 109 * complexities for the client, and probably doesn't make
127 * that much difference in bandwidth. 110 * that much difference in bandwidth.
128 */ 111 */
129 mx = ns->mapx; 112 mx = ns->mapx;
130 my = ns->mapy; 113 my = ns->mapy;
131 114
132 if (ns->mapmode == Map1aCmd) { 115 if (ns->mapmode == Map1aCmd)
116 {
133 mx += MAX_HEAD_OFFSET; 117 mx += MAX_HEAD_OFFSET;
134 my += MAX_HEAD_OFFSET; 118 my += MAX_HEAD_OFFSET;
135 } 119 }
136 120
137 /* the x and y here are coordinates for the new map, i.e. if we moved 121 /* the x and y here are coordinates for the new map, i.e. if we moved
138 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 122 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
139 * if the destination x or y coordinate is outside the viewable 123 * if the destination x or y coordinate is outside the viewable
140 * area, we clear the values - otherwise, the old values 124 * area, we clear the values - otherwise, the old values
141 * are preserved, and the check_head thinks it needs to clear them. 125 * are preserved, and the check_head thinks it needs to clear them.
142 */ 126 */
143 for(x=0; x<mx; x++) { 127 for (x = 0; x < mx; x++)
144 for(y=0; y<my; y++) { 128 {
129 for (y = 0; y < my; y++)
130 {
145 if(x >= ns->mapx || y >= ns->mapy) { 131 if (x >= ns->mapx || y >= ns->mapy)
146 /* clear cells outside the viewable area */ 132 /* clear cells outside the viewable area */
147 memset(&newmap.cells[x][y], 0, sizeof(struct MapCell)); 133 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
148 }
149 else if ((x+dx) < 0 || (x+dx) >= ns->mapx || (y+dy) < 0 || (y + dy) >= ns->mapy) { 134 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
150 /* clear newly visible tiles within the viewable area */ 135 /* clear newly visible tiles within the viewable area */
151 memset(&(newmap.cells[x][y]), 0, sizeof(struct MapCell)); 136 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
137 else
138 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
139 }
152 } 140 }
153 else {
154 memcpy(&(newmap.cells[x][y]),
155 &(ns->lastmap.cells[x+dx][y+dy]),sizeof(struct MapCell));
156 }
157 }
158 }
159 141
160 memcpy(&(ns->lastmap), &newmap,sizeof(struct Map)); 142 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
161 143
162 /* Make sure that the next "map1" command will be sent (even if it is 144 /* Make sure that the next "map1" command will be sent (even if it is
163 * empty). 145 * empty).
164 */ 146 */
165 ns->sent_scroll = 1; 147 ns->sent_scroll = 1;
166} 148}
167 149
168static void 150static void
169clear_map (player *pl) 151clear_map (player *pl)
170{ 152{
171 NewSocket &socket = pl->socket; 153 client_socket &socket = *pl->socket;
172 154
173 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 155 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
174 156
175 if (socket.newmapcmd == 1) 157 if (socket.newmapcmd == 1)
176 Write_String_To_Socket (&socket, "newmap", 6); 158 socket.send_packet ("newmap");
177 159
178 socket.update_look = 1; 160 socket.update_look = 1;
179 socket.look_position = 0; 161 socket.look_position = 0;
180} 162}
181 163
182/** check for map change and send new map data */ 164/** check for map change and send new map data */
183static void 165static void
184check_map_change (player *pl) 166check_map_change (player *pl)
185{ 167{
186 NewSocket &socket = pl->socket; 168 client_socket &socket = *pl->socket;
187 object *ob = pl->ob; 169 object *ob = pl->ob;
188 char buf[MAX_BUF]; /* eauugggh */ 170 char buf[MAX_BUF]; /* eauugggh */
189 171
190 if (socket.current_map != ob->map) 172 if (socket.current_map != ob->map)
191 { 173 {
192 socket.current_map = ob->map; 174 socket.current_map = ob->map;
193 175
194 clear_map (pl); 176 clear_map (pl);
195 177
196 if (socket.mapinfocmd) 178 if (socket.mapinfocmd)
197 { 179 {
198 if (ob->map && ob->map->path [0]) 180 if (ob->map && ob->map->path[0])
199 { 181 {
200 int flags = 0; 182 int flags = 0;
201 183
202 if (ob->map->tile_path [0]) flags |= 1; 184 if (ob->map->tile_path[0])
185 flags |= 1;
203 if (ob->map->tile_path [1]) flags |= 2; 186 if (ob->map->tile_path[1])
187 flags |= 2;
204 if (ob->map->tile_path [2]) flags |= 4; 188 if (ob->map->tile_path[2])
189 flags |= 4;
205 if (ob->map->tile_path [3]) flags |= 8; 190 if (ob->map->tile_path[3])
191 flags |= 8;
206 192
207 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 193 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
208 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, 194 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
209 ob->map->width, ob->map->height, ob->map->path);
210 } 195 }
211 else 196 else
212 snprintf (buf, MAX_BUF, "mapinfo current"); 197 snprintf (buf, MAX_BUF, "mapinfo current");
213 198
214 Write_String_To_Socket (&socket, buf, strlen (buf)); 199 socket.send_packet (buf);
215 } 200 }
216 } 201 }
217 else if (socket.current_x != ob->x || socket.current_y != ob->y) 202 else if (socket.current_x != ob->x || socket.current_y != ob->y)
218 { 203 {
219 int dx = ob->x - socket.current_x; 204 int dx = ob->x - socket.current_x;
220 int dy = ob->y - socket.current_y; 205 int dy = ob->y - socket.current_y;
221 206
222 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
223 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 208 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
224 else 209 else
225 { 210 {
226 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 211 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
227 socket.update_look = 1; 212 socket.update_look = 1;
228 socket.look_position = 0; 213 socket.look_position = 0;
… …
231 216
232 socket.current_x = ob->x; 217 socket.current_x = ob->x;
233 socket.current_y = ob->y; 218 socket.current_y = ob->y;
234} 219}
235 220
221void
236void ExtCmd (char *buf, int len, player *pl) 222ExtCmd (char *buf, int len, player *pl)
237{ 223{
238 execute_global_event (EVENT_EXTCMD, pl, buf, len); 224 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
239} 225}
240 226
227void
241void MapInfoCmd (char *buf, int len, player *pl) 228MapInfoCmd (char *buf, int len, player *pl)
242{ 229{
243 // <mapinfo tag spatial tile-path 230 // <mapinfo tag spatial tile-path
244 // >mapinfo tag spatial flags x y w h hash 231 // >mapinfo tag spatial flags x y w h hash
245 232
246 char bigbuf[MAX_BUF], *cp, *token; 233 char bigbuf[MAX_BUF], *token;
247 234
248 token = buf; 235 token = buf;
249 // copy token 236 // copy token
250 if (!(buf = strchr (buf, ' '))) 237 if (!(buf = strchr (buf, ' ')))
251 return; 238 return;
… …
255 if (!strncmp (buf, "spatial ", 8)) 242 if (!strncmp (buf, "spatial ", 8))
256 { 243 {
257 buf += 8; 244 buf += 8;
258 245
259 // initial map and its origin 246 // initial map and its origin
260 mapstruct *map = pl->ob->map; 247 maptile *map = pl->ob->map;
261 sint16 dx, dy; 248 sint16 dx, dy;
262 int mapx = pl->socket.mapx / 2 - pl->ob->x; 249 int mapx = pl->socket->mapx / 2 - pl->ob->x;
263 int mapy = pl->socket.mapy / 2 - pl->ob->y; 250 int mapy = pl->socket->mapy / 2 - pl->ob->y;
264 int max_distance = 8; // limit maximum path length to something generous 251 int max_distance = 8; // limit maximum path length to something generous
265 252
266 while (*buf && map && max_distance) 253 while (*buf && map && max_distance)
267 { 254 {
268 int dir = *buf++; 255 int dir = *buf++;
269 256
270 switch (dir) 257 switch (dir)
271 { 258 {
272 case '1': 259 case '1':
260 dx = 0;
261 dy = -1;
273 dx = 0; dy = -1; map = get_map_from_coord (map, &dx, &dy); 262 map = get_map_from_coord (map, &dx, &dy);
274 map && (mapy -= map->height); 263 map && (mapy -= map->height);
275 break; 264 break;
276 case '2': 265 case '2':
277 mapx += map->width; 266 mapx += map->width;
267 dx = map->width;
268 dy = 0;
278 dx = map->width; dy = 0; map = get_map_from_coord (map, &dx, &dy); 269 map = get_map_from_coord (map, &dx, &dy);
279 break; 270 break;
280 case '3': 271 case '3':
281 mapy += map->height; 272 mapy += map->height;
273 dx = 0;
274 dy = map->height;
282 dx = 0; dy = map->height; map = get_map_from_coord (map, &dx, &dy); 275 map = get_map_from_coord (map, &dx, &dy);
283 break; 276 break;
284 case '4': 277 case '4':
278 dx = -1;
279 dy = 0;
285 dx = -1; dy = 0; map = get_map_from_coord (map, &dx, &dy); 280 map = get_map_from_coord (map, &dx, &dy);
286 map && (mapx -= map->width); 281 map && (mapx -= map->width);
287 break; 282 break;
288 } 283 }
289 284
290 --max_distance; 285 --max_distance;
291 } 286 }
292 287
293 if (!max_distance) 288 if (!max_distance)
294 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 289 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
295 else if (map && map->path [0]) 290 else if (map && map->path[0])
296 { 291 {
297 int flags = 0; 292 int flags = 0;
298 293
299 if (map->tile_path [0]) flags |= 1; 294 if (map->tile_path[0])
295 flags |= 1;
300 if (map->tile_path [1]) flags |= 2; 296 if (map->tile_path[1])
297 flags |= 2;
301 if (map->tile_path [2]) flags |= 4; 298 if (map->tile_path[2])
299 flags |= 4;
302 if (map->tile_path [3]) flags |= 8; 300 if (map->tile_path[3])
301 flags |= 8;
303 302
304 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", 303 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
305 token, flags, mapx, mapy,
306 map->width, map->height, map->path);
307 } 304 }
308 else 305 else
309 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
310 } 307 }
311 else 308 else
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
313 310
314 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 311 pl->socket->send_packet (bigbuf);
315} 312}
316 313
317/** This is the Setup cmd - easy first implementation */ 314/** This is the Setup cmd - easy first implementation */
315void
318void SetUp(char *buf, int len, NewSocket *ns) 316SetUp (char *buf, int len, client_socket * ns)
319{ 317{
320 int s, slen; 318 int s, slen;
321 char *cmd, *param, cmdback[HUGE_BUF]; 319 char *cmd, *param, cmdback[HUGE_BUF];
322 320
323 /* run through the cmds of setup 321 /* run through the cmds of setup
324 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... 322 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
325 * 323 *
326 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 324 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
327 * The client then must sort this out 325 * The client then must sort this out
328 */ 326 */
329 327
330 LOG(llevInfo,"Get SetupCmd:: %s\n", buf); 328 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
329
331 strcpy(cmdback,"setup"); 330 strcpy (cmdback, "setup");
332 for(s=0;s<len; ) { 331 for (s = 0; s < len; )
333 332 {
334 cmd = &buf[s]; 333 cmd = &buf[s];
335 334
336 /* find the next space, and put a null there */ 335 /* find the next space, and put a null there */
337 for(;buf[s] && buf[s] != ' ';s++) ; 336 for (; buf[s] && buf[s] != ' '; s++)
338 buf[s++]=0; 337 ;
338
339 buf[s++] = 0;
340
339 while (buf[s] == ' ') s++; 341 while (buf[s] == ' ')
342 s++;
340 343
341 if(s>=len) 344 if (s >= len)
342 break; 345 break;
343 346
344 param = &buf[s]; 347 param = &buf[s];
345 348
346 for(;buf[s] && buf[s] != ' ';s++) ; 349 for (; buf[s] && buf[s] != ' '; s++)
347 buf[s++]=0; 350 ;
351
352 buf[s++] = 0;
353
348 while (buf[s] == ' ') s++; 354 while (buf[s] == ' ')
349 355 s++;
356
350 slen = strlen(cmdback); 357 slen = strlen (cmdback);
351 safe_strcat(cmdback, " ", &slen, HUGE_BUF); 358 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
352 safe_strcat(cmdback, cmd, &slen, HUGE_BUF); 359 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
353 safe_strcat(cmdback, " ", &slen, HUGE_BUF); 360 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
354 361
355 if (!strcmp(cmd,"sound")) { 362 if (!strcmp (cmd, "sound"))
363 {
356 ns->sound = atoi(param); 364 ns->sound = atoi (param);
357 safe_strcat(cmdback, param, &slen, HUGE_BUF); 365 safe_strcat (cmdback, param, &slen, HUGE_BUF);
358 } 366 }
359 else if (!strcmp(cmd,"exp64")) { 367 else if (!strcmp (cmd, "exp64"))
368 {
360 ns->exp64 = atoi(param); 369 ns->exp64 = atoi (param);
361 safe_strcat(cmdback, param, &slen, HUGE_BUF); 370 safe_strcat (cmdback, param, &slen, HUGE_BUF);
371 }
362 } else if (!strcmp(cmd, "spellmon")) { 372 else if (!strcmp (cmd, "spellmon"))
373 {
363 ns->monitor_spells = atoi(param); 374 ns->monitor_spells = atoi (param);
364 safe_strcat(cmdback, param, &slen, HUGE_BUF); 375 safe_strcat (cmdback, param, &slen, HUGE_BUF);
376 }
365 } else if (!strcmp(cmd,"darkness")) { 377 else if (!strcmp (cmd, "darkness"))
378 {
366 ns->darkness = atoi(param); 379 ns->darkness = atoi (param);
367 safe_strcat(cmdback, param, &slen, HUGE_BUF); 380 safe_strcat (cmdback, param, &slen, HUGE_BUF);
381 }
368 } else if (!strcmp(cmd,"map1cmd")) { 382 else if (!strcmp (cmd, "map1cmd"))
369 if (atoi(param)) ns->mapmode = Map1Cmd; 383 {
384 if (atoi (param))
385 ns->mapmode = Map1Cmd;
370 /* if beyond this size, need to use map1cmd no matter what */ 386 /* if beyond this size, need to use map1cmd no matter what */
371 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1Cmd; 387 if (ns->mapx > 11 || ns->mapy > 11)
388 ns->mapmode = Map1Cmd;
372 safe_strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0", &slen, HUGE_BUF); 389 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
390 }
373 } else if (!strcmp(cmd,"map1acmd")) { 391 else if (!strcmp (cmd, "map1acmd"))
374 if (atoi(param)) ns->mapmode = Map1aCmd; 392 {
393 if (atoi (param))
394 ns->mapmode = Map1aCmd;
375 /* if beyond this size, need to use map1acmd no matter what */ 395 /* if beyond this size, need to use map1acmd no matter what */
376 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1aCmd; 396 if (ns->mapx > 11 || ns->mapy > 11)
397 ns->mapmode = Map1aCmd;
377 safe_strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0", &slen, HUGE_BUF); 398 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
399 }
378 } else if (!strcmp(cmd,"newmapcmd")) { 400 else if (!strcmp (cmd, "newmapcmd"))
401 {
379 ns->newmapcmd= atoi(param); 402 ns->newmapcmd = atoi (param);
380 safe_strcat(cmdback, param, &slen, HUGE_BUF); 403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
381// } else if (!strcmp(cmd,"plugincmd")) { 404// } else if (!strcmp(cmd,"plugincmd")) {
382// ns->plugincmd = atoi(param); 405// ns->plugincmd = atoi(param);
383// safe_strcat(cmdback, param, &slen, HUGE_BUF); 406// safe_strcat(cmdback, param, &slen, HUGE_BUF);
407 }
384 } else if (!strcmp(cmd,"mapinfocmd")) { 408 else if (!strcmp (cmd, "mapinfocmd"))
409 {
385 ns->mapinfocmd = atoi(param); 410 ns->mapinfocmd = atoi (param);
386 safe_strcat(cmdback, "1", &slen, HUGE_BUF); 411 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
412 }
387 } else if (!strcmp(cmd,"extcmd")) { 413 else if (!strcmp (cmd, "extcmd"))
414 {
388 ns->extcmd = atoi(param); 415 ns->extcmd = atoi (param);
389 safe_strcat(cmdback, "1", &slen, HUGE_BUF); 416 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
417 }
390 } else if (!strcmp(cmd,"extmap")) { 418 else if (!strcmp (cmd, "extmap"))
419 {
391 ns->extmap = atoi(param); 420 ns->extmap = atoi (param);
392 safe_strcat(cmdback, "1", &slen, HUGE_BUF); 421 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
422 }
393 } else if (!strcmp(cmd,"facecache")) { 423 else if (!strcmp (cmd, "facecache"))
424 {
394 ns->facecache = atoi(param); 425 ns->facecache = atoi (param);
395 safe_strcat(cmdback, param, &slen, HUGE_BUF); 426 safe_strcat (cmdback, param, &slen, HUGE_BUF);
427 }
396 } else if (!strcmp(cmd,"faceset")) { 428 else if (!strcmp (cmd, "faceset"))
429 {
397 char tmpbuf[20]; 430 char tmpbuf[20];
398 int q = atoi(param); 431 int q = atoi (param);
399 432
400 if (is_valid_faceset(q)) 433 if (is_valid_faceset (q))
401 ns->faceset=q; 434 ns->faceset = q;
402 sprintf(tmpbuf,"%d", ns->faceset); 435 sprintf (tmpbuf, "%d", ns->faceset);
403 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 436 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
404 /* if the client is using faceset, it knows about image2 command */ 437 /* if the client is using faceset, it knows about image2 command */
405 ns->image2=1; 438 ns->image2 = 1;
439 }
406 } else if (!strcmp(cmd,"itemcmd")) { 440 else if (!strcmp (cmd, "itemcmd"))
441 {
407 /* Version of the item protocol command to use. Currently, 442 /* Version of the item protocol command to use. Currently,
408 * only supported versions are 1 and 2. Using a numeric 443 * only supported versions are 1 and 2. Using a numeric
409 * value will make it very easy to extend this in the future. 444 * value will make it very easy to extend this in the future.
410 */ 445 */
411 char tmpbuf[20]; 446 char tmpbuf[20];
412 int q = atoi(param); 447 int q = atoi (param);
413 if (q<1 || q>2) { 448
414 strcpy(tmpbuf,"FALSE"); 449 if (q < 1 || q > 2)
415 } else { 450 {
416 ns->itemcmd = q; 451 strcpy (tmpbuf, "FALSE");
452 }
453 else
454 {
455 ns->itemcmd = q;
417 sprintf(tmpbuf,"%d", ns->itemcmd); 456 sprintf (tmpbuf, "%d", ns->itemcmd);
418 } 457 }
419 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 458 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
459 }
420 } else if (!strcmp(cmd,"mapsize")) { 460 else if (!strcmp (cmd, "mapsize"))
461 {
421 int x, y=0; 462 int x, y = 0;
422 char tmpbuf[MAX_BUF], *cp; 463 char tmpbuf[MAX_BUF], *cp;
423 464
424 x = atoi(param); 465 x = atoi (param);
425 for (cp = param; *cp!=0; cp++) 466 for (cp = param; *cp != 0; cp++)
426 if (*cp == 'x' || *cp == 'X') { 467 if (*cp == 'x' || *cp == 'X')
427 y = atoi(cp+1); 468 {
428 break; 469 y = atoi (cp + 1);
429 } 470 break;
471 }
430 if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) { 472 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
473 {
431 sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 474 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
432 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 475 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
433 } else { 476 }
434 ns->mapx = x; 477 else
435 ns->mapy = y; 478 {
479 ns->mapx = x;
480 ns->mapy = y;
436 /* better to send back what we are really using and not the 481 /* better to send back what we are really using and not the
437 * param as given to us in case it gets parsed differently. 482 * param as given to us in case it gets parsed differently.
438 */ 483 */
439 sprintf(tmpbuf,"%dx%d", x,y); 484 sprintf (tmpbuf, "%dx%d", x, y);
440 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 485 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
441 /* If beyond this size and still using orig map command, need to 486 /* If beyond this size and still using orig map command, need to
442 * go to map1cmd. 487 * go to map1cmd.
443 */ 488 */
444 if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd; 489 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
445 } 490 ns->mapmode = Map1Cmd;
491 }
492 }
446 } else if (!strcmp(cmd,"extendedMapInfos")) { 493 else if (!strcmp (cmd, "extendedMapInfos"))
494 {
447 /* Added by tchize 495 /* Added by tchize
448 * prepare to use the mapextended command 496 * prepare to use the mapextended command
449 */ 497 */
450 char tmpbuf[20]; 498 char tmpbuf[20];
499
451 ns->ext_mapinfos = (atoi(param)); 500 ns->ext_mapinfos = (atoi (param));
452 sprintf(tmpbuf,"%d", ns->ext_mapinfos); 501 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
453 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 502 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
503 }
454 } else if (!strcmp(cmd,"extendedTextInfos")) { 504 else if (!strcmp (cmd, "extendedTextInfos"))
505 {
455 /* Added by tchize 506 /* Added by tchize
456 * prepare to use the extended text commands 507 * prepare to use the extended text commands
457 * Client toggle this to non zero to get exttext 508 * Client toggle this to non zero to get exttext
458 */ 509 */
459 char tmpbuf[20]; 510 char tmpbuf[20];
460 511
461 ns->has_readable_type = (atoi(param)); 512 ns->has_readable_type = (atoi (param));
462 sprintf(tmpbuf,"%d", ns->has_readable_type); 513 sprintf (tmpbuf, "%d", ns->has_readable_type);
463 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF); 514 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
464 } else { 515 }
516 else
517 {
465 /* Didn't get a setup command we understood - 518 /* Didn't get a setup command we understood -
466 * report a failure to the client. 519 * report a failure to the client.
467 */ 520 */
468 safe_strcat(cmdback, "FALSE", &slen, HUGE_BUF); 521 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
469 } 522 }
470 } /* for processing all the setup commands */ 523 } /* for processing all the setup commands */
524
471 LOG(llevInfo,"SendBack SetupCmd:: %s\n", cmdback); 525 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
472 Write_String_To_Socket(ns, cmdback, strlen(cmdback)); 526 ns->send_packet (cmdback);
473} 527}
474 528
475/** 529/**
476 * The client has requested to be added to the game. 530 * The client has requested to be added to the game.
477 * This is what takes care of it. We tell the client how things worked out. 531 * This is what takes care of it. We tell the client how things worked out.
478 * I am not sure if this file is the best place for this function. however, 532 * I am not sure if this file is the best place for this function. however,
479 * it either has to be here or init_sockets needs to be exported. 533 * it either has to be here or init_sockets needs to be exported.
480 */ 534 */
535void
481void AddMeCmd(char *buf, int len, NewSocket *ns) 536AddMeCmd (char *buf, int len, client_socket * ns)
482{ 537{
483 Settings oldsettings; 538 Settings oldsettings;
539
484 oldsettings=settings; 540 oldsettings = settings;
485 if (ns->status != Ns_Add || add_player(ns)) { 541 if (ns->status != Ns_Add || add_player (ns))
486 Write_String_To_Socket(ns, "addme_failed",12); 542 ns->send_packet ("addme_failed");
487 } else { 543 else
488 /* Basically, the add_player copies the socket structure into 544 ns->send_packet ("addme_success");
489 * the player structure, so this one (which is from init_sockets) 545
490 * is not needed anymore. The write below should still work, as the
491 * stuff in ns is still relevant.
492 */
493 Write_String_To_Socket(ns, "addme_success",13);
494 socket_info.nconns--;
495 ns->status = Ns_Avail;
496 }
497 settings=oldsettings; 546 settings = oldsettings;
498} 547}
499 548
500/** Reply to ExtendedInfos command */ 549/** Reply to ExtendedInfos command */
550void
501void ToggleExtendedInfos (char *buf, int len, NewSocket *ns){ 551ToggleExtendedInfos (char *buf, int len, client_socket * ns)
552{
502 char cmdback[MAX_BUF]; 553 char cmdback[MAX_BUF];
503 char command[50]; 554 char command[50];
504 int info,nextinfo; 555 int info, nextinfo;
556
505 cmdback[0]='\0'; 557 cmdback[0] = '\0';
506 nextinfo=0; 558 nextinfo = 0;
559
507 while (1){ 560 while (1)
561 {
508 /* 1. Extract an info*/ 562 /* 1. Extract an info */
509 info=nextinfo; 563 info = nextinfo;
564
510 while ( (info<len) && (buf[info]==' ') ) info++; 565 while ((info < len) && (buf[info] == ' '))
566 info++;
567
511 if (info>=len) 568 if (info >= len)
512 break; 569 break;
570
513 nextinfo=info+1; 571 nextinfo = info + 1;
572
514 while ( (nextinfo<len) && (buf[nextinfo]!=' ') ) 573 while ((nextinfo < len) && (buf[nextinfo] != ' '))
515 nextinfo++; 574 nextinfo++;
575
516 if (nextinfo-info>=49) /*Erroneous info asked*/ 576 if (nextinfo - info >= 49) /*Erroneous info asked */
517 continue; 577 continue;
578
518 strncpy (command,&(buf[info]),nextinfo-info); 579 strncpy (command, &(buf[info]), nextinfo - info);
519 command[nextinfo-info]='\0'; 580
520 /* 2. Interpret info*/ 581 /* 2. Interpret info */
521 if (!strcmp("smooth",command)){ 582 if (!strcmp ("smooth", command))
522 /* Toggle smoothing*/ 583 /* Toggle smoothing */
523 ns->EMI_smooth=!ns->EMI_smooth; 584 ns->EMI_smooth = !ns->EMI_smooth;
524 }else{ 585 else
525 /*bad value*/ 586 /*bad value */;
526 } 587
527 /*3. Next info*/ 588 /*3. Next info */
528 } 589 }
590
529 strcpy (cmdback,"ExtendedInfoSet"); 591 strcpy (cmdback, "ExtendedInfoSet");
592
530 if (ns->EMI_smooth){ 593 if (ns->EMI_smooth)
594 {
531 strcat (cmdback," "); 595 strcat (cmdback, " ");
532 strcat (cmdback,"smoothing"); 596 strcat (cmdback, "smoothing");
533 } 597 }
534 Write_String_To_Socket(ns, cmdback,strlen(cmdback)); 598
599 ns->send_packet (cmdback);
535} 600}
601
536/* 602/*
537#define MSG_TYPE_BOOK 1 603#define MSG_TYPE_BOOK 1
538#define MSG_TYPE_CARD 2 604#define MSG_TYPE_CARD 2
539#define MSG_TYPE_PAPER 3 605#define MSG_TYPE_PAPER 3
540#define MSG_TYPE_SIGN 4 606#define MSG_TYPE_SIGN 4
541#define MSG_TYPE_MONUMENT 5 607#define MSG_TYPE_MONUMENT 5
542#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 608#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609
543/** Reply to ExtendedInfos command */ 610/** Reply to ExtendedInfos command */
611void
544void ToggleExtendedText (char *buf, int len, NewSocket *ns){ 612ToggleExtendedText (char *buf, int len, client_socket * ns)
613{
545 char cmdback[MAX_BUF]; 614 char cmdback[MAX_BUF];
546 char temp[10]; 615 char temp[10];
547 char command[50]; 616 char command[50];
548 int info,nextinfo,i,flag; 617 int info, nextinfo, i, flag;
618
549 cmdback[0]='\0'; 619 cmdback[0] = '\0';
620
550 nextinfo=0; 621 nextinfo = 0;
551 while (1){ 622 while (1)
623 {
552 /* 1. Extract an info*/ 624 /* 1. Extract an info */
553 info=nextinfo; 625 info = nextinfo;
626
554 while ( (info<len) && (buf[info]==' ') ) info++; 627 while ((info < len) && (buf[info] == ' '))
628 info++;
629
555 if (info>=len) 630 if (info >= len)
556 break; 631 break;
632
557 nextinfo=info+1; 633 nextinfo = info + 1;
634
558 while ( (nextinfo<len) && (buf[nextinfo]!=' ') ) 635 while ((nextinfo < len) && (buf[nextinfo] != ' '))
559 nextinfo++; 636 nextinfo++;
637
560 if (nextinfo-info>=49) /*Erroneous info asked*/ 638 if (nextinfo - info >= 49) /*Erroneous info asked */
561 continue; 639 continue;
640
562 strncpy (command,&(buf[info]),nextinfo-info); 641 strncpy (command, &(buf[info]), nextinfo - info);
563 command[nextinfo-info]='\0'; 642 command[nextinfo - info] = '\0';
564 /* 2. Interpret info*/ 643 /* 2. Interpret info */
565 i = sscanf(command,"%d",&flag); 644 i = sscanf (command, "%d", &flag);
645
566 if ( (i==1) && (flag>0) && (flag<=MSG_TYPE_LAST)) 646 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
567 ns->supported_readables|=(1<<flag); 647 ns->supported_readables |= (1 << flag);
568 /*3. Next info*/ 648 /*3. Next info */
569 } 649 }
650
570 /* Send resulting state */ 651 /* Send resulting state */
571 strcpy (cmdback,"ExtendedTextSet"); 652 strcpy (cmdback, "ExtendedTextSet");
653
572 for (i=0;i<=MSG_TYPE_LAST;i++) 654 for (i = 0; i <= MSG_TYPE_LAST; i++)
573 if (ns->supported_readables &(1<<i)){ 655 if (ns->supported_readables & (1 << i))
656 {
574 strcat (cmdback," "); 657 strcat (cmdback, " ");
575 snprintf(temp,sizeof(temp),"%d",i); 658 snprintf (temp, sizeof (temp), "%d", i);
576 strcat (cmdback,temp); 659 strcat (cmdback, temp);
577 } 660 }
578 Write_String_To_Socket(ns, cmdback,strlen(cmdback)); 661
662 ns->send_packet (cmdback);
579} 663}
580 664
581/** 665/**
582 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 666 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
583 * Basically, it makes no sense to wait for the client to request a 667 * Basically, it makes no sense to wait for the client to request a
584 * a piece of data from us that we know the client wants. So 668 * a piece of data from us that we know the client wants. So
585 * if we know the client wants it, might as well push it to the 669 * if we know the client wants it, might as well push it to the
586 * client. 670 * client.
587 */ 671 */
588static void SendSmooth(NewSocket *ns, uint16 face) { 672static void
673SendSmooth (client_socket * ns, uint16 face)
674{
589 uint16 smoothface; 675 uint16 smoothface;
590 unsigned char reply[MAX_BUF];
591 SockList sl;
592 676
593 /* If we can't find a face, return and set it so we won't try to send this 677 /* If we can't find a face, return and set it so we won't try to send this
594 * again. 678 * again.
595 */ 679 */
596 if ((!FindSmooth (face, &smoothface)) && 680 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
597 (!FindSmooth ( smooth_face->number, &smoothface))) { 681 {
598 682
599 LOG(llevError,"could not findsmooth for %d. Neither default (%s)\n",face,smooth_face->name); 683 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
600 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 684 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
601 return; 685 return;
602 } 686 }
603 687
604 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
605 esrv_send_face(ns, smoothface, 0); 689 esrv_send_face (ns, smoothface, 0);
606 690
607 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
608 692
609 sl.buf=reply; 693 packet sl;
610 strcpy((char*)sl.buf,"smooth "); 694
611 sl.len=strlen((char*)sl.buf); 695 sl << "smooth "
612 SockList_AddShort(&sl, face); 696 << uint16 (face)
613 SockList_AddShort(&sl, smoothface); 697 << uint16 (smoothface);
614 Send_With_Handling(ns, &sl); 698
699 ns->send_packet (sl);
615} 700}
616 701
617 /** 702 /**
618 * Tells client the picture it has to use 703 * Tells client the picture it has to use
619 * to smooth a picture number given as argument. 704 * to smooth a picture number given as argument.
620 */ 705 */
706void
621void AskSmooth (char *buf, int len, NewSocket *ns){ 707AskSmooth (char *buf, int len, client_socket * ns)
708{
622 uint16 facenbr; 709 uint16 facenbr;
623 710
624 facenbr=atoi (buf); 711 facenbr = atoi (buf);
625 SendSmooth(ns, facenbr); 712 SendSmooth (ns, facenbr);
626} 713}
627
628
629
630
631 714
632/** 715/**
633 * This handles the general commands from the client (ie, north, fire, cast, 716 * This handles the general commands from the client (ie, north, fire, cast,
634 * etc.) 717 * etc.)
635 */ 718 */
719void
636void PlayerCmd(char *buf, int len, player *pl) 720PlayerCmd (char *buf, int len, player *pl)
637{ 721{
638 722
639 /* The following should never happen with a proper or honest client. 723 /* The following should never happen with a proper or honest client.
640 * Therefore, the error message doesn't have to be too clear - if 724 * Therefore, the error message doesn't have to be too clear - if
641 * someone is playing with a hacked/non working client, this gives them 725 * someone is playing with a hacked/non working client, this gives them
642 * an idea of the problem, but they deserve what they get 726 * an idea of the problem, but they deserve what they get
643 */ 727 */
644 if (pl->state!=ST_PLAYING) { 728 if (pl->state != ST_PLAYING)
645 new_draw_info_format(NDI_UNIQUE, 0,pl->ob,
646 "You can not issue commands - state is not ST_PLAYING (%s)", buf);
647 return;
648 } 729 {
730 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
731 return;
732 }
649 /* Check if there is a count. In theory, a zero count could also be 733 /* Check if there is a count. In theory, a zero count could also be
650 * sent, so check for that also. 734 * sent, so check for that also.
651 */ 735 */
652 if (atoi(buf) || buf[0]=='0') { 736 if (atoi (buf) || buf[0] == '0')
737 {
653 pl->count=atoi((char*)buf); 738 pl->count = atoi ((char *) buf);
654 buf=strchr(buf,' '); /* advance beyond the numbers */ 739 buf = strchr (buf, ' '); /* advance beyond the numbers */
655 if (!buf) { 740 if (!buf)
741 {
656#ifdef ESRV_DEBUG 742#ifdef ESRV_DEBUG
657 LOG(llevDebug,"PlayerCmd: Got count but no command.\n"); 743 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
658#endif 744#endif
659 return; 745 return;
660 } 746 }
661 buf++; 747 buf++;
662 } 748 }
663 /* This should not happen anymore. */ 749 /* This should not happen anymore. */
664 if (pl->ob->speed_left<-1.0) { 750 if (pl->ob->speed_left < -1.0)
751 {
665 LOG(llevError,"Player has negative time - shouldn't do command.\n"); 752 LOG (llevError, "Player has negative time - shouldn't do command.\n");
666 } 753 }
667 /* In c_new.c */ 754 /* In c_new.c */
668 execute_newserver_command(pl->ob, (char*)buf); 755 execute_newserver_command (pl->ob, (char *) buf);
669 /* Perhaps something better should be done with a left over count. 756 /* Perhaps something better should be done with a left over count.
670 * Cleaning up the input should probably be done first - all actions 757 * Cleaning up the input should probably be done first - all actions
671 * for the command that issued the count should be done before any other 758 * for the command that issued the count should be done before any other
672 * commands. 759 * commands.
673 */ 760 */
674 761
675 pl->count=0; 762 pl->count = 0;
676 763
677} 764}
678 765
679 766
680/** 767/**
681 * This handles the general commands from the client (ie, north, fire, cast, 768 * This handles the general commands from the client (ie, north, fire, cast,
682 * etc.). It is a lot like PlayerCmd above, but is called with the 769 * etc.). It is a lot like PlayerCmd above, but is called with the
683 * 'ncom' method which gives more information back to the client so it 770 * 'ncom' method which gives more information back to the client so it
684 * can throttle. 771 * can throttle.
685 */ 772 */
773void
686void NewPlayerCmd(uint8 *buf, int len, player *pl) 774NewPlayerCmd (uint8 * buf, int len, player *pl)
687{ 775{
688 int time,repeat; 776 int time, repeat;
689 short packet;
690 unsigned char command[MAX_BUF]; 777 char command[MAX_BUF];
691 SockList sl; 778 int pktlen;
692 779
693 if (len < 7) { 780 if (len < 7)
781 {
694 LOG(llevDebug,"Corrupt ncom command <%s> not long enough - discarding\n", buf); 782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
695 return; 783 return;
696 } 784 }
697 785
698 packet = GetShort_String(buf); 786 pktlen = net_uint16 (buf);
699 repeat = GetInt_String(buf+2); 787 repeat = net_uint32 (buf + 2);
788
700 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
701 if (repeat!=-1) { 790 if (repeat != -1)
702 pl->count=repeat; 791 pl->count = repeat;
703 }
704 if ((len-4) >= MAX_BUF) len=MAX_BUF-5;
705 792
793 if ((len - 4) >= MAX_BUF)
794 len = MAX_BUF - 5;
795
706 strncpy((char*)command, (char*)buf+6, len-4); 796 strncpy ((char *) command, (char *) buf + 6, len - 4);
707 command[len-4]='\0'; 797 command[len - 4] = '\0';
708 798
709 /* The following should never happen with a proper or honest client. 799 /* The following should never happen with a proper or honest client.
710 * Therefore, the error message doesn't have to be too clear - if 800 * Therefore, the error message doesn't have to be too clear - if
711 * someone is playing with a hacked/non working client, this gives them 801 * someone is playing with a hacked/non working client, this gives them
712 * an idea of the problem, but they deserve what they get 802 * an idea of the problem, but they deserve what they get
713 */ 803 */
714 if (pl->state!=ST_PLAYING) { 804 if (pl->state != ST_PLAYING)
715 new_draw_info_format(NDI_UNIQUE, 0,pl->ob,
716 "You can not issue commands - state is not ST_PLAYING (%s)", buf);
717 return;
718 } 805 {
806 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
807 return;
808 }
719 809
720 /* This should not happen anymore. */ 810 /* This should not happen anymore. */
721 if (pl->ob->speed_left<-1.0) { 811 if (pl->ob->speed_left < -1.0)
722 LOG(llevError,"Player has negative time - shouldn't do command.\n"); 812 LOG (llevError, "Player has negative time - shouldn't do command.\n");
723 } 813
724 /* In c_new.c */ 814 /* In c_new.c */
725 execute_newserver_command(pl->ob, (char*)command); 815 execute_newserver_command (pl->ob, (char *) command);
726 /* Perhaps something better should be done with a left over count. 816 /* Perhaps something better should be done with a left over count.
727 * Cleaning up the input should probably be done first - all actions 817 * Cleaning up the input should probably be done first - all actions
728 * for the command that issued the count should be done before any other 818 * for the command that issued the count should be done before any other
729 * commands. 819 * commands.
730 */ 820 */
731 pl->count=0; 821 pl->count = 0;
732 822
823 if (FABS (pl->ob->speed) < 0.001)
824 time = MAX_TIME * 100;
825 else
826 time = (int) (MAX_TIME / FABS (pl->ob->speed));
827
733 /* Send confirmation of command execution now */ 828 /* Send confirmation of command execution now */
734 sl.buf = command; 829
735 strcpy((char*)sl.buf,"comc "); 830 packet sl;
736 sl.len=5; 831 sl << "comc " << uint16 (pktlen) << uint32 (time);
737 SockList_AddShort(&sl,packet); 832 pl->socket->send_packet (sl);
738 if (FABS(pl->ob->speed) < 0.001) time=MAX_TIME * 100;
739 else
740 time = ( int )( MAX_TIME/ FABS(pl->ob->speed) );
741 SockList_AddInt(&sl,time);
742 Send_With_Handling(&pl->socket, &sl);
743} 833}
744 834
745 835
746/** This is a reply to a previous query. */ 836/** This is a reply to a previous query. */
837void
747void ReplyCmd(char *buf, int len, player *pl) 838ReplyCmd (char *buf, int len, player *pl)
748{ 839{
749 /* This is to synthesize how the data would be stored if it 840 /* This is to synthesize how the data would be stored if it
750 * was normally entered. A bit of a hack, and should be cleaned up 841 * was normally entered. A bit of a hack, and should be cleaned up
751 * once all the X11 code is removed from the server. 842 * once all the X11 code is removed from the server.
752 * 843 *
753 * We pass 13 to many of the functions because this way they 844 * We pass 13 to many of the functions because this way they
754 * think it was the carriage return that was entered, and the 845 * think it was the carriage return that was entered, and the
755 * function then does not try to do additional input. 846 * function then does not try to do additional input.
756 */ 847 */
757 snprintf(pl->write_buf, sizeof(pl->write_buf), ":%s", buf); 848 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
758 849
759 /* this avoids any hacking here */ 850 /* this avoids any hacking here */
760 851
761 switch (pl->state) { 852 switch (pl->state)
853 {
762 case ST_PLAYING: 854 case ST_PLAYING:
763 LOG(llevError,"Got reply message with ST_PLAYING input state\n"); 855 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
764 break; 856 break;
765 857
766 case ST_PLAY_AGAIN: 858 case ST_PLAY_AGAIN:
767 /* We can check this for return value (2==quit). Maybe we 859 /* We can check this for return value (2==quit). Maybe we
768 * should, and do something appropriate? 860 * should, and do something appropriate?
769 */ 861 */
770 receive_play_again(pl->ob, buf[0]); 862 receive_play_again (pl->ob, buf[0]);
771 break; 863 break;
772 864
773 case ST_ROLL_STAT: 865 case ST_ROLL_STAT:
774 key_roll_stat(pl->ob,buf[0]); 866 key_roll_stat (pl->ob, buf[0]);
775 break; 867 break;
776 868
777 case ST_CHANGE_CLASS: 869 case ST_CHANGE_CLASS:
778 870
779 key_change_class(pl->ob, buf[0]); 871 key_change_class (pl->ob, buf[0]);
780 break; 872 break;
781 873
782 case ST_CONFIRM_QUIT: 874 case ST_CONFIRM_QUIT:
783 key_confirm_quit(pl->ob, buf[0]); 875 key_confirm_quit (pl->ob, buf[0]);
784 break; 876 break;
785 877
786 case ST_CONFIGURE: 878 case ST_CONFIGURE:
787 LOG(llevError,"In client input handling, but into configure state\n"); 879 LOG (llevError, "In client input handling, but into configure state\n");
788 pl->state = ST_PLAYING; 880 pl->state = ST_PLAYING;
789 break; 881 break;
790 882
791 case ST_GET_NAME: 883 case ST_GET_NAME:
792 receive_player_name(pl->ob,13); 884 receive_player_name (pl->ob, 13);
793 break; 885 break;
794 886
795 case ST_GET_PASSWORD: 887 case ST_GET_PASSWORD:
796 case ST_CONFIRM_PASSWORD: 888 case ST_CONFIRM_PASSWORD:
797 receive_player_password(pl->ob,13); 889 receive_player_password (pl->ob, 13);
798 break; 890 break;
799 891
800 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 892 case ST_GET_PARTY_PASSWORD: /* Get password for party */
801 receive_party_password(pl->ob,13); 893 receive_party_password (pl->ob, 13);
802 break; 894 break;
803 895
804 default: 896 default:
805 LOG(llevError,"Unknown input state: %d\n", pl->state); 897 LOG (llevError, "Unknown input state: %d\n", pl->state);
806 } 898 }
807} 899}
808 900
809/** 901/**
810 * Client tells its version. If there is a mismatch, we close the 902 * Client tells its version. If there is a mismatch, we close the
811 * socket. In real life, all we should care about is the client having 903 * socket. In real life, all we should care about is the client having
812 * something older than the server. If we assume the client will be 904 * something older than the server. If we assume the client will be
813 * backwards compatible, having it be a later version should not be a 905 * backwards compatible, having it be a later version should not be a
814 * problem. 906 * problem.
815 */ 907 */
908void
816void VersionCmd(char *buf, int len,NewSocket *ns) 909VersionCmd (char *buf, int len, client_socket * ns)
817{ 910{
818 char *cp; 911 char *cp;
819 char version_warning[256]; 912 char version_warning[256];
820 913
821 if (!buf) { 914 if (!buf)
915 {
822 LOG(llevError, "CS: received corrupted version command\n"); 916 LOG (llevError, "CS: received corrupted version command\n");
823 return; 917 return;
824 } 918 }
825 919
826 ns->cs_version = atoi(buf); 920 ns->cs_version = atoi (buf);
827 ns->sc_version = ns->cs_version; 921 ns->sc_version = ns->cs_version;
828 if (VERSION_CS != ns->cs_version) { 922 if (VERSION_CS != ns->cs_version)
923 {
829#ifdef ESRV_DEBUG 924#ifdef ESRV_DEBUG
830 LOG(llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS,ns->cs_version); 925 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
831#endif 926#endif
832 } 927 }
833 cp = strchr(buf+1,' '); 928 cp = strchr (buf + 1, ' ');
834 if (!cp) return; 929 if (!cp)
930 return;
835 ns->sc_version = atoi(cp); 931 ns->sc_version = atoi (cp);
836 if (VERSION_SC != ns->sc_version) { 932 if (VERSION_SC != ns->sc_version)
933 {
837#ifdef ESRV_DEBUG 934#ifdef ESRV_DEBUG
838 LOG(llevDebug, "CS: scversion mismatch (%d,%d)\n",VERSION_SC,ns->sc_version); 935 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
839#endif 936#endif
840 } 937 }
841 cp = strchr(cp+1, ' '); 938 cp = strchr (cp + 1, ' ');
842 if (cp) { 939 if (cp)
940 {
843 LOG(llevDebug,"CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 941 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
844 942
845 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 943 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
846 944
847 /* This is first implementation - i skip all beta DX clients with it 945 /* This is first implementation - i skip all beta DX clients with it
848 * Add later stuff here for other clients 946 * Add later stuff here for other clients
849 */ 947 */
850 948
851 /* these are old dxclients */ 949 /* these are old dxclients */
852 /* Version 1024 added support for singular + plural name values - 950 /* Version 1024 added support for singular + plural name values -
853 * requiing this minimal value reduces complexity of that code, and it 951 * requiing this minimal value reduces complexity of that code, and it
854 * has been around for a long time. 952 * has been around for a long time.
855 */ 953 */
856 if(!strcmp(" CF DX CLIENT", cp) || ns->sc_version < 1024 ) 954 if (ns->sc_version < 1026)
857 { 955 {
858 sprintf(version_warning,"drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 956 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
859 Write_String_To_Socket(ns, version_warning, strlen(version_warning)); 957 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
860 } 958 ns->send_packet (version_warning);
959 }
861 960
862 } 961 }
863} 962}
864 963
865/** sound related functions. */ 964/** sound related functions. */
866 965
966void
867void SetSound(char *buf, int len, NewSocket *ns) 967SetSound (char *buf, int len, client_socket * ns)
868{ 968{
869 ns->sound = atoi(buf); 969 ns->sound = atoi (buf);
870} 970}
871 971
872/** client wants the map resent */ 972/** client wants the map resent */
873 973
974void
874void MapRedrawCmd(char *buf, int len, player *pl) 975MapRedrawCmd (char *buf, int len, player *pl)
875{ 976{
977
876/* This function is currently disabled; just clearing the map state results in 978/* This function is currently disabled; just clearing the map state results in
877 * display errors. It should clear the cache and send a newmap command. 979 * display errors. It should clear the cache and send a newmap command.
878 * Unfortunately this solution does not work because some client versions send 980 * Unfortunately this solution does not work because some client versions send
879 * a mapredraw command after receiving a newmap command. 981 * a mapredraw command after receiving a newmap command.
880 */ 982 */
881#if 0 983#if 0
882 /* Okay, this is MAJOR UGLY. but the only way I know how to 984 /* Okay, this is MAJOR UGLY. but the only way I know how to
883 * clear the "cache" 985 * clear the "cache"
884 */ 986 */
885 memset(&pl->socket.lastmap, 0, sizeof(struct Map)); 987 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
886 draw_client_map(pl->ob); 988 draw_client_map (pl->ob);
887#endif 989#endif
888} 990}
889 991
890/** 992/**
891 * Moves an object (typically, container to inventory). 993 * Moves an object (typically, container to inventory).
892 * syntax is: move (to) (tag) (nrof) 994 * syntax is: move (to) (tag) (nrof)
893 */ 995 */
996void
894void MoveCmd(char *buf, int len,player *pl) 997MoveCmd (char *buf, int len, player *pl)
895{ 998{
896 int vals[3], i; 999 int vals[3], i;
897 1000
898 /* A little funky here. We only cycle for 2 records, because 1001 /* A little funky here. We only cycle for 2 records, because
899 * we obviously am not going to find a space after the third 1002 * we obviously am not going to find a space after the third
900 * record. Perhaps we should just replace this with a 1003 * record. Perhaps we should just replace this with a
901 * sscanf? 1004 * sscanf?
902 */ 1005 */
903 for (i=0; i<2; i++) { 1006 for (i = 0; i < 2; i++)
1007 {
904 vals[i]=atoi(buf); 1008 vals[i] = atoi (buf);
905 if (!(buf = strchr(buf, ' '))) { 1009 if (!(buf = strchr (buf, ' ')))
1010 {
906 LOG(llevError,"Incomplete move command: %s\n", buf); 1011 LOG (llevError, "Incomplete move command: %s\n", buf);
907 return; 1012 return;
908 } 1013 }
909 buf++; 1014 buf++;
910 } 1015 }
911 vals[2]=atoi(buf); 1016 vals[2] = atoi (buf);
912 1017
913/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 1018/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
914 esrv_move_object(pl->ob,vals[0], vals[1], vals[2]); 1019 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
915} 1020}
916 1021
917 1022
918 1023
919/****************************************************************************** 1024/******************************************************************************
… …
924 1029
925/** 1030/**
926 * Asks the client to query the user. This way, the client knows 1031 * Asks the client to query the user. This way, the client knows
927 * it needs to send something back (vs just printing out a message) 1032 * it needs to send something back (vs just printing out a message)
928 */ 1033 */
1034void
929void send_query(NewSocket *ns, uint8 flags, char *text) 1035send_query (client_socket * ns, uint8 flags, char *text)
930{ 1036{
931 char buf[MAX_BUF]; 1037 char buf[MAX_BUF];
932 1038
933 sprintf(buf,"query %d %s", flags, text?text:""); 1039 sprintf (buf, "query %d %s", flags, text ? text : "");
934 Write_String_To_Socket(ns, buf, strlen(buf)); 1040 ns->send_packet (buf);
935} 1041}
936 1042
937#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1043#define AddIfInt64(Old,New,Type) if (Old != New) {\
938 Old = New; \ 1044 Old = New; \
939 SockList_AddChar(&sl, Type); \ 1045 sl << uint8 (Type) << uint64 (New); \
940 SockList_AddInt64(&sl, New); \ 1046 }
941 }
942 1047
943#define AddIfInt(Old,New,Type) if (Old != New) {\ 1048#define AddIfInt(Old,New,Type) if (Old != New) {\
944 Old = New; \ 1049 Old = New; \
945 SockList_AddChar(&sl, Type); \ 1050 sl << uint8 (Type) << uint32 (New); \
946 SockList_AddInt(&sl, New); \ 1051 }
947 }
948 1052
949#define AddIfShort(Old,New,Type) if (Old != New) {\ 1053#define AddIfShort(Old,New,Type) if (Old != New) {\
950 Old = New; \ 1054 Old = New; \
951 SockList_AddChar(&sl, Type); \ 1055 sl << uint8 (Type) << uint16 (New); \
952 SockList_AddShort(&sl, New); \ 1056 }
953 }
954 1057
955#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1058#define AddIfFloat(Old,New,Type) if (Old != New) {\
956 Old = New; \ 1059 Old = New; \
957 SockList_AddChar(&sl, Type); \ 1060 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
958 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ 1061 }
959 }
960 1062
961#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1063#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
962 if (Old) free(Old);\ 1064 free(Old); Old = strdup (New);\
963 Old = strdup_local(New);\ 1065 sl << uint8 (Type) << data8 (New); \
964 SockList_AddChar(&sl, Type); \ 1066 }
965 SockList_AddChar(&sl, ( char )strlen(New)); \
966 strcpy((char*)sl.buf + sl.len, New); \
967 sl.len += strlen(New); \
968 }
969 1067
970/** 1068/**
971 * Sends a statistics update. We look at the old values, 1069 * Sends a statistics update. We look at the old values,
972 * and only send what has changed. Stat mapping values are in newclient.h 1070 * and only send what has changed. Stat mapping values are in newclient.h
973 * Since this gets sent a lot, this is actually one of the few binary 1071 * Since this gets sent a lot, this is actually one of the few binary
974 * commands for now. 1072 * commands for now.
975 */ 1073 */
1074void
976void esrv_update_stats(player *pl) 1075esrv_update_stats (player *pl)
977{ 1076{
978 SockList sl;
979 char buf[MAX_BUF]; 1077 char buf[MAX_BUF];
980 uint16 flags; 1078 uint16 flags;
981 1079
982 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1080 packet sl;
983 strcpy((char*)sl.buf,"stats "); 1081 sl << "stats ";
984 sl.len=strlen((char*)sl.buf); 1082
985
986 if(pl->ob != NULL) 1083 if (pl->ob != NULL)
987 { 1084 {
988 AddIfShort(pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1085 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
989 AddIfShort(pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1086 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
990 AddIfShort(pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1087 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
991 AddIfShort(pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1088 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
992 AddIfShort(pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1089 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
993 AddIfShort(pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1090 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
994 AddIfShort(pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1091 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
995 AddIfShort(pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1092 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
996 AddIfShort(pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1093 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
997 AddIfShort(pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1094 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
998 AddIfShort(pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1095 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
999 AddIfShort(pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1096 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1000 AddIfShort(pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1097 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1001 }
1002 if(pl->socket.exp64) {
1003 uint8 s;
1004 for(s=0;s<NUM_SKILLS;s++) {
1005 if (pl->last_skill_ob[s] &&
1006 pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) {
1007
1008 /* Always send along the level if exp changes. This is only
1009 * 1 extra byte, but keeps processing simpler.
1010 */
1011 SockList_AddChar(&sl, ( char )( s + CS_STAT_SKILLINFO ));
1012 SockList_AddChar(&sl, ( char )pl->last_skill_ob[s]->level);
1013 SockList_AddInt64(&sl, pl->last_skill_ob[s]->stats.exp);
1014 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1015 } 1098 }
1016 } 1099
1017 }
1018 if (pl->socket.exp64) { 1100 if (pl->socket->exp64)
1101 {
1102 uint8 s;
1103
1104 for (s = 0; s < NUM_SKILLS; s++)
1105 {
1106 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1107 {
1108 /* Always send along the level if exp changes. This is only
1109 * 1 extra byte, but keeps processing simpler.
1110 */
1111 sl << uint8 (s + CS_STAT_SKILLINFO)
1112 << uint8 (pl->last_skill_ob[s]->level)
1113 << uint64 (pl->last_skill_ob[s]->stats.exp);
1114
1115 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1116 }
1117 }
1118 }
1119
1120 if (pl->socket->exp64)
1019 AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1121 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1020 } else { 1122 else
1021 AddIfInt(pl->last_stats.exp, ( int )pl->ob->stats.exp, CS_STAT_EXP); 1123 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1022 } 1124
1023 AddIfShort(pl->last_level, ( char )pl->ob->level, CS_STAT_LEVEL); 1125 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1024 AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1126 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1025 AddIfShort(pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1127 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1026 AddIfShort(pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1128 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1027 AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1129 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1028 AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1130 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
1029 AddIfFloat(pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1131 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1030 AddIfInt(pl->last_weight_limit, (sint32)weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1132 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1031 flags=0; 1133 flags = 0;
1032 if (pl->fire_on) flags |=SF_FIREON;
1033 if (pl->run_on) flags |= SF_RUNON;
1034 1134
1135 if (pl->fire_on)
1136 flags |= SF_FIREON;
1137
1138 if (pl->run_on)
1139 flags |= SF_RUNON;
1140
1035 AddIfShort(pl->last_flags, flags, CS_STAT_FLAGS); 1141 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1142
1036 if (pl->socket.sc_version<1025) { 1143 if (pl->socket->sc_version < 1025)
1037 AddIfShort(pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1144 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1038 } else { 1145 else
1039 int i; 1146 {
1147 int i;
1040 1148
1041 for (i=0; i<NROFATTACKS; i++) { 1149 for (i = 0; i < NROFATTACKS; i++)
1150 {
1042 /* Skip ones we won't send */ 1151 /* Skip ones we won't send */
1043 if (atnr_cs_stat[i]==-1) continue; 1152 if (atnr_cs_stat[i] == -1)
1153 continue;
1154
1044 AddIfShort(pl->last_resist[i], pl->ob->resist[i], ( char )atnr_cs_stat[i]); 1155 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1045 } 1156 }
1046 } 1157 }
1158
1047 if (pl->socket.monitor_spells) { 1159 if (pl->socket->monitor_spells)
1160 {
1048 AddIfInt(pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1161 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1049 AddIfInt(pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1162 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1050 AddIfInt(pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1163 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1051 } 1164 }
1165
1052 rangetostring(pl->ob, buf); /* we want use the new fire & run system in new client */ 1166 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1053 AddIfString(pl->socket.stats.range, buf, CS_STAT_RANGE); 1167 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1054 set_title(pl->ob, buf); 1168 set_title (pl->ob, buf);
1055 AddIfString(pl->socket.stats.title, buf, CS_STAT_TITLE); 1169 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1056 1170
1057 /* Only send it away if we have some actual data */ 1171 /* Only send it away if we have some actual data */
1058 if (sl.len>6) { 1172 if (sl.length () > 6)
1059#ifdef ESRV_DEBUG 1173 pl->socket->send_packet (sl);
1060 LOG(llevDebug,"Sending stats command, %d bytes long.\n", sl.len);
1061#endif
1062 Send_With_Handling(&pl->socket, &sl);
1063 }
1064 free(sl.buf);
1065} 1174}
1066
1067 1175
1068/** 1176/**
1069 * Tells the client that here is a player it should start using. 1177 * Tells the client that here is a player it should start using.
1070 */ 1178 */
1179void
1071void esrv_new_player(player *pl, uint32 weight) 1180esrv_new_player (player *pl, uint32 weight)
1072{ 1181{
1073 SockList sl;
1074
1075 pl->last_weight = weight; 1182 pl->last_weight = weight;
1076 1183
1077 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1184 packet sl;
1185 sl << "player ";
1078 1186
1079 strcpy((char*)sl.buf,"player "); 1187 sl << uint32 (pl->ob->count)
1080 sl.len=strlen((char*)sl.buf); 1188 << uint32 (weight)
1081 SockList_AddInt(&sl, pl->ob->count); 1189 << uint32 (pl->ob->face->number)
1082 SockList_AddInt(&sl, weight); 1190 << data8 (pl->ob->name);
1083 SockList_AddInt(&sl, pl->ob->face->number);
1084 1191
1085 SockList_AddChar(&sl, ( char )strlen(pl->ob->name)); 1192 pl->socket->send_packet (sl);
1086 strcpy((char*)sl.buf+sl.len, pl->ob->name);
1087 sl.len += strlen(pl->ob->name);
1088
1089 Send_With_Handling(&pl->socket, &sl);
1090 free(sl.buf);
1091 SET_FLAG(pl->ob, FLAG_CLIENT_SENT); 1193 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1092} 1194}
1093
1094 1195
1095/** 1196/**
1096 * Need to send an animation sequence to the client. 1197 * Need to send an animation sequence to the client.
1097 * We will send appropriate face commands to the client if we haven't 1198 * We will send appropriate face commands to the client if we haven't
1098 * sent them the face yet (this can become quite costly in terms of 1199 * sent them the face yet (this can become quite costly in terms of
1099 * how much we are sending - on the other hand, this should only happen 1200 * how much we are sending - on the other hand, this should only happen
1100 * when the player logs in and picks stuff up. 1201 * when the player logs in and picks stuff up.
1101 */ 1202 */
1203void
1102void esrv_send_animation(NewSocket *ns, short anim_num) 1204esrv_send_animation (client_socket * ns, short anim_num)
1103{ 1205{
1104 SockList sl;
1105 int i; 1206 int i;
1106 1207
1107 /* Do some checking on the anim_num we got. Note that the animations 1208 /* Do some checking on the anim_num we got. Note that the animations
1108 * are added in contigous order, so if the number is in the valid 1209 * are added in contigous order, so if the number is in the valid
1109 * range, it must be a valid animation. 1210 * range, it must be a valid animation.
1110 */ 1211 */
1111 if (anim_num < 0 || anim_num > num_animations) { 1212 if (anim_num < 0 || anim_num > num_animations)
1213 {
1112 LOG(llevError,"esrv_send_anim (%d) out of bounds??\n",anim_num); 1214 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1113 return; 1215 return;
1114 } 1216 }
1115 1217
1116 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1218 packet sl;
1117 strcpy((char*)sl.buf, "anim "); 1219
1118 sl.len=5; 1220 sl << "anim "
1119 SockList_AddShort(&sl, anim_num); 1221 << uint16 (anim_num)
1120 SockList_AddShort(&sl, 0); /* flags - not used right now */ 1222 << uint16 (0); /* flags - not used right now */
1223
1121 /* Build up the list of faces. Also, send any information (ie, the 1224 /* Build up the list of faces. Also, send any information (ie, the
1122 * the face itself) down to the client. 1225 * the face itself) down to the client.
1123 */ 1226 */
1124 for (i=0; i<animations[anim_num].num_animations; i++) { 1227 for (i = 0; i < animations[anim_num].num_animations; i++)
1228 {
1125 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1229 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1126 esrv_send_face(ns,animations[anim_num].faces[i],0); 1230 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1127 SockList_AddShort(&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1231 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1128 } 1232 }
1129 Send_With_Handling(ns, &sl); 1233
1130 free(sl.buf); 1234 ns->send_packet (sl);
1235
1131 ns->anims_sent[anim_num] = 1; 1236 ns->anims_sent[anim_num] = 1;
1132} 1237}
1133 1238
1134 1239
1135/****************************************************************************** 1240/******************************************************************************
1136 * 1241 *
… …
1140 1245
1141/** 1246/**
1142 * This adds face_num to a map cell at x,y. If the client doesn't have 1247 * This adds face_num to a map cell at x,y. If the client doesn't have
1143 * the face yet, we will also send it. 1248 * the face yet, we will also send it.
1144 */ 1249 */
1145static void esrv_map_setbelow(NewSocket *ns, int x,int y, 1250static void
1146 short face_num, struct Map *newmap) 1251esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1147{ 1252{
1148 if(newmap->cells[x][y].count >= MAP_LAYERS) { 1253 if (newmap->cells[x][y].count >= MAP_LAYERS)
1254 {
1149 LOG(llevError,"Too many faces in map cell %d %d\n",x,y); 1255 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1150 return; 1256 return;
1151 abort(); 1257 abort ();
1152 } 1258 }
1259
1153 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1260 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1154 newmap->cells[x][y].count ++; 1261 newmap->cells[x][y].count++;
1262
1155 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1263 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1156 esrv_send_face(ns,face_num,0); 1264 esrv_send_face (ns, face_num, 0);
1157} 1265}
1158 1266
1159struct LayerCell { 1267struct LayerCell
1268{
1160 uint16 xy; 1269 uint16 xy;
1161 short face; 1270 short face;
1162}; 1271};
1163 1272
1164struct MapLayer { 1273struct MapLayer
1274{
1165 int count; 1275 int count;
1166 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1276 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1167}; 1277};
1168 1278
1169/** Checkes if map cells have changed */ 1279/** Checkes if map cells have changed */
1280static int
1170static int mapcellchanged(NewSocket *ns,int i,int j, struct Map *newmap) 1281mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1171{ 1282{
1172 int k; 1283 int k;
1173 1284
1174 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1285 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1175 return 1; 1286 return 1;
1176 for(k=0;k<newmap->cells[i][j].count;k++) { 1287 for (k = 0; k < newmap->cells[i][j].count; k++)
1177 if (ns->lastmap.cells[i][j].faces[k] != 1288 {
1178 newmap->cells[i][j].faces[k]) { 1289 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1290 {
1179 return 1; 1291 return 1;
1180 } 1292 }
1181 } 1293 }
1182 return 0; 1294 return 0;
1183} 1295}
1184 1296
1185/** 1297/**
1186 * Basically, what this does is pack the data into layers. 1298 * Basically, what this does is pack the data into layers.
1187 * cnum is the client number, cur is the the buffer we put all of 1299 * cnum is the client number, cur is the the buffer we put all of
1188 * this data into. we return the end of the data. layers is 1300 * this data into. we return the end of the data. layers is
1189 * how many layers of data we should back. 1301 * how many layers of data we should back.
1190 */ 1302 */
1191static uint8 *compactlayer(NewSocket *ns, unsigned char *cur, int numlayers, 1303static uint8 *
1192 struct Map *newmap) 1304compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1193{ 1305{
1194 int x,y,k; 1306 int x, y, k;
1195 int face; 1307 int face;
1196 unsigned char *fcur; 1308 unsigned char *fcur;
1197 struct MapLayer layers[MAP_LAYERS]; 1309 struct MapLayer layers[MAP_LAYERS];
1198 1310
1199 for(k = 0;k<MAP_LAYERS;k++) 1311 for (k = 0; k < MAP_LAYERS; k++)
1200 layers[k].count = 0; 1312 layers[k].count = 0;
1201 fcur = cur; 1313 fcur = cur;
1202 for(x=0;x<ns->mapx;x++) { 1314 for (x = 0; x < ns->mapx; x++)
1203 for(y=0;y<ns->mapy;y++) { 1315 {
1316 for (y = 0; y < ns->mapy; y++)
1317 {
1204 if (!mapcellchanged(ns,x,y,newmap)) 1318 if (!mapcellchanged (ns, x, y, newmap))
1205 continue; 1319 continue;
1206 if (newmap->cells[x][y].count == 0) { 1320 if (newmap->cells[x][y].count == 0)
1321 {
1207 *cur = x*ns->mapy+y; /* mark empty space */ 1322 *cur = x * ns->mapy + y; /* mark empty space */
1208 cur++; 1323 cur++;
1209 continue; 1324 continue;
1325 }
1326 for (k = 0; k < newmap->cells[x][y].count; k++)
1327 {
1328 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1329 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1330 layers[k].count++;
1331 }
1332 }
1210 } 1333 }
1211 for(k=0;k<newmap->cells[x][y].count;k++) {
1212 layers[k].lcells[layers[k].count].xy = x*ns->mapy+y;
1213 layers[k].lcells[layers[k].count].face =
1214 newmap->cells[x][y].faces[k];
1215 layers[k].count++;
1216 }
1217 }
1218 }
1219 /* If no data, return now. */ 1334 /* If no data, return now. */
1220 if (fcur == cur && layers[0].count == 0) 1335 if (fcur == cur && layers[0].count == 0)
1221 return cur;
1222 *cur = 255; /* mark end of explicitly cleared cells */
1223 cur++;
1224 /* First pack by layers. */
1225 for(k=0;k<numlayers;k++) {
1226 if (layers[k].count == 0)
1227 break; /* once a layer is entirely empty, no layer below it can
1228 have anything in it either */
1229 /* Pack by entries in thie layer */
1230 for(x=0;x<layers[k].count;) {
1231 fcur = cur;
1232 *cur = layers[k].lcells[x].face >> 8;
1233 cur++;
1234 *cur = layers[k].lcells[x].face & 0xFF;
1235 cur++;
1236 face = layers[k].lcells[x].face;
1237 /* Now, we back the redundant data into 1 byte xy pairings */
1238 for(y=x;y<layers[k].count;y++) {
1239 if (layers[k].lcells[y].face == face) {
1240 *cur = ( uint8 )layers[k].lcells[y].xy;
1241 cur++;
1242 layers[k].lcells[y].face = -1;
1243 }
1244 }
1245 *(cur-1) = *(cur-1) | 128; /* mark for end of xy's; 11*11 < 128 */
1246 /* forward over the now redundant data */
1247 while(x < layers[k].count &&
1248 layers[k].lcells[x].face == -1)
1249 x++;
1250 }
1251 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1252 }
1253 return cur; 1336 return cur;
1254} 1337 *cur = 255; /* mark end of explicitly cleared cells */
1255 1338 cur++;
1256static void esrv_map_doneredraw(NewSocket *ns, struct Map *newmap) 1339 /* First pack by layers. */
1257{ 1340 for (k = 0; k < numlayers; k++)
1258 static long frames,bytes,tbytes,tframes;
1259 char *cur;
1260 SockList sl;
1261
1262
1263 sl.buf=(unsigned char*)malloc(MAXSOCKBUF);
1264 strcpy((char*)sl.buf,"map ");
1265 sl.len=strlen((char*)sl.buf);
1266
1267 cur = (char *) compactlayer(ns,(unsigned char*) sl.buf+sl.len,MAP_LAYERS,newmap);
1268 sl.len=cur-(char*)sl.buf;
1269
1270/* LOG(llevDebug, "Sending map command.\n");*/
1271
1272 if (sl.len>( int )strlen("map ") || ns->sent_scroll) {
1273 /* All of this is just accounting stuff */
1274 if (tframes>100) {
1275 tframes = tbytes = 0;
1276 }
1277 tframes++;
1278 frames++;
1279 tbytes += sl.len;
1280 bytes += sl.len;
1281 memcpy(&ns->lastmap,newmap,sizeof(struct Map));
1282 Send_With_Handling(ns, &sl);
1283 ns->sent_scroll = 0;
1284 } 1341 {
1285 free(sl.buf); 1342 if (layers[k].count == 0)
1343 break; /* once a layer is entirely empty, no layer below it can
1344 have anything in it either */
1345 /* Pack by entries in thie layer */
1346 for (x = 0; x < layers[k].count;)
1347 {
1348 fcur = cur;
1349 *cur = layers[k].lcells[x].face >> 8;
1350 cur++;
1351 *cur = layers[k].lcells[x].face & 0xFF;
1352 cur++;
1353 face = layers[k].lcells[x].face;
1354 /* Now, we back the redundant data into 1 byte xy pairings */
1355 for (y = x; y < layers[k].count; y++)
1356 {
1357 if (layers[k].lcells[y].face == face)
1358 {
1359 *cur = (uint8) layers[k].lcells[y].xy;
1360 cur++;
1361 layers[k].lcells[y].face = -1;
1362 }
1363 }
1364 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1365 /* forward over the now redundant data */
1366 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1367 x++;
1368 }
1369 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1370 }
1371 return cur;
1286} 1372}
1287
1288 1373
1289/** Clears a map cell */ 1374/** Clears a map cell */
1375static void
1290static void map_clearcell(struct MapCell *cell, int face0, int face1, int face2, int count) 1376map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1291{ 1377{
1292 cell->faces[0] = face0; 1378 cell->faces[0] = face0;
1293 cell->faces[1] = face1; 1379 cell->faces[1] = face1;
1294 cell->faces[2] = face2; 1380 cell->faces[2] = face2;
1295 cell->count = count; 1381 cell->count = count;
1296 cell->stat_hp = 0; 1382 cell->stat_hp = 0;
1383 cell->flags = 0;
1384 cell->player = 0;
1297} 1385}
1298 1386
1299#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1387#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1300#define MAX_LAYERS 3 1388#define MAX_LAYERS 3
1301 1389
… …
1304 * and saves the space of allocating this in the socket object when we only 1392 * and saves the space of allocating this in the socket object when we only
1305 * need it for this cycle. If the serve is ever threaded, this needs to be 1393 * need it for this cycle. If the serve is ever threaded, this needs to be
1306 * re-examined. 1394 * re-examined.
1307 */ 1395 */
1308 1396
1309static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1397static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1310 1398
1311/** 1399/**
1312 * Returns true if any of the heads for this 1400 * Returns true if any of the heads for this
1313 * space is set. Returns false if all are blank - this is used 1401 * space is set. Returns false if all are blank - this is used
1314 * for empty space checking. 1402 * for empty space checking.
1315 */ 1403 */
1316static inline int have_head(int ax, int ay) { 1404static inline int
1405have_head (int ax, int ay)
1406{
1317 1407
1318 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1408 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1319 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || 1409 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1320 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) return 1;
1321 return 0; 1410 return 1;
1411 return 0;
1322} 1412}
1323 1413
1324/** 1414/**
1325 * check_head is a bit simplistic version of update_space below. 1415 * check_head is a bit simplistic version of update_space below.
1326 * basically, it only checks the that the head on space ax,ay at layer 1416 * basically, it only checks the that the head on space ax,ay at layer
1327 * needs to get sent - if so, it adds the data, sending the head 1417 * needs to get sent - if so, it adds the data, sending the head
1328 * if needed, and returning 1. If this no data needs to get 1418 * if needed, and returning 1. If this no data needs to get
1329 * sent, it returns zero. 1419 * sent, it returns zero.
1330 */ 1420 */
1421static int
1331static int check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1422check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1332{ 1423{
1333 short face_num; 1424 short face_num;
1334 1425
1335 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1426 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1336 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1427 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1337 else 1428 else
1338 face_num = 0; 1429 face_num = 0;
1339 1430
1340 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) { 1431 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1341 SockList_AddShort (&sl, face_num); 1432 {
1433 sl << uint16 (face_num);
1342 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1434 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1343 esrv_send_face (&ns, face_num, 0); 1435 esrv_send_face (&ns, face_num, 0);
1436
1344 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1437 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1345 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1438 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1346 return 1; 1439 return 1;
1347 } 1440 }
1348 1441
1349 return 0; /* No change */ 1442 return 0; /* No change */
1350} 1443}
1351 1444
1352/** 1445/**
1353 * Removes the need to replicate the same code for each layer. 1446 * Removes the need to replicate the same code for each layer.
1354 * this returns true if this space is now in fact different than 1447 * this returns true if this space is now in fact different than
… …
1367 * the map command, where the faces stack up. Sinces that is no longer 1460 * the map command, where the faces stack up. Sinces that is no longer
1368 * the case, it seems to make more sense to have these layer values 1461 * the case, it seems to make more sense to have these layer values
1369 * actually match. 1462 * actually match.
1370 */ 1463 */
1371 1464
1465static int
1372static int update_space(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1466update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1373{ 1467{
1374 object *ob, *head; 1468 object *ob, *head;
1375 uint16 face_num; 1469 uint16 face_num;
1376 int bx, by,i; 1470 int bx, by, i;
1377 1471
1378 /* If there is a multipart object stored away, treat that as more important. 1472 /* If there is a multipart object stored away, treat that as more important.
1379 * If not, then do the normal processing. 1473 * If not, then do the normal processing.
1380 */ 1474 */
1381
1382 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1475 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1383 1476
1384 /* Check to see if this head is part of the set of objects 1477 /* Check to see if this head is part of the set of objects
1385 * we would normally send for this space. If so, then 1478 * we would normally send for this space. If so, then
1386 * don't use the head value. We need to do the check 1479 * don't use the head value. We need to do the check
1387 * here and not when setting up the heads[] value for two reasons - 1480 * here and not when setting up the heads[] value for two reasons -
1388 * 1) the heads[] values will get used even if the space is not visible. 1481 * 1) the heads[] values will get used even if the space is not visible.
1389 * 2) its possible the head is not on the same map as a part, and I'd 1482 * 2) its possible the head is not on the same map as a part, and I'd
1390 * rather not need to do the map translation overhead. 1483 * rather not need to do the map translation overhead.
1391 * 3) We need to do some extra checking to make sure that we will 1484 * 3) We need to do some extra checking to make sure that we will
1392 * otherwise send the image as this layer, eg, either it matches 1485 * otherwise send the image as this layer, eg, either it matches
1393 * the head value, or is not multipart. 1486 * the head value, or is not multipart.
1394 */ 1487 */
1395 if (head && !head->more) { 1488 if (head && !head->more)
1489 {
1396 for (i=0; i<MAP_LAYERS; i++) { 1490 for (i = 0; i < MAP_LAYERS; i++)
1491 {
1397 ob = GET_MAP_FACE_OBJ(mp, mx, my, i); 1492 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1398 if (!ob) continue; 1493 if (!ob)
1494 continue;
1399 1495
1400 if (ob->head) ob=ob->head; 1496 if (ob->head)
1497 ob = ob->head;
1401 1498
1402 if (ob == head) { 1499 if (ob == head)
1500 {
1403 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; 1501 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1404 head = NULL; 1502 head = NULL;
1405 break; 1503 break;
1504 }
1505 }
1406 } 1506 }
1407 }
1408 }
1409 1507
1410 ob = head; 1508 ob = head;
1509 if (!ob)
1411 if (!ob) ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1510 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1412 1511
1413 /* If there is no object for this space, or if the face for the object 1512 /* If there is no object for this space, or if the face for the object
1414 * is the blank face, set the face number to zero. 1513 * is the blank face, set the face number to zero.
1415 * else if we have the stored head object for this space, that takes 1514 * else if we have the stored head object for this space, that takes
1416 * precedence over the other object for this space. 1515 * precedence over the other object for this space.
1417 * otherwise, we do special head processing 1516 * otherwise, we do special head processing
1418 */ 1517 */
1419 if (!ob || ob->face == blank_face) face_num=0; 1518 if (!ob || ob->face == blank_face)
1519 face_num = 0;
1420 else if (head){ 1520 else if (head)
1521 {
1421 /* if this is a head that had previously been stored */ 1522 /* if this is a head that had previously been stored */
1422 face_num = ob->face->number; 1523 face_num = ob->face->number;
1423 } else { 1524 }
1525 else
1526 {
1424 /* if the faces for the different parts of a multipart object 1527 /* if the faces for the different parts of a multipart object
1425 * are the same, we only want to send the bottom right most 1528 * are the same, we only want to send the bottom right most
1426 * portion of the object. That info is in the tail_.. values 1529 * portion of the object. That info is in the tail_.. values
1427 * of the head. Note that for the head itself, ob->head will 1530 * of the head. Note that for the head itself, ob->head will
1428 * be null, so we only do this block if we are working on 1531 * be null, so we only do this block if we are working on
1429 * a tail piece. 1532 * a tail piece.
1430 */ 1533 */
1431 1534
1432 /* tail_x and tail_y will only be set in the head object. If 1535 /* tail_x and tail_y will only be set in the head object. If
1433 * this is the head object and these are set, we proceed 1536 * this is the head object and these are set, we proceed
1434 * with logic to only send bottom right. Similarly, if 1537 * with logic to only send bottom right. Similarly, if
1435 * this is one of the more parts but the head has those values 1538 * this is one of the more parts but the head has those values
1436 * set, we want to do the processing. There can be cases where 1539 * set, we want to do the processing. There can be cases where
1437 * the head is not visible but one of its parts is, so we just 1540 * the head is not visible but one of its parts is, so we just
1438 * can always expect that ob->arch->tail_x will be true for all 1541 * can always expect that ob->arch->tail_x will be true for all
1439 * object we may want to display. 1542 * object we may want to display.
1440 */ 1543 */
1441 if ((ob->arch->tail_x || ob->arch->tail_y) || 1544 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1442 (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) { 1545 {
1443 1546
1444 if (ob->head) head = ob->head; 1547 if (ob->head)
1445 else head = ob; 1548 head = ob->head;
1549 else
1550 head = ob;
1446 1551
1447 /* Basically figure out where the offset is from where we are right 1552 /* Basically figure out where the offset is from where we are right
1448 * now. the ob->arch->clone.{x,y} values hold the offset that this current 1553 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1449 * piece is from the head, and the tail is where the tail is from the 1554 * piece is from the head, and the tail is where the tail is from the
1450 * head. Note that bx and by will equal sx and sy if we are already working 1555 * head. Note that bx and by will equal sx and sy if we are already working
1451 * on the bottom right corner. If ob is the head, the clone values 1556 * on the bottom right corner. If ob is the head, the clone values
1452 * will be zero, so the right thing will still happen. 1557 * will be zero, so the right thing will still happen.
1453 */ 1558 */
1454 bx = sx + head->arch->tail_x - ob->arch->clone.x; 1559 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1455 by = sy + head->arch->tail_y - ob->arch->clone.y; 1560 by = sy + head->arch->tail_y - ob->arch->clone.y;
1456 1561
1457 /* I don't think this can ever happen, but better to check for it just 1562 /* I don't think this can ever happen, but better to check for it just
1458 * in case. 1563 * in case.
1459 */ 1564 */
1460 if (bx < sx || by < sy) { 1565 if (bx < sx || by < sy)
1566 {
1461 LOG(llevError,"update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", 1567 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1462 bx, by, sx, sy); 1568 face_num = 0;
1463 face_num = 0; 1569 }
1464 }
1465 /* single part object, multipart object with non merged faces, 1570 /* single part object, multipart object with non merged faces,
1466 * of multipart object already at lower right. 1571 * of multipart object already at lower right.
1467 */ 1572 */
1468 else if (bx == sx && by == sy) { 1573 else if (bx == sx && by == sy)
1574 {
1469 face_num = ob->face->number; 1575 face_num = ob->face->number;
1470 1576
1471 /* if this face matches one stored away, clear that one away. 1577 /* if this face matches one stored away, clear that one away.
1472 * this code relies on the fact that the map1 commands 1578 * this code relies on the fact that the map1 commands
1473 * goes from 2 down to 0. 1579 * goes from 2 down to 0.
1474 */ 1580 */
1475 for (i=0; i<MAP_LAYERS; i++) 1581 for (i = 0; i < MAP_LAYERS; i++)
1476 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1582 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1477 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1583 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1478 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1584 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1479 } 1585 }
1480 else { 1586 else
1587 {
1481 /* If this head is stored away, clear it - otherwise, 1588 /* If this head is stored away, clear it - otherwise,
1482 * there can be cases where a object is on multiple layers - 1589 * there can be cases where a object is on multiple layers -
1483 * we only want to send it once. 1590 * we only want to send it once.
1484 */ 1591 */
1485 face_num = head->face->number; 1592 face_num = head->face->number;
1486 for (i=0; i<MAP_LAYERS; i++) 1593 for (i = 0; i < MAP_LAYERS; i++)
1487 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1594 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1488 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1595 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1489 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1596 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1490 1597
1491 /* First, try to put the new head on the same layer. If that is used up, 1598 /* First, try to put the new head on the same layer. If that is used up,
1492 * then find another layer. 1599 * then find another layer.
1493 */ 1600 */
1494 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) { 1601 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1602 {
1495 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; 1603 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1496 } else for (i=0; i<MAX_LAYERS; i++) { 1604 }
1605 else
1606 for (i = 0; i < MAX_LAYERS; i++)
1607 {
1497 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || 1608 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1498 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) { 1609 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1610 {
1499 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; 1611 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1500 } 1612 }
1501 } 1613 }
1502 face_num = 0; /* Don't send this object - we'll send the head later */ 1614 face_num = 0; /* Don't send this object - we'll send the head later */
1503 } 1615 }
1504 } else { 1616 }
1617 else
1618 {
1505 /* In this case, we are already at the lower right or single part object, 1619 /* In this case, we are already at the lower right or single part object,
1506 * so nothing special 1620 * so nothing special
1507 */ 1621 */
1508 face_num = ob->face->number; 1622 face_num = ob->face->number;
1509 1623
1510 /* clear out any head entries that have the same face as this one */ 1624 /* clear out any head entries that have the same face as this one */
1511 for (bx=0; bx<layer; bx++) 1625 for (bx = 0; bx < layer; bx++)
1512 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1626 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1513 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1627 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1514 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1628 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1515 } 1629 }
1516 } /* else not already head object or blank face */ 1630 } /* else not already head object or blank face */
1517 1631
1518 /* This is a real hack. Basically, if we have nothing to send for this layer, 1632 /* This is a real hack. Basically, if we have nothing to send for this layer,
1519 * but there is a head on the next layer, send that instead. 1633 * but there is a head on the next layer, send that instead.
1520 * Without this, what happens is you can get the case where the player stands 1634 * Without this, what happens is you can get the case where the player stands
1521 * on the same space as the head. However, if you have overlapping big objects 1635 * on the same space as the head. However, if you have overlapping big objects
1522 * of the same type, what happens then is it doesn't think it needs to send 1636 * of the same type, what happens then is it doesn't think it needs to send
1523 * This tends to make stacking also work/look better. 1637 * This tends to make stacking also work/look better.
1524 */ 1638 */
1525 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]) { 1639 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1640 {
1526 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]->face->number; 1641 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1527 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1] = NULL; 1642 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1528 } 1643 }
1529 1644
1530 /* Another hack - because of heads and whatnot, this face may match one 1645 /* Another hack - because of heads and whatnot, this face may match one
1531 * we already sent for a lower layer. In that case, don't send 1646 * we already sent for a lower layer. In that case, don't send
1532 * this one. 1647 * this one.
1533 */ 1648 */
1534 if (face_num && layer+1<MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer+1] == face_num) { 1649 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1535 face_num = 0; 1650 face_num = 0;
1536 }
1537 1651
1538 /* We've gotten what face we want to use for the object. Now see if 1652 /* We've gotten what face we want to use for the object. Now see if
1539 * if it has changed since we last sent it to the client. 1653 * if it has changed since we last sent it to the client.
1540 */ 1654 */
1541 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) { 1655 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1656 {
1542 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1657 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1543 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1658 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1544 esrv_send_face(ns, face_num, 0); 1659 esrv_send_face (&ns, face_num, 0);
1545 SockList_AddShort(sl, face_num); 1660
1546 return 1; 1661 sl << uint16 (face_num);
1662 return 1;
1547 } 1663 }
1664
1548 /* Nothing changed */ 1665 /* Nothing changed */
1549 return 0; 1666 return 0;
1550} 1667}
1551 1668
1552/** 1669/**
1553 * This function is mainly a copy of update_space, 1670 * This function is mainly a copy of update_space,
1554 * except it handles update of the smoothing updates, 1671 * except it handles update of the smoothing updates,
… …
1566 * layer is the layer to update, with 2 being the floor and 0 the 1683 * layer is the layer to update, with 2 being the floor and 0 the
1567 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1684 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1568 * take. 1685 * take.
1569 */ 1686 */
1570 1687
1688static inline int
1571static inline int update_smooth(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1689update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1572{ 1690{
1573 object *ob; 1691 object *ob;
1574 int smoothlevel; /* old face_num;*/ 1692 int smoothlevel; /* old face_num; */
1575 1693
1576 ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1694 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1577 1695
1578 /* If there is no object for this space, or if the face for the object 1696 /* If there is no object for this space, or if the face for the object
1579 * is the blank face, set the smoothlevel to zero. 1697 * is the blank face, set the smoothlevel to zero.
1580 */ 1698 */
1581 if (!ob || ob->face == blank_face || MAP_NOSMOOTH(mp)) smoothlevel=0; 1699 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1700 smoothlevel = 0;
1582 else { 1701 else
1702 {
1583 smoothlevel = ob->smoothlevel; 1703 smoothlevel = ob->smoothlevel;
1584 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1704 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1585 SendSmooth(ns, ob->face->number); 1705 SendSmooth (&ns, ob->face->number);
1586 } /* else not already head object or blank face */ 1706 } /* else not already head object or blank face */
1587 1707
1588 /* We've gotten what face we want to use for the object. Now see if 1708 /* We've gotten what face we want to use for the object. Now see if
1589 * if it has changed since we last sent it to the client. 1709 * if it has changed since we last sent it to the client.
1590 */ 1710 */
1591 if (smoothlevel>255) 1711 if (smoothlevel > 255)
1592 smoothlevel=255; 1712 smoothlevel = 255;
1593 else if (smoothlevel<0) 1713 else if (smoothlevel < 0)
1594 smoothlevel=0; 1714 smoothlevel = 0;
1715
1595 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) { 1716 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1717 {
1596 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1718 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1597 SockList_AddChar(sl, (uint8) (smoothlevel&0xFF)); 1719 sl << uint8 (smoothlevel);
1598 return 1; 1720 return 1;
1599 } 1721 }
1722
1600 /* Nothing changed */ 1723 /* Nothing changed */
1601 return 0; 1724 return 0;
1602} 1725}
1603 1726
1604/** 1727/**
1605 * Returns the size of a data for a map square as returned by 1728 * Returns the size of a data for a map square as returned by
1606 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1729 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1607 * available. 1730 * available.
1608 */ 1731 */
1732int
1609int getExtendedMapInfoSize(NewSocket* ns){ 1733getExtendedMapInfoSize (client_socket * ns)
1734{
1610 int result=0; 1735 int result = 0;
1736
1611 if (ns->ext_mapinfos){ 1737 if (ns->ext_mapinfos)
1738 {
1612 if (ns->EMI_smooth) 1739 if (ns->EMI_smooth)
1613 result+=1; /*One byte for smoothlevel*/ 1740 result += 1; /*One byte for smoothlevel */
1614 } 1741 }
1615 return result; 1742 return result;
1616} 1743}
1744
1617/** 1745/**
1618 * This function uses the new map1 protocol command to send the map 1746 * This function uses the new map1 protocol command to send the map
1619 * to the client. It is necessary because the old map command supports 1747 * to the client. It is necessary because the old map command supports
1620 * a maximum map size of 15x15. 1748 * a maximum map size of 15x15.
1621 * This function is much simpler than the old one. This is because 1749 * This function is much simpler than the old one. This is because
… …
1634 * we use the count value to hold the darkness value. If -1, then this space 1762 * we use the count value to hold the darkness value. If -1, then this space
1635 * is not viewable. 1763 * is not viewable.
1636 * we use faces[0] faces[1] faces[2] to hold what the three layers 1764 * we use faces[0] faces[1] faces[2] to hold what the three layers
1637 * look like. 1765 * look like.
1638 */ 1766 */
1767void
1639void draw_client_map1(object *pl) 1768draw_client_map1 (object *pl)
1640{ 1769{
1641 int x,y,ax, ay, d, startlen, max_x, max_y, oldlen; 1770 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1642 sint16 nx, ny; 1771 sint16 nx, ny;
1643 int estartlen, eoldlen; 1772 int estartlen, eoldlen;
1644 SockList sl;
1645 SockList esl; /*For extended Map info*/
1646 uint16 mask,emask; 1773 uint16 mask, emask;
1647 uint8 eentrysize; 1774 uint8 eentrysize;
1648 uint16 ewhatstart,ewhatflag; 1775 uint16 ewhatstart, ewhatflag;
1649 uint8 extendedinfos; 1776 uint8 extendedinfos;
1650 mapstruct *m; 1777 maptile *m;
1778
1651 NewSocket &socket = pl->contr->socket; 1779 client_socket &socket = *pl->contr->socket;
1652 1780
1653 check_map_change (pl->contr); 1781 check_map_change (pl->contr);
1654 1782
1655 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1783 packet sl;
1656 if (socket.mapmode == Map1Cmd) 1784 packet esl;
1657 strcpy((char*)sl.buf,"map1 "); 1785
1658 else 1786 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1659 strcpy((char*)sl.buf,"map1a ");
1660 sl.len=strlen((char*)sl.buf);
1661 startlen = sl.len; 1787 startlen = sl.length ();
1788
1662 /*Extendedmapinfo structure initialisation*/ 1789 /*Extendedmapinfo structure initialisation */
1663 if (socket.ext_mapinfos){ 1790 if (socket.ext_mapinfos)
1664 esl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1791 {
1665 strcpy((char*)esl.buf,"mapextended ");
1666 esl.len=strlen((char*)esl.buf);
1667 extendedinfos=EMI_NOREDRAW; 1792 extendedinfos = EMI_NOREDRAW;
1793
1668 if (socket.EMI_smooth) 1794 if (socket.EMI_smooth)
1669 extendedinfos|=EMI_SMOOTH; 1795 extendedinfos |= EMI_SMOOTH;
1796
1670 ewhatstart=esl.len; 1797 ewhatstart = esl.length ();
1671 ewhatflag=extendedinfos; /*The EMI_NOREDRAW bit 1798 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1672 could need to be taken away*/ 1799 could need to be taken away */
1673 SockList_AddChar(&esl, extendedinfos);
1674 eentrysize=getExtendedMapInfoSize(&socket); 1800 eentrysize = getExtendedMapInfoSize (&socket);
1675 SockList_AddChar(&esl, eentrysize); 1801 esl << "mapextended "
1802 << uint8 (extendedinfos)
1803 << uint8 (eentrysize);
1804
1676 estartlen = esl.len; 1805 estartlen = esl.length ();
1677 } else { 1806 }
1807 else
1808 {
1678 /* suppress compiler warnings */ 1809 /* suppress compiler warnings */
1679 ewhatstart = 0; 1810 ewhatstart = 0;
1680 ewhatflag = 0; 1811 ewhatflag = 0;
1681 estartlen = 0; 1812 estartlen = 0;
1682 } 1813 }
1814
1683 /* Init data to zero */ 1815 /* Init data to zero */
1684 memset(heads, 0, sizeof(object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1816 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1685 1817
1686 /* x,y are the real map locations. ax, ay are viewport relative 1818 /* x,y are the real map locations. ax, ay are viewport relative
1687 * locations. 1819 * locations.
1688 */ 1820 */
1689 ay=0; 1821 ay = 0;
1690 1822
1691 /* We could do this logic as conditionals in the if statement, 1823 /* We could do this logic as conditionals in the if statement,
1692 * but that started to get a bit messy to look at. 1824 * but that started to get a bit messy to look at.
1693 */ 1825 */
1694 max_x = pl->x+(socket.mapx+1)/2; 1826 max_x = pl->x + (socket.mapx + 1) / 2;
1695 max_y = pl->y+(socket.mapy+1)/2; 1827 max_y = pl->y + (socket.mapy + 1) / 2;
1828
1696 if (socket.mapmode == Map1aCmd) { 1829 if (socket.mapmode == Map1aCmd)
1830 {
1697 max_x += MAX_HEAD_OFFSET; 1831 max_x += MAX_HEAD_OFFSET;
1698 max_y += MAX_HEAD_OFFSET; 1832 max_y += MAX_HEAD_OFFSET;
1699 } 1833 }
1700 1834
1701 for(y=pl->y-socket.mapy/2; y<max_y; y++,ay++) { 1835 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1702 ax=0; 1836 {
1837 ax = 0;
1703 for(x=pl->x-socket.mapx/2;x<max_x;x++,ax++) { 1838 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1839 {
1704 1840
1705 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1841 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1706 1842
1707 /* If this space is out of the normal viewable area, we only check 1843 /* If this space is out of the normal viewable area, we only check
1708 * the heads value ax or ay will only be greater than what 1844 * the heads value ax or ay will only be greater than what
1709 * the client wants if using the map1a command - this is because 1845 * the client wants if using the map1a command - this is because
1710 * if the map1a command is not used, max_x and max_y will be 1846 * if the map1a command is not used, max_x and max_y will be
1711 * set to lower values. 1847 * set to lower values.
1712 */ 1848 */
1713 if (ax >= socket.mapx || ay >= socket.mapy) { 1849 if (ax >= socket.mapx || ay >= socket.mapy)
1714 int i, got_one; 1850 {
1851 int i, got_one;
1715 1852
1716 oldlen = sl.len; 1853 oldlen = sl.length ();
1717 1854
1718 SockList_AddShort(&sl, mask); 1855 sl << uint16 (mask);
1719 1856
1720 if (check_head (sl, socket, ax, ay, 2)) 1857 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1721 mask |= 0x4; 1858 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1722 if (check_head (sl, socket, ax, ay, 1)) 1859 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1723 mask |= 0x2;
1724 if (check_head (sl, socket, ax, ay, 0))
1725 mask |= 0x1;
1726 1860
1727 /* If all we are doing is sending 0 (blank) faces, we don't 1861 /* If all we are doing is sending 0 (blank) faces, we don't
1728 * actually need to send that - just the coordinates 1862 * actually need to send that - just the coordinates
1729 * with no faces tells the client to blank out the 1863 * with no faces tells the client to blank out the
1730 * space. 1864 * space.
1731 */ 1865 */
1732 got_one=0; 1866 got_one = 0;
1733 for (i=oldlen+2; i<sl.len; i++) { 1867 for (i = oldlen + 2; i < sl.length (); i++)
1734 if (sl.buf[i]) got_one=1; 1868 if (sl[i])
1735 } 1869 got_one = 1;
1736 1870
1737 if (got_one && (mask & 0xf)) { 1871 if (got_one && (mask & 0xf))
1738 sl.buf[oldlen+1] = mask & 0xff; 1872 sl[oldlen + 1] = mask & 0xff;
1739 } else { /*either all faces blank, either no face at all*/ 1873 else
1874 { /*either all faces blank, either no face at all */
1740 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates*/ 1875 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1741 sl.len = oldlen + 2; 1876 sl.reset (oldlen + 2);
1742 else 1877 else
1743 sl.len = oldlen; 1878 sl.reset (oldlen);
1744 } 1879 }
1880
1745 /*What concerns extendinfos, nothing to be done for now 1881 /*What concerns extendinfos, nothing to be done for now
1746 * (perhaps effects layer later) 1882 * (perhaps effects layer later)
1747 */ 1883 */
1748 continue; /* don't do processing below */ 1884 continue; /* don't do processing below */
1749 } 1885 }
1750 1886
1751 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1887 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1752 1888
1753 d = pl->contr->blocked_los[ax][ay]; 1889 d = pl->contr->blocked_los[ax][ay];
1754 1890
1755 /* If the coordinates are not valid, or it is too dark to see, 1891 /* If the coordinates are not valid, or it is too dark to see,
1756 * we tell the client as such 1892 * we tell the client as such
1757 */ 1893 */
1758 nx=x; 1894 nx = x;
1759 ny=y; 1895 ny = y;
1760 m = get_map_from_coord(pl->map, &nx, &ny); 1896 m = get_map_from_coord (pl->map, &nx, &ny);
1761 if (!m) { 1897
1898 if (!m)
1899 {
1762 /* space is out of map. Update space and clear values 1900 /* space is out of map. Update space and clear values
1763 * if this hasn't already been done. If the space is out 1901 * if this hasn't already been done. If the space is out
1764 * of the map, it shouldn't have a head 1902 * of the map, it shouldn't have a head
1765 */ 1903 */
1766 if (lastcell.count != -1) { 1904 if (lastcell.count != -1)
1767 SockList_AddShort(&sl, mask); 1905 {
1906 sl << uint16 (mask);
1768 map_clearcell(&lastcell,0,0,0,-1); 1907 map_clearcell (&lastcell, 0, 0, 0, -1);
1769 } 1908 }
1770 } else if (d>3) { 1909 }
1771 int need_send=0, count; 1910 else if (d > 3)
1911 {
1912 int need_send = 0, count;
1913
1772 /* This block deals with spaces that are not visible for whatever 1914 /* This block deals with spaces that are not visible for whatever
1773 * reason. Still may need to send the head for this space. 1915 * reason. Still may need to send the head for this space.
1774 */ 1916 */
1775 1917
1776 oldlen = sl.len; 1918 oldlen = sl.length ();
1777 1919
1778 SockList_AddShort(&sl, mask); 1920 sl << uint16 (mask);
1921
1779 if (lastcell.count != -1) need_send=1; 1922 if (lastcell.count != -1)
1923 need_send = 1;
1924
1780 count = -1; 1925 count = -1;
1781 1926
1782 if (socket.mapmode == Map1aCmd && have_head(ax, ay)) { 1927 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1928 {
1783 /* Now check to see if any heads need to be sent */ 1929 /* Now check to see if any heads need to be sent */
1784 1930
1785 if (check_head (sl, socket, ax, ay, 2)) 1931 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1786 mask |= 0x4; 1932 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1787 if (check_head (sl, socket, ax, ay, 1)) 1933 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1788 mask |= 0x2;
1789 if (check_head (sl, socket, ax, ay, 0))
1790 mask |= 0x1;
1791 1934
1792 lastcell.count = count; 1935 lastcell.count = count;
1793 1936 }
1794 } else { 1937 else
1795 struct MapCell *cell = &lastcell; 1938 {
1796 /* properly clear a previously sent big face */ 1939 /* properly clear a previously sent big face */
1797 if(cell->faces[0] != 0 1940 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1798 || cell->faces[1] != 0 1941 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1799 || cell->faces[2] != 0) 1942 need_send = 1;
1800 need_send = 1; 1943
1801 map_clearcell(&lastcell, 0, 0, 0, count); 1944 map_clearcell (&lastcell, 0, 0, 0, count);
1802 } 1945 }
1803 1946
1804 if ((mask & 0xf) || need_send) { 1947 if ((mask & 0xf) || need_send)
1805 sl.buf[oldlen+1] = mask & 0xff; 1948 sl[oldlen + 1] = mask & 0xff;
1806 } else { 1949 else
1807 sl.len = oldlen; 1950 sl.reset (oldlen);
1808 } 1951 }
1809 } else { 1952 else
1953 {
1810 /* In this block, the space is visible or there are head objects 1954 /* In this block, the space is visible or there are head objects
1811 * we need to send. 1955 * we need to send.
1812 */ 1956 */
1813 1957
1814 /* Rather than try to figure out what everything that we might 1958 /* Rather than try to figure out what everything that we might
1815 * need to send is, then form the packet after that, 1959 * need to send is, then form the packet after that,
1816 * we presume that we will in fact form a packet, and update 1960 * we presume that we will in fact form a packet, and update
1817 * the bits by what we do actually send. If we send nothing, 1961 * the bits by what we do actually send. If we send nothing,
1818 * we just back out sl.len to the old value, and no harm 1962 * we just back out sl.length () to the old value, and no harm
1819 * is done. 1963 * is done.
1820 * I think this is simpler than doing a bunch of checks to see 1964 * I think this is simpler than doing a bunch of checks to see
1821 * what if anything we need to send, setting the bits, then 1965 * what if anything we need to send, setting the bits, then
1822 * doing those checks again to add the real data. 1966 * doing those checks again to add the real data.
1823 */ 1967 */
1824 oldlen = sl.len; 1968 oldlen = sl.length ();
1825 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1969 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1826 eoldlen = esl.len; 1970 eoldlen = esl.length ();
1827 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1971 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1828 SockList_AddShort(&sl, mask); 1972 sl << uint16 (mask);
1829 1973
1830 if (socket.ext_mapinfos) 1974 if (socket.ext_mapinfos)
1831 SockList_AddShort(&esl, emask); 1975 esl << uint16 (emask);
1832 1976
1833 unsigned char dummy; 1977 unsigned char dummy;
1834 unsigned char *last_ext = &dummy; 1978 unsigned char *last_ext = &dummy;
1835 1979
1836 /* Darkness changed */ 1980 /* Darkness changed */
1837 if (lastcell.count != d && socket.darkness) { 1981 if (lastcell.count != d && socket.darkness)
1838 mask |= 0x8; 1982 {
1983 mask |= 0x8;
1839 1984
1840 if (socket.extmap) 1985 if (socket.extmap)
1841 { 1986 {
1842 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, d); 1987 *last_ext |= 0x80;
1988 last_ext = &sl[sl.length ()];
1989 sl << uint8 (d);
1843 } 1990 }
1844 else 1991 else
1845 SockList_AddChar (&sl, 255 - 64 * d); 1992 sl << uint8 (255 - 64 * d);
1846 } 1993 }
1847 1994
1848 lastcell.count = d; 1995 lastcell.count = d;
1849 1996
1850 if (socket.extmap) 1997 if (socket.extmap)
1851 { 1998 {
1852 uint8 stat_hp = 0; 1999 uint8 stat_hp = 0;
1853 uint8 stat_width = 0; 2000 uint8 stat_width = 0;
2001 uint8 flags = 0;
1854 tag_t player = 0; 2002 UUID player = 0;
1855 2003
1856 // send hp information, if applicable 2004 // send hp information, if applicable
1857 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2005 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1858 { 2006 {
1859 if (op->head || op->invisible) 2007 if (op->head || op->invisible)
1860 continue; 2008 ; // do not show
1861
1862 if (op->type == PLAYER 2009 else if (op->type == PLAYER
1863 || QUERY_FLAG(op, FLAG_MONSTER) 2010 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1864 || QUERY_FLAG(op, FLAG_ALIVE)
1865 || QUERY_FLAG(op, FLAG_GENERATOR))
1866 { 2011 {
1867 if (op->stats.maxhp > 0 2012 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1868 && (unsigned)op->stats.maxhp > (unsigned)op->stats.hp)
1869 { 2013 {
1870 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2014 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1871 stat_width = op->arch->tail_x; 2015 stat_width = op->arch->tail_x;
1872 } 2016 }
1873 } 2017 }
1874 2018
2019 if (op->msg && op->msg[0] == '@')
2020 flags |= 1;
2021
1875 if (op->type == PLAYER && op != pl) 2022 if (op->type == PLAYER && op != pl)
1876 player = op->count; 2023 player = op->count;
1877 } 2024 }
1878 2025
1879 if (lastcell.stat_hp != stat_hp) 2026 if (lastcell.stat_hp != stat_hp)
1880 { 2027 {
1881 lastcell.stat_hp = stat_hp; 2028 lastcell.stat_hp = stat_hp;
1882 2029
1883 mask |= 0x8; 2030 mask |= 0x8;
1884 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 5); 2031 *last_ext |= 0x80;
1885 SockList_AddChar (&sl, stat_hp); 2032 last_ext = &sl[sl.length ()];
1886 2033
2034 sl << uint8 (5) << uint8 (stat_hp);
2035
1887 if (stat_width > 1) 2036 if (stat_width > 1)
1888 { 2037 {
1889 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 6); 2038 *last_ext |= 0x80;
1890 SockList_AddChar (&sl, stat_width); 2039 last_ext = &sl[sl.length ()];
2040
2041 sl << uint8 (6) << uint8 (stat_width);
1891 } 2042 }
1892 } 2043 }
1893 2044
1894 if (lastcell.player != player) 2045 if (lastcell.player != player)
1895 { 2046 {
1896 lastcell.player = player; 2047 lastcell.player = player;
2048
1897 mask |= 0x8; 2049 mask |= 0x8;
1898 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 0x47); 2050 *last_ext |= 0x80;
1899 SockList_AddChar (&sl, 4); 2051 last_ext = &sl[sl.length ()];
1900 SockList_AddInt (&sl, player); 2052
2053 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1901 } 2054 }
2055
2056 if (lastcell.flags != flags)
2057 {
2058 lastcell.flags = flags;
2059
2060 mask |= 0x8;
2061 *last_ext |= 0x80;
2062 last_ext = &sl[sl.length ()];
2063
2064 sl << uint8 (8) << uint8 (flags);
1902 } 2065 }
2066 }
1903 2067
1904 /* Floor face */ 2068 /* Floor face */
1905 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 2)) 2069 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1906 mask |= 0x4; 2070 mask |= 0x4;
1907 2071
1908 if (socket.EMI_smooth) 2072 if (socket.EMI_smooth)
1909 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 2)) 2073 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1910 emask |= 0x4; 2074 emask |= 0x4;
1911 2075
1912 /* Middle face */ 2076 /* Middle face */
1913 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 1)) 2077 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1914 mask |= 0x2; 2078 mask |= 0x2;
1915 2079
1916 if (socket.EMI_smooth) 2080 if (socket.EMI_smooth)
1917 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 1)) 2081 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1918 emask |= 0x2; 2082 emask |= 0x2;
1919 2083
1920 if(nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) { 2084 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2085 {
1921 if (lastcell.faces[0] != pl->face->number) { 2086 if (lastcell.faces[0] != pl->face->number)
1922 lastcell.faces[0] = pl->face->number; 2087 {
1923 mask |= 0x1; 2088 lastcell.faces[0] = pl->face->number;
2089 mask |= 0x1;
2090
1924 if (!(socket.faces_sent[pl->face->number] &NS_FACESENT_FACE)) 2091 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1925 esrv_send_face(&socket, pl->face->number, 0); 2092 esrv_send_face (&socket, pl->face->number, 0);
1926 SockList_AddShort(&sl, pl->face->number); 2093
1927 } 2094 sl << uint16 (pl->face->number);
1928 } 2095 }
1929 /* Top face */ 2096 }
1930 else { 2097 else
2098 {
2099 /* Top face */
1931 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 0)) 2100 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1932 mask |= 0x1; 2101 mask |= 0x1;
2102
1933 if (socket.EMI_smooth) 2103 if (socket.EMI_smooth)
1934 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 0)){ 2104 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1935 emask |= 0x1; 2105 emask |= 0x1;
1936 } 2106 }
1937 } 2107
1938 /* Check to see if we are in fact sending anything for this 2108 /* Check to see if we are in fact sending anything for this
1939 * space by checking the mask. If so, update the mask. 2109 * space by checking the mask. If so, update the mask.
1940 * if not, reset the len to that from before adding the mask 2110 * if not, reset the len to that from before adding the mask
1941 * value, so we don't send those bits. 2111 * value, so we don't send those bits.
1942 */ 2112 */
1943 if (mask & 0xf) { 2113 if (mask & 0xf)
1944 sl.buf[oldlen+1] = mask & 0xff; 2114 sl[oldlen + 1] = mask & 0xff;
1945 } else { 2115 else
1946 sl.len = oldlen; 2116 sl.reset (oldlen);
1947 } 2117
1948 if (emask & 0xf) { 2118 if (emask & 0xf)
1949 esl.buf[eoldlen+1] = emask & 0xff; 2119 esl[eoldlen + 1] = emask & 0xff;
1950 } else { 2120 else
1951 esl.len = eoldlen; 2121 esl.reset (eoldlen);
1952 }
1953 } /* else this is a viewable space */ 2122 } /* else this is a viewable space */
1954 } /* for x loop */ 2123 } /* for x loop */
1955 } /* for y loop */ 2124 } /* for y loop */
1956 2125
1957 /* Verify that we in fact do need to send this */ 2126 /* Verify that we in fact do need to send this */
1958 if (socket.ext_mapinfos){ 2127 if (socket.ext_mapinfos)
2128 {
1959 if (!(sl.len>startlen || socket.sent_scroll)){ 2129 if (!(sl.length () > startlen || socket.sent_scroll))
2130 {
1960 /* No map data will follow, so don't say the client 2131 /* No map data will follow, so don't say the client
1961 * it doesn't need draw! 2132 * it doesn't need draw!
1962 */ 2133 */
1963 ewhatflag&=(~EMI_NOREDRAW); 2134 ewhatflag &= (~EMI_NOREDRAW);
1964 esl.buf[ewhatstart+1] = ewhatflag & 0xff; 2135 esl[ewhatstart + 1] = ewhatflag & 0xff;
1965 } 2136 }
2137
1966 if (esl.len>estartlen) { 2138 if (esl.length () > estartlen)
1967 Send_With_Handling(&socket, &esl); 2139 socket.send_packet (esl);
1968 }
1969 free(esl.buf);
1970 } 2140 }
2141
1971 if (sl.len>startlen || socket.sent_scroll) { 2142 if (sl.length () > startlen || socket.sent_scroll)
1972 Send_With_Handling(&socket, &sl); 2143 {
2144 socket.send_packet (sl);
1973 socket.sent_scroll = 0; 2145 socket.sent_scroll = 0;
1974 } 2146 }
1975 free(sl.buf);
1976} 2147}
1977 2148
1978/** 2149/**
1979 * Draws client map. 2150 * Draws client map.
1980 */ 2151 */
2152void
1981void draw_client_map(object *pl) 2153draw_client_map (object *pl)
1982{ 2154{
1983 int i,j; 2155 int i, j;
1984 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */ 2156 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1985 New_Face *face,*floor; 2157 New_Face *face, *floor;
1986 New_Face *floor2; 2158 New_Face *floor2;
1987 int d, mflags; 2159 int d, mflags;
1988 struct Map newmap; 2160 struct Map newmap;
1989 mapstruct *m, *pm; 2161 maptile *m, *pm;
1990 2162
1991 if (pl->type != PLAYER) { 2163 if (pl->type != PLAYER)
2164 {
1992 LOG(llevError,"draw_client_map called with non player/non eric-server\n"); 2165 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1993 return; 2166 return;
1994 } 2167 }
1995 2168
1996 if (pl->contr->transport) {
1997 pm = pl->contr->transport->map;
1998 }
1999 else
2000 pm = pl->map; 2169 pm = pl->map;
2001 2170
2002 /* If player is just joining the game, he isn't here yet, so the map 2171 /* If player is just joining the game, he isn't here yet, so the map
2003 * can get swapped out. If so, don't try to send them a map. All will 2172 * can get swapped out. If so, don't try to send them a map. All will
2004 * be OK once they really log in. 2173 * be OK once they really log in.
2005 */ 2174 */
2006 if (pm==NULL || pm->in_memory!=MAP_IN_MEMORY) return; 2175 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2176 return;
2007 2177
2008 memset(&newmap, 0, sizeof(struct Map)); 2178 memset (&newmap, 0, sizeof (struct Map));
2009 2179
2010 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) { 2180 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2181 {
2011 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) { 2182 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2012 ax=i; 2183 {
2013 ay=j; 2184 ax = i;
2185 ay = j;
2014 m = pm; 2186 m = pm;
2015 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay); 2187 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2016 if (mflags & P_OUT_OF_MAP) 2188 if (mflags & P_OUT_OF_MAP)
2017 continue; 2189 continue;
2018 if (mflags & P_NEED_UPDATE) 2190 if (mflags & P_NEED_UPDATE)
2019 update_position(m, ax, ay); 2191 update_position (m, ax, ay);
2020 /* If a map is visible to the player, we don't want to swap it out 2192 /* If a map is visible to the player, we don't want to swap it out
2021 * just to reload it. This should really call something like 2193 * just to reload it. This should really call something like
2022 * swap_map, but this is much more efficient and 'good enough' 2194 * swap_map, but this is much more efficient and 'good enough'
2023 */ 2195 */
2024 if (mflags & P_NEW_MAP) 2196 if (mflags & P_NEW_MAP)
2025 m->timeout = 50; 2197 m->timeout = 50;
2026 } 2198 }
2027 } 2199 }
2028 /* do LOS after calls to update_position */ 2200 /* do LOS after calls to update_position */
2029 if(pl->contr->do_los) { 2201 if (pl->contr->do_los)
2202 {
2030 update_los(pl); 2203 update_los (pl);
2031 pl->contr->do_los = 0; 2204 pl->contr->do_los = 0;
2032 } 2205 }
2033 2206
2034 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) {
2035 /* Big maps need a different drawing mechanism to work */ 2207 /* Big maps need a different drawing mechanism to work */
2036 draw_client_map1(pl); 2208 draw_client_map1 (pl);
2037 return;
2038 }
2039
2040 if(pl->invisible & (pl->invisible < 50 ? 4 : 1)) {
2041 esrv_map_setbelow(&pl->contr->socket,pl->contr->socket.mapx/2,
2042 pl->contr->socket.mapy/2,pl->face->number,&newmap);
2043 }
2044
2045 /* j and i are the y and x coordinates of the real map (which is
2046 * basically some number of spaces around the player)
2047 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2048 * left corner) and are thus disconnected from the map values.
2049 * Subtract 1 from the max values so that we properly handle cases where
2050 * player has specified an even map. Otherwise, we try to send them too
2051 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2052 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2053 * odd, this still works fine.
2054 */
2055 ay=0;
2056 for(j=pl->y-pl->contr->socket.mapy/2; j<=pl->y+(pl->contr->socket.mapy-1)/2;j++, ay++) {
2057 ax=0;
2058 for(i=pl->x-pl->contr->socket.mapx/2;i<=pl->x+(pl->contr->socket.mapx-1)/2;i++, ax++) {
2059
2060 d = pl->contr->blocked_los[ax][ay];
2061 /* note the out_of_map and d>3 checks are both within the same
2062 * negation check.
2063 */
2064 nx = i;
2065 ny = j;
2066 m = get_map_from_coord(pm, &nx, &ny);
2067 if (m && d<4) {
2068 face = GET_MAP_FACE(m, nx, ny,0);
2069 floor2 = GET_MAP_FACE(m, nx, ny,1);
2070 floor = GET_MAP_FACE(m, nx, ny,2);
2071
2072 /* If all is blank, send a blank face. */
2073 if ((!face || face == blank_face) &&
2074 (!floor2 || floor2 == blank_face) &&
2075 (!floor || floor == blank_face)) {
2076 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2077 blank_face->number,&newmap);
2078 } else { /* actually have something interesting */
2079 /* send the darkness mask, if any. */
2080 if (d && pl->contr->socket.darkness)
2081 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2082 dark_faces[d-1]->number,&newmap);
2083
2084 if (face && face != blank_face)
2085 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2086 face->number,&newmap);
2087 if (floor2 && floor2 != blank_face)
2088 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2089 floor2->number,&newmap);
2090 if (floor && floor != blank_face)
2091 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2092 floor->number,&newmap);
2093 }
2094 } /* Is a valid space */
2095 }
2096 }
2097 esrv_map_doneredraw(&pl->contr->socket, &newmap);
2098
2099 check_map_change (pl->contr);
2100} 2209}
2101 2210
2102 2211
2103/*****************************************************************************/ 2212/*****************************************************************************/
2213
2104/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 2214/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2215
2105/* a player. Of course, the client need to know the command to be able to */ 2216/* a player. Of course, the client need to know the command to be able to */
2217
2106/* manage it ! */ 2218/* manage it ! */
2219
2107/*****************************************************************************/ 2220/*****************************************************************************/
2221void
2108void send_plugin_custom_message(object *pl, char *buf) 2222send_plugin_custom_message (object *pl, char *buf)
2109{ 2223{
2110 cs_write_string(&pl->contr->socket,buf,strlen(buf)); 2224 pl->contr->socket->send_packet (buf);
2111} 2225}
2112 2226
2113/** 2227/**
2114 * This sends the skill number to name mapping. We ignore 2228 * This sends the skill number to name mapping. We ignore
2115 * the params - we always send the same info no matter what. 2229 * the params - we always send the same info no matter what.
2116 */ 2230 */
2231void
2117void send_skill_info(NewSocket *ns, char *params) 2232send_skill_info (client_socket *ns, char *params)
2118{ 2233{
2119 SockList sl; 2234 packet sl;
2120 int i; 2235 sl << "replyinfo skill_info\n";
2121 2236
2122 sl.buf = (unsigned char*) malloc(MAXSOCKBUF);
2123 strcpy((char*)sl.buf,"replyinfo skill_info\n");
2124 for (i=1; i< NUM_SKILLS; i++) { 2237 for (int i = 1; i < NUM_SKILLS; i++)
2125 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, 2238 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2126 skill_names[i]); 2239
2127 }
2128 sl.len = strlen((char*)sl.buf);
2129 if (sl.len >= MAXSOCKBUF) { 2240 if (sl.length () >= MAXSOCKBUF)
2241 {
2130 LOG(llevError,"Buffer overflow in send_skill_info!\n"); 2242 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2131 fatal(0); 2243 fatal (0);
2132 } 2244 }
2133 Send_With_Handling(ns, &sl); 2245
2134 free(sl.buf); 2246 ns->send_packet (sl);
2135} 2247}
2136 2248
2137/** 2249/**
2138 * This sends the spell path to name mapping. We ignore 2250 * This sends the spell path to name mapping. We ignore
2139 * the params - we always send the same info no matter what. 2251 * the params - we always send the same info no matter what.
2140 */ 2252 */
2253void
2141void send_spell_paths (NewSocket *ns, char *params) { 2254send_spell_paths (client_socket * ns, char *params)
2142 SockList sl; 2255{
2143 int i; 2256 packet sl;
2144 2257
2145 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2258 sl << "replyinfo spell_paths\n";
2146 strcpy((char*)sl.buf,"replyinfo spell_paths\n"); 2259
2147 for(i=0; i<NRSPELLPATHS; i++) 2260 for (int i = 0; i < NRSPELLPATHS; i++)
2148 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]); 2261 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2149 sl.len = strlen((char*)sl.buf); 2262
2150 if (sl.len >= MAXSOCKBUF) { 2263 if (sl.length () >= MAXSOCKBUF)
2264 {
2151 LOG(llevError,"Buffer overflow in send_spell_paths!\n"); 2265 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2152 fatal(0); 2266 fatal (0);
2153 } 2267 }
2154 Send_With_Handling(ns, &sl); 2268
2155 free(sl.buf); 2269 ns->send_packet (sl);
2156} 2270}
2157 2271
2158/** 2272/**
2159 * This looks for any spells the player may have that have changed their stats. 2273 * This looks for any spells the player may have that have changed their stats.
2160 * it then sends an updspell packet for each spell that has changed in this way 2274 * it then sends an updspell packet for each spell that has changed in this way
2161 */ 2275 */
2276void
2162void esrv_update_spells(player *pl) { 2277esrv_update_spells (player *pl)
2163 SockList sl; 2278{
2164 int flags=0;
2165 object *spell;
2166 if (!pl->socket.monitor_spells) return; 2279 if (!pl->socket->monitor_spells)
2280 return;
2281
2167 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2282 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2283 {
2168 if (spell->type == SPELL) { 2284 if (spell->type == SPELL)
2285 {
2286 int flags = 0;
2287
2169 /* check if we need to update it*/ 2288 /* check if we need to update it */
2170 if (spell->last_sp != SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA)) { 2289 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2290 {
2171 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2291 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2172 flags |= UPD_SP_MANA; 2292 flags |= UPD_SP_MANA;
2173 } 2293 }
2294
2174 if (spell->last_grace != SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE)) { 2295 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2296 {
2175 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2297 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2176 flags |= UPD_SP_GRACE; 2298 flags |= UPD_SP_GRACE;
2177 } 2299 }
2300
2178 if (spell->last_eat != spell->stats.dam+SP_level_dam_adjust(pl->ob, spell)) { 2301 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2302 {
2179 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2303 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2180 flags |= UPD_SP_DAMAGE; 2304 flags |= UPD_SP_DAMAGE;
2305 }
2306
2307 if (flags)
2308 {
2309 packet sl;
2310
2311 sl << "updspell "
2312 << uint8 (flags)
2313 << uint32 (spell->count);
2314
2315 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2316 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2317 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2318
2319 pl->socket->send_packet (sl);
2320 }
2321 }
2181 } 2322 }
2182 if (flags !=0) {
2183 sl.buf =(unsigned char*) malloc(MAXSOCKBUF);
2184 strcpy((char*)sl.buf,"updspell ");
2185 sl.len=strlen((char*)sl.buf);
2186 SockList_AddChar(&sl, flags);
2187 SockList_AddInt(&sl, spell->count);
2188 if (flags & UPD_SP_MANA) SockList_AddShort(&sl, spell->last_sp);
2189 if (flags & UPD_SP_GRACE) SockList_AddShort(&sl, spell->last_grace);
2190 if (flags & UPD_SP_DAMAGE) SockList_AddShort(&sl, spell->last_eat);
2191 flags = 0;
2192 Send_With_Handling(&pl->socket, &sl);
2193 free(sl.buf);
2194 }
2195 }
2196 }
2197} 2323}
2198 2324
2325void
2199void esrv_remove_spell(player *pl, object *spell) { 2326esrv_remove_spell (player *pl, object *spell)
2200 SockList sl; 2327{
2201
2202 if (!pl->socket.monitor_spells) return; 2328 if (!pl->socket->monitor_spells)
2329 return;
2330
2203 if (!pl || !spell || spell->env != pl->ob) { 2331 if (!pl || !spell || spell->env != pl->ob)
2332 {
2204 LOG(llevError, "Invalid call to esrv_remove_spell"); 2333 LOG (llevError, "Invalid call to esrv_remove_spell");
2205 return; 2334 return;
2206 } 2335 }
2207 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2336
2208 strcpy((char*)sl.buf,"delspell "); 2337 packet sl;
2209 sl.len=strlen((char*)sl.buf); 2338
2210 SockList_AddInt(&sl, spell->count); 2339 sl << "delspell "
2211 Send_With_Handling(&pl->socket, &sl); 2340 << uint32 (spell->count);
2212 free(sl.buf); 2341
2342 pl->socket->send_packet (sl);
2213} 2343}
2214 2344
2215/* appends the spell *spell to the Socklist we will send the data to. */ 2345/* appends the spell *spell to the Socklist we will send the data to. */
2346static void
2216static void append_spell (player *pl, SockList *sl, object *spell) { 2347append_spell (player *pl, packet &sl, object *spell)
2348{
2217 int len, i, skill=0; 2349 int len, i, skill = 0;
2218 2350
2219 if (!(spell->name)) { 2351 if (!(spell->name))
2352 {
2220 LOG(llevError, "item number %d is a spell with no name.\n", spell->count); 2353 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2221 return; 2354 return;
2222 } 2355 }
2223 SockList_AddInt(sl, spell->count); 2356
2224 SockList_AddShort(sl, spell->level);
2225 SockList_AddShort(sl, spell->casting_time);
2226 /* store costs and damage in the object struct, to compare to later */ 2357 /* store costs and damage in the object struct, to compare to later */
2227 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2358 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2228 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2359 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2229 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2360 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2230 /* send the current values */
2231 SockList_AddShort(sl, spell->last_sp);
2232 SockList_AddShort(sl, spell->last_grace);
2233 SockList_AddShort(sl, spell->last_eat);
2234 2361
2235 /* figure out which skill it uses, if it uses one */ 2362 /* figure out which skill it uses, if it uses one */
2236 if (spell->skill) { 2363 if (spell->skill)
2364 {
2237 for (i=1; i< NUM_SKILLS; i++) 2365 for (i = 1; i < NUM_SKILLS; i++)
2238 if (!strcmp(spell->skill, skill_names[i])) { 2366 if (!strcmp (spell->skill, skill_names[i]))
2367 {
2239 skill = i+CS_STAT_SKILLINFO; 2368 skill = i + CS_STAT_SKILLINFO;
2240 break; 2369 break;
2370 }
2241 } 2371 }
2242 }
2243 SockList_AddChar(sl, skill);
2244 2372
2245 SockList_AddInt(sl, spell->path_attuned); 2373 /* send the current values */
2246 SockList_AddInt(sl, (spell->face)?spell->face->number:0); 2374 sl << uint32 (spell->count)
2247 2375 << uint16 (spell->level)
2248 len = strlen(spell->name); 2376 << uint16 (spell->casting_time)
2249 SockList_AddChar(sl, (char)len); 2377 << uint16 (spell->last_sp)
2250 memcpy(sl->buf+sl->len, spell->name, len); 2378 << uint16 (spell->last_grace)
2251 sl->len+=len; 2379 << uint16 (spell->last_eat)
2252 2380 << uint8 (skill)
2253 if (!spell->msg) { 2381 << uint32 (spell->path_attuned)
2254 SockList_AddShort(sl, 0); 2382 << uint32 (spell->face ? spell->face->number : 0)
2255 } 2383 << data8 (spell->name)
2256 else { 2384 << data16 (spell->msg);
2257 len = strlen(spell->msg);
2258 SockList_AddShort(sl, len);
2259 memcpy(sl->buf+sl->len, spell->msg, len);
2260 sl->len+=len;
2261 }
2262} 2385}
2263 2386
2264/** 2387/**
2265 * This tells the client to add the spell *ob, if *ob is NULL, then add 2388 * This tells the client to add the spell *ob, if *ob is NULL, then add
2266 * all spells in the player's inventory. 2389 * all spells in the player's inventory.
2267 */ 2390 */
2391void
2268void esrv_add_spells(player *pl, object *spell) { 2392esrv_add_spells (player *pl, object *spell)
2269 SockList sl; 2393{
2270 if (!pl) { 2394 if (!pl)
2395 {
2271 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2396 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2272 return; 2397 return;
2273 } 2398 }
2399
2274 if (!pl->socket.monitor_spells) return; 2400 if (!pl->socket->monitor_spells)
2275 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2401 return;
2276 strcpy((char*)sl.buf,"addspell "); 2402
2277 sl.len=strlen((char*)sl.buf); 2403 packet sl;
2404
2405 sl << "addspell ";
2406
2278 if (!spell) { 2407 if (!spell)
2408 {
2279 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2409 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2410 {
2280 /* were we to simply keep appending data here, we could exceed 2411 /* were we to simply keep appending data here, we could exceed
2281 * MAXSOCKBUF if the player has enough spells to add, we know that 2412 * MAXSOCKBUF if the player has enough spells to add, we know that
2282 * append_spells will always append 19 data bytes, plus 4 length 2413 * append_spells will always append 19 data bytes, plus 4 length
2283 * bytes and 3 strings (because that is the spec) so we need to 2414 * bytes and 3 strings (because that is the spec) so we need to
2284 * check that the length of those 3 strings, plus the 23 bytes, 2415 * check that the length of those 3 strings, plus the 23 bytes,
2285 * won't take us over the length limit for the socket, if it does, 2416 * won't take us over the length limit for the socket, if it does,
2286 * we need to send what we already have, and restart packet formation 2417 * we need to send what we already have, and restart packet formation
2287 */ 2418 */
2288 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 2419 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2289 * to show add_spell is 26 bytes + 2 strings. However, the overun 2420 * to show add_spell is 26 bytes + 2 strings. However, the overun
2290 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2421 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2291 * like it will fix this 2422 * like it will fix this
2292 */ 2423 */
2293 if (spell->type != SPELL) continue; 2424 if (spell->type != SPELL)
2294 if (sl.len >= (MAXSOCKBUF - (26 + strlen(spell->name) + 2425 continue;
2295 (spell->msg?strlen(spell->msg):0)))) { 2426
2296 Send_With_Handling(&pl->socket, &sl); 2427 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2297 strcpy((char*)sl.buf,"addspell "); 2428 {
2298 sl.len=strlen((char*)sl.buf); 2429 pl->socket->send_packet (sl);
2430
2431 sl.reset ();
2432 sl << "addspell ";
2433 }
2434
2435 append_spell (pl, sl, spell);
2436 }
2299 } 2437 }
2438 else if (spell->type != SPELL)
2439 {
2440 LOG (llevError, "Asked to send a non-spell object as a spell");
2441 return;
2442 }
2443 else
2300 append_spell(pl, &sl, spell); 2444 append_spell (pl, sl, spell);
2301 } 2445
2302 }
2303 else if (spell->type != SPELL) {
2304 LOG(llevError, "Asked to send a non-spell object as a spell");
2305 return;
2306 }
2307 else append_spell(pl, &sl, spell);
2308 if (sl.len >= MAXSOCKBUF) { 2446 if (sl.length () >= MAXSOCKBUF)
2447 {
2309 LOG(llevError,"Buffer overflow in esrv_add_spells!\n"); 2448 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2310 fatal(0); 2449 fatal (0);
2311 } 2450 }
2451
2312 /* finally, we can send the packet */ 2452 /* finally, we can send the packet */
2313 Send_With_Handling(&pl->socket, &sl); 2453 pl->socket->send_packet (sl);
2314 free(sl.buf);
2315} 2454}
2316 2455

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines