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

Diff Legend

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