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.22 by root, Tue Sep 19 10:12:50 2006 UTC vs.
Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC

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

Diff Legend

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