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.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.24 by root, Tue Sep 19 22:05:55 2006 UTC

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

Diff Legend

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