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.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.48 by root, Wed Dec 20 11:36:39 2006 UTC

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

Diff Legend

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