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

Diff Legend

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