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.9 by root, Thu Aug 24 17:29:30 2006 UTC vs.
Revision 1.26 by pippijn, Mon Dec 11 19:46:47 2006 UTC

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

Diff Legend

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