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.14 by elmex, Mon Sep 4 17:14:10 2006 UTC vs.
Revision 1.21 by root, Sat Sep 16 22:24:13 2006 UTC

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

Diff Legend

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