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.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.25 by root, Thu Sep 21 14:51:16 2006 UTC

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

Diff Legend

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