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.12 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.52 by root, Sat Dec 23 09:41:55 2006 UTC

1/*
2 * static char *rcsid_init_c =
3 * "$Id: request.C,v 1.12 2006/08/29 08:01:38 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++)
118 {
144 for(y=0; y<my; y++) { 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));
152 }
153 else { 127 else
154 memcpy(&(newmap.cells[x][y]),
155 &(ns->lastmap.cells[x+dx][y+dy]),sizeof(struct MapCell)); 128 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
156 } 129 }
157 }
158 } 130 }
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++)
373 ;
374
338 buf[s++]=0; 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++)
386 ;
387
347 buf[s++]=0; 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);
397
398 if (!strcmp (cmd, "sound"))
354 399 {
355 if (!strcmp(cmd,"sound")) {
356 ns->sound = atoi(param); 400 ns->sound = atoi (param);
357 safe_strcat(cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
358 } 402 }
359 else if (!strcmp(cmd,"exp64")) { 403 else if (!strcmp (cmd, "exp64"))
404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 else if (!strcmp (cmd, "spellmon"))
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);
409 }
362 } else if (!strcmp(cmd, "spellmon")) { 410 else if (!strcmp (cmd, "darkness"))
411 {
363 ns->monitor_spells = atoi(param); 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"))
416 {
417 if (atoi (param))
369 if (atoi(param)) ns->mapmode = Map1Cmd; 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"))
425 {
426 if (atoi (param))
374 if (atoi(param)) ns->mapmode = Map1aCmd; 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);
481
413 if (q<1 || q>2) { 482 if (q < 1 || q > 2)
483 {
414 strcpy(tmpbuf,"FALSE"); 484 strcpy (tmpbuf, "FALSE");
415 } else {
416 ns->itemcmd = q;
417 sprintf(tmpbuf,"%d", ns->itemcmd);
418 } 485 }
419 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
420 } else if (!strcmp(cmd,"mapsize")) {
421 int x, y=0;
422 char tmpbuf[MAX_BUF], *cp;
423
424 x = atoi(param);
425 for (cp = param; *cp!=0; cp++)
426 if (*cp == 'x' || *cp == 'X') {
427 y = atoi(cp+1);
428 break;
429 }
430 if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) {
431 sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
432 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
433 } else { 486 else
487 {
434 ns->mapx = x; 488 ns->itemcmd = q;
435 ns->mapy = y;
436 /* better to send back what we are really using and not the
437 * param as given to us in case it gets parsed differently.
438 */
439 sprintf(tmpbuf,"%dx%d", x,y); 489 sprintf (tmpbuf, "%d", ns->itemcmd);
440 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
441 /* If beyond this size and still using orig map command, need to
442 * go to map1cmd.
443 */
444 if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd;
445 } 490 }
491 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
492 }
493 else if (!strcmp (cmd, "mapsize"))
494 {
495 int x, y = 0;
496 char tmpbuf[MAX_BUF], *cp;
497
498 x = atoi (param);
499 for (cp = param; *cp != 0; cp++)
500 if (*cp == 'x' || *cp == 'X')
501 {
502 y = atoi (cp + 1);
503 break;
504 }
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 }
510 else
511 {
512 ns->mapx = x;
513 ns->mapy = y;
514 /* better to send back what we are really using and not the
515 * param as given to us in case it gets parsed differently.
516 */
517 sprintf (tmpbuf, "%dx%d", x, y);
518 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
519 /* If beyond this size and still using orig map command, need to
520 * go to map1cmd.
521 */
522 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
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);
548 }
464 } else { 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 743 /* Check if there is a count. In theory, a zero count could also be
639 /* The following should never happen with a proper or honest client. 744 * sent, so check for that also.
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 */ 745 */
644 if (pl->state!=ST_PLAYING) { 746 if (atoi (buf) || buf[0] == '0')
645 new_draw_info_format(NDI_UNIQUE, 0,pl->ob, 747 {
646 "You can not issue commands - state is not ST_PLAYING (%s)", buf); 748 pl->count = atoi ((char *) buf);
749
750 buf = strchr (buf, ' '); /* advance beyond the numbers */
751 if (!buf)
647 return; 752 return;
648 } 753
649 /* Check if there is a count. In theory, a zero count could also be
650 * sent, so check for that also.
651 */
652 if (atoi(buf) || buf[0]=='0') {
653 pl->count=atoi((char*)buf);
654 buf=strchr(buf,' '); /* advance beyond the numbers */
655 if (!buf) {
656#ifdef ESRV_DEBUG
657 LOG(llevDebug,"PlayerCmd: Got count but no command.\n");
658#endif
659 return;
660 }
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
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!! ****"); 907 "**** 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 919
920void
874void MapRedrawCmd(char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
875{ 922{
876/* This function is currently disabled; just clearing the map state results in 923/* 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. 924 * display errors. It should clear the cache and send a newmap command.
878 * Unfortunately this solution does not work because some client versions send 925 * Unfortunately this solution does not work because some client versions send
879 * a mapredraw command after receiving a newmap command. 926 * a mapredraw command after receiving a newmap command.
880 */ 927 */
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} 928}
889 929
890/** 930/**
891 * Moves an object (typically, container to inventory). 931 * Moves an object (typically, container to inventory).
892 * syntax is: move (to) (tag) (nrof) 932 * syntax is: move (to) (tag) (nrof)
893 */ 933 */
934void
894void MoveCmd(char *buf, int len,player *pl) 935MoveCmd (char *buf, int len, player *pl)
895{ 936{
896 int vals[3], i; 937 int vals[3], i;
897 938
898 /* A little funky here. We only cycle for 2 records, because 939 /* A little funky here. We only cycle for 2 records, because
899 * we obviously am not going to find a space after the third 940 * we obviously are not going to find a space after the third
900 * record. Perhaps we should just replace this with a 941 * record. Perhaps we should just replace this with a
901 * sscanf? 942 * sscanf?
902 */ 943 */
903 for (i=0; i<2; i++) { 944 for (i = 0; i < 2; i++)
945 {
904 vals[i]=atoi(buf); 946 vals[i] = atoi (buf);
947
905 if (!(buf = strchr(buf, ' '))) { 948 if (!(buf = strchr (buf, ' ')))
949 {
906 LOG(llevError,"Incomplete move command: %s\n", buf); 950 LOG (llevError, "Incomplete move command: %s\n", buf);
907 return; 951 return;
908 } 952 }
953
909 buf++; 954 buf++;
910 } 955 }
956
911 vals[2]=atoi(buf); 957 vals[2] = atoi (buf);
912 958
913/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 959/* 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]); 960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
915} 961}
916
917
918 962
919/****************************************************************************** 963/******************************************************************************
920 * 964 *
921 * Start of commands the server sends to the client. 965 * Start of commands the server sends to the client.
922 * 966 *
… …
924 968
925/** 969/**
926 * Asks the client to query the user. This way, the client knows 970 * 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) 971 * it needs to send something back (vs just printing out a message)
928 */ 972 */
973void
929void send_query(NewSocket *ns, uint8 flags, char *text) 974send_query (client *ns, uint8 flags, char *text)
930{ 975{
931 char buf[MAX_BUF];
932
933 sprintf(buf,"query %d %s", flags, text?text:""); 976 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
934 Write_String_To_Socket(ns, buf, strlen(buf));
935} 977}
936 978
937#define AddIfInt64(Old,New,Type) if (Old != New) {\ 979#define AddIfInt64(Old,New,Type) if (Old != New) {\
938 Old = New; \ 980 Old = New; \
939 SockList_AddChar(&sl, Type); \ 981 sl << uint8 (Type) << uint64 (New); \
940 SockList_AddInt64(&sl, New); \
941 } 982 }
942 983
943#define AddIfInt(Old,New,Type) if (Old != New) {\ 984#define AddIfInt(Old,New,Type) if (Old != New) {\
944 Old = New; \ 985 Old = New; \
945 SockList_AddChar(&sl, Type); \ 986 sl << uint8 (Type) << uint32 (New); \
946 SockList_AddInt(&sl, New); \
947 } 987 }
948 988
949#define AddIfShort(Old,New,Type) if (Old != New) {\ 989#define AddIfShort(Old,New,Type) if (Old != New) {\
950 Old = New; \ 990 Old = New; \
951 SockList_AddChar(&sl, Type); \ 991 sl << uint8 (Type) << uint16 (New); \
952 SockList_AddShort(&sl, New); \
953 } 992 }
954 993
955#define AddIfFloat(Old,New,Type) if (Old != New) {\ 994#define AddIfFloat(Old,New,Type) if (Old != New) {\
956 Old = New; \ 995 Old = New; \
957 SockList_AddChar(&sl, Type); \ 996 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
958 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
959 } 997 }
960 998
961#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 999#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
962 if (Old) free(Old);\
963 Old = strdup_local(New);\ 1000 free(Old); Old = strdup (New);\
964 SockList_AddChar(&sl, Type); \ 1001 sl << uint8 (Type) << data8 (New); \
965 SockList_AddChar(&sl, ( char )strlen(New)); \
966 strcpy((char*)sl.buf + sl.len, New); \
967 sl.len += strlen(New); \
968 } 1002 }
969 1003
970/** 1004/**
971 * Sends a statistics update. We look at the old values, 1005 * Sends a statistics update. We look at the old values,
972 * and only send what has changed. Stat mapping values are in newclient.h 1006 * 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 1007 * Since this gets sent a lot, this is actually one of the few binary
974 * commands for now. 1008 * commands for now.
975 */ 1009 */
1010void
976void esrv_update_stats(player *pl) 1011esrv_update_stats (player *pl)
977{ 1012{
978 SockList sl;
979 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
980 uint16 flags; 1014 uint16 flags;
981 1015
982 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1016 packet sl ("stats");
983 strcpy((char*)sl.buf,"stats "); 1017
984 sl.len=strlen((char*)sl.buf); 1018 if (pl->ob)
985 1019 {
986 if(pl->ob != NULL)
987 {
988 AddIfShort(pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1020 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); 1021 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); 1022 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); 1023 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); 1024 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); 1025 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); 1026 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); 1027 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); 1028 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1029 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1030 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1031 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); 1032 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1001 } 1033 }
1002 if(pl->socket.exp64) { 1034
1003 uint8 s; 1035 for (int s = 0; s < NUM_SKILLS; s++)
1004 for(s=0;s<NUM_SKILLS;s++) {
1005 if (pl->last_skill_ob[s] &&
1006 pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) { 1036 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1007 1037 {
1008 /* Always send along the level if exp changes. This is only 1038 /* Always send along the level if exp changes. This is only
1009 * 1 extra byte, but keeps processing simpler. 1039 * 1 extra byte, but keeps processing simpler.
1010 */ 1040 */
1011 SockList_AddChar(&sl, ( char )( s + CS_STAT_SKILLINFO )); 1041 sl << uint8 (s + CS_STAT_SKILLINFO)
1012 SockList_AddChar(&sl, ( char )pl->last_skill_ob[s]->level); 1042 << uint8 (pl->last_skill_ob[s]->level)
1013 SockList_AddInt64(&sl, pl->last_skill_ob[s]->stats.exp); 1043 << uint64 (pl->last_skill_ob[s]->stats.exp);
1044
1014 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1045 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1015 }
1016 } 1046 }
1017 } 1047
1018 if (pl->socket.exp64) {
1019 AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1048 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); 1049 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1024 AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1050 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); 1051 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); 1052 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1027 AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1053 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1028 AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1054 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); 1055 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); 1056 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1031 flags=0; 1057 flags = 0;
1032 if (pl->fire_on) flags |=SF_FIREON;
1033 if (pl->run_on) flags |= SF_RUNON;
1034 1058
1059 if (pl->fire_on)
1060 flags |= SF_FIREON;
1061
1062 if (pl->run_on)
1063 flags |= SF_RUNON;
1064
1035 AddIfShort(pl->last_flags, flags, CS_STAT_FLAGS); 1065 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1066
1036 if (pl->socket.sc_version<1025) { 1067 if (pl->ns->sc_version < 1025)
1037 AddIfShort(pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1068 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1038 } else { 1069 else
1039 int i;
1040
1041 for (i=0; i<NROFATTACKS; i++) { 1070 for (int i = 0; i < NROFATTACKS; i++)
1071 {
1042 /* Skip ones we won't send */ 1072 /* Skip ones we won't send */
1043 if (atnr_cs_stat[i]==-1) continue; 1073 if (atnr_cs_stat[i] == -1)
1074 continue;
1075
1044 AddIfShort(pl->last_resist[i], pl->ob->resist[i], ( char )atnr_cs_stat[i]); 1076 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1045 } 1077 }
1046 } 1078
1047 if (pl->socket.monitor_spells) { 1079 if (pl->ns->monitor_spells)
1080 {
1048 AddIfInt(pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1081 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); 1082 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); 1083 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1051 } 1084 }
1085
1052 rangetostring(pl->ob, buf); /* we want use the new fire & run system in new client */ 1086 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); 1087 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1054 set_title(pl->ob, buf); 1088 set_title (pl->ob, buf);
1055 AddIfString(pl->socket.stats.title, buf, CS_STAT_TITLE); 1089 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1056 1090
1057 /* Only send it away if we have some actual data */ 1091 /* Only send it away if we have some actual data */
1058 if (sl.len>6) { 1092 if (sl.length () > 6)
1059#ifdef ESRV_DEBUG 1093 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} 1094}
1066
1067 1095
1068/** 1096/**
1069 * Tells the client that here is a player it should start using. 1097 * Tells the client that here is a player it should start using.
1070 */ 1098 */
1099void
1071void esrv_new_player(player *pl, uint32 weight) 1100esrv_new_player (player *pl, uint32 weight)
1072{ 1101{
1073 SockList sl;
1074
1075 pl->last_weight = weight; 1102 pl->last_weight = weight;
1076 1103
1077 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1104 packet sl ("player");
1078 1105
1079 strcpy((char*)sl.buf,"player "); 1106 sl << uint32 (pl->ob->count)
1080 sl.len=strlen((char*)sl.buf); 1107 << uint32 (weight)
1081 SockList_AddInt(&sl, pl->ob->count); 1108 << uint32 (pl->ob->face->number)
1082 SockList_AddInt(&sl, weight); 1109 << data8 (pl->ob->name);
1083 SockList_AddInt(&sl, pl->ob->face->number);
1084 1110
1085 SockList_AddChar(&sl, ( char )strlen(pl->ob->name)); 1111 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); 1112 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1092} 1113}
1093
1094 1114
1095/** 1115/**
1096 * Need to send an animation sequence to the client. 1116 * Need to send an animation sequence to the client.
1097 * We will send appropriate face commands to the client if we haven't 1117 * 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 1118 * 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 1119 * how much we are sending - on the other hand, this should only happen
1100 * when the player logs in and picks stuff up. 1120 * when the player logs in and picks stuff up.
1101 */ 1121 */
1122void
1102void esrv_send_animation(NewSocket *ns, short anim_num) 1123esrv_send_animation (client * ns, short anim_num)
1103{ 1124{
1104 SockList sl;
1105 int i;
1106
1107 /* Do some checking on the anim_num we got. Note that the animations 1125 /* 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 1126 * are added in contigous order, so if the number is in the valid
1109 * range, it must be a valid animation. 1127 * range, it must be a valid animation.
1110 */ 1128 */
1111 if (anim_num < 0 || anim_num > num_animations) { 1129 if (anim_num < 0 || anim_num > num_animations)
1130 {
1112 LOG(llevError,"esrv_send_anim (%d) out of bounds??\n",anim_num); 1131 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1113 return; 1132 return;
1114 } 1133 }
1115 1134
1116 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1135 packet sl ("anim");
1117 strcpy((char*)sl.buf, "anim "); 1136
1118 sl.len=5; 1137 sl << uint16 (anim_num)
1119 SockList_AddShort(&sl, anim_num); 1138 << uint16 (0); /* flags - not used right now */
1120 SockList_AddShort(&sl, 0); /* flags - not used right now */ 1139
1121 /* Build up the list of faces. Also, send any information (ie, the 1140 /* Build up the list of faces. Also, send any information (ie, the
1122 * the face itself) down to the client. 1141 * the face itself) down to the client.
1123 */ 1142 */
1124 for (i=0; i<animations[anim_num].num_animations; i++) { 1143 for (int i = 0; i < animations[anim_num].num_animations; i++)
1144 {
1125 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1145 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1126 esrv_send_face(ns,animations[anim_num].faces[i],0); 1146 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1147
1127 SockList_AddShort(&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1148 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1128 } 1149 }
1129 Send_With_Handling(ns, &sl); 1150
1130 free(sl.buf); 1151 ns->send_packet (sl);
1152
1131 ns->anims_sent[anim_num] = 1; 1153 ns->anims_sent[anim_num] = 1;
1132} 1154}
1133 1155
1134 1156
1135/****************************************************************************** 1157/******************************************************************************
1136 * 1158 *
… …
1140 1162
1141/** 1163/**
1142 * This adds face_num to a map cell at x,y. If the client doesn't have 1164 * 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. 1165 * the face yet, we will also send it.
1144 */ 1166 */
1145static void esrv_map_setbelow(NewSocket *ns, int x,int y, 1167static void
1146 short face_num, struct Map *newmap) 1168esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1147{ 1169{
1148 if(newmap->cells[x][y].count >= MAP_LAYERS) { 1170 if (newmap->cells[x][y].count >= MAP_LAYERS)
1171 {
1172 //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); 1173 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1150 return; 1174 return;
1151 abort(); 1175 abort ();
1152 } 1176 }
1177
1153 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1178 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1154 newmap->cells[x][y].count ++; 1179 newmap->cells[x][y].count++;
1180
1155 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1181 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1156 esrv_send_face(ns,face_num,0); 1182 esrv_send_face (ns, face_num, 0);
1157} 1183}
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 1184
1289/** Clears a map cell */ 1185/** Clears a map cell */
1186static void
1290static void map_clearcell(struct MapCell *cell, int face0, int face1, int face2, int count) 1187map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1291{ 1188{
1292 cell->faces[0] = face0; 1189 cell->faces[0] = face0;
1293 cell->faces[1] = face1; 1190 cell->faces[1] = face1;
1294 cell->faces[2] = face2; 1191 cell->faces[2] = face2;
1295 cell->count = count; 1192 cell->count = count;
1296 cell->stat_hp = 0; 1193 cell->stat_hp = 0;
1194 cell->flags = 0;
1297 cell->player = 0; 1195 cell->player = 0;
1298} 1196}
1299 1197
1300#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1198#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1301#define MAX_LAYERS 3 1199#define MAX_LAYERS 3
1302 1200
1303/* Using a global really isn't a good approach, but saves the over head of 1201/* 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, 1202 * 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 1203 * 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 1204 * need it for this cycle. If the server is ever threaded, this needs to be
1307 * re-examined. 1205 * re-examined.
1308 */ 1206 */
1309
1310static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1207static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1311 1208
1312/** 1209/**
1313 * Returns true if any of the heads for this 1210 * Returns true if any of the heads for this
1314 * space is set. Returns false if all are blank - this is used 1211 * space is set. Returns false if all are blank - this is used
1315 * for empty space checking. 1212 * for empty space checking.
1316 */ 1213 */
1317static inline int have_head(int ax, int ay) { 1214static inline int
1318 1215have_head (int ax, int ay)
1216{
1319 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1217 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1320 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || 1218 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; 1219 return 1;
1220
1221 return 0;
1323} 1222}
1324 1223
1325/** 1224/**
1326 * check_head is a bit simplistic version of update_space below. 1225 * 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 1226 * 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 1227 * 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 1228 * if needed, and returning 1. If this no data needs to get
1330 * sent, it returns zero. 1229 * sent, it returns zero.
1331 */ 1230 */
1231static int
1332static int check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1232check_head (packet &sl, client &ns, int ax, int ay, int layer)
1333{ 1233{
1334 short face_num; 1234 short face_num;
1335 1235
1336 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1236 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1337 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1237 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1338 else 1238 else
1339 face_num = 0; 1239 face_num = 0;
1340 1240
1341 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) { 1241 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1342 SockList_AddShort (&sl, face_num); 1242 {
1243 sl << uint16 (face_num);
1343 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1244 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1344 esrv_send_face (&ns, face_num, 0); 1245 esrv_send_face (&ns, face_num, 0);
1246
1345 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1247 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1346 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1248 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1347 return 1; 1249 return 1;
1348 } 1250 }
1349 1251
1350 return 0; /* No change */ 1252 return 0; /* No change */
1351} 1253}
1352 1254
1353/** 1255/**
1354 * Removes the need to replicate the same code for each layer. 1256 * Removes the need to replicate the same code for each layer.
1355 * this returns true if this space is now in fact different than 1257 * this returns true if this space is now in fact different than
… …
1367 * numbers the spaces differently - I think this was a leftover from 1269 * 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 1270 * 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 1271 * the case, it seems to make more sense to have these layer values
1370 * actually match. 1272 * actually match.
1371 */ 1273 */
1372 1274static int
1373static int update_space(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1275update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1374{ 1276{
1375 object *ob, *head; 1277 object *ob, *head;
1376 uint16 face_num; 1278 uint16 face_num;
1377 int bx, by,i; 1279 int bx, by, i;
1378 1280
1379 /* If there is a multipart object stored away, treat that as more important. 1281 /* If there is a multipart object stored away, treat that as more important.
1380 * If not, then do the normal processing. 1282 * If not, then do the normal processing.
1381 */ 1283 */
1382
1383 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1284 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1384 1285
1385 /* Check to see if this head is part of the set of objects 1286 /* Check to see if this head is part of the set of objects
1386 * we would normally send for this space. If so, then 1287 * we would normally send for this space. If so, then
1387 * don't use the head value. We need to do the check 1288 * 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 - 1289 * 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. 1290 * 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 1291 * 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. 1292 * rather not need to do the map translation overhead.
1392 * 3) We need to do some extra checking to make sure that we will 1293 * 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 1294 * otherwise send the image as this layer, eg, either it matches
1394 * the head value, or is not multipart. 1295 * the head value, or is not multipart.
1395 */ 1296 */
1396 if (head && !head->more) { 1297 if (head && !head->more)
1298 {
1397 for (i=0; i<MAP_LAYERS; i++) { 1299 for (i = 0; i < MAP_LAYERS; i++)
1300 {
1398 ob = GET_MAP_FACE_OBJ(mp, mx, my, i); 1301 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1302 if (!ob)
1399 if (!ob) continue; 1303 continue;
1400 1304
1401 if (ob->head) ob=ob->head; 1305 if (ob->head)
1306 ob = ob->head;
1402 1307
1403 if (ob == head) { 1308 if (ob == head)
1309 {
1404 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; 1310 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1405 head = NULL; 1311 head = NULL;
1406 break; 1312 break;
1407 } 1313 }
1408 } 1314 }
1409 } 1315 }
1410 1316
1411 ob = head; 1317 ob = head;
1318 if (!ob)
1412 if (!ob) ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1319 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1413 1320
1414 /* If there is no object for this space, or if the face for the object 1321 /* 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. 1322 * is the blank face, set the face number to zero.
1416 * else if we have the stored head object for this space, that takes 1323 * else if we have the stored head object for this space, that takes
1417 * precedence over the other object for this space. 1324 * precedence over the other object for this space.
1418 * otherwise, we do special head processing 1325 * otherwise, we do special head processing
1419 */ 1326 */
1420 if (!ob || ob->face == blank_face) face_num=0; 1327 if (!ob || ob->face == blank_face)
1328 face_num = 0;
1421 else if (head){ 1329 else if (head)
1330 {
1422 /* if this is a head that had previously been stored */ 1331 /* if this is a head that had previously been stored */
1423 face_num = ob->face->number; 1332 face_num = ob->face->number;
1424 } else { 1333 }
1334 else
1335 {
1425 /* if the faces for the different parts of a multipart object 1336 /* if the faces for the different parts of a multipart object
1426 * are the same, we only want to send the bottom right most 1337 * are the same, we only want to send the bottom right most
1427 * portion of the object. That info is in the tail_.. values 1338 * portion of the object. That info is in the tail_.. values
1428 * of the head. Note that for the head itself, ob->head will 1339 * 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 1340 * be null, so we only do this block if we are working on
1430 * a tail piece. 1341 * a tail piece.
1431 */ 1342 */
1432 1343
1433 /* tail_x and tail_y will only be set in the head object. If 1344 /* 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 1345 * this is the head object and these are set, we proceed
1435 * with logic to only send bottom right. Similarly, if 1346 * with logic to only send bottom right. Similarly, if
1436 * this is one of the more parts but the head has those values 1347 * 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 1348 * 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 1349 * 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 1350 * can always expect that ob->arch->tail_x will be true for all
1440 * object we may want to display. 1351 * object we may want to display.
1441 */ 1352 */
1442 if ((ob->arch->tail_x || ob->arch->tail_y) || 1353 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))) { 1354 {
1444 1355
1356 if (ob->head)
1445 if (ob->head) head = ob->head; 1357 head = ob->head;
1358 else
1446 else head = ob; 1359 head = ob;
1447 1360
1448 /* Basically figure out where the offset is from where we are right 1361 /* 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 1362 * 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 1363 * 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 1364 * 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 1365 * on the bottom right corner. If ob is the head, the clone values
1453 * will be zero, so the right thing will still happen. 1366 * will be zero, so the right thing will still happen.
1454 */ 1367 */
1455 bx = sx + head->arch->tail_x - ob->arch->clone.x; 1368 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1456 by = sy + head->arch->tail_y - ob->arch->clone.y; 1369 by = sy + head->arch->tail_y - ob->arch->clone.y;
1457 1370
1458 /* I don't think this can ever happen, but better to check for it just 1371 /* I don't think this can ever happen, but better to check for it just
1459 * in case. 1372 * in case.
1460 */ 1373 */
1461 if (bx < sx || by < sy) { 1374 if (bx < sx || by < sy)
1375 {
1462 LOG(llevError,"update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", 1376 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);
1464 face_num = 0; 1377 face_num = 0;
1465 } 1378 }
1466 /* single part object, multipart object with non merged faces, 1379 /* single part object, multipart object with non merged faces,
1467 * of multipart object already at lower right. 1380 * of multipart object already at lower right.
1468 */ 1381 */
1469 else if (bx == sx && by == sy) { 1382 else if (bx == sx && by == sy)
1383 {
1470 face_num = ob->face->number; 1384 face_num = ob->face->number;
1471 1385
1472 /* if this face matches one stored away, clear that one away. 1386 /* if this face matches one stored away, clear that one away.
1473 * this code relies on the fact that the map1 commands 1387 * this code relies on the fact that the map1 commands
1474 * goes from 2 down to 0. 1388 * goes from 2 down to 0.
1475 */ 1389 */
1476 for (i=0; i<MAP_LAYERS; i++) 1390 for (i = 0; i < MAP_LAYERS; i++)
1477 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1391 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1478 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1392 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1479 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1393 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1480 } 1394 }
1481 else { 1395 else
1396 {
1482 /* If this head is stored away, clear it - otherwise, 1397 /* If this head is stored away, clear it - otherwise,
1483 * there can be cases where a object is on multiple layers - 1398 * there can be cases where a object is on multiple layers -
1484 * we only want to send it once. 1399 * we only want to send it once.
1485 */ 1400 */
1486 face_num = head->face->number; 1401 face_num = head->face->number;
1487 for (i=0; i<MAP_LAYERS; i++) 1402 for (i = 0; i < MAP_LAYERS; i++)
1488 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1403 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1489 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1490 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1405 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1491 1406
1492 /* First, try to put the new head on the same layer. If that is used up, 1407 /* First, try to put the new head on the same layer. If that is used up,
1493 * then find another layer. 1408 * then find another layer.
1494 */ 1409 */
1495 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) { 1410 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1411 {
1496 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; 1412 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1413 }
1414 else
1497 } else for (i=0; i<MAX_LAYERS; i++) { 1415 for (i = 0; i < MAX_LAYERS; i++)
1416 {
1498 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || 1417 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1499 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) { 1418 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1419 {
1500 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; 1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1501 } 1421 }
1502 } 1422 }
1503 face_num = 0; /* Don't send this object - we'll send the head later */ 1423 face_num = 0; /* Don't send this object - we'll send the head later */
1504 } 1424 }
1425 }
1505 } else { 1426 else
1427 {
1506 /* In this case, we are already at the lower right or single part object, 1428 /* In this case, we are already at the lower right or single part object,
1507 * so nothing special 1429 * so nothing special
1508 */ 1430 */
1509 face_num = ob->face->number; 1431 face_num = ob->face->number;
1510 1432
1511 /* clear out any head entries that have the same face as this one */ 1433 /* clear out any head entries that have the same face as this one */
1512 for (bx=0; bx<layer; bx++) 1434 for (bx = 0; bx < layer; bx++)
1513 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1435 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1514 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1436 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1515 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1437 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1516 } 1438 }
1517 } /* else not already head object or blank face */ 1439 } /* else not already head object or blank face */
1518 1440
1519 /* This is a real hack. Basically, if we have nothing to send for this layer, 1441 /* 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. 1442 * 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 1443 * 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 1444 * 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 1445 * 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. 1446 * This tends to make stacking also work/look better.
1525 */ 1447 */
1526 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]) { 1448 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1449 {
1527 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]->face->number; 1450 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; 1451 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1529 } 1452 }
1530 1453
1531 /* Another hack - because of heads and whatnot, this face may match one 1454 /* 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 1455 * we already sent for a lower layer. In that case, don't send
1533 * this one. 1456 * this one.
1534 */ 1457 */
1535 if (face_num && layer+1<MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer+1] == face_num) { 1458 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1536 face_num = 0; 1459 face_num = 0;
1537 }
1538 1460
1539 /* We've gotten what face we want to use for the object. Now see if 1461 /* 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. 1462 * if it has changed since we last sent it to the client.
1541 */ 1463 */
1542 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) { 1464 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1465 {
1543 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1466 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1544 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1467 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1545 esrv_send_face(ns, face_num, 0); 1468 esrv_send_face (&ns, face_num, 0);
1546 SockList_AddShort(sl, face_num); 1469
1470 sl << uint16 (face_num);
1547 return 1; 1471 return 1;
1548 } 1472 }
1473
1549 /* Nothing changed */ 1474 /* Nothing changed */
1550 return 0; 1475 return 0;
1551} 1476}
1552 1477
1553/** 1478/**
1554 * This function is mainly a copy of update_space, 1479 * This function is mainly a copy of update_space,
1555 * except it handles update of the smoothing updates, 1480 * except it handles update of the smoothing updates,
… …
1567 * layer is the layer to update, with 2 being the floor and 0 the 1492 * 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 1493 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1569 * take. 1494 * take.
1570 */ 1495 */
1571 1496
1572static inline int update_smooth(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1497static inline int
1498update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1573{ 1499{
1574 object *ob; 1500 object *ob;
1575 int smoothlevel; /* old face_num;*/ 1501 int smoothlevel; /* old face_num; */
1576 1502
1577 ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1503 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1578 1504
1579 /* If there is no object for this space, or if the face for the object 1505 /* 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. 1506 * is the blank face, set the smoothlevel to zero.
1581 */ 1507 */
1582 if (!ob || ob->face == blank_face || MAP_NOSMOOTH(mp)) smoothlevel=0; 1508 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1509 smoothlevel = 0;
1583 else { 1510 else
1511 {
1584 smoothlevel = ob->smoothlevel; 1512 smoothlevel = ob->smoothlevel;
1585 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1513 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1586 SendSmooth(ns, ob->face->number); 1514 SendSmooth (&ns, ob->face->number);
1587 } /* else not already head object or blank face */ 1515 } /* else not already head object or blank face */
1588 1516
1589 /* We've gotten what face we want to use for the object. Now see if 1517 /* 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. 1518 * if it has changed since we last sent it to the client.
1591 */ 1519 */
1592 if (smoothlevel>255) 1520 if (smoothlevel > 255)
1593 smoothlevel=255; 1521 smoothlevel = 255;
1594 else if (smoothlevel<0) 1522 else if (smoothlevel < 0)
1595 smoothlevel=0; 1523 smoothlevel = 0;
1524
1596 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) { 1525 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1526 {
1597 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1527 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1598 SockList_AddChar(sl, (uint8) (smoothlevel&0xFF)); 1528 sl << uint8 (smoothlevel);
1599 return 1; 1529 return 1;
1600 } 1530 }
1531
1601 /* Nothing changed */ 1532 /* Nothing changed */
1602 return 0; 1533 return 0;
1603} 1534}
1604 1535
1605/** 1536/**
1606 * Returns the size of a data for a map square as returned by 1537 * Returns the size of a data for a map square as returned by
1607 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1538 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1608 * available. 1539 * available.
1609 */ 1540 */
1541int
1610int getExtendedMapInfoSize(NewSocket* ns){ 1542getExtendedMapInfoSize (client * ns)
1543{
1611 int result=0; 1544 int result = 0;
1545
1612 if (ns->ext_mapinfos){ 1546 if (ns->ext_mapinfos)
1547 {
1613 if (ns->EMI_smooth) 1548 if (ns->EMI_smooth)
1614 result+=1; /*One byte for smoothlevel*/ 1549 result += 1; /*One byte for smoothlevel */
1615 } 1550 }
1551
1616 return result; 1552 return result;
1617} 1553}
1554
1618/** 1555/**
1619 * This function uses the new map1 protocol command to send the map 1556 * 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 1557 * to the client. It is necessary because the old map command supports
1621 * a maximum map size of 15x15. 1558 * a maximum map size of 15x15.
1622 * This function is much simpler than the old one. This is because 1559 * 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 1563 * 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, 1564 * 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 1565 * and use the other 4 bits for other informatiion. For full documentation
1629 * of what we send, see the doc/Protocol file. 1566 * of what we send, see the doc/Protocol file.
1630 * I will describe internally what we do: 1567 * I will describe internally what we do:
1631 * the socket->lastmap shows how the map last looked when sent to the client. 1568 * 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 1569 * in the lastmap structure, there is a cells array, which is set to the
1633 * maximum viewable size (As set in config.h). 1570 * maximum viewable size (As set in config.h).
1634 * in the cells, there are faces and a count value. 1571 * 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 1572 * we use the count value to hold the darkness value. If -1, then this space
1636 * is not viewable. 1573 * is not viewable.
1637 * we use faces[0] faces[1] faces[2] to hold what the three layers 1574 * we use faces[0] faces[1] faces[2] to hold what the three layers
1638 * look like. 1575 * look like.
1639 */ 1576 */
1577void
1640void draw_client_map1(object *pl) 1578draw_client_map1 (object *pl)
1641{ 1579{
1642 int x,y,ax, ay, d, startlen, max_x, max_y, oldlen; 1580 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1643 sint16 nx, ny; 1581 sint16 nx, ny;
1644 int estartlen, eoldlen; 1582 int estartlen, eoldlen;
1645 SockList sl;
1646 SockList esl; /*For extended Map info*/
1647 uint16 mask,emask; 1583 uint16 mask, emask;
1648 uint8 eentrysize; 1584 uint8 eentrysize;
1649 uint16 ewhatstart,ewhatflag; 1585 uint16 ewhatstart, ewhatflag;
1650 uint8 extendedinfos; 1586 uint8 extendedinfos;
1651 mapstruct *m; 1587 maptile *m;
1652 NewSocket &socket = pl->contr->socket;
1653 1588
1589 client &socket = *pl->contr->ns;
1590
1654 check_map_change (pl->contr); 1591 check_map_change (pl->contr);
1655 1592
1656 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1593 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1657 if (socket.mapmode == Map1Cmd) 1594 packet esl;
1658 strcpy((char*)sl.buf,"map1 "); 1595
1659 else
1660 strcpy((char*)sl.buf,"map1a ");
1661 sl.len=strlen((char*)sl.buf);
1662 startlen = sl.len; 1596 startlen = sl.length ();
1597
1663 /*Extendedmapinfo structure initialisation*/ 1598 /*Extendedmapinfo structure initialisation */
1664 if (socket.ext_mapinfos){ 1599 if (socket.ext_mapinfos)
1665 esl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1600 {
1666 strcpy((char*)esl.buf,"mapextended ");
1667 esl.len=strlen((char*)esl.buf);
1668 extendedinfos=EMI_NOREDRAW; 1601 extendedinfos = EMI_NOREDRAW;
1602
1669 if (socket.EMI_smooth) 1603 if (socket.EMI_smooth)
1670 extendedinfos|=EMI_SMOOTH; 1604 extendedinfos |= EMI_SMOOTH;
1605
1671 ewhatstart=esl.len; 1606 ewhatstart = esl.length ();
1672 ewhatflag=extendedinfos; /*The EMI_NOREDRAW bit 1607 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1673 could need to be taken away*/ 1608 could need to be taken away */
1674 SockList_AddChar(&esl, extendedinfos);
1675 eentrysize=getExtendedMapInfoSize(&socket); 1609 eentrysize = getExtendedMapInfoSize (&socket);
1676 SockList_AddChar(&esl, eentrysize); 1610 esl << "mapextended "
1611 << uint8 (extendedinfos)
1612 << uint8 (eentrysize);
1613
1677 estartlen = esl.len; 1614 estartlen = esl.length ();
1678 } else { 1615 }
1616 else
1617 {
1679 /* suppress compiler warnings */ 1618 /* suppress compiler warnings */
1680 ewhatstart = 0; 1619 ewhatstart = 0;
1681 ewhatflag = 0; 1620 ewhatflag = 0;
1682 estartlen = 0; 1621 estartlen = 0;
1683 } 1622 }
1623
1684 /* Init data to zero */ 1624 /* Init data to zero */
1685 memset(heads, 0, sizeof(object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1625 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1686 1626
1687 /* x,y are the real map locations. ax, ay are viewport relative 1627 /* x,y are the real map locations. ax, ay are viewport relative
1688 * locations. 1628 * locations.
1689 */ 1629 */
1690 ay=0; 1630 ay = 0;
1691 1631
1692 /* We could do this logic as conditionals in the if statement, 1632 /* We could do this logic as conditionals in the if statement,
1693 * but that started to get a bit messy to look at. 1633 * but that started to get a bit messy to look at.
1694 */ 1634 */
1695 max_x = pl->x+(socket.mapx+1)/2; 1635 max_x = pl->x + (socket.mapx + 1) / 2;
1696 max_y = pl->y+(socket.mapy+1)/2; 1636 max_y = pl->y + (socket.mapy + 1) / 2;
1637
1697 if (socket.mapmode == Map1aCmd) { 1638 if (socket.mapmode == Map1aCmd)
1639 {
1698 max_x += MAX_HEAD_OFFSET; 1640 max_x += MAX_HEAD_OFFSET;
1699 max_y += MAX_HEAD_OFFSET; 1641 max_y += MAX_HEAD_OFFSET;
1700 } 1642 }
1701 1643
1702 for(y=pl->y-socket.mapy/2; y<max_y; y++,ay++) { 1644 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1645 {
1703 ax=0; 1646 ax = 0;
1704 for(x=pl->x-socket.mapx/2;x<max_x;x++,ax++) { 1647 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1705 1648 {
1706 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1649 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1707 1650
1708 /* If this space is out of the normal viewable area, we only check 1651 /* 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 1652 * the heads value ax or ay will only be greater than what
1710 * the client wants if using the map1a command - this is because 1653 * 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 1654 * if the map1a command is not used, max_x and max_y will be
1712 * set to lower values. 1655 * set to lower values.
1713 */ 1656 */
1714 if (ax >= socket.mapx || ay >= socket.mapy) { 1657 if (ax >= socket.mapx || ay >= socket.mapy)
1658 {
1715 int i, got_one; 1659 int i, got_one;
1716 1660
1717 oldlen = sl.len; 1661 oldlen = sl.length ();
1718 1662
1719 SockList_AddShort(&sl, mask); 1663 sl << uint16 (mask);
1720 1664
1721 if (check_head (sl, socket, ax, ay, 2)) 1665 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1722 mask |= 0x4;
1723 if (check_head (sl, socket, ax, ay, 1)) 1666 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1724 mask |= 0x2;
1725 if (check_head (sl, socket, ax, ay, 0)) 1667 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1726 mask |= 0x1;
1727 1668
1728 /* If all we are doing is sending 0 (blank) faces, we don't 1669 /* If all we are doing is sending 0 (blank) faces, we don't
1729 * actually need to send that - just the coordinates 1670 * actually need to send that - just the coordinates
1730 * with no faces tells the client to blank out the 1671 * with no faces tells the client to blank out the
1731 * space. 1672 * space.
1732 */ 1673 */
1733 got_one=0; 1674 got_one = 0;
1734 for (i=oldlen+2; i<sl.len; i++) { 1675 for (i = oldlen + 2; i < sl.length (); i++)
1735 if (sl.buf[i]) got_one=1; 1676 if (sl[i])
1677 got_one = 1;
1678
1679 if (got_one && (mask & 0xf))
1680 sl[oldlen + 1] = mask & 0xff;
1681 else
1682 { /*either all faces blank, either no face at all */
1683 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1684 sl.reset (oldlen + 2);
1685 else
1686 sl.reset (oldlen);
1736 } 1687 }
1737 1688
1738 if (got_one && (mask & 0xf)) { 1689 /*What concerns extendinfos, nothing to be done for now
1690 * (perhaps effects layer later)
1691 */
1692 continue; /* don't do processing below */
1693 }
1694
1695 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1696
1697 d = pl->contr->blocked_los[ax][ay];
1698
1699 /* If the coordinates are not valid, or it is too dark to see,
1700 * we tell the client as such
1701 */
1702 nx = x;
1703 ny = y;
1704 m = get_map_from_coord (pl->map, &nx, &ny);
1705
1706 if (!m)
1707 {
1708 /* space is out of map. Update space and clear values
1709 * if this hasn't already been done. If the space is out
1710 * of the map, it shouldn't have a head
1711 */
1712 if (lastcell.count != -1)
1713 {
1714 sl << uint16 (mask);
1715 map_clearcell (&lastcell, 0, 0, 0, -1);
1716 }
1717 }
1718 else if (d > 3)
1719 {
1720 int need_send = 0, count;
1721
1722 /* This block deals with spaces that are not visible for whatever
1723 * reason. Still may need to send the head for this space.
1724 */
1725
1726 oldlen = sl.length ();
1727
1728 sl << uint16 (mask);
1729
1730 if (lastcell.count != -1)
1731 need_send = 1;
1732
1733 count = -1;
1734
1735 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1736 {
1737 /* Now check to see if any heads need to be sent */
1738
1739 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1740 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1741 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1742
1743 lastcell.count = count;
1744 }
1745 else
1746 {
1747 /* properly clear a previously sent big face */
1748 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1749 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1750 need_send = 1;
1751
1752 map_clearcell (&lastcell, 0, 0, 0, count);
1753 }
1754
1755 if ((mask & 0xf) || need_send)
1739 sl.buf[oldlen+1] = mask & 0xff; 1756 sl[oldlen + 1] = mask & 0xff;
1740 } else { /*either all faces blank, either no face at all*/ 1757 else
1741 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates*/ 1758 sl.reset (oldlen);
1742 sl.len = oldlen + 2; 1759 }
1760 else
1761 {
1762 /* In this block, the space is visible or there are head objects
1763 * we need to send.
1764 */
1765
1766 /* Rather than try to figure out what everything that we might
1767 * need to send is, then form the packet after that,
1768 * we presume that we will in fact form a packet, and update
1769 * the bits by what we do actually send. If we send nothing,
1770 * we just back out sl.length () to the old value, and no harm
1771 * is done.
1772 * I think this is simpler than doing a bunch of checks to see
1773 * what if anything we need to send, setting the bits, then
1774 * doing those checks again to add the real data.
1775 */
1776 oldlen = sl.length ();
1777 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1778 eoldlen = esl.length ();
1779 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1780 sl << uint16 (mask);
1781
1782 if (socket.ext_mapinfos)
1783 esl << uint16 (emask);
1784
1785 unsigned char dummy;
1786 unsigned char *last_ext = &dummy;
1787
1788 /* Darkness changed */
1789 if (lastcell.count != d && socket.darkness)
1790 {
1791 mask |= 0x8;
1792
1793 if (socket.extmap)
1794 {
1795 *last_ext |= 0x80;
1796 last_ext = &sl[sl.length ()];
1797 sl << uint8 (d);
1798 }
1743 else 1799 else
1744 sl.len = oldlen; 1800 sl << uint8 (255 - 64 * d);
1745 } 1801 }
1746 /*What concerns extendinfos, nothing to be done for now
1747 * (perhaps effects layer later)
1748 */
1749 continue; /* don't do processing below */
1750 }
1751 1802
1752 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1753
1754 d = pl->contr->blocked_los[ax][ay];
1755
1756 /* If the coordinates are not valid, or it is too dark to see,
1757 * we tell the client as such
1758 */
1759 nx=x;
1760 ny=y;
1761 m = get_map_from_coord(pl->map, &nx, &ny);
1762 if (!m) {
1763 /* space is out of map. Update space and clear values
1764 * if this hasn't already been done. If the space is out
1765 * of the map, it shouldn't have a head
1766 */
1767 if (lastcell.count != -1) {
1768 SockList_AddShort(&sl, mask);
1769 map_clearcell(&lastcell,0,0,0,-1);
1770 }
1771 } else if (d>3) {
1772 int need_send=0, count;
1773 /* This block deals with spaces that are not visible for whatever
1774 * reason. Still may need to send the head for this space.
1775 */
1776
1777 oldlen = sl.len;
1778
1779 SockList_AddShort(&sl, mask);
1780 if (lastcell.count != -1) need_send=1;
1781 count = -1;
1782
1783 if (socket.mapmode == Map1aCmd && have_head(ax, ay)) {
1784 /* Now check to see if any heads need to be sent */
1785
1786 if (check_head (sl, socket, ax, ay, 2))
1787 mask |= 0x4;
1788 if (check_head (sl, socket, ax, ay, 1))
1789 mask |= 0x2;
1790 if (check_head (sl, socket, ax, ay, 0))
1791 mask |= 0x1;
1792
1793 lastcell.count = count;
1794
1795 } else {
1796 struct MapCell *cell = &lastcell;
1797 /* properly clear a previously sent big face */
1798 if(cell->faces[0] != 0
1799 || cell->faces[1] != 0
1800 || cell->faces[2] != 0)
1801 need_send = 1;
1802 map_clearcell(&lastcell, 0, 0, 0, count);
1803 }
1804
1805 if ((mask & 0xf) || need_send) {
1806 sl.buf[oldlen+1] = mask & 0xff;
1807 } else {
1808 sl.len = oldlen;
1809 }
1810 } else {
1811 /* In this block, the space is visible or there are head objects
1812 * we need to send.
1813 */
1814
1815 /* Rather than try to figure out what everything that we might
1816 * need to send is, then form the packet after that,
1817 * 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,
1819 * we just back out sl.len to the old value, and no harm
1820 * is done.
1821 * 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
1823 * doing those checks again to add the real data.
1824 */
1825 oldlen = sl.len;
1826 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1827 eoldlen = esl.len;
1828 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1829 SockList_AddShort(&sl, mask);
1830
1831 if (socket.ext_mapinfos)
1832 SockList_AddShort(&esl, emask);
1833
1834 unsigned char dummy;
1835 unsigned char *last_ext = &dummy;
1836
1837 /* Darkness changed */
1838 if (lastcell.count != d && socket.darkness) {
1839 mask |= 0x8;
1840
1841 if (socket.extmap)
1842 {
1843 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, d);
1844 }
1845 else
1846 SockList_AddChar (&sl, 255 - 64 * d);
1847 }
1848
1849 lastcell.count = d; 1803 lastcell.count = d;
1850 1804
1851 if (socket.extmap) 1805 if (socket.extmap)
1852 { 1806 {
1853 uint8 stat_hp = 0; 1807 uint8 stat_hp = 0;
1854 uint8 stat_width = 0; 1808 uint8 stat_width = 0;
1809 uint8 flags = 0;
1855 tag_t player = 0; 1810 UUID player = 0;
1856 1811
1857 // send hp information, if applicable 1812 // send hp information, if applicable
1858 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1813 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1859 { 1814 {
1860 if (op->head || op->invisible) 1815 if (op->head || op->invisible)
1861 ; // do not show 1816 ; // do not show
1862 else if (op->type == PLAYER 1817 else if (op->type == PLAYER
1863 || QUERY_FLAG (op, FLAG_MONSTER) 1818 || 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 { 1819 {
1867 if (op->stats.maxhp > 0 1820 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1868 && (unsigned)op->stats.maxhp > (unsigned)op->stats.hp)
1869 { 1821 {
1870 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1822 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1871 stat_width = op->arch->tail_x; 1823 stat_width = op->arch->tail_x;
1872 } 1824 }
1873 } 1825 }
1874 1826
1827 if (op->msg && op->msg[0] == '@')
1828 flags |= 1;
1829
1875 if (op->type == PLAYER && op != pl) 1830 if (op->type == PLAYER && op != pl)
1876 player = op->count; 1831 player = op->count;
1877 } 1832 }
1878 1833
1879 if (lastcell.stat_hp != stat_hp && 0) 1834 if (lastcell.stat_hp != stat_hp)
1880 { 1835 {
1881 lastcell.stat_hp = stat_hp; 1836 lastcell.stat_hp = stat_hp;
1882 1837
1883 mask |= 0x8; 1838 mask |= 0x8;
1884 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 5); 1839 *last_ext |= 0x80;
1885 SockList_AddChar (&sl, stat_hp); 1840 last_ext = &sl[sl.length ()];
1886 1841
1842 sl << uint8 (5) << uint8 (stat_hp);
1843
1887 if (stat_width > 1) 1844 if (stat_width > 1)
1888 { 1845 {
1889 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 6); 1846 *last_ext |= 0x80;
1890 SockList_AddChar (&sl, stat_width); 1847 last_ext = &sl[sl.length ()];
1848
1849 sl << uint8 (6) << uint8 (stat_width);
1891 } 1850 }
1892 } 1851 }
1893 1852
1894 if (lastcell.player != player && 0) 1853 if (lastcell.player != player)
1895 { 1854 {
1896 lastcell.player = player; 1855 lastcell.player = player;
1856
1897 mask |= 0x8; 1857 mask |= 0x8;
1898 *last_ext |= 0x80; last_ext = sl.buf + sl.len; SockList_AddChar (&sl, 0x47); 1858 *last_ext |= 0x80;
1899 SockList_AddChar (&sl, 4); 1859 last_ext = &sl[sl.length ()];
1900 SockList_AddInt (&sl, player); 1860
1861 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1901 } 1862 }
1863
1864 if (lastcell.flags != flags)
1902 } 1865 {
1903
1904 /* Floor face */
1905 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 2))
1906 mask |= 0x4;
1907
1908 if (socket.EMI_smooth)
1909 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 2))
1910 emask |= 0x4;
1911
1912 /* Middle face */
1913 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 1))
1914 mask |= 0x2;
1915
1916 if (socket.EMI_smooth)
1917 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 1))
1918 emask |= 0x2;
1919
1920 if(nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) {
1921 if (lastcell.faces[0] != pl->face->number) {
1922 lastcell.faces[0] = pl->face->number; 1866 lastcell.flags = flags;
1867
1923 mask |= 0x1; 1868 mask |= 0x8;
1924 if (!(socket.faces_sent[pl->face->number] &NS_FACESENT_FACE)) 1869 *last_ext |= 0x80;
1925 esrv_send_face(&socket, pl->face->number, 0); 1870 last_ext = &sl[sl.length ()];
1926 SockList_AddShort(&sl, pl->face->number); 1871
1872 sl << uint8 (8) << uint8 (flags);
1927 } 1873 }
1928 } 1874 }
1875
1929 /* Top face */ 1876 /* Floor face */
1930 else {
1931 if (update_space(&sl, &socket, m, nx, ny, ax, ay, 0)) 1877 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1878 mask |= 0x4;
1879
1880 if (socket.EMI_smooth)
1881 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1882 emask |= 0x4;
1883
1884 /* Middle face */
1885 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1886 mask |= 0x2;
1887
1888 if (socket.EMI_smooth)
1889 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1890 emask |= 0x2;
1891
1892 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1893 {
1894 if (lastcell.faces[0] != pl->face->number)
1895 {
1896 lastcell.faces[0] = pl->face->number;
1932 mask |= 0x1; 1897 mask |= 0x1;
1933 if (socket.EMI_smooth) 1898
1934 if (update_smooth(&esl, &socket, m, nx, ny, ax, ay, 0)){ 1899 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1935 emask |= 0x1; 1900 esrv_send_face (&socket, pl->face->number, 0);
1901
1902 sl << uint16 (pl->face->number);
1936 } 1903 }
1937 } 1904 }
1938 /* Check to see if we are in fact sending anything for this 1905 else
1939 * space by checking the mask. If so, update the mask.
1940 * if not, reset the len to that from before adding the mask
1941 * value, so we don't send those bits.
1942 */ 1906 {
1943 if (mask & 0xf) { 1907 /* Top face */
1944 sl.buf[oldlen+1] = mask & 0xff; 1908 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1945 } else { 1909 mask |= 0x1;
1946 sl.len = oldlen; 1910
1911 if (socket.EMI_smooth)
1912 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1913 emask |= 0x1;
1947 } 1914 }
1915
1916 /* Check to see if we are in fact sending anything for this
1917 * space by checking the mask. If so, update the mask.
1918 * if not, reset the len to that from before adding the mask
1919 * value, so we don't send those bits.
1920 */
1921 if (mask & 0xf)
1922 sl[oldlen + 1] = mask & 0xff;
1923 else
1924 sl.reset (oldlen);
1925
1948 if (emask & 0xf) { 1926 if (emask & 0xf)
1949 esl.buf[eoldlen+1] = emask & 0xff; 1927 esl[eoldlen + 1] = emask & 0xff;
1950 } else { 1928 else
1951 esl.len = eoldlen; 1929 esl.reset (eoldlen);
1952 }
1953 } /* else this is a viewable space */ 1930 } /* else this is a viewable space */
1954 } /* for x loop */ 1931 } /* for x loop */
1955 } /* for y loop */ 1932 } /* for y loop */
1956 1933
1957 /* Verify that we in fact do need to send this */ 1934 /* Verify that we in fact do need to send this */
1958 if (socket.ext_mapinfos){ 1935 if (socket.ext_mapinfos)
1936 {
1959 if (!(sl.len>startlen || socket.sent_scroll)){ 1937 if (!(sl.length () > startlen || socket.sent_scroll))
1938 {
1960 /* No map data will follow, so don't say the client 1939 /* No map data will follow, so don't say the client
1961 * it doesn't need draw! 1940 * it doesn't need draw!
1962 */ 1941 */
1963 ewhatflag&=(~EMI_NOREDRAW); 1942 ewhatflag &= (~EMI_NOREDRAW);
1964 esl.buf[ewhatstart+1] = ewhatflag & 0xff; 1943 esl[ewhatstart + 1] = ewhatflag & 0xff;
1965 } 1944 }
1945
1966 if (esl.len>estartlen) { 1946 if (esl.length () > estartlen)
1967 Send_With_Handling(&socket, &esl); 1947 socket.send_packet (esl);
1968 }
1969 free(esl.buf);
1970 } 1948 }
1949
1971 if (sl.len>startlen || socket.sent_scroll) { 1950 if (sl.length () > startlen || socket.sent_scroll)
1972 Send_With_Handling(&socket, &sl); 1951 {
1952 socket.send_packet (sl);
1973 socket.sent_scroll = 0; 1953 socket.sent_scroll = 0;
1974 } 1954 }
1975 free(sl.buf);
1976} 1955}
1977 1956
1978/** 1957/**
1979 * Draws client map. 1958 * Draws client map.
1980 */ 1959 */
1960void
1981void draw_client_map(object *pl) 1961draw_client_map (object *pl)
1982{ 1962{
1983 int i,j; 1963 int i, j;
1984 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */ 1964 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1985 New_Face *face,*floor; 1965 New_Face *face, *floor;
1986 New_Face *floor2; 1966 New_Face *floor2;
1987 int d, mflags; 1967 int d, mflags;
1988 struct Map newmap; 1968 struct Map newmap;
1989 mapstruct *m, *pm; 1969 maptile *m, *pm;
1990 1970
1991 if (pl->type != PLAYER) { 1971 if (pl->type != PLAYER)
1972 {
1992 LOG(llevError,"draw_client_map called with non player/non eric-server\n"); 1973 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1993 return; 1974 return;
1994 } 1975 }
1995 1976
1996 pm = pl->map; 1977 pm = pl->map;
1997 1978
1998 /* If player is just joining the game, he isn't here yet, so the map 1979 /* If player is just joining the game, he isn't here yet, so the map
1999 * can get swapped out. If so, don't try to send them a map. All will 1980 * can get swapped out. If so, don't try to send them a map. All will
2000 * be OK once they really log in. 1981 * be OK once they really log in.
2001 */ 1982 */
2002 if (pm==NULL || pm->in_memory!=MAP_IN_MEMORY) return; 1983 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1984 return;
2003 1985
2004 memset(&newmap, 0, sizeof(struct Map)); 1986 memset (&newmap, 0, sizeof (struct Map));
2005 1987
2006 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) { 1988 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2007 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) { 1989 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1990 {
2008 ax=i; 1991 ax = i;
2009 ay=j; 1992 ay = j;
2010 m = pm; 1993 m = pm;
2011 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay); 1994 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1995
2012 if (mflags & P_OUT_OF_MAP) 1996 if (mflags & P_OUT_OF_MAP)
2013 continue; 1997 continue;
2014 if (mflags & P_NEED_UPDATE) 1998
2015 update_position(m, ax, ay);
2016 /* If a map is visible to the player, we don't want to swap it out 1999 /* If a map is visible to the player, we don't want to swap it out
2017 * just to reload it. This should really call something like 2000 * just to reload it. This should really call something like
2018 * swap_map, but this is much more efficient and 'good enough' 2001 * swap_map, but this is much more efficient and 'good enough'
2019 */ 2002 */
2020 if (mflags & P_NEW_MAP) 2003 if (mflags & P_NEW_MAP)
2021 m->timeout = 50; 2004 m->timeout = 50;
2022 } 2005 }
2023 } 2006
2024 /* do LOS after calls to update_position */ 2007 /* do LOS after calls to update_position */
2025 if(pl->contr->do_los) { 2008 if (pl->contr->do_los)
2009 {
2026 update_los(pl); 2010 update_los (pl);
2027 pl->contr->do_los = 0; 2011 pl->contr->do_los = 0;
2028 } 2012 }
2029 2013
2030 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) {
2031 /* Big maps need a different drawing mechanism to work */ 2014 /* Big maps need a different drawing mechanism to work */
2032 draw_client_map1(pl); 2015 draw_client_map1 (pl);
2033 return;
2034 }
2035
2036 if(pl->invisible & (pl->invisible < 50 ? 4 : 1)) {
2037 esrv_map_setbelow(&pl->contr->socket,pl->contr->socket.mapx/2,
2038 pl->contr->socket.mapy/2,pl->face->number,&newmap);
2039 }
2040
2041 /* j and i are the y and x coordinates of the real map (which is
2042 * basically some number of spaces around the player)
2043 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2044 * left corner) and are thus disconnected from the map values.
2045 * Subtract 1 from the max values so that we properly handle cases where
2046 * player has specified an even map. Otherwise, we try to send them too
2047 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2048 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2049 * odd, this still works fine.
2050 */
2051 ay=0;
2052 for(j=pl->y-pl->contr->socket.mapy/2; j<=pl->y+(pl->contr->socket.mapy-1)/2;j++, ay++) {
2053 ax=0;
2054 for(i=pl->x-pl->contr->socket.mapx/2;i<=pl->x+(pl->contr->socket.mapx-1)/2;i++, ax++) {
2055
2056 d = pl->contr->blocked_los[ax][ay];
2057 /* note the out_of_map and d>3 checks are both within the same
2058 * negation check.
2059 */
2060 nx = i;
2061 ny = j;
2062 m = get_map_from_coord(pm, &nx, &ny);
2063 if (m && d<4) {
2064 face = GET_MAP_FACE(m, nx, ny,0);
2065 floor2 = GET_MAP_FACE(m, nx, ny,1);
2066 floor = GET_MAP_FACE(m, nx, ny,2);
2067
2068 /* If all is blank, send a blank face. */
2069 if ((!face || face == blank_face) &&
2070 (!floor2 || floor2 == blank_face) &&
2071 (!floor || floor == blank_face)) {
2072 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2073 blank_face->number,&newmap);
2074 } else { /* actually have something interesting */
2075 /* send the darkness mask, if any. */
2076 if (d && pl->contr->socket.darkness)
2077 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2078 dark_faces[d-1]->number,&newmap);
2079
2080 if (face && face != blank_face)
2081 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2082 face->number,&newmap);
2083 if (floor2 && floor2 != blank_face)
2084 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2085 floor2->number,&newmap);
2086 if (floor && floor != blank_face)
2087 esrv_map_setbelow(&pl->contr->socket,ax,ay,
2088 floor->number,&newmap);
2089 }
2090 } /* Is a valid space */
2091 }
2092 }
2093 esrv_map_doneredraw(&pl->contr->socket, &newmap);
2094
2095 check_map_change (pl->contr);
2096} 2016}
2097 2017
2098 2018
2099/*****************************************************************************/ 2019/*****************************************************************************/
2020
2100/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 2021/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2022
2101/* a player. Of course, the client need to know the command to be able to */ 2023/* a player. Of course, the client need to know the command to be able to */
2024
2102/* manage it ! */ 2025/* manage it ! */
2026
2103/*****************************************************************************/ 2027/*****************************************************************************/
2028void
2104void send_plugin_custom_message(object *pl, char *buf) 2029send_plugin_custom_message (object *pl, char *buf)
2105{ 2030{
2106 cs_write_string(&pl->contr->socket,buf,strlen(buf)); 2031 pl->contr->ns->send_packet (buf);
2107} 2032}
2108 2033
2109/** 2034/**
2110 * This sends the skill number to name mapping. We ignore 2035 * This sends the skill number to name mapping. We ignore
2111 * the params - we always send the same info no matter what. 2036 * the params - we always send the same info no matter what.
2112 */ 2037 */
2038void
2113void send_skill_info(NewSocket *ns, char *params) 2039send_skill_info (client *ns, char *params)
2114{ 2040{
2115 SockList sl; 2041 packet sl;
2116 int i; 2042 sl << "replyinfo skill_info\n";
2117 2043
2118 sl.buf = (unsigned char*) malloc(MAXSOCKBUF);
2119 strcpy((char*)sl.buf,"replyinfo skill_info\n");
2120 for (i=1; i< NUM_SKILLS; i++) { 2044 for (int i = 1; i < NUM_SKILLS; i++)
2121 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, 2045 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2122 skill_names[i]); 2046
2123 }
2124 sl.len = strlen((char*)sl.buf);
2125 if (sl.len >= MAXSOCKBUF) { 2047 if (sl.length () >= MAXSOCKBUF)
2048 {
2126 LOG(llevError,"Buffer overflow in send_skill_info!\n"); 2049 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2127 fatal(0); 2050 fatal (0);
2128 } 2051 }
2129 Send_With_Handling(ns, &sl); 2052
2130 free(sl.buf); 2053 ns->send_packet (sl);
2131} 2054}
2132 2055
2133/** 2056/**
2134 * This sends the spell path to name mapping. We ignore 2057 * This sends the spell path to name mapping. We ignore
2135 * the params - we always send the same info no matter what. 2058 * the params - we always send the same info no matter what.
2136 */ 2059 */
2060void
2137void send_spell_paths (NewSocket *ns, char *params) { 2061send_spell_paths (client * ns, char *params)
2138 SockList sl; 2062{
2139 int i; 2063 packet sl;
2140 2064
2141 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2065 sl << "replyinfo spell_paths\n";
2142 strcpy((char*)sl.buf,"replyinfo spell_paths\n"); 2066
2143 for(i=0; i<NRSPELLPATHS; i++) 2067 for (int i = 0; i < NRSPELLPATHS; i++)
2144 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]); 2068 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2145 sl.len = strlen((char*)sl.buf); 2069
2146 if (sl.len >= MAXSOCKBUF) { 2070 if (sl.length () >= MAXSOCKBUF)
2071 {
2147 LOG(llevError,"Buffer overflow in send_spell_paths!\n"); 2072 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2148 fatal(0); 2073 fatal (0);
2149 } 2074 }
2150 Send_With_Handling(ns, &sl); 2075
2151 free(sl.buf); 2076 ns->send_packet (sl);
2152} 2077}
2153 2078
2154/** 2079/**
2155 * This looks for any spells the player may have that have changed their stats. 2080 * This looks for any spells the player may have that have changed their stats.
2156 * it then sends an updspell packet for each spell that has changed in this way 2081 * it then sends an updspell packet for each spell that has changed in this way
2157 */ 2082 */
2083void
2158void esrv_update_spells(player *pl) { 2084esrv_update_spells (player *pl)
2159 SockList sl; 2085{
2160 int flags=0; 2086 if (!pl->ns->monitor_spells)
2161 object *spell; 2087 return;
2162 if (!pl->socket.monitor_spells) return; 2088
2163 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2089 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2090 {
2164 if (spell->type == SPELL) { 2091 if (spell->type == SPELL)
2092 {
2093 int flags = 0;
2094
2165 /* check if we need to update it*/ 2095 /* check if we need to update it */
2166 if (spell->last_sp != SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA)) { 2096 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2097 {
2167 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2098 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2168 flags |= UPD_SP_MANA; 2099 flags |= UPD_SP_MANA;
2169 } 2100 }
2101
2170 if (spell->last_grace != SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE)) { 2102 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2103 {
2171 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2104 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2172 flags |= UPD_SP_GRACE; 2105 flags |= UPD_SP_GRACE;
2173 } 2106 }
2107
2174 if (spell->last_eat != spell->stats.dam+SP_level_dam_adjust(pl->ob, spell)) { 2108 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2109 {
2175 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2110 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2176 flags |= UPD_SP_DAMAGE; 2111 flags |= UPD_SP_DAMAGE;
2177 } 2112 }
2113
2178 if (flags !=0) { 2114 if (flags)
2179 sl.buf =(unsigned char*) malloc(MAXSOCKBUF); 2115 {
2180 strcpy((char*)sl.buf,"updspell "); 2116 packet sl;
2181 sl.len=strlen((char*)sl.buf); 2117
2182 SockList_AddChar(&sl, flags); 2118 sl << "updspell "
2183 SockList_AddInt(&sl, spell->count); 2119 << uint8 (flags)
2120 << uint32 (spell->count);
2121
2184 if (flags & UPD_SP_MANA) SockList_AddShort(&sl, spell->last_sp); 2122 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2185 if (flags & UPD_SP_GRACE) SockList_AddShort(&sl, spell->last_grace); 2123 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2186 if (flags & UPD_SP_DAMAGE) SockList_AddShort(&sl, spell->last_eat); 2124 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2187 flags = 0; 2125
2188 Send_With_Handling(&pl->socket, &sl); 2126 pl->ns->send_packet (sl);
2189 free(sl.buf);
2190 } 2127 }
2191 } 2128 }
2192 } 2129 }
2193} 2130}
2194 2131
2132void
2195void esrv_remove_spell(player *pl, object *spell) { 2133esrv_remove_spell (player *pl, object *spell)
2196 SockList sl; 2134{
2135 if (!pl->ns->monitor_spells)
2136 return;
2197 2137
2198 if (!pl->socket.monitor_spells) return;
2199 if (!pl || !spell || spell->env != pl->ob) { 2138 if (!pl || !spell || spell->env != pl->ob)
2139 {
2200 LOG(llevError, "Invalid call to esrv_remove_spell"); 2140 LOG (llevError, "Invalid call to esrv_remove_spell");
2201 return; 2141 return;
2202 } 2142 }
2203 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2143
2204 strcpy((char*)sl.buf,"delspell "); 2144 packet sl ("delspell");
2205 sl.len=strlen((char*)sl.buf); 2145
2206 SockList_AddInt(&sl, spell->count); 2146 sl << uint32 (spell->count);
2207 Send_With_Handling(&pl->socket, &sl); 2147
2208 free(sl.buf); 2148 pl->ns->send_packet (sl);
2209} 2149}
2210 2150
2211/* appends the spell *spell to the Socklist we will send the data to. */ 2151/* appends the spell *spell to the Socklist we will send the data to. */
2152static void
2212static void append_spell (player *pl, SockList *sl, object *spell) { 2153append_spell (player *pl, packet &sl, object *spell)
2154{
2213 int len, i, skill=0; 2155 int len, i, skill = 0;
2214 2156
2215 if (!(spell->name)) { 2157 if (!(spell->name))
2158 {
2216 LOG(llevError, "item number %d is a spell with no name.\n", spell->count); 2159 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2217 return; 2160 return;
2218 } 2161 }
2219 SockList_AddInt(sl, spell->count); 2162
2220 SockList_AddShort(sl, spell->level);
2221 SockList_AddShort(sl, spell->casting_time);
2222 /* store costs and damage in the object struct, to compare to later */ 2163 /* store costs and damage in the object struct, to compare to later */
2223 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2164 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2224 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2165 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2225 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2166 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2226 /* send the current values */
2227 SockList_AddShort(sl, spell->last_sp);
2228 SockList_AddShort(sl, spell->last_grace);
2229 SockList_AddShort(sl, spell->last_eat);
2230 2167
2231 /* figure out which skill it uses, if it uses one */ 2168 /* figure out which skill it uses, if it uses one */
2232 if (spell->skill) { 2169 if (spell->skill)
2170 {
2233 for (i=1; i< NUM_SKILLS; i++) 2171 for (i = 1; i < NUM_SKILLS; i++)
2234 if (!strcmp(spell->skill, skill_names[i])) { 2172 if (!strcmp (spell->skill, skill_names[i]))
2173 {
2235 skill = i+CS_STAT_SKILLINFO; 2174 skill = i + CS_STAT_SKILLINFO;
2236 break; 2175 break;
2237 } 2176 }
2238 } 2177 }
2239 SockList_AddChar(sl, skill);
2240 2178
2241 SockList_AddInt(sl, spell->path_attuned); 2179 /* send the current values */
2242 SockList_AddInt(sl, (spell->face)?spell->face->number:0); 2180 sl << uint32 (spell->count)
2243 2181 << uint16 (spell->level)
2244 len = strlen(spell->name); 2182 << uint16 (spell->casting_time)
2245 SockList_AddChar(sl, (char)len); 2183 << uint16 (spell->last_sp)
2246 memcpy(sl->buf+sl->len, spell->name, len); 2184 << uint16 (spell->last_grace)
2247 sl->len+=len; 2185 << uint16 (spell->last_eat)
2248 2186 << uint8 (skill)
2249 if (!spell->msg) { 2187 << uint32 (spell->path_attuned)
2250 SockList_AddShort(sl, 0); 2188 << uint32 (spell->face ? spell->face->number : 0)
2251 } 2189 << data8 (spell->name)
2252 else { 2190 << data16 (spell->msg);
2253 len = strlen(spell->msg);
2254 SockList_AddShort(sl, len);
2255 memcpy(sl->buf+sl->len, spell->msg, len);
2256 sl->len+=len;
2257 }
2258} 2191}
2259 2192
2260/** 2193/**
2261 * This tells the client to add the spell *ob, if *ob is NULL, then add 2194 * This tells the client to add the spell *ob, if *ob is NULL, then add
2262 * all spells in the player's inventory. 2195 * all spells in the player's inventory.
2263 */ 2196 */
2197void
2264void esrv_add_spells(player *pl, object *spell) { 2198esrv_add_spells (player *pl, object *spell)
2265 SockList sl; 2199{
2266 if (!pl) { 2200 if (!pl)
2201 {
2267 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2202 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2268 return; 2203 return;
2269 } 2204 }
2270 if (!pl->socket.monitor_spells) return; 2205
2271 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2206 if (!pl->ns->monitor_spells)
2272 strcpy((char*)sl.buf,"addspell "); 2207 return;
2273 sl.len=strlen((char*)sl.buf); 2208
2209 packet sl ("addspell");
2210
2274 if (!spell) { 2211 if (!spell)
2212 {
2275 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2213 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2214 {
2276 /* were we to simply keep appending data here, we could exceed 2215 /* were we to simply keep appending data here, we could exceed
2277 * MAXSOCKBUF if the player has enough spells to add, we know that 2216 * MAXSOCKBUF if the player has enough spells to add, we know that
2278 * append_spells will always append 19 data bytes, plus 4 length 2217 * append_spells will always append 19 data bytes, plus 4 length
2279 * bytes and 3 strings (because that is the spec) so we need to 2218 * bytes and 3 strings (because that is the spec) so we need to
2280 * check that the length of those 3 strings, plus the 23 bytes, 2219 * check that the length of those 3 strings, plus the 23 bytes,
2281 * won't take us over the length limit for the socket, if it does, 2220 * won't take us over the length limit for the socket, if it does,
2282 * we need to send what we already have, and restart packet formation 2221 * we need to send what we already have, and restart packet formation
2283 */ 2222 */
2284 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 2223 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2285 * to show add_spell is 26 bytes + 2 strings. However, the overun 2224 * to show add_spell is 26 bytes + 2 strings. However, the overun
2286 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2225 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2287 * like it will fix this 2226 * like it will fix this
2288 */ 2227 */
2289 if (spell->type != SPELL) continue; 2228 if (spell->type != SPELL)
2290 if (sl.len >= (MAXSOCKBUF - (26 + strlen(spell->name) + 2229 continue;
2291 (spell->msg?strlen(spell->msg):0)))) { 2230
2292 Send_With_Handling(&pl->socket, &sl); 2231 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2293 strcpy((char*)sl.buf,"addspell "); 2232 {
2294 sl.len=strlen((char*)sl.buf); 2233 pl->ns->send_packet (sl);
2234
2235 sl.reset ();
2236 sl << "addspell ";
2295 } 2237 }
2238
2296 append_spell(pl, &sl, spell); 2239 append_spell (pl, sl, spell);
2297 } 2240 }
2298 } 2241 }
2299 else if (spell->type != SPELL) { 2242 else if (spell->type != SPELL)
2243 {
2300 LOG(llevError, "Asked to send a non-spell object as a spell"); 2244 LOG (llevError, "Asked to send a non-spell object as a spell");
2301 return; 2245 return;
2302 } 2246 }
2247 else
2303 else append_spell(pl, &sl, spell); 2248 append_spell (pl, sl, spell);
2249
2304 if (sl.len >= MAXSOCKBUF) { 2250 if (sl.length () >= MAXSOCKBUF)
2251 {
2305 LOG(llevError,"Buffer overflow in esrv_add_spells!\n"); 2252 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2306 fatal(0); 2253 fatal (0);
2307 } 2254 }
2255
2308 /* finally, we can send the packet */ 2256 /* finally, we can send the packet */
2309 Send_With_Handling(&pl->socket, &sl); 2257 pl->ns->send_packet (sl);
2310 free(sl.buf);
2311} 2258}
2312 2259

Diff Legend

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