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

Diff Legend

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