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.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.35 by root, Thu Dec 14 02:37:37 2006 UTC

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

Diff Legend

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