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.15 by pippijn, Thu Sep 7 20:03:21 2006 UTC vs.
Revision 1.16 by root, Sun Sep 10 13:43:33 2006 UTC

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

Diff Legend

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