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.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.49 by root, Thu Dec 21 06:12:37 2006 UTC

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

Diff Legend

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