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.41 by root, Fri Dec 15 19:59:20 2006 UTC

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

Diff Legend

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