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

Diff Legend

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