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

Diff Legend

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