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.10 by root, Fri Aug 25 17:11:54 2006 UTC vs.
Revision 1.17 by root, Tue Sep 12 19:20:09 2006 UTC

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

Diff Legend

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