ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.10 by root, Fri Aug 25 17:11:54 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

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

Diff Legend

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