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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.25 by root, Thu Sep 21 14:51:16 2006 UTC

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

Diff Legend

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