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

Diff Legend

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