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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.43 by root, Sat Dec 16 20:16:37 2006 UTC

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

Diff Legend

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