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

Diff Legend

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