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

Diff Legend

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