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.25 by root, Thu Sep 21 14:51:16 2006 UTC

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

Diff Legend

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