ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.36 by root, Thu Dec 14 04:30:33 2006 UTC

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

Diff Legend

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