ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.16 by root, Sun Sep 10 13:43:33 2006 UTC

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

Diff Legend

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