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

Diff Legend

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