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.35 by root, Thu Dec 14 02:37:37 2006 UTC

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

Diff Legend

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