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.6 by root, Sat Aug 19 03:54:23 2006 UTC vs.
Revision 1.49 by root, Thu Dec 21 06:12:37 2006 UTC

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

Diff Legend

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