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.7 by root, Mon Aug 21 07:13:32 2006 UTC vs.
Revision 1.30 by root, Thu Dec 14 00:01:37 2006 UTC

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

Diff Legend

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