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

Diff Legend

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