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.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.53 by root, Mon Dec 25 11:25:50 2006 UTC

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

Diff Legend

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