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.10 by root, Fri Aug 25 17:11:54 2006 UTC vs.
Revision 1.27 by root, Wed Dec 13 18:08:02 2006 UTC

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

Diff Legend

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