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

Diff Legend

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