ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.43 by root, Sat Dec 16 20:16:37 2006 UTC

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

Diff Legend

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