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

Diff Legend

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