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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.18 by root, Thu Sep 14 19:08:41 2006 UTC

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

Diff Legend

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