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.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.27 by root, Wed Dec 13 18:08:02 2006 UTC

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

Diff Legend

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