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

Diff Legend

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