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.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.22 by root, Tue Sep 19 10:12:50 2006 UTC

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

Diff Legend

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