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

Diff Legend

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