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.6 by root, Sat Aug 19 03:54:23 2006 UTC vs.
Revision 1.40 by root, Fri Dec 15 04:21:29 2006 UTC

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

Diff Legend

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