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.21 by root, Sat Sep 16 22:24:13 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 }
932 }
933 if (pl->socket.exp64) { 1136 if (pl->socket.exp64)
1137 {
1138 uint8 s;
1139
1140 for (s = 0; s < NUM_SKILLS; s++)
1141 {
1142 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1143 {
1144
1145 /* Always send along the level if exp changes. This is only
1146 * 1 extra byte, but keeps processing simpler.
1147 */
1148 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO));
1149 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level);
1150 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp);
1151 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1152 }
1153 }
1154 }
1155 if (pl->socket.exp64)
1156 {
934 AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1157 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
935 } else { 1158 }
1159 else
1160 {
936 AddIfInt(pl->last_stats.exp, ( int )pl->ob->stats.exp, CS_STAT_EXP); 1161 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP);
937 } 1162 }
938 AddIfShort(pl->last_level, ( char )pl->ob->level, CS_STAT_LEVEL); 1163 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
939 AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1164 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
940 AddIfShort(pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1165 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
941 AddIfShort(pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1166 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
942 AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1167 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
943 AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1168 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
944 AddIfFloat(pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1169 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
945 AddIfInt(pl->last_weight_limit, (sint32)weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1170 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
946 flags=0; 1171 flags = 0;
947 if (pl->fire_on) flags |=SF_FIREON; 1172 if (pl->fire_on)
948 if (pl->run_on) flags |= SF_RUNON; 1173 flags |= SF_FIREON;
1174 if (pl->run_on)
1175 flags |= SF_RUNON;
949 1176
950 AddIfShort(pl->last_flags, flags, CS_STAT_FLAGS); 1177 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
951 if (pl->socket.sc_version<1025) { 1178 if (pl->socket.sc_version < 1025)
1179 {
952 AddIfShort(pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1180 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR);
953 } else { 1181 }
954 int i; 1182 else
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;
959 AddIfShort(pl->last_resist[i], pl->ob->resist[i], ( char )atnr_cs_stat[i]); 1191 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
960 } 1192 }
961 } 1193 }
962 if (pl->socket.monitor_spells) { 1194 if (pl->socket.monitor_spells)
1195 {
963 AddIfInt(pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1196 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
964 AddIfInt(pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1197 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
965 AddIfInt(pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1198 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
966 } 1199 }
967 rangetostring(pl->ob, buf); /* we want use the new fire & run system in new client */ 1200 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
968 AddIfString(pl->socket.stats.range, buf, CS_STAT_RANGE); 1201 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
969 set_title(pl->ob, buf); 1202 set_title (pl->ob, buf);
970 AddIfString(pl->socket.stats.title, buf, CS_STAT_TITLE); 1203 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
971 1204
972 /* Only send it away if we have some actual data */ 1205 /* Only send it away if we have some actual data */
973 if (sl.len>6) { 1206 if (sl.len > 6)
1207 {
974#ifdef ESRV_DEBUG 1208#ifdef ESRV_DEBUG
975 LOG(llevDebug,"Sending stats command, %d bytes long.\n", sl.len); 1209 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
976#endif 1210#endif
977 Send_With_Handling(&pl->socket, &sl); 1211 Send_With_Handling (&pl->socket, &sl);
978 } 1212 }
979 free(sl.buf); 1213 free (sl.buf);
980} 1214}
981 1215
982 1216
983/** 1217/**
984 * Tells the client that here is a player it should start using. 1218 * Tells the client that here is a player it should start using.
985 */ 1219 */
1220void
986void esrv_new_player(player *pl, uint32 weight) 1221esrv_new_player (player *pl, uint32 weight)
987{ 1222{
988 SockList sl; 1223 SockList sl;
989 1224
990 pl->last_weight = weight; 1225 pl->last_weight = weight;
991 1226
992 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1227 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
993 1228
994 strcpy((char*)sl.buf,"player "); 1229 strcpy ((char *) sl.buf, "player ");
995 sl.len=strlen((char*)sl.buf); 1230 sl.len = strlen ((char *) sl.buf);
996 SockList_AddInt(&sl, pl->ob->count); 1231 SockList_AddInt (&sl, pl->ob->count);
997 SockList_AddInt(&sl, weight); 1232 SockList_AddInt (&sl, weight);
998 SockList_AddInt(&sl, pl->ob->face->number); 1233 SockList_AddInt (&sl, pl->ob->face->number);
999 1234
1000 SockList_AddChar(&sl, ( char )strlen(pl->ob->name)); 1235 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1001 strcpy((char*)sl.buf+sl.len, pl->ob->name); 1236 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1002 sl.len += strlen(pl->ob->name); 1237 sl.len += strlen (pl->ob->name);
1003 1238
1004 Send_With_Handling(&pl->socket, &sl); 1239 Send_With_Handling (&pl->socket, &sl);
1005 free(sl.buf); 1240 free (sl.buf);
1006 SET_FLAG(pl->ob, FLAG_CLIENT_SENT); 1241 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1007} 1242}
1008 1243
1009 1244
1010/** 1245/**
1011 * Need to send an animation sequence to the client. 1246 * Need to send an animation sequence to the client.
1012 * We will send appropriate face commands to the client if we haven't 1247 * We will send appropriate face commands to the client if we haven't
1013 * sent them the face yet (this can become quite costly in terms of 1248 * sent them the face yet (this can become quite costly in terms of
1014 * how much we are sending - on the other hand, this should only happen 1249 * how much we are sending - on the other hand, this should only happen
1015 * when the player logs in and picks stuff up. 1250 * when the player logs in and picks stuff up.
1016 */ 1251 */
1252void
1017void esrv_send_animation(NewSocket *ns, short anim_num) 1253esrv_send_animation (NewSocket * ns, short anim_num)
1018{ 1254{
1019 SockList sl; 1255 SockList sl;
1020 int i; 1256 int i;
1021 1257
1022 /* Do some checking on the anim_num we got. Note that the animations 1258 /* Do some checking on the anim_num we got. Note that the animations
1023 * are added in contigous order, so if the number is in the valid 1259 * are added in contigous order, so if the number is in the valid
1024 * range, it must be a valid animation. 1260 * range, it must be a valid animation.
1025 */ 1261 */
1026 if (anim_num < 0 || anim_num > num_animations) { 1262 if (anim_num < 0 || anim_num > num_animations)
1263 {
1027 LOG(llevError,"esrv_send_anim (%d) out of bounds??\n",anim_num); 1264 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1028 return; 1265 return;
1029 } 1266 }
1030 1267
1031 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1268 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1032 strcpy((char*)sl.buf, "anim "); 1269 strcpy ((char *) sl.buf, "anim ");
1033 sl.len=5; 1270 sl.len = 5;
1034 SockList_AddShort(&sl, anim_num); 1271 SockList_AddShort (&sl, anim_num);
1035 SockList_AddShort(&sl, 0); /* flags - not used right now */ 1272 SockList_AddShort (&sl, 0); /* flags - not used right now */
1036 /* Build up the list of faces. Also, send any information (ie, the 1273 /* Build up the list of faces. Also, send any information (ie, the
1037 * the face itself) down to the client. 1274 * the face itself) down to the client.
1038 */ 1275 */
1039 for (i=0; i<animations[anim_num].num_animations; i++) { 1276 for (i = 0; i < animations[anim_num].num_animations; i++)
1277 {
1040 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1278 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1041 esrv_send_face(ns,animations[anim_num].faces[i],0); 1279 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1042 SockList_AddShort(&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1280 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */
1043 } 1281 }
1044 Send_With_Handling(ns, &sl); 1282 Send_With_Handling (ns, &sl);
1045 free(sl.buf); 1283 free (sl.buf);
1046 ns->anims_sent[anim_num] = 1; 1284 ns->anims_sent[anim_num] = 1;
1047} 1285}
1048 1286
1049 1287
1050/****************************************************************************** 1288/******************************************************************************
1051 * 1289 *
… …
1055 1293
1056/** 1294/**
1057 * This adds face_num to a map cell at x,y. If the client doesn't have 1295 * This adds face_num to a map cell at x,y. If the client doesn't have
1058 * the face yet, we will also send it. 1296 * the face yet, we will also send it.
1059 */ 1297 */
1060static void esrv_map_setbelow(NewSocket *ns, int x,int y, 1298static void
1061 short face_num, struct Map *newmap) 1299esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap)
1062{ 1300{
1063 if(newmap->cells[x][y].count >= MAP_LAYERS) { 1301 if (newmap->cells[x][y].count >= MAP_LAYERS)
1302 {
1064 LOG(llevError,"Too many faces in map cell %d %d\n",x,y); 1303 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1065 return; 1304 return;
1066 abort(); 1305 abort ();
1067 } 1306 }
1068 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1307 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1069 newmap->cells[x][y].count ++; 1308 newmap->cells[x][y].count++;
1070 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1309 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1071 esrv_send_face(ns,face_num,0); 1310 esrv_send_face (ns, face_num, 0);
1072} 1311}
1073 1312
1074struct LayerCell { 1313struct LayerCell
1314{
1075 uint16 xy; 1315 uint16 xy;
1076 short face; 1316 short face;
1077}; 1317};
1078 1318
1079struct MapLayer { 1319struct MapLayer
1320{
1080 int count; 1321 int count;
1081 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1322 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1082}; 1323};
1083 1324
1084/** Checkes if map cells have changed */ 1325/** Checkes if map cells have changed */
1326static int
1085static int mapcellchanged(NewSocket *ns,int i,int j, struct Map *newmap) 1327mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap)
1086{ 1328{
1087 int k; 1329 int k;
1088 1330
1089 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1331 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1090 return 1; 1332 return 1;
1091 for(k=0;k<newmap->cells[i][j].count;k++) { 1333 for (k = 0; k < newmap->cells[i][j].count; k++)
1092 if (ns->lastmap.cells[i][j].faces[k] != 1334 {
1093 newmap->cells[i][j].faces[k]) { 1335 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1336 {
1094 return 1; 1337 return 1;
1095 } 1338 }
1096 } 1339 }
1097 return 0; 1340 return 0;
1098} 1341}
1099 1342
1100/** 1343/**
1101 * Basically, what this does is pack the data into layers. 1344 * 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 1345 * 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 1346 * this data into. we return the end of the data. layers is
1104 * how many layers of data we should back. 1347 * how many layers of data we should back.
1105 */ 1348 */
1349static uint8 *
1106static uint8 *compactlayer(NewSocket *ns, unsigned char *cur, int numlayers, 1350compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1107 struct Map *newmap)
1108{ 1351{
1109 int x,y,k; 1352 int x, y, k;
1110 int face; 1353 int face;
1111 unsigned char *fcur; 1354 unsigned char *fcur;
1112 struct MapLayer layers[MAP_LAYERS]; 1355 struct MapLayer layers[MAP_LAYERS];
1113 1356
1114 for(k = 0;k<MAP_LAYERS;k++) 1357 for (k = 0; k < MAP_LAYERS; k++)
1115 layers[k].count = 0; 1358 layers[k].count = 0;
1116 fcur = cur; 1359 fcur = cur;
1117 for(x=0;x<ns->mapx;x++) { 1360 for (x = 0; x < ns->mapx; x++)
1118 for(y=0;y<ns->mapy;y++) { 1361 {
1362 for (y = 0; y < ns->mapy; y++)
1363 {
1119 if (!mapcellchanged(ns,x,y,newmap)) 1364 if (!mapcellchanged (ns, x, y, newmap))
1120 continue; 1365 continue;
1121 if (newmap->cells[x][y].count == 0) { 1366 if (newmap->cells[x][y].count == 0)
1367 {
1122 *cur = x*ns->mapy+y; /* mark empty space */ 1368 *cur = x * ns->mapy + y; /* mark empty space */
1123 cur++; 1369 cur++;
1124 continue; 1370 continue;
1371 }
1372 for (k = 0; k < newmap->cells[x][y].count; k++)
1373 {
1374 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1375 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1376 layers[k].count++;
1377 }
1378 }
1125 } 1379 }
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. */ 1380 /* If no data, return now. */
1135 if (fcur == cur && layers[0].count == 0) 1381 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; 1382 return cur;
1383 *cur = 255; /* mark end of explicitly cleared cells */
1384 cur++;
1385 /* First pack by layers. */
1386 for (k = 0; k < numlayers; k++)
1387 {
1388 if (layers[k].count == 0)
1389 break; /* once a layer is entirely empty, no layer below it can
1390 have anything in it either */
1391 /* Pack by entries in thie layer */
1392 for (x = 0; x < layers[k].count;)
1393 {
1394 fcur = cur;
1395 *cur = layers[k].lcells[x].face >> 8;
1396 cur++;
1397 *cur = layers[k].lcells[x].face & 0xFF;
1398 cur++;
1399 face = layers[k].lcells[x].face;
1400 /* Now, we back the redundant data into 1 byte xy pairings */
1401 for (y = x; y < layers[k].count; y++)
1402 {
1403 if (layers[k].lcells[y].face == face)
1404 {
1405 *cur = (uint8) layers[k].lcells[y].xy;
1406 cur++;
1407 layers[k].lcells[y].face = -1;
1408 }
1409 }
1410 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1411 /* forward over the now redundant data */
1412 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1413 x++;
1414 }
1415 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1416 }
1417 return cur;
1169} 1418}
1170 1419
1420static void
1171static void esrv_map_doneredraw(NewSocket *ns, struct Map *newmap) 1421esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1172{ 1422{
1173 static long frames,bytes,tbytes,tframes; 1423 static long frames, bytes, tbytes, tframes;
1174 char *cur; 1424 char *cur;
1175 SockList sl; 1425 SockList sl;
1176 1426
1177 1427
1178 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1428 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1179 strcpy((char*)sl.buf,"map "); 1429 strcpy ((char *) sl.buf, "map ");
1180 sl.len=strlen((char*)sl.buf); 1430 sl.len = strlen ((char *) sl.buf);
1181 1431
1182 cur = (char *) compactlayer(ns,(unsigned char*) sl.buf+sl.len,MAP_LAYERS,newmap); 1432 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1183 sl.len=cur-(char*)sl.buf; 1433 sl.len = cur - (char *) sl.buf;
1184 1434
1185/* LOG(llevDebug, "Sending map command.\n");*/ 1435/* LOG(llevDebug, "Sending map command.\n");*/
1186 1436
1187 if (sl.len>( int )strlen("map ") || ns->sent_scroll) { 1437 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1438 {
1188 /* All of this is just accounting stuff */ 1439 /* All of this is just accounting stuff */
1189 if (tframes>100) { 1440 if (tframes > 100)
1190 tframes = tbytes = 0; 1441 tframes = tbytes = 0;
1191 } 1442
1192 tframes++; 1443 tframes++;
1193 frames++; 1444 frames++;
1194 tbytes += sl.len; 1445 tbytes += sl.len;
1195 bytes += sl.len; 1446 bytes += sl.len;
1196 memcpy(&ns->lastmap,newmap,sizeof(struct Map)); 1447 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1197 Send_With_Handling(ns, &sl); 1448 Send_With_Handling (ns, &sl);
1198 ns->sent_scroll = 0; 1449 ns->sent_scroll = 0;
1199 } 1450 }
1451
1200 free(sl.buf); 1452 free (sl.buf);
1201} 1453}
1202 1454
1203 1455
1204/** Clears a map cell */ 1456/** Clears a map cell */
1457static void
1205static void map_clearcell(struct MapCell *cell, int face0, int face1, int face2, int count) 1458map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1206{ 1459{
1207 cell->count=count;
1208 cell->faces[0] = face0; 1460 cell->faces[0] = face0;
1209 cell->faces[1] = face1; 1461 cell->faces[1] = face1;
1210 cell->faces[2] = face2; 1462 cell->faces[2] = face2;
1463 cell->count = count;
1464 cell->stat_hp = 0;
1465 cell->player = 0;
1211} 1466}
1212 1467
1213#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1468#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1214#define MAX_LAYERS 3 1469#define MAX_LAYERS 3
1215 1470
… …
1218 * and saves the space of allocating this in the socket object when we only 1473 * and saves the space of allocating this in the socket object when we only
1219 * need it for this cycle. If the serve is ever threaded, this needs to be 1474 * need it for this cycle. If the serve is ever threaded, this needs to be
1220 * re-examined. 1475 * re-examined.
1221 */ 1476 */
1222 1477
1223static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1478static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1224 1479
1225/** 1480/**
1226 * Returns true if any of the heads for this 1481 * Returns true if any of the heads for this
1227 * space is set. Returns false if all are blank - this is used 1482 * space is set. Returns false if all are blank - this is used
1228 * for empty space checking. 1483 * for empty space checking.
1229 */ 1484 */
1230static inline int have_head(int ax, int ay) { 1485static inline int
1486have_head (int ax, int ay)
1487{
1231 1488
1232 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1489 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1233 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || 1490 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1234 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) return 1;
1235 return 0; 1491 return 1;
1492 return 0;
1236} 1493}
1237 1494
1238/** 1495/**
1239 * check_head is a bit simplistic version of update_space below. 1496 * 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 1497 * 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 1498 * 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 1499 * if needed, and returning 1. If this no data needs to get
1243 * sent, it returns zero. 1500 * sent, it returns zero.
1244 */ 1501 */
1502static int
1245static inline int check_head(SockList *sl, NewSocket *ns, int ax, int ay, int layer) 1503check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer)
1246{ 1504{
1247 short face_num; 1505 short face_num;
1248 1506
1249 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1507 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1250 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1508 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1251 else 1509 else
1252 face_num = 0; 1510 face_num = 0;
1253 1511
1254 if (face_num != ns->lastmap.cells[ax][ay].faces[layer]) { 1512 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1513 {
1255 SockList_AddShort(sl, face_num); 1514 SockList_AddShort (&sl, face_num);
1256 if (face_num && !(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1515 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1257 esrv_send_face(ns, face_num, 0); 1516 esrv_send_face (&ns, face_num, 0);
1258 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1517 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1259 ns->lastmap.cells[ax][ay].faces[layer] = face_num; 1518 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1260 return 1; 1519 return 1;
1261 } 1520 }
1262 1521
1263 return 0; /* No change */ 1522 return 0; /* No change */
1264} 1523}
1265 1524
1266/** 1525/**
1267 * Removes the need to replicate the same code for each layer. 1526 * Removes the need to replicate the same code for each layer.
1268 * this returns true if this space is now in fact different than 1527 * this returns true if this space is now in fact different than
… …
1281 * the map command, where the faces stack up. Sinces that is no longer 1540 * the map command, where the faces stack up. Sinces that is no longer
1282 * the case, it seems to make more sense to have these layer values 1541 * the case, it seems to make more sense to have these layer values
1283 * actually match. 1542 * actually match.
1284 */ 1543 */
1285 1544
1545static int
1286static inline int update_space(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1546update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1287{ 1547{
1288 object *ob, *head; 1548 object *ob, *head;
1289 uint16 face_num; 1549 uint16 face_num;
1290 int bx, by,i; 1550 int bx, by, i;
1291 1551
1292 /* If there is a multipart object stored away, treat that as more important. 1552 /* If there is a multipart object stored away, treat that as more important.
1293 * If not, then do the normal processing. 1553 * If not, then do the normal processing.
1294 */ 1554 */
1295 1555
1296 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1556 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1297 1557
1298 /* Check to see if this head is part of the set of objects 1558 /* Check to see if this head is part of the set of objects
1299 * we would normally send for this space. If so, then 1559 * we would normally send for this space. If so, then
1300 * don't use the head value. We need to do the check 1560 * don't use the head value. We need to do the check
1301 * here and not when setting up the heads[] value for two reasons - 1561 * here and not when setting up the heads[] value for two reasons -
1302 * 1) the heads[] values will get used even if the space is not visible. 1562 * 1) the heads[] values will get used even if the space is not visible.
1303 * 2) its possible the head is not on the same map as a part, and I'd 1563 * 2) its possible the head is not on the same map as a part, and I'd
1304 * rather not need to do the map translation overhead. 1564 * rather not need to do the map translation overhead.
1305 * 3) We need to do some extra checking to make sure that we will 1565 * 3) We need to do some extra checking to make sure that we will
1306 * otherwise send the image as this layer, eg, either it matches 1566 * otherwise send the image as this layer, eg, either it matches
1307 * the head value, or is not multipart. 1567 * the head value, or is not multipart.
1308 */ 1568 */
1309 if (head && !head->more) { 1569 if (head && !head->more)
1570 {
1310 for (i=0; i<MAP_LAYERS; i++) { 1571 for (i = 0; i < MAP_LAYERS; i++)
1572 {
1311 ob = GET_MAP_FACE_OBJ(mp, mx, my, i); 1573 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1312 if (!ob) continue; 1574 if (!ob)
1575 continue;
1313 1576
1314 if (ob->head) ob=ob->head; 1577 if (ob->head)
1578 ob = ob->head;
1315 1579
1316 if (ob == head) { 1580 if (ob == head)
1581 {
1317 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; 1582 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1318 head = NULL; 1583 head = NULL;
1319 break; 1584 break;
1585 }
1586 }
1320 } 1587 }
1321 }
1322 }
1323 1588
1324 ob = head; 1589 ob = head;
1590 if (!ob)
1325 if (!ob) ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1591 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1326 1592
1327 /* If there is no object for this space, or if the face for the object 1593 /* If there is no object for this space, or if the face for the object
1328 * is the blank face, set the face number to zero. 1594 * is the blank face, set the face number to zero.
1329 * else if we have the stored head object for this space, that takes 1595 * else if we have the stored head object for this space, that takes
1330 * precedence over the other object for this space. 1596 * precedence over the other object for this space.
1331 * otherwise, we do special head processing 1597 * otherwise, we do special head processing
1332 */ 1598 */
1333 if (!ob || ob->face == blank_face) face_num=0; 1599 if (!ob || ob->face == blank_face)
1600 face_num = 0;
1334 else if (head){ 1601 else if (head)
1602 {
1335 /* if this is a head that had previously been stored */ 1603 /* if this is a head that had previously been stored */
1336 face_num = ob->face->number; 1604 face_num = ob->face->number;
1337 } else { 1605 }
1606 else
1607 {
1338 /* if the faces for the different parts of a multipart object 1608 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most 1609 * are the same, we only want to send the bottom right most
1340 * portion of the object. That info is in the tail_.. values 1610 * portion of the object. That info is in the tail_.. values
1341 * of the head. Note that for the head itself, ob->head will 1611 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on 1612 * be null, so we only do this block if we are working on
1343 * a tail piece. 1613 * a tail piece.
1344 */ 1614 */
1345 1615
1346 /* tail_x and tail_y will only be set in the head object. If 1616 /* tail_x and tail_y will only be set in the head object. If
1347 * this is the head object and these are set, we proceed 1617 * this is the head object and these are set, we proceed
1348 * with logic to only send bottom right. Similarly, if 1618 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values 1619 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where 1620 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just 1621 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all 1622 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display. 1623 * object we may want to display.
1354 */ 1624 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) || 1625 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356 (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) { 1626 {
1357 1627
1358 if (ob->head) head = ob->head; 1628 if (ob->head)
1359 else head = ob; 1629 head = ob->head;
1630 else
1631 head = ob;
1360 1632
1361 /* Basically figure out where the offset is from where we are right 1633 /* Basically figure out where the offset is from where we are right
1362 * now. the ob->arch->clone.{x,y} values hold the offset that this current 1634 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1363 * piece is from the head, and the tail is where the tail is from the 1635 * piece is from the head, and the tail is where the tail is from the
1364 * head. Note that bx and by will equal sx and sy if we are already working 1636 * head. Note that bx and by will equal sx and sy if we are already working
1365 * on the bottom right corner. If ob is the head, the clone values 1637 * on the bottom right corner. If ob is the head, the clone values
1366 * will be zero, so the right thing will still happen. 1638 * will be zero, so the right thing will still happen.
1367 */ 1639 */
1368 bx = sx + head->arch->tail_x - ob->arch->clone.x; 1640 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1369 by = sy + head->arch->tail_y - ob->arch->clone.y; 1641 by = sy + head->arch->tail_y - ob->arch->clone.y;
1370 1642
1371 /* I don't think this can ever happen, but better to check for it just 1643 /* I don't think this can ever happen, but better to check for it just
1372 * in case. 1644 * in case.
1373 */ 1645 */
1374 if (bx < sx || by < sy) { 1646 if (bx < sx || by < sy)
1647 {
1375 LOG(llevError,"update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", 1648 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1376 bx, by, sx, sy); 1649 face_num = 0;
1377 face_num = 0; 1650 }
1378 }
1379 /* single part object, multipart object with non merged faces, 1651 /* single part object, multipart object with non merged faces,
1380 * of multipart object already at lower right. 1652 * of multipart object already at lower right.
1381 */ 1653 */
1382 else if (bx == sx && by == sy) { 1654 else if (bx == sx && by == sy)
1655 {
1383 face_num = ob->face->number; 1656 face_num = ob->face->number;
1384 1657
1385 /* if this face matches one stored away, clear that one away. 1658 /* if this face matches one stored away, clear that one away.
1386 * this code relies on the fact that the map1 commands 1659 * this code relies on the fact that the map1 commands
1387 * goes from 2 down to 0. 1660 * goes from 2 down to 0.
1388 */ 1661 */
1389 for (i=0; i<MAP_LAYERS; i++) 1662 for (i = 0; i < MAP_LAYERS; i++)
1390 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1663 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1391 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1664 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1392 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1665 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1393 } 1666 }
1394 else { 1667 else
1668 {
1395 /* If this head is stored away, clear it - otherwise, 1669 /* If this head is stored away, clear it - otherwise,
1396 * there can be cases where a object is on multiple layers - 1670 * there can be cases where a object is on multiple layers -
1397 * we only want to send it once. 1671 * we only want to send it once.
1398 */ 1672 */
1399 face_num = head->face->number; 1673 face_num = head->face->number;
1400 for (i=0; i<MAP_LAYERS; i++) 1674 for (i = 0; i < MAP_LAYERS; i++)
1401 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1675 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1402 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1676 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1403 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1677 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1404 1678
1405 /* First, try to put the new head on the same layer. If that is used up, 1679 /* First, try to put the new head on the same layer. If that is used up,
1406 * then find another layer. 1680 * then find another layer.
1407 */ 1681 */
1408 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) { 1682 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1683 {
1409 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; 1684 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1410 } else for (i=0; i<MAX_LAYERS; i++) { 1685 }
1686 else
1687 for (i = 0; i < MAX_LAYERS; i++)
1688 {
1411 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || 1689 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1412 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) { 1690 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1691 {
1413 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; 1692 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1414 } 1693 }
1415 } 1694 }
1416 face_num = 0; /* Don't send this object - we'll send the head later */ 1695 face_num = 0; /* Don't send this object - we'll send the head later */
1417 } 1696 }
1418 } else { 1697 }
1698 else
1699 {
1419 /* In this case, we are already at the lower right or single part object, 1700 /* In this case, we are already at the lower right or single part object,
1420 * so nothing special 1701 * so nothing special
1421 */ 1702 */
1422 face_num = ob->face->number; 1703 face_num = ob->face->number;
1423 1704
1424 /* clear out any head entries that have the same face as this one */ 1705 /* clear out any head entries that have the same face as this one */
1425 for (bx=0; bx<layer; bx++) 1706 for (bx = 0; bx < layer; bx++)
1426 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1707 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1427 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1708 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1428 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1709 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1429 } 1710 }
1430 } /* else not already head object or blank face */ 1711 } /* else not already head object or blank face */
1431 1712
1432 /* This is a real hack. Basically, if we have nothing to send for this layer, 1713 /* This is a real hack. Basically, if we have nothing to send for this layer,
1433 * but there is a head on the next layer, send that instead. 1714 * but there is a head on the next layer, send that instead.
1434 * Without this, what happens is you can get the case where the player stands 1715 * Without this, what happens is you can get the case where the player stands
1435 * on the same space as the head. However, if you have overlapping big objects 1716 * on the same space as the head. However, if you have overlapping big objects
1436 * of the same type, what happens then is it doesn't think it needs to send 1717 * of the same type, what happens then is it doesn't think it needs to send
1437 * This tends to make stacking also work/look better. 1718 * This tends to make stacking also work/look better.
1438 */ 1719 */
1439 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]) { 1720 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1721 {
1440 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]->face->number; 1722 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1441 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1] = NULL; 1723 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1442 } 1724 }
1443 1725
1444 /* Another hack - because of heads and whatnot, this face may match one 1726 /* Another hack - because of heads and whatnot, this face may match one
1445 * we already sent for a lower layer. In that case, don't send 1727 * we already sent for a lower layer. In that case, don't send
1446 * this one. 1728 * this one.
1447 */ 1729 */
1448 if (face_num && layer+1<MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer+1] == face_num) { 1730 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1449 face_num = 0;
1450 } 1731 {
1732 face_num = 0;
1733 }
1451 1734
1452 /* We've gotten what face we want to use for the object. Now see if 1735 /* We've gotten what face we want to use for the object. Now see if
1453 * if it has changed since we last sent it to the client. 1736 * if it has changed since we last sent it to the client.
1454 */ 1737 */
1455 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) { 1738 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num)
1739 {
1456 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1740 ns->lastmap.cells[sx][sy].faces[layer] = face_num;
1457 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1741 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1458 esrv_send_face(ns, face_num, 0); 1742 esrv_send_face (ns, face_num, 0);
1459 SockList_AddShort(sl, face_num); 1743 SockList_AddShort (sl, face_num);
1460 return 1; 1744 return 1;
1461 } 1745 }
1462 /* Nothing changed */ 1746 /* Nothing changed */
1463 return 0; 1747 return 0;
1464} 1748}
1465 1749
1466/** 1750/**
1467 * This function is mainly a copy of update_space, 1751 * This function is mainly a copy of update_space,
1468 * except it handles update of the smoothing updates, 1752 * except it handles update of the smoothing updates,
… …
1480 * layer is the layer to update, with 2 being the floor and 0 the 1764 * layer is the layer to update, with 2 being the floor and 0 the
1481 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1765 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1482 * take. 1766 * take.
1483 */ 1767 */
1484 1768
1769static inline int
1485static inline int update_smooth(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1770update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1486{ 1771{
1487 object *ob; 1772 object *ob;
1488 int smoothlevel; /* old face_num;*/ 1773 int smoothlevel; /* old face_num; */
1489 1774
1490 ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1775 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1491 1776
1492 /* If there is no object for this space, or if the face for the object 1777 /* If there is no object for this space, or if the face for the object
1493 * is the blank face, set the smoothlevel to zero. 1778 * is the blank face, set the smoothlevel to zero.
1494 */ 1779 */
1495 if (!ob || ob->face == blank_face || MAP_NOSMOOTH(mp)) smoothlevel=0; 1780 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1781 smoothlevel = 0;
1496 else { 1782 else
1783 {
1497 smoothlevel = ob->smoothlevel; 1784 smoothlevel = ob->smoothlevel;
1498 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1785 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1499 SendSmooth(ns, ob->face->number); 1786 SendSmooth (ns, ob->face->number);
1500 } /* else not already head object or blank face */ 1787 } /* else not already head object or blank face */
1501 1788
1502 /* We've gotten what face we want to use for the object. Now see if 1789 /* We've gotten what face we want to use for the object. Now see if
1503 * if it has changed since we last sent it to the client. 1790 * if it has changed since we last sent it to the client.
1504 */ 1791 */
1505 if (smoothlevel>255) 1792 if (smoothlevel > 255)
1506 smoothlevel=255; 1793 smoothlevel = 255;
1507 else if (smoothlevel<0) 1794 else if (smoothlevel < 0)
1508 smoothlevel=0; 1795 smoothlevel = 0;
1509 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) { 1796 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1797 {
1510 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1798 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1511 SockList_AddChar(sl, (uint8) (smoothlevel&0xFF)); 1799 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF));
1512 return 1; 1800 return 1;
1513 } 1801 }
1514 /* Nothing changed */ 1802 /* Nothing changed */
1515 return 0; 1803 return 0;
1516} 1804}
1517 1805
1518/** 1806/**
1519 * Returns the size of a data for a map square as returned by 1807 * Returns the size of a data for a map square as returned by
1520 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1808 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1521 * available. 1809 * available.
1522 */ 1810 */
1811int
1523int getExtendedMapInfoSize(NewSocket* ns){ 1812getExtendedMapInfoSize (NewSocket * ns)
1813{
1524 int result=0; 1814 int result = 0;
1815
1525 if (ns->ext_mapinfos){ 1816 if (ns->ext_mapinfos)
1817 {
1526 if (ns->EMI_smooth) 1818 if (ns->EMI_smooth)
1527 result+=1; /*One byte for smoothlevel*/ 1819 result += 1; /*One byte for smoothlevel */
1528 } 1820 }
1529 return result; 1821 return result;
1530} 1822}
1823
1531/** 1824/**
1532 * This function uses the new map1 protocol command to send the map 1825 * This function uses the new map1 protocol command to send the map
1533 * to the client. It is necessary because the old map command supports 1826 * to the client. It is necessary because the old map command supports
1534 * a maximum map size of 15x15. 1827 * a maximum map size of 15x15.
1535 * This function is much simpler than the old one. This is because 1828 * This function is much simpler than the old one. This is because
… …
1548 * we use the count value to hold the darkness value. If -1, then this space 1841 * we use the count value to hold the darkness value. If -1, then this space
1549 * is not viewable. 1842 * is not viewable.
1550 * we use faces[0] faces[1] faces[2] to hold what the three layers 1843 * we use faces[0] faces[1] faces[2] to hold what the three layers
1551 * look like. 1844 * look like.
1552 */ 1845 */
1846void
1553void draw_client_map1(object *pl) 1847draw_client_map1 (object *pl)
1554{ 1848{
1555 int x,y,ax, ay, d, startlen, max_x, max_y, oldlen; 1849 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1556 sint16 nx, ny; 1850 sint16 nx, ny;
1557 int estartlen, eoldlen; 1851 int estartlen, eoldlen;
1558 SockList sl; 1852 SockList sl;
1559 SockList esl; /*For extended Map info*/ 1853 SockList esl; /*For extended Map info */
1560 uint16 mask,emask; 1854 uint16 mask, emask;
1561 uint8 eentrysize; 1855 uint8 eentrysize;
1562 uint16 ewhatstart,ewhatflag; 1856 uint16 ewhatstart, ewhatflag;
1563 uint8 extendedinfos; 1857 uint8 extendedinfos;
1564 mapstruct *m; 1858 maptile *m;
1565 1859
1860 NewSocket & socket = pl->contr->socket;
1861
1862 check_map_change (pl->contr);
1863
1566 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1864 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1567 if (pl->contr->socket.mapmode == Map1Cmd) 1865 if (socket.mapmode == Map1Cmd)
1568 strcpy((char*)sl.buf,"map1 "); 1866 strcpy ((char *) sl.buf, "map1 ");
1569 else 1867 else
1570 strcpy((char*)sl.buf,"map1a "); 1868 strcpy ((char *) sl.buf, "map1a ");
1571 sl.len=strlen((char*)sl.buf); 1869 sl.len = strlen ((char *) sl.buf);
1572 startlen = sl.len; 1870 startlen = sl.len;
1573 /*Extendedmapinfo structure initialisation*/ 1871 /*Extendedmapinfo structure initialisation */
1574 if (pl->contr->socket.ext_mapinfos){ 1872 if (socket.ext_mapinfos)
1873 {
1575 esl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1874 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1576 strcpy((char*)esl.buf,"mapextended "); 1875 strcpy ((char *) esl.buf, "mapextended ");
1577 esl.len=strlen((char*)esl.buf); 1876 esl.len = strlen ((char *) esl.buf);
1578 extendedinfos=EMI_NOREDRAW; 1877 extendedinfos = EMI_NOREDRAW;
1579 if (pl->contr->socket.EMI_smooth) 1878 if (socket.EMI_smooth)
1580 extendedinfos|=EMI_SMOOTH; 1879 extendedinfos |= EMI_SMOOTH;
1581 ewhatstart=esl.len; 1880 ewhatstart = esl.len;
1582 ewhatflag=extendedinfos; /*The EMI_NOREDRAW bit 1881 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1583 could need to be taken away*/ 1882 could need to be taken away */
1584 SockList_AddChar(&esl, extendedinfos); 1883 SockList_AddChar (&esl, extendedinfos);
1585 eentrysize=getExtendedMapInfoSize(&(pl->contr->socket)); 1884 eentrysize = getExtendedMapInfoSize (&socket);
1586 SockList_AddChar(&esl, eentrysize); 1885 SockList_AddChar (&esl, eentrysize);
1587 estartlen = esl.len; 1886 estartlen = esl.len;
1588 } else { 1887 }
1888 else
1889 {
1589 /* suppress compiler warnings */ 1890 /* suppress compiler warnings */
1590 ewhatstart = 0; 1891 ewhatstart = 0;
1591 ewhatflag = 0; 1892 ewhatflag = 0;
1592 estartlen = 0; 1893 estartlen = 0;
1593 } 1894 }
1594 /* Init data to zero */ 1895 /* Init data to zero */
1595 memset(heads, 0, sizeof(object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1896 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1596 1897
1597 /* x,y are the real map locations. ax, ay are viewport relative 1898 /* x,y are the real map locations. ax, ay are viewport relative
1598 * locations. 1899 * locations.
1599 */ 1900 */
1600 ay=0; 1901 ay = 0;
1601 1902
1602 /* We could do this logic as conditionals in the if statement, 1903 /* We could do this logic as conditionals in the if statement,
1603 * but that started to get a bit messy to look at. 1904 * but that started to get a bit messy to look at.
1604 */ 1905 */
1605 max_x = pl->x+(pl->contr->socket.mapx+1)/2; 1906 max_x = pl->x + (socket.mapx + 1) / 2;
1606 max_y = pl->y+(pl->contr->socket.mapy+1)/2; 1907 max_y = pl->y + (socket.mapy + 1) / 2;
1607 if (pl->contr->socket.mapmode == Map1aCmd) { 1908 if (socket.mapmode == Map1aCmd)
1909 {
1608 max_x += MAX_HEAD_OFFSET; 1910 max_x += MAX_HEAD_OFFSET;
1609 max_y += MAX_HEAD_OFFSET; 1911 max_y += MAX_HEAD_OFFSET;
1912 }
1913
1914 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1610 } 1915 {
1916 ax = 0;
1917 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1918 {
1611 1919
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; 1920 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1617 1921
1618 /* If this space is out of the normal viewable area, we only check 1922 /* If this space is out of the normal viewable area, we only check
1619 * the heads value ax or ay will only be greater than what 1923 * the heads value ax or ay will only be greater than what
1620 * the client wants if using the map1a command - this is because 1924 * 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 1925 * if the map1a command is not used, max_x and max_y will be
1622 * set to lower values. 1926 * set to lower values.
1623 */ 1927 */
1624 if (ax >= pl->contr->socket.mapx || ay >= pl->contr->socket.mapy) { 1928 if (ax >= socket.mapx || ay >= socket.mapy)
1625 int i, got_one; 1929 {
1930 int i, got_one;
1626 1931
1627 oldlen = sl.len; 1932 oldlen = sl.len;
1628 1933
1629
1630 SockList_AddShort(&sl, mask); 1934 SockList_AddShort (&sl, mask);
1631 1935
1632 if (check_head(&sl, &pl->contr->socket, ax, ay, 2)) 1936 if (check_head (sl, socket, ax, ay, 2))
1633 mask |= 0x4; 1937 mask |= 0x4;
1634 if (check_head(&sl, &pl->contr->socket, ax, ay, 1)) 1938 if (check_head (sl, socket, ax, ay, 1))
1635 mask |= 0x2; 1939 mask |= 0x2;
1636 if (check_head(&sl, &pl->contr->socket, ax, ay, 0)) 1940 if (check_head (sl, socket, ax, ay, 0))
1637 mask |= 0x1; 1941 mask |= 0x1;
1638 1942
1639 /* If all we are doing is sending 0 (blank) faces, we don't 1943 /* If all we are doing is sending 0 (blank) faces, we don't
1640 * actually need to send that - just the coordinates 1944 * actually need to send that - just the coordinates
1641 * with no faces tells the client to blank out the 1945 * with no faces tells the client to blank out the
1642 * space. 1946 * space.
1643 */ 1947 */
1644 got_one=0; 1948 got_one = 0;
1645 for (i=oldlen+2; i<sl.len; i++) { 1949 for (i = oldlen + 2; i < sl.len; i++)
1646 if (sl.buf[i]) got_one=1; 1950 {
1647 } 1951 if (sl.buf[i])
1952 got_one = 1;
1953 }
1648 1954
1649 if (got_one && (mask & 0xf)) { 1955 if (got_one && (mask & 0xf))
1956 {
1650 sl.buf[oldlen+1] = mask & 0xff; 1957 sl.buf[oldlen + 1] = mask & 0xff;
1651 } else { /*either all faces blank, either no face at all*/ 1958 }
1652 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates*/
1653 sl.len = oldlen + 2;
1654 else 1959 else
1960 { /*either all faces blank, either no face at all */
1961 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1962 sl.len = oldlen + 2;
1963 else
1964 sl.len = oldlen;
1965 }
1966 /*What concerns extendinfos, nothing to be done for now
1967 * (perhaps effects layer later)
1968 */
1969 continue; /* don't do processing below */
1970 }
1971
1972 MapCell & lastcell = socket.lastmap.cells[ax][ay];
1973
1974 d = pl->contr->blocked_los[ax][ay];
1975
1976 /* If the coordinates are not valid, or it is too dark to see,
1977 * we tell the client as such
1978 */
1979 nx = x;
1980 ny = y;
1981 m = get_map_from_coord (pl->map, &nx, &ny);
1982 if (!m)
1983 {
1984 /* space is out of map. Update space and clear values
1985 * if this hasn't already been done. If the space is out
1986 * of the map, it shouldn't have a head
1987 */
1988 if (lastcell.count != -1)
1989 {
1990 SockList_AddShort (&sl, mask);
1991 map_clearcell (&lastcell, 0, 0, 0, -1);
1992 }
1993 }
1994 else if (d > 3)
1995 {
1996 int need_send = 0, count;
1997
1998 /* This block deals with spaces that are not visible for whatever
1999 * reason. Still may need to send the head for this space.
2000 */
2001
2002 oldlen = sl.len;
2003
2004 SockList_AddShort (&sl, mask);
2005 if (lastcell.count != -1)
2006 need_send = 1;
2007 count = -1;
2008
2009 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2010 {
2011 /* Now check to see if any heads need to be sent */
2012
2013 if (check_head (sl, socket, ax, ay, 2))
2014 mask |= 0x4;
2015 if (check_head (sl, socket, ax, ay, 1))
2016 mask |= 0x2;
2017 if (check_head (sl, socket, ax, ay, 0))
2018 mask |= 0x1;
2019
2020 lastcell.count = count;
2021
2022 }
2023 else
2024 {
2025 struct MapCell *cell = &lastcell;
2026
2027 /* properly clear a previously sent big face */
2028 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0)
2029 need_send = 1;
2030 map_clearcell (&lastcell, 0, 0, 0, count);
2031 }
2032
2033 if ((mask & 0xf) || need_send)
2034 {
2035 sl.buf[oldlen + 1] = mask & 0xff;
2036 }
2037 else
2038 {
1655 sl.len = oldlen; 2039 sl.len = oldlen;
1656 } 2040 }
1657 /*What concerns extendinfos, nothing to be done for now 2041 }
1658 * (perhaps effects layer later) 2042 else
1659 */ 2043 {
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 2044 /* In this block, the space is visible or there are head objects
1735 * we need to send. 2045 * we need to send.
1736 */ 2046 */
1737 2047
1738 /* Rather than try to figure out what everything that we might 2048 /* Rather than try to figure out what everything that we might
1739 * need to send is, then form the packet after that, 2049 * need to send is, then form the packet after that,
1740 * we presume that we will in fact form a packet, and update 2050 * 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, 2051 * 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 2052 * we just back out sl.len to the old value, and no harm
1743 * is done. 2053 * is done.
1744 * I think this is simpler than doing a bunch of checks to see 2054 * 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 2055 * what if anything we need to send, setting the bits, then
1746 * doing those checks again to add the real data. 2056 * doing those checks again to add the real data.
1747 */ 2057 */
1748 oldlen = sl.len; 2058 oldlen = sl.len;
1749 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2059 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1750 eoldlen = esl.len; 2060 eoldlen = esl.len;
1751 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2061 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1752 SockList_AddShort(&sl, mask); 2062 SockList_AddShort (&sl, mask);
1753 2063
1754 if (pl->contr->socket.ext_mapinfos) 2064 if (socket.ext_mapinfos)
1755 SockList_AddShort(&esl, emask); 2065 SockList_AddShort (&esl, emask);
1756 2066
1757 /* Darkness changed */ 2067 unsigned char dummy;
1758 if (pl->contr->socket.lastmap.cells[ax][ay].count != d && pl->contr->socket.darkness) { 2068 unsigned char *last_ext = &dummy;
1759 pl->contr->socket.lastmap.cells[ax][ay].count = d;
1760 mask |= 0x8; /* darkness bit */
1761 2069
1762 /* Protocol defines 255 full bright, 0 full dark. 2070 /* Darkness changed */
1763 * We currently don't have that many darkness ranges, 2071 if (lastcell.count != d && socket.darkness)
1764 * so we current what limited values we do have. 2072 {
1765 */ 2073 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 2074
1779 /* Floor face */ 2075 if (socket.extmap)
2076 {
2077 *last_ext |= 0x80;
2078 last_ext = sl.buf + sl.len;
2079 SockList_AddChar (&sl, d);
2080 }
2081 else
2082 SockList_AddChar (&sl, 255 - 64 * d);
2083 }
2084
2085 lastcell.count = d;
2086
2087 if (socket.extmap)
2088 {
2089 uint8 stat_hp = 0;
2090 uint8 stat_width = 0;
2091 tag_t player = 0;
2092
2093 // send hp information, if applicable
2094 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2095 {
2096 if (op->head || op->invisible)
2097 ; // do not show
2098 else if (op->type == PLAYER
2099 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
2100 {
2101 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
2102 {
2103 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2104 stat_width = op->arch->tail_x;
2105 }
2106 }
2107
2108 if (op->type == PLAYER && op != pl)
2109 player = op->count;
2110 }
2111
2112 if (lastcell.stat_hp != stat_hp)
2113 {
2114 lastcell.stat_hp = stat_hp;
2115
2116 mask |= 0x8;
2117 *last_ext |= 0x80;
2118 last_ext = sl.buf + sl.len;
2119 SockList_AddChar (&sl, 5);
2120 SockList_AddChar (&sl, stat_hp);
2121
2122 if (stat_width > 1)
2123 {
2124 *last_ext |= 0x80;
2125 last_ext = sl.buf + sl.len;
2126 SockList_AddChar (&sl, 6);
2127 SockList_AddChar (&sl, stat_width);
2128 }
2129 }
2130
2131 if (lastcell.player != player)
2132 {
2133 lastcell.player = player;
2134
2135 mask |= 0x8;
2136 *last_ext |= 0x80;
2137 last_ext = sl.buf + sl.len;
2138 SockList_AddChar (&sl, 0x47);
2139 SockList_AddChar (&sl, 4);
2140 SockList_AddInt (&sl, player);
2141 }
2142 }
2143
2144 /* Floor face */
1780 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 2)) 2145 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2))
1781 mask |= 0x4; 2146 mask |= 0x4;
1782 2147
1783 if (pl->contr->socket.EMI_smooth) 2148 if (socket.EMI_smooth)
1784 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 2)){ 2149 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2))
1785 emask |= 0x4; 2150 emask |= 0x4;
1786 }
1787 2151
1788 /* Middle face */ 2152 /* Middle face */
1789 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 1)) 2153 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1))
1790 mask |= 0x2; 2154 mask |= 0x2;
1791 2155
1792 if (pl->contr->socket.EMI_smooth) 2156 if (socket.EMI_smooth)
1793 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 1)){ 2157 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1))
1794 emask |= 0x2; 2158 emask |= 0x2;
1795 }
1796 2159
1797
1798 if(nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) { 2160 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) { 2161 {
1800 pl->contr->socket.lastmap.cells[ax][ay].faces[0] = pl->face->number; 2162 if (lastcell.faces[0] != pl->face->number)
1801 mask |= 0x1; 2163 {
2164 lastcell.faces[0] = pl->face->number;
2165 mask |= 0x1;
1802 if (!(pl->contr->socket.faces_sent[pl->face->number] &NS_FACESENT_FACE)) 2166 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1803 esrv_send_face(&pl->contr->socket, pl->face->number, 0); 2167 esrv_send_face (&socket, pl->face->number, 0);
1804 SockList_AddShort(&sl, pl->face->number); 2168 SockList_AddShort (&sl, pl->face->number);
1805 } 2169 }
1806 } 2170 }
1807 /* Top face */ 2171 /* Top face */
1808 else { 2172 else
2173 {
1809 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 0)) 2174 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0))
1810 mask |= 0x1; 2175 mask |= 0x1;
1811 if (pl->contr->socket.EMI_smooth) 2176 if (socket.EMI_smooth)
1812 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 0)){ 2177 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0))
1813 emask |= 0x1; 2178 {
1814 } 2179 emask |= 0x1;
1815 } 2180 }
2181 }
1816 /* Check to see if we are in fact sending anything for this 2182 /* Check to see if we are in fact sending anything for this
1817 * space by checking the mask. If so, update the mask. 2183 * space by checking the mask. If so, update the mask.
1818 * if not, reset the len to that from before adding the mask 2184 * if not, reset the len to that from before adding the mask
1819 * value, so we don't send those bits. 2185 * value, so we don't send those bits.
1820 */ 2186 */
1821 if (mask & 0xf) { 2187 if (mask & 0xf)
2188 {
1822 sl.buf[oldlen+1] = mask & 0xff; 2189 sl.buf[oldlen + 1] = mask & 0xff;
1823 } else { 2190 }
1824 sl.len = oldlen; 2191 else
1825 } 2192 {
1826 if (emask & 0xf) { 2193 sl.len = oldlen;
2194 }
2195 if (emask & 0xf)
2196 {
1827 esl.buf[eoldlen+1] = emask & 0xff; 2197 esl.buf[eoldlen + 1] = emask & 0xff;
1828 } else { 2198 }
1829 esl.len = eoldlen; 2199 else
1830 } 2200 {
2201 esl.len = eoldlen;
2202 }
1831 } /* else this is a viewable space */ 2203 } /* else this is a viewable space */
1832 } /* for x loop */ 2204 } /* for x loop */
1833 } /* for y loop */ 2205 } /* for y loop */
1834 2206
1835 /* Verify that we in fact do need to send this */ 2207 /* Verify that we in fact do need to send this */
1836 if (pl->contr->socket.ext_mapinfos){ 2208 if (socket.ext_mapinfos)
2209 {
1837 if (!(sl.len>startlen || pl->contr->socket.sent_scroll)){ 2210 if (!(sl.len > startlen || socket.sent_scroll))
2211 {
1838 /* No map data will follow, so don't say the client 2212 /* No map data will follow, so don't say the client
1839 * it doesn't need draw! 2213 * it doesn't need draw!
1840 */ 2214 */
1841 ewhatflag&=(~EMI_NOREDRAW); 2215 ewhatflag &= (~EMI_NOREDRAW);
1842 esl.buf[ewhatstart+1] = ewhatflag & 0xff; 2216 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
1843 } 2217 }
2218
1844 if (esl.len>estartlen) { 2219 if (esl.len > estartlen)
1845 Send_With_Handling(&pl->contr->socket, &esl); 2220 Send_With_Handling (&socket, &esl);
1846 } 2221
1847 free(esl.buf); 2222 free (esl.buf);
1848 } 2223 }
2224
1849 if (sl.len>startlen || pl->contr->socket.sent_scroll) { 2225 if (sl.len > startlen || socket.sent_scroll)
1850 Send_With_Handling(&pl->contr->socket, &sl);
1851 pl->contr->socket.sent_scroll = 0;
1852 } 2226 {
2227 Send_With_Handling (&socket, &sl);
2228 socket.sent_scroll = 0;
2229 }
2230
1853 free(sl.buf); 2231 free (sl.buf);
1854
1855 check_map_change (pl->contr);
1856} 2232}
1857 2233
1858/** 2234/**
1859 * Draws client map. 2235 * Draws client map.
1860 */ 2236 */
2237void
1861void draw_client_map(object *pl) 2238draw_client_map (object *pl)
1862{ 2239{
1863 int i,j; 2240 int i, j;
1864 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */ 2241 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1865 New_Face *face,*floor; 2242 New_Face *face, *floor;
1866 New_Face *floor2; 2243 New_Face *floor2;
1867 int d, mflags; 2244 int d, mflags;
1868 struct Map newmap; 2245 struct Map newmap;
1869 mapstruct *m, *pm; 2246 maptile *m, *pm;
1870 2247
1871 if (pl->type != PLAYER) { 2248 if (pl->type != PLAYER)
2249 {
1872 LOG(llevError,"draw_client_map called with non player/non eric-server\n"); 2250 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1873 return; 2251 return;
1874 } 2252 }
1875 2253
1876 if (pl->contr->transport) {
1877 pm = pl->contr->transport->map;
1878 }
1879 else
1880 pm = pl->map; 2254 pm = pl->map;
1881 2255
1882 /* If player is just joining the game, he isn't here yet, so the map 2256 /* If player is just joining the game, he isn't here yet, so the map
1883 * can get swapped out. If so, don't try to send them a map. All will 2257 * can get swapped out. If so, don't try to send them a map. All will
1884 * be OK once they really log in. 2258 * be OK once they really log in.
1885 */ 2259 */
1886 if (pm==NULL || pm->in_memory!=MAP_IN_MEMORY) return; 2260 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2261 return;
1887 2262
1888 memset(&newmap, 0, sizeof(struct Map)); 2263 memset (&newmap, 0, sizeof (struct Map));
1889 2264
1890 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) { 2265 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++)
2266 {
1891 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) { 2267 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++)
1892 ax=i; 2268 {
1893 ay=j; 2269 ax = i;
2270 ay = j;
1894 m = pm; 2271 m = pm;
1895 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay); 2272 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1896 if (mflags & P_OUT_OF_MAP) 2273 if (mflags & P_OUT_OF_MAP)
1897 continue; 2274 continue;
1898 if (mflags & P_NEED_UPDATE) 2275 if (mflags & P_NEED_UPDATE)
1899 update_position(m, ax, ay); 2276 update_position (m, ax, ay);
1900 /* If a map is visible to the player, we don't want to swap it out 2277 /* If a map is visible to the player, we don't want to swap it out
1901 * just to reload it. This should really call something like 2278 * just to reload it. This should really call something like
1902 * swap_map, but this is much more efficient and 'good enough' 2279 * swap_map, but this is much more efficient and 'good enough'
1903 */ 2280 */
1904 if (mflags & P_NEW_MAP) 2281 if (mflags & P_NEW_MAP)
1905 m->timeout = 50; 2282 m->timeout = 50;
1906 } 2283 }
1907 } 2284 }
1908 /* do LOS after calls to update_position */ 2285 /* do LOS after calls to update_position */
1909 if(pl->contr->do_los) { 2286 if (pl->contr->do_los)
2287 {
1910 update_los(pl); 2288 update_los (pl);
1911 pl->contr->do_los = 0; 2289 pl->contr->do_los = 0;
1912 } 2290 }
1913 2291
1914 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) { 2292 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2293 {
1915 /* Big maps need a different drawing mechanism to work */ 2294 /* Big maps need a different drawing mechanism to work */
1916 draw_client_map1(pl); 2295 draw_client_map1 (pl);
1917 return; 2296 return;
1918 }
1919 2297 }
2298
1920 if(pl->invisible & (pl->invisible < 50 ? 4 : 1)) { 2299 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 } 2300 {
2301 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2302 }
1924 2303
1925 /* j and i are the y and x coordinates of the real map (which is 2304 /* j and i are the y and x coordinates of the real map (which is
1926 * basically some number of spaces around the player) 2305 * basically some number of spaces around the player)
1927 * ax and ay are values from within the viewport (ie, 0, 0 is upper 2306 * ax and ay are values from within the viewport (ie, 0, 0 is upper
1928 * left corner) and are thus disconnected from the map values. 2307 * left corner) and are thus disconnected from the map values.
1929 * Subtract 1 from the max values so that we properly handle cases where 2308 * Subtract 1 from the max values so that we properly handle cases where
1930 * player has specified an even map. Otherwise, we try to send them too 2309 * player has specified an even map. Otherwise, we try to send them too
1931 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually 2310 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
1932 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is 2311 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
1933 * odd, this still works fine. 2312 * odd, this still works fine.
1934 */ 2313 */
1935 ay=0; 2314 ay = 0;
1936 for(j=pl->y-pl->contr->socket.mapy/2; j<=pl->y+(pl->contr->socket.mapy-1)/2;j++, ay++) { 2315 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
1937 ax=0; 2316 {
2317 ax = 0;
1938 for(i=pl->x-pl->contr->socket.mapx/2;i<=pl->x+(pl->contr->socket.mapx-1)/2;i++, ax++) { 2318 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2319 {
1939 2320
1940 d = pl->contr->blocked_los[ax][ay]; 2321 d = pl->contr->blocked_los[ax][ay];
1941 /* note the out_of_map and d>3 checks are both within the same 2322 /* note the out_of_map and d>3 checks are both within the same
1942 * negation check. 2323 * negation check.
1943 */ 2324 */
1944 nx = i; 2325 nx = i;
1945 ny = j; 2326 ny = j;
1946 m = get_map_from_coord(pm, &nx, &ny); 2327 m = get_map_from_coord (pm, &nx, &ny);
1947 if (m && d<4) { 2328 if (m && d < 4)
2329 {
1948 face = GET_MAP_FACE(m, nx, ny,0); 2330 face = GET_MAP_FACE (m, nx, ny, 0);
1949 floor2 = GET_MAP_FACE(m, nx, ny,1); 2331 floor2 = GET_MAP_FACE (m, nx, ny, 1);
1950 floor = GET_MAP_FACE(m, nx, ny,2); 2332 floor = GET_MAP_FACE (m, nx, ny, 2);
1951 2333
1952 /* If all is blank, send a blank face. */ 2334 /* If all is blank, send a blank face. */
1953 if ((!face || face == blank_face) && 2335 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
1954 (!floor2 || floor2 == blank_face) && 2336 {
1955 (!floor || floor == blank_face)) { 2337 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
1956 esrv_map_setbelow(&pl->contr->socket,ax,ay, 2338 }
1957 blank_face->number,&newmap); 2339 else
1958 } else { /* actually have something interesting */ 2340 { /* actually have something interesting */
1959 /* send the darkness mask, if any. */ 2341 /* send the darkness mask, if any. */
1960 if (d && pl->contr->socket.darkness) 2342 if (d && pl->contr->socket.darkness)
1961 esrv_map_setbelow(&pl->contr->socket,ax,ay, 2343 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
1962 dark_faces[d-1]->number,&newmap);
1963 2344
1964 if (face && face != blank_face) 2345 if (face && face != blank_face)
1965 esrv_map_setbelow(&pl->contr->socket,ax,ay, 2346 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
1966 face->number,&newmap);
1967 if (floor2 && floor2 != blank_face) 2347 if (floor2 && floor2 != blank_face)
1968 esrv_map_setbelow(&pl->contr->socket,ax,ay, 2348 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
1969 floor2->number,&newmap);
1970 if (floor && floor != blank_face) 2349 if (floor && floor != blank_face)
1971 esrv_map_setbelow(&pl->contr->socket,ax,ay, 2350 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
1972 floor->number,&newmap); 2351 }
1973 } 2352 } /* Is a valid space */
1974 } /* Is a valid space */ 2353 }
1975 }
1976 } 2354 }
1977 esrv_map_doneredraw(&pl->contr->socket, &newmap); 2355 esrv_map_doneredraw (&pl->contr->socket, &newmap);
1978 2356
1979 check_map_change (pl->contr); 2357 check_map_change (pl->contr);
1980} 2358}
1981 2359
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 2360
2038/*****************************************************************************/ 2361/*****************************************************************************/
2362
2039/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 2363/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2364
2040/* a player. Of course, the client need to know the command to be able to */ 2365/* a player. Of course, the client need to know the command to be able to */
2366
2041/* manage it ! */ 2367/* manage it ! */
2368
2042/*****************************************************************************/ 2369/*****************************************************************************/
2370void
2043void send_plugin_custom_message(object *pl, char *buf) 2371send_plugin_custom_message (object *pl, char *buf)
2044{ 2372{
2045 cs_write_string(&pl->contr->socket,buf,strlen(buf)); 2373 cs_write_string (&pl->contr->socket, buf, strlen (buf));
2046} 2374}
2047 2375
2048/** 2376/**
2049 * This sends the skill number to name mapping. We ignore 2377 * This sends the skill number to name mapping. We ignore
2050 * the params - we always send the same info no matter what. 2378 * the params - we always send the same info no matter what.
2051 */ 2379 */
2380void
2052void send_skill_info(NewSocket *ns, char *params) 2381send_skill_info (NewSocket * ns, char *params)
2053{ 2382{
2054 SockList sl; 2383 SockList sl;
2055 int i; 2384 int i;
2056 2385
2057 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2386 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2058 strcpy((char*)sl.buf,"replyinfo skill_info\n"); 2387 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2059 for (i=1; i< NUM_SKILLS; i++) { 2388 for (i = 1; i < NUM_SKILLS; i++)
2389 {
2060 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, 2390 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2061 skill_names[i]);
2062 } 2391 }
2063 sl.len = strlen((char*)sl.buf); 2392 sl.len = strlen ((char *) sl.buf);
2064 if (sl.len >= MAXSOCKBUF) { 2393 if (sl.len >= MAXSOCKBUF)
2394 {
2065 LOG(llevError,"Buffer overflow in send_skill_info!\n"); 2395 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2066 fatal(0); 2396 fatal (0);
2067 } 2397 }
2068 Send_With_Handling(ns, &sl); 2398 Send_With_Handling (ns, &sl);
2069 free(sl.buf); 2399 free (sl.buf);
2070} 2400}
2071 2401
2072/** 2402/**
2073 * This sends the spell path to name mapping. We ignore 2403 * This sends the spell path to name mapping. We ignore
2074 * the params - we always send the same info no matter what. 2404 * the params - we always send the same info no matter what.
2075 */ 2405 */
2406void
2076void send_spell_paths (NewSocket *ns, char *params) { 2407send_spell_paths (NewSocket * ns, char *params)
2408{
2077 SockList sl; 2409 SockList sl;
2078 int i; 2410 int i;
2079 2411
2080 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2412 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2081 strcpy((char*)sl.buf,"replyinfo spell_paths\n"); 2413 strcpy ((char *) sl.buf, "replyinfo spell_paths\n");
2082 for(i=0; i<NRSPELLPATHS; i++) 2414 for (i = 0; i < NRSPELLPATHS; i++)
2083 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]); 2415 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]);
2084 sl.len = strlen((char*)sl.buf); 2416 sl.len = strlen ((char *) sl.buf);
2085 if (sl.len >= MAXSOCKBUF) { 2417 if (sl.len >= MAXSOCKBUF)
2418 {
2086 LOG(llevError,"Buffer overflow in send_spell_paths!\n"); 2419 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2087 fatal(0); 2420 fatal (0);
2088 } 2421 }
2089 Send_With_Handling(ns, &sl); 2422 Send_With_Handling (ns, &sl);
2090 free(sl.buf); 2423 free (sl.buf);
2091} 2424}
2092 2425
2093/** 2426/**
2094 * This looks for any spells the player may have that have changed their stats. 2427 * This looks for any spells the player may have that have changed their stats.
2095 * it then sends an updspell packet for each spell that has changed in this way 2428 * it then sends an updspell packet for each spell that has changed in this way
2096 */ 2429 */
2430void
2097void esrv_update_spells(player *pl) { 2431esrv_update_spells (player *pl)
2432{
2098 SockList sl; 2433 SockList sl;
2099 int flags=0; 2434 int flags = 0;
2100 object *spell; 2435 object *spell;
2436
2101 if (!pl->socket.monitor_spells) return; 2437 if (!pl->socket.monitor_spells)
2438 return;
2102 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2439 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2440 {
2103 if (spell->type == SPELL) { 2441 if (spell->type == SPELL)
2442 {
2104 /* check if we need to update it*/ 2443 /* check if we need to update it */
2105 if (spell->last_sp != SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA)) { 2444 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2445 {
2106 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2446 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2107 flags |= UPD_SP_MANA; 2447 flags |= UPD_SP_MANA;
2108 } 2448 }
2109 if (spell->last_grace != SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE)) { 2449 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2450 {
2110 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2451 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2111 flags |= UPD_SP_GRACE; 2452 flags |= UPD_SP_GRACE;
2112 } 2453 }
2113 if (spell->last_eat != spell->stats.dam+SP_level_dam_adjust(pl->ob, spell)) { 2454 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2455 {
2114 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2456 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2115 flags |= UPD_SP_DAMAGE; 2457 flags |= UPD_SP_DAMAGE;
2458 }
2459 if (flags != 0)
2460 {
2461 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2462 strcpy ((char *) sl.buf, "updspell ");
2463 sl.len = strlen ((char *) sl.buf);
2464 SockList_AddChar (&sl, flags);
2465 SockList_AddInt (&sl, spell->count);
2466 if (flags & UPD_SP_MANA)
2467 SockList_AddShort (&sl, spell->last_sp);
2468 if (flags & UPD_SP_GRACE)
2469 SockList_AddShort (&sl, spell->last_grace);
2470 if (flags & UPD_SP_DAMAGE)
2471 SockList_AddShort (&sl, spell->last_eat);
2472 flags = 0;
2473 Send_With_Handling (&pl->socket, &sl);
2474 free (sl.buf);
2475 }
2476 }
2116 } 2477 }
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} 2478}
2133 2479
2480void
2134void esrv_remove_spell(player *pl, object *spell) { 2481esrv_remove_spell (player *pl, object *spell)
2482{
2135 SockList sl; 2483 SockList sl;
2136 2484
2137 if (!pl->socket.monitor_spells) return; 2485 if (!pl->socket.monitor_spells)
2486 return;
2138 if (!pl || !spell || spell->env != pl->ob) { 2487 if (!pl || !spell || spell->env != pl->ob)
2488 {
2139 LOG(llevError, "Invalid call to esrv_remove_spell"); 2489 LOG (llevError, "Invalid call to esrv_remove_spell");
2140 return; 2490 return;
2141 } 2491 }
2142 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2492 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2143 strcpy((char*)sl.buf,"delspell "); 2493 strcpy ((char *) sl.buf, "delspell ");
2144 sl.len=strlen((char*)sl.buf); 2494 sl.len = strlen ((char *) sl.buf);
2145 SockList_AddInt(&sl, spell->count); 2495 SockList_AddInt (&sl, spell->count);
2146 Send_With_Handling(&pl->socket, &sl); 2496 Send_With_Handling (&pl->socket, &sl);
2147 free(sl.buf); 2497 free (sl.buf);
2148} 2498}
2149 2499
2150/* appends the spell *spell to the Socklist we will send the data to. */ 2500/* appends the spell *spell to the Socklist we will send the data to. */
2501static void
2151static void append_spell (player *pl, SockList *sl, object *spell) { 2502append_spell (player *pl, SockList * sl, object *spell)
2503{
2152 int len, i, skill=0; 2504 int len, i, skill = 0;
2153 2505
2154 if (!(spell->name)) { 2506 if (!(spell->name))
2507 {
2155 LOG(llevError, "item number %d is a spell with no name.\n", spell->count); 2508 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2156 return; 2509 return;
2157 } 2510 }
2158 SockList_AddInt(sl, spell->count); 2511 SockList_AddInt (sl, spell->count);
2159 SockList_AddShort(sl, spell->level); 2512 SockList_AddShort (sl, spell->level);
2160 SockList_AddShort(sl, spell->casting_time); 2513 SockList_AddShort (sl, spell->casting_time);
2161 /* store costs and damage in the object struct, to compare to later */ 2514 /* store costs and damage in the object struct, to compare to later */
2162 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2515 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2163 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2516 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2164 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2517 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2165 /* send the current values */ 2518 /* send the current values */
2166 SockList_AddShort(sl, spell->last_sp); 2519 SockList_AddShort (sl, spell->last_sp);
2167 SockList_AddShort(sl, spell->last_grace); 2520 SockList_AddShort (sl, spell->last_grace);
2168 SockList_AddShort(sl, spell->last_eat); 2521 SockList_AddShort (sl, spell->last_eat);
2169 2522
2170 /* figure out which skill it uses, if it uses one */ 2523 /* figure out which skill it uses, if it uses one */
2171 if (spell->skill) { 2524 if (spell->skill)
2525 {
2172 for (i=1; i< NUM_SKILLS; i++) 2526 for (i = 1; i < NUM_SKILLS; i++)
2173 if (!strcmp(spell->skill, skill_names[i])) { 2527 if (!strcmp (spell->skill, skill_names[i]))
2528 {
2174 skill = i+CS_STAT_SKILLINFO; 2529 skill = i + CS_STAT_SKILLINFO;
2175 break; 2530 break;
2531 }
2176 } 2532 }
2177 }
2178 SockList_AddChar(sl, skill); 2533 SockList_AddChar (sl, skill);
2179 2534
2180 SockList_AddInt(sl, spell->path_attuned); 2535 SockList_AddInt (sl, spell->path_attuned);
2181 SockList_AddInt(sl, (spell->face)?spell->face->number:0); 2536 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0);
2182 2537
2183 len = strlen(spell->name); 2538 len = strlen (spell->name);
2184 SockList_AddChar(sl, (char)len); 2539 SockList_AddChar (sl, (char) len);
2185 memcpy(sl->buf+sl->len, spell->name, len); 2540 memcpy (sl->buf + sl->len, spell->name, len);
2186 sl->len+=len; 2541 sl->len += len;
2187 2542
2188 if (!spell->msg) { 2543 if (!spell->msg)
2544 {
2189 SockList_AddShort(sl, 0); 2545 SockList_AddShort (sl, 0);
2546 }
2547 else
2190 } 2548 {
2191 else {
2192 len = strlen(spell->msg); 2549 len = strlen (spell->msg);
2193 SockList_AddShort(sl, len); 2550 SockList_AddShort (sl, len);
2194 memcpy(sl->buf+sl->len, spell->msg, len); 2551 memcpy (sl->buf + sl->len, spell->msg, len);
2195 sl->len+=len; 2552 sl->len += len;
2196 } 2553 }
2197} 2554}
2198 2555
2199/** 2556/**
2200 * This tells the client to add the spell *ob, if *ob is NULL, then add 2557 * This tells the client to add the spell *ob, if *ob is NULL, then add
2201 * all spells in the player's inventory. 2558 * all spells in the player's inventory.
2202 */ 2559 */
2560void
2203void esrv_add_spells(player *pl, object *spell) { 2561esrv_add_spells (player *pl, object *spell)
2562{
2204 SockList sl; 2563 SockList sl;
2564
2205 if (!pl) { 2565 if (!pl)
2566 {
2206 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2567 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2207 return; 2568 return;
2208 } 2569 }
2209 if (!pl->socket.monitor_spells) return; 2570 if (!pl->socket.monitor_spells)
2571 return;
2210 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2572 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2211 strcpy((char*)sl.buf,"addspell "); 2573 strcpy ((char *) sl.buf, "addspell ");
2212 sl.len=strlen((char*)sl.buf); 2574 sl.len = strlen ((char *) sl.buf);
2213 if (!spell) { 2575 if (!spell)
2576 {
2214 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2577 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2578 {
2215 /* were we to simply keep appending data here, we could exceed 2579 /* were we to simply keep appending data here, we could exceed
2216 * MAXSOCKBUF if the player has enough spells to add, we know that 2580 * MAXSOCKBUF if the player has enough spells to add, we know that
2217 * append_spells will always append 19 data bytes, plus 4 length 2581 * 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 2582 * 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, 2583 * 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, 2584 * 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 2585 * we need to send what we already have, and restart packet formation
2222 */ 2586 */
2223 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 2587 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2224 * to show add_spell is 26 bytes + 2 strings. However, the overun 2588 * to show add_spell is 26 bytes + 2 strings. However, the overun
2225 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2589 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2226 * like it will fix this 2590 * like it will fix this
2227 */ 2591 */
2228 if (spell->type != SPELL) continue; 2592 if (spell->type != SPELL)
2229 if (sl.len >= (MAXSOCKBUF - (26 + strlen(spell->name) + 2593 continue;
2230 (spell->msg?strlen(spell->msg):0)))) { 2594 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2595 {
2231 Send_With_Handling(&pl->socket, &sl); 2596 Send_With_Handling (&pl->socket, &sl);
2232 strcpy((char*)sl.buf,"addspell "); 2597 strcpy ((char *) sl.buf, "addspell ");
2233 sl.len=strlen((char*)sl.buf); 2598 sl.len = strlen ((char *) sl.buf);
2599 }
2600 append_spell (pl, &sl, spell);
2601 }
2234 } 2602 }
2603 else if (spell->type != SPELL)
2604 {
2605 LOG (llevError, "Asked to send a non-spell object as a spell");
2606 return;
2607 }
2608 else
2235 append_spell(pl, &sl, spell); 2609 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) { 2610 if (sl.len >= MAXSOCKBUF)
2611 {
2244 LOG(llevError,"Buffer overflow in esrv_add_spells!\n"); 2612 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2245 fatal(0); 2613 fatal (0);
2246 } 2614 }
2247 /* finally, we can send the packet */ 2615 /* finally, we can send the packet */
2248 Send_With_Handling(&pl->socket, &sl); 2616 Send_With_Handling (&pl->socket, &sl);
2249 free(sl.buf); 2617 free (sl.buf);
2250} 2618}
2251

Diff Legend

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