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.5 by root, Sat Aug 19 02:57:05 2006 UTC vs.
Revision 1.43 by root, Sat Dec 16 20:16:37 2006 UTC

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

Diff Legend

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