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.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.57 by root, Thu Jan 4 00:08:08 2007 UTC

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

Diff Legend

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