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

Diff Legend

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