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.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.42 by root, Sat Dec 16 03:08:26 2006 UTC

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

Diff Legend

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