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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.5 by root, Sat Aug 19 02:57:05 2006 UTC vs.
Revision 1.41 by root, Fri Dec 15 19:59:20 2006 UTC

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

Diff Legend

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