ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.40 by root, Fri Dec 15 04:21:29 2006 UTC

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

Diff Legend

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