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.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC

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

Diff Legend

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