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.39 by root, Fri Dec 15 03:53:44 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 (char *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 ((uint8 *)buf);
679 repeat = GetInt_String(buf+2); 787 repeat = net_uint32 ((uint8 *)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.
690 * Therefore, the error message doesn't have to be too clear - if
691 * someone is playing with a hacked/non working client, this gives them
692 * an idea of the problem, but they deserve what they get
693 */
694 if (pl->state!=ST_PLAYING) {
695 new_draw_info_format(NDI_UNIQUE, 0,pl->ob,
696 "You can not issue commands - state is not ST_PLAYING (%s)", buf);
697 return;
698 }
699
700 /* This should not happen anymore. */ 799 /* This should not happen anymore. */
701 if (pl->ob->speed_left<-1.0) { 800 if (pl->ob->speed_left < -1.0)
702 LOG(llevError,"Player has negative time - shouldn't do command.\n"); 801 LOG (llevError, "Player has negative time - shouldn't do command.\n");
703 } 802
704 /* In c_new.c */ 803 /* In c_new.c */
705 execute_newserver_command(pl->ob, (char*)command); 804 execute_newserver_command (pl->ob, (char *) command);
706 /* Perhaps something better should be done with a left over count. 805 /* Perhaps something better should be done with a left over count.
707 * Cleaning up the input should probably be done first - all actions 806 * 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 807 * for the command that issued the count should be done before any other
709 * commands. 808 * commands.
710 */ 809 */
711 pl->count=0; 810 pl->count = 0;
712 811
812 if (FABS (pl->ob->speed) < 0.001)
813 time = MAX_TIME * 100;
814 else
815 time = (int) (MAX_TIME / FABS (pl->ob->speed));
816
713 /* Send confirmation of command execution now */ 817 /* Send confirmation of command execution now */
714 sl.buf = command; 818
715 strcpy((char*)sl.buf,"comc "); 819 packet sl;
716 sl.len=5; 820 sl << "comc " << uint16 (pktlen) << uint32 (time);
717 SockList_AddShort(&sl,packet); 821 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} 822}
724 823
725 824
726/** This is a reply to a previous query. */ 825/** This is a reply to a previous query. */
826void
727void ReplyCmd(char *buf, int len, player *pl) 827ReplyCmd (char *buf, int len, player *pl)
728{ 828{
729 /* This is to synthesize how the data would be stored if it 829 /* 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 830 * was normally entered. A bit of a hack, and should be cleaned up
731 * once all the X11 code is removed from the server. 831 * once all the X11 code is removed from the server.
732 * 832 *
733 * We pass 13 to many of the functions because this way they 833 * We pass 13 to many of the functions because this way they
734 * think it was the carriage return that was entered, and the 834 * think it was the carriage return that was entered, and the
735 * function then does not try to do additional input. 835 * function then does not try to do additional input.
736 */ 836 */
737 snprintf(pl->write_buf, sizeof(pl->write_buf), ":%s", buf); 837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
738 838
739 /* this avoids any hacking here */ 839 /* this avoids any hacking here */
740 840
741 switch (pl->state) { 841 switch (pl->state)
842 {
742 case ST_PLAYING: 843 case ST_PLAYING:
743 LOG(llevError,"Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
744 break; 845 break;
745 846
746 case ST_PLAY_AGAIN: 847 case ST_PLAY_AGAIN:
747 /* We can check this for return value (2==quit). Maybe we 848 /* We can check this for return value (2==quit). Maybe we
748 * should, and do something appropriate? 849 * should, and do something appropriate?
749 */ 850 */
750 receive_play_again(pl->ob, buf[0]); 851 receive_play_again (pl->ob, buf[0]);
751 break; 852 break;
752 853
753 case ST_ROLL_STAT: 854 case ST_ROLL_STAT:
754 key_roll_stat(pl->ob,buf[0]); 855 key_roll_stat (pl->ob, buf[0]);
755 break; 856 break;
756 857
757 case ST_CHANGE_CLASS: 858 case ST_CHANGE_CLASS:
758 859
759 key_change_class(pl->ob, buf[0]); 860 key_change_class (pl->ob, buf[0]);
760 break; 861 break;
761 862
762 case ST_CONFIRM_QUIT: 863 case ST_CONFIRM_QUIT:
763 key_confirm_quit(pl->ob, buf[0]); 864 key_confirm_quit (pl->ob, buf[0]);
764 break; 865 break;
765 866
766 case ST_CONFIGURE: 867 case ST_CONFIGURE:
767 LOG(llevError,"In client input handling, but into configure state\n"); 868 LOG (llevError, "In client input handling, but into configure state\n");
768 pl->state = ST_PLAYING; 869 pl->state = ST_PLAYING;
769 break; 870 break;
770 871
771 case ST_GET_NAME: 872 case ST_GET_NAME:
772 receive_player_name(pl->ob,13); 873 receive_player_name (pl->ob, 13);
773 break; 874 break;
774 875
775 case ST_GET_PASSWORD: 876 case ST_GET_PASSWORD:
776 case ST_CONFIRM_PASSWORD: 877 case ST_CONFIRM_PASSWORD:
777 receive_player_password(pl->ob,13); 878 receive_player_password (pl->ob, 13);
778 break; 879 break;
779 880
780 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 881 case ST_GET_PARTY_PASSWORD: /* Get password for party */
781 receive_party_password(pl->ob,13); 882 receive_party_password (pl->ob, 13);
782 break; 883 break;
783 884
784 default: 885 default:
785 LOG(llevError,"Unknown input state: %d\n", pl->state); 886 LOG (llevError, "Unknown input state: %d\n", pl->state);
786 } 887 }
787} 888}
788 889
789/** 890/**
790 * Client tells its version. If there is a mismatch, we close the 891 * 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 892 * 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 893 * 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 894 * backwards compatible, having it be a later version should not be a
794 * problem. 895 * problem.
795 */ 896 */
897void
796void VersionCmd(char *buf, int len,NewSocket *ns) 898VersionCmd (char *buf, int len, client_socket * ns)
797{ 899{
798 char *cp; 900 char *cp;
799 char version_warning[256]; 901 char version_warning[256];
800 902
801 if (!buf) { 903 if (!buf)
904 {
802 LOG(llevError, "CS: received corrupted version command\n"); 905 LOG (llevError, "CS: received corrupted version command\n");
803 return; 906 return;
804 } 907 }
805 908
806 ns->cs_version = atoi(buf); 909 ns->cs_version = atoi (buf);
807 ns->sc_version = ns->cs_version; 910 ns->sc_version = ns->cs_version;
808 if (VERSION_CS != ns->cs_version) { 911 if (VERSION_CS != ns->cs_version)
912 {
809#ifdef ESRV_DEBUG 913#ifdef ESRV_DEBUG
810 LOG(llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS,ns->cs_version); 914 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
811#endif 915#endif
812 } 916 }
813 cp = strchr(buf+1,' '); 917 cp = strchr (buf + 1, ' ');
814 if (!cp) return; 918 if (!cp)
919 return;
815 ns->sc_version = atoi(cp); 920 ns->sc_version = atoi (cp);
816 if (VERSION_SC != ns->sc_version) { 921 if (VERSION_SC != ns->sc_version)
922 {
817#ifdef ESRV_DEBUG 923#ifdef ESRV_DEBUG
818 LOG(llevDebug, "CS: scversion mismatch (%d,%d)\n",VERSION_SC,ns->sc_version); 924 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
819#endif 925#endif
820 } 926 }
821 cp = strchr(cp+1, ' '); 927 cp = strchr (cp + 1, ' ');
822 if (cp) { 928 if (cp)
929 {
823 LOG(llevDebug,"CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 930 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
824 931
932 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
933
825 /* This is first implementation - i skip all beta DX clients with it 934 /* This is first implementation - i skip all beta DX clients with it
826 * Add later stuff here for other clients 935 * Add later stuff here for other clients
827 */ 936 */
828 937
829 /* these are old dxclients */ 938 /* these are old dxclients */
830 /* Version 1024 added support for singular + plural name values - 939 /* Version 1024 added support for singular + plural name values -
831 * requiing this minimal value reduces complexity of that code, and it 940 * requiing this minimal value reduces complexity of that code, and it
832 * has been around for a long time. 941 * has been around for a long time.
833 */ 942 */
834 if(!strcmp(" CF DX CLIENT", cp) || ns->sc_version < 1024 ) 943 if (ns->sc_version < 1026)
835 { 944 {
836 sprintf(version_warning,"drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 945 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
837 Write_String_To_Socket(ns, version_warning, strlen(version_warning)); 946 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
838 } 947 ns->send_packet (version_warning);
948 }
839 949
840 } 950 }
841} 951}
842 952
843/** sound related functions. */ 953/** sound related functions. */
844 954
955void
845void SetSound(char *buf, int len, NewSocket *ns) 956SetSound (char *buf, int len, client_socket * ns)
846{ 957{
847 ns->sound = atoi(buf); 958 ns->sound = atoi (buf);
848} 959}
849 960
850/** client wants the map resent */ 961/** client wants the map resent */
851 962
963void
852void MapRedrawCmd(char *buf, int len, player *pl) 964MapRedrawCmd (char *buf, int len, player *pl)
853{ 965{
966
854/* This function is currently disabled; just clearing the map state results in 967/* 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. 968 * display errors. It should clear the cache and send a newmap command.
856 * Unfortunately this solution does not work because some client versions send 969 * Unfortunately this solution does not work because some client versions send
857 * a mapredraw command after receiving a newmap command. 970 * a mapredraw command after receiving a newmap command.
858 */ 971 */
859#if 0 972#if 0
860 /* Okay, this is MAJOR UGLY. but the only way I know how to 973 /* Okay, this is MAJOR UGLY. but the only way I know how to
861 * clear the "cache" 974 * clear the "cache"
862 */ 975 */
863 memset(&pl->socket.lastmap, 0, sizeof(struct Map)); 976 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
864 draw_client_map(pl->ob); 977 draw_client_map (pl->ob);
865#endif 978#endif
866} 979}
867 980
868/** 981/**
869 * Moves an object (typically, container to inventory). 982 * Moves an object (typically, container to inventory).
870 * syntax is: move (to) (tag) (nrof) 983 * syntax is: move (to) (tag) (nrof)
871 */ 984 */
985void
872void MoveCmd(char *buf, int len,player *pl) 986MoveCmd (char *buf, int len, player *pl)
873{ 987{
874 int vals[3], i; 988 int vals[3], i;
875 989
876 /* A little funky here. We only cycle for 2 records, because 990 /* A little funky here. We only cycle for 2 records, because
877 * we obviously am not going to find a space after the third 991 * we obviously am not going to find a space after the third
878 * record. Perhaps we should just replace this with a 992 * record. Perhaps we should just replace this with a
879 * sscanf? 993 * sscanf?
880 */ 994 */
881 for (i=0; i<2; i++) { 995 for (i = 0; i < 2; i++)
996 {
882 vals[i]=atoi(buf); 997 vals[i] = atoi (buf);
883 if (!(buf = strchr(buf, ' '))) { 998 if (!(buf = strchr (buf, ' ')))
999 {
884 LOG(llevError,"Incomplete move command: %s\n", buf); 1000 LOG (llevError, "Incomplete move command: %s\n", buf);
885 return; 1001 return;
886 } 1002 }
887 buf++; 1003 buf++;
888 } 1004 }
889 vals[2]=atoi(buf); 1005 vals[2] = atoi (buf);
890 1006
891/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 1007/* 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]); 1008 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
893} 1009}
894 1010
895 1011
896 1012
897/****************************************************************************** 1013/******************************************************************************
… …
902 1018
903/** 1019/**
904 * Asks the client to query the user. This way, the client knows 1020 * 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) 1021 * it needs to send something back (vs just printing out a message)
906 */ 1022 */
1023void
907void send_query(NewSocket *ns, uint8 flags, char *text) 1024send_query (client_socket * ns, uint8 flags, char *text)
908{ 1025{
909 char buf[MAX_BUF]; 1026 char buf[MAX_BUF];
910 1027
911 sprintf(buf,"query %d %s", flags, text?text:""); 1028 sprintf (buf, "query %d %s", flags, text ? text : "");
912 Write_String_To_Socket(ns, buf, strlen(buf)); 1029 ns->send_packet (buf);
913} 1030}
914 1031
915#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1032#define AddIfInt64(Old,New,Type) if (Old != New) {\
916 Old = New; \ 1033 Old = New; \
917 SockList_AddChar(&sl, Type); \ 1034 sl << uint8 (Type) << uint64 (New); \
918 SockList_AddInt64(&sl, New); \ 1035 }
919 }
920 1036
921#define AddIfInt(Old,New,Type) if (Old != New) {\ 1037#define AddIfInt(Old,New,Type) if (Old != New) {\
922 Old = New; \ 1038 Old = New; \
923 SockList_AddChar(&sl, Type); \ 1039 sl << uint8 (Type) << uint32 (New); \
924 SockList_AddInt(&sl, New); \ 1040 }
925 }
926 1041
927#define AddIfShort(Old,New,Type) if (Old != New) {\ 1042#define AddIfShort(Old,New,Type) if (Old != New) {\
928 Old = New; \ 1043 Old = New; \
929 SockList_AddChar(&sl, Type); \ 1044 sl << uint8 (Type) << uint16 (New); \
930 SockList_AddShort(&sl, New); \ 1045 }
931 }
932 1046
933#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1047#define AddIfFloat(Old,New,Type) if (Old != New) {\
934 Old = New; \ 1048 Old = New; \
935 SockList_AddChar(&sl, Type); \ 1049 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
936 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ 1050 }
937 }
938 1051
939#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1052#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
940 if (Old) free(Old);\ 1053 free(Old); Old = strdup (New);\
941 Old = strdup_local(New);\ 1054 sl << uint8 (Type) << data8 (New); \
942 SockList_AddChar(&sl, Type); \ 1055 }
943 SockList_AddChar(&sl, ( char )strlen(New)); \
944 strcpy((char*)sl.buf + sl.len, New); \
945 sl.len += strlen(New); \
946 }
947 1056
948/** 1057/**
949 * Sends a statistics update. We look at the old values, 1058 * Sends a statistics update. We look at the old values,
950 * and only send what has changed. Stat mapping values are in newclient.h 1059 * 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 1060 * Since this gets sent a lot, this is actually one of the few binary
952 * commands for now. 1061 * commands for now.
953 */ 1062 */
1063void
954void esrv_update_stats(player *pl) 1064esrv_update_stats (player *pl)
955{ 1065{
956 SockList sl;
957 char buf[MAX_BUF]; 1066 char buf[MAX_BUF];
958 uint16 flags; 1067 uint16 flags;
959 1068
960 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1069 packet sl;
961 strcpy((char*)sl.buf,"stats "); 1070 sl << "stats ";
962 sl.len=strlen((char*)sl.buf); 1071
963
964 if(pl->ob != NULL) 1072 if (pl->ob != NULL)
965 { 1073 {
966 AddIfShort(pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1074 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); 1075 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); 1076 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); 1077 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); 1078 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); 1079 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); 1080 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); 1081 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); 1082 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); 1083 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); 1084 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); 1085 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); 1086 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 } 1087 }
994 } 1088
995 }
996 if (pl->socket.exp64) { 1089 if (pl->socket->exp64)
1090 {
1091 uint8 s;
1092
1093 for (s = 0; s < NUM_SKILLS; s++)
1094 {
1095 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1096 {
1097 /* Always send along the level if exp changes. This is only
1098 * 1 extra byte, but keeps processing simpler.
1099 */
1100 sl << uint8 (s + CS_STAT_SKILLINFO)
1101 << uint8 (pl->last_skill_ob[s]->level)
1102 << uint64 (pl->last_skill_ob[s]->stats.exp);
1103
1104 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1105 }
1106 }
1107 }
1108
1109 if (pl->socket->exp64)
997 AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1110 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
998 } else { 1111 else
999 AddIfInt(pl->last_stats.exp, ( int )pl->ob->stats.exp, CS_STAT_EXP); 1112 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1000 } 1113
1001 AddIfShort(pl->last_level, ( char )pl->ob->level, CS_STAT_LEVEL); 1114 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1002 AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1115 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); 1116 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); 1117 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1005 AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1118 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1006 AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1119 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); 1120 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); 1121 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1009 flags=0; 1122 flags = 0;
1010 if (pl->fire_on) flags |=SF_FIREON;
1011 if (pl->run_on) flags |= SF_RUNON;
1012 1123
1124 if (pl->fire_on)
1125 flags |= SF_FIREON;
1126
1127 if (pl->run_on)
1128 flags |= SF_RUNON;
1129
1013 AddIfShort(pl->last_flags, flags, CS_STAT_FLAGS); 1130 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1131
1014 if (pl->socket.sc_version<1025) { 1132 if (pl->socket->sc_version < 1025)
1015 AddIfShort(pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1133 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1016 } else { 1134 else
1017 int i; 1135 {
1136 int i;
1018 1137
1019 for (i=0; i<NROFATTACKS; i++) { 1138 for (i = 0; i < NROFATTACKS; i++)
1139 {
1020 /* Skip ones we won't send */ 1140 /* Skip ones we won't send */
1021 if (atnr_cs_stat[i]==-1) continue; 1141 if (atnr_cs_stat[i] == -1)
1142 continue;
1143
1022 AddIfShort(pl->last_resist[i], pl->ob->resist[i], ( char )atnr_cs_stat[i]); 1144 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1023 } 1145 }
1024 } 1146 }
1147
1025 if (pl->socket.monitor_spells) { 1148 if (pl->socket->monitor_spells)
1149 {
1026 AddIfInt(pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1150 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); 1151 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); 1152 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1029 } 1153 }
1154
1030 rangetostring(pl->ob, buf); /* we want use the new fire & run system in new client */ 1155 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); 1156 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1032 set_title(pl->ob, buf); 1157 set_title (pl->ob, buf);
1033 AddIfString(pl->socket.stats.title, buf, CS_STAT_TITLE); 1158 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1034 1159
1035 /* Only send it away if we have some actual data */ 1160 /* Only send it away if we have some actual data */
1036 if (sl.len>6) { 1161 if (sl.length () > 6)
1037#ifdef ESRV_DEBUG 1162 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} 1163}
1044
1045 1164
1046/** 1165/**
1047 * Tells the client that here is a player it should start using. 1166 * Tells the client that here is a player it should start using.
1048 */ 1167 */
1168void
1049void esrv_new_player(player *pl, uint32 weight) 1169esrv_new_player (player *pl, uint32 weight)
1050{ 1170{
1051 SockList sl;
1052
1053 pl->last_weight = weight; 1171 pl->last_weight = weight;
1054 1172
1055 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1173 packet sl;
1174 sl << "player ";
1056 1175
1057 strcpy((char*)sl.buf,"player "); 1176 sl << uint32 (pl->ob->count)
1058 sl.len=strlen((char*)sl.buf); 1177 << uint32 (weight)
1059 SockList_AddInt(&sl, pl->ob->count); 1178 << uint32 (pl->ob->face->number)
1060 SockList_AddInt(&sl, weight); 1179 << data8 (pl->ob->name);
1061 SockList_AddInt(&sl, pl->ob->face->number);
1062 1180
1063 SockList_AddChar(&sl, ( char )strlen(pl->ob->name)); 1181 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); 1182 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1070} 1183}
1071
1072 1184
1073/** 1185/**
1074 * Need to send an animation sequence to the client. 1186 * Need to send an animation sequence to the client.
1075 * We will send appropriate face commands to the client if we haven't 1187 * 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 1188 * 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 1189 * how much we are sending - on the other hand, this should only happen
1078 * when the player logs in and picks stuff up. 1190 * when the player logs in and picks stuff up.
1079 */ 1191 */
1192void
1080void esrv_send_animation(NewSocket *ns, short anim_num) 1193esrv_send_animation (client_socket * ns, short anim_num)
1081{ 1194{
1082 SockList sl;
1083 int i; 1195 int i;
1084 1196
1085 /* Do some checking on the anim_num we got. Note that the animations 1197 /* 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 1198 * are added in contigous order, so if the number is in the valid
1087 * range, it must be a valid animation. 1199 * range, it must be a valid animation.
1088 */ 1200 */
1089 if (anim_num < 0 || anim_num > num_animations) { 1201 if (anim_num < 0 || anim_num > num_animations)
1202 {
1090 LOG(llevError,"esrv_send_anim (%d) out of bounds??\n",anim_num); 1203 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1091 return; 1204 return;
1092 } 1205 }
1093 1206
1094 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1207 packet sl;
1095 strcpy((char*)sl.buf, "anim "); 1208
1096 sl.len=5; 1209 sl << "anim "
1097 SockList_AddShort(&sl, anim_num); 1210 << uint16 (anim_num)
1098 SockList_AddShort(&sl, 0); /* flags - not used right now */ 1211 << uint16 (0); /* flags - not used right now */
1212
1099 /* Build up the list of faces. Also, send any information (ie, the 1213 /* Build up the list of faces. Also, send any information (ie, the
1100 * the face itself) down to the client. 1214 * the face itself) down to the client.
1101 */ 1215 */
1102 for (i=0; i<animations[anim_num].num_animations; i++) { 1216 for (i = 0; i < animations[anim_num].num_animations; i++)
1217 {
1103 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1218 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1104 esrv_send_face(ns,animations[anim_num].faces[i],0); 1219 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1105 SockList_AddShort(&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1220 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1106 } 1221 }
1107 Send_With_Handling(ns, &sl); 1222
1108 free(sl.buf); 1223 ns->send_packet (sl);
1224
1109 ns->anims_sent[anim_num] = 1; 1225 ns->anims_sent[anim_num] = 1;
1110} 1226}
1111 1227
1112 1228
1113/****************************************************************************** 1229/******************************************************************************
1114 * 1230 *
… …
1118 1234
1119/** 1235/**
1120 * This adds face_num to a map cell at x,y. If the client doesn't have 1236 * 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. 1237 * the face yet, we will also send it.
1122 */ 1238 */
1123static void esrv_map_setbelow(NewSocket *ns, int x,int y, 1239static void
1124 short face_num, struct Map *newmap) 1240esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1125{ 1241{
1126 if(newmap->cells[x][y].count >= MAP_LAYERS) { 1242 if (newmap->cells[x][y].count >= MAP_LAYERS)
1243 {
1127 LOG(llevError,"Too many faces in map cell %d %d\n",x,y); 1244 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1128 return; 1245 return;
1129 abort(); 1246 abort ();
1130 } 1247 }
1248
1131 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1249 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1132 newmap->cells[x][y].count ++; 1250 newmap->cells[x][y].count++;
1251
1133 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1252 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1134 esrv_send_face(ns,face_num,0); 1253 esrv_send_face (ns, face_num, 0);
1135} 1254}
1136 1255
1137struct LayerCell { 1256struct LayerCell
1257{
1138 uint16 xy; 1258 uint16 xy;
1139 short face; 1259 short face;
1140}; 1260};
1141 1261
1142struct MapLayer { 1262struct MapLayer
1263{
1143 int count; 1264 int count;
1144 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1265 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1145}; 1266};
1146 1267
1147/** Checkes if map cells have changed */ 1268/** Checkes if map cells have changed */
1269static int
1148static int mapcellchanged(NewSocket *ns,int i,int j, struct Map *newmap) 1270mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1149{ 1271{
1150 int k; 1272 int k;
1151 1273
1152 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1274 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1153 return 1; 1275 return 1;
1154 for(k=0;k<newmap->cells[i][j].count;k++) { 1276 for (k = 0; k < newmap->cells[i][j].count; k++)
1155 if (ns->lastmap.cells[i][j].faces[k] != 1277 {
1156 newmap->cells[i][j].faces[k]) { 1278 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1279 {
1157 return 1; 1280 return 1;
1158 } 1281 }
1159 } 1282 }
1160 return 0; 1283 return 0;
1161} 1284}
1162 1285
1163/** 1286/**
1164 * Basically, what this does is pack the data into layers. 1287 * 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 1288 * 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 1289 * this data into. we return the end of the data. layers is
1167 * how many layers of data we should back. 1290 * how many layers of data we should back.
1168 */ 1291 */
1169static uint8 *compactlayer(NewSocket *ns, unsigned char *cur, int numlayers, 1292static uint8 *
1170 struct Map *newmap) 1293compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1171{ 1294{
1172 int x,y,k; 1295 int x, y, k;
1173 int face; 1296 int face;
1174 unsigned char *fcur; 1297 unsigned char *fcur;
1175 struct MapLayer layers[MAP_LAYERS]; 1298 struct MapLayer layers[MAP_LAYERS];
1176 1299
1177 for(k = 0;k<MAP_LAYERS;k++) 1300 for (k = 0; k < MAP_LAYERS; k++)
1178 layers[k].count = 0; 1301 layers[k].count = 0;
1179 fcur = cur; 1302 fcur = cur;
1180 for(x=0;x<ns->mapx;x++) { 1303 for (x = 0; x < ns->mapx; x++)
1181 for(y=0;y<ns->mapy;y++) { 1304 {
1305 for (y = 0; y < ns->mapy; y++)
1306 {
1182 if (!mapcellchanged(ns,x,y,newmap)) 1307 if (!mapcellchanged (ns, x, y, newmap))
1183 continue; 1308 continue;
1184 if (newmap->cells[x][y].count == 0) { 1309 if (newmap->cells[x][y].count == 0)
1310 {
1185 *cur = x*ns->mapy+y; /* mark empty space */ 1311 *cur = x * ns->mapy + y; /* mark empty space */
1186 cur++; 1312 cur++;
1187 continue; 1313 continue;
1314 }
1315 for (k = 0; k < newmap->cells[x][y].count; k++)
1316 {
1317 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1318 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1319 layers[k].count++;
1320 }
1321 }
1188 } 1322 }
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. */ 1323 /* If no data, return now. */
1198 if (fcur == cur && layers[0].count == 0) 1324 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; 1325 return cur;
1232} 1326 *cur = 255; /* mark end of explicitly cleared cells */
1233 1327 cur++;
1234static void esrv_map_doneredraw(NewSocket *ns, struct Map *newmap) 1328 /* First pack by layers. */
1235{ 1329 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 } 1330 {
1263 free(sl.buf); 1331 if (layers[k].count == 0)
1332 break; /* once a layer is entirely empty, no layer below it can
1333 have anything in it either */
1334 /* Pack by entries in thie layer */
1335 for (x = 0; x < layers[k].count;)
1336 {
1337 fcur = cur;
1338 *cur = layers[k].lcells[x].face >> 8;
1339 cur++;
1340 *cur = layers[k].lcells[x].face & 0xFF;
1341 cur++;
1342 face = layers[k].lcells[x].face;
1343 /* Now, we back the redundant data into 1 byte xy pairings */
1344 for (y = x; y < layers[k].count; y++)
1345 {
1346 if (layers[k].lcells[y].face == face)
1347 {
1348 *cur = (uint8) layers[k].lcells[y].xy;
1349 cur++;
1350 layers[k].lcells[y].face = -1;
1351 }
1352 }
1353 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1354 /* forward over the now redundant data */
1355 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1356 x++;
1357 }
1358 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1359 }
1360 return cur;
1264} 1361}
1265
1266 1362
1267/** Clears a map cell */ 1363/** Clears a map cell */
1364static void
1268static void map_clearcell(struct MapCell *cell, int face0, int face1, int face2, int count) 1365map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1269{ 1366{
1270 cell->count=count;
1271 cell->faces[0] = face0; 1367 cell->faces[0] = face0;
1272 cell->faces[1] = face1; 1368 cell->faces[1] = face1;
1273 cell->faces[2] = face2; 1369 cell->faces[2] = face2;
1370 cell->count = count;
1371 cell->stat_hp = 0;
1372 cell->flags = 0;
1373 cell->player = 0;
1274} 1374}
1275 1375
1276#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1376#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1277#define MAX_LAYERS 3 1377#define MAX_LAYERS 3
1278 1378
… …
1281 * and saves the space of allocating this in the socket object when we only 1381 * 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 1382 * need it for this cycle. If the serve is ever threaded, this needs to be
1283 * re-examined. 1383 * re-examined.
1284 */ 1384 */
1285 1385
1286static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1386static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1287 1387
1288/** 1388/**
1289 * Returns true if any of the heads for this 1389 * Returns true if any of the heads for this
1290 * space is set. Returns false if all are blank - this is used 1390 * space is set. Returns false if all are blank - this is used
1291 * for empty space checking. 1391 * for empty space checking.
1292 */ 1392 */
1293static inline int have_head(int ax, int ay) { 1393static inline int
1394have_head (int ax, int ay)
1395{
1294 1396
1295 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1397 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1296 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || 1398 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; 1399 return 1;
1400 return 0;
1299} 1401}
1300 1402
1301/** 1403/**
1302 * check_head is a bit simplistic version of update_space below. 1404 * 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 1405 * 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 1406 * 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 1407 * if needed, and returning 1. If this no data needs to get
1306 * sent, it returns zero. 1408 * sent, it returns zero.
1307 */ 1409 */
1308static inline int check_head(SockList *sl, NewSocket *ns, int ax, int ay, int layer) 1410static int
1411check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1309{ 1412{
1310 short face_num; 1413 short face_num;
1311 1414
1312 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1415 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1313 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1416 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1314 else 1417 else
1315 face_num = 0; 1418 face_num = 0;
1316 1419
1317 if (face_num != ns->lastmap.cells[ax][ay].faces[layer]) { 1420 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1318 SockList_AddShort(sl, face_num); 1421 {
1422 sl << uint16 (face_num);
1319 if (face_num && !(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1423 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1320 esrv_send_face(ns, face_num, 0); 1424 esrv_send_face (&ns, face_num, 0);
1425
1321 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1426 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1322 ns->lastmap.cells[ax][ay].faces[layer] = face_num; 1427 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1323 return 1; 1428 return 1;
1324 } 1429 }
1325 1430
1326 return 0; /* No change */ 1431 return 0; /* No change */
1327} 1432}
1328 1433
1329/** 1434/**
1330 * Removes the need to replicate the same code for each layer. 1435 * Removes the need to replicate the same code for each layer.
1331 * this returns true if this space is now in fact different than 1436 * 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 1449 * 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 1450 * the case, it seems to make more sense to have these layer values
1346 * actually match. 1451 * actually match.
1347 */ 1452 */
1348 1453
1454static int
1349static inline int update_space(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1455update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1350{ 1456{
1351 object *ob, *head; 1457 object *ob, *head;
1352 uint16 face_num; 1458 uint16 face_num;
1353 int bx, by,i; 1459 int bx, by, i;
1354 1460
1355 /* If there is a multipart object stored away, treat that as more important. 1461 /* If there is a multipart object stored away, treat that as more important.
1356 * If not, then do the normal processing. 1462 * If not, then do the normal processing.
1357 */ 1463 */
1358
1359 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1464 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1360 1465
1361 /* Check to see if this head is part of the set of objects 1466 /* Check to see if this head is part of the set of objects
1362 * we would normally send for this space. If so, then 1467 * we would normally send for this space. If so, then
1363 * don't use the head value. We need to do the check 1468 * 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 - 1469 * 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. 1470 * 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 1471 * 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. 1472 * rather not need to do the map translation overhead.
1368 * 3) We need to do some extra checking to make sure that we will 1473 * 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 1474 * otherwise send the image as this layer, eg, either it matches
1370 * the head value, or is not multipart. 1475 * the head value, or is not multipart.
1371 */ 1476 */
1372 if (head && !head->more) { 1477 if (head && !head->more)
1478 {
1373 for (i=0; i<MAP_LAYERS; i++) { 1479 for (i = 0; i < MAP_LAYERS; i++)
1480 {
1374 ob = GET_MAP_FACE_OBJ(mp, mx, my, i); 1481 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1375 if (!ob) continue; 1482 if (!ob)
1483 continue;
1376 1484
1377 if (ob->head) ob=ob->head; 1485 if (ob->head)
1486 ob = ob->head;
1378 1487
1379 if (ob == head) { 1488 if (ob == head)
1489 {
1380 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; 1490 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1381 head = NULL; 1491 head = NULL;
1382 break; 1492 break;
1493 }
1494 }
1383 } 1495 }
1384 }
1385 }
1386 1496
1387 ob = head; 1497 ob = head;
1498 if (!ob)
1388 if (!ob) ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1499 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1389 1500
1390 /* If there is no object for this space, or if the face for the object 1501 /* 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. 1502 * is the blank face, set the face number to zero.
1392 * else if we have the stored head object for this space, that takes 1503 * else if we have the stored head object for this space, that takes
1393 * precedence over the other object for this space. 1504 * precedence over the other object for this space.
1394 * otherwise, we do special head processing 1505 * otherwise, we do special head processing
1395 */ 1506 */
1396 if (!ob || ob->face == blank_face) face_num=0; 1507 if (!ob || ob->face == blank_face)
1508 face_num = 0;
1397 else if (head){ 1509 else if (head)
1510 {
1398 /* if this is a head that had previously been stored */ 1511 /* if this is a head that had previously been stored */
1399 face_num = ob->face->number; 1512 face_num = ob->face->number;
1400 } else { 1513 }
1514 else
1515 {
1401 /* if the faces for the different parts of a multipart object 1516 /* if the faces for the different parts of a multipart object
1402 * are the same, we only want to send the bottom right most 1517 * are the same, we only want to send the bottom right most
1403 * portion of the object. That info is in the tail_.. values 1518 * portion of the object. That info is in the tail_.. values
1404 * of the head. Note that for the head itself, ob->head will 1519 * 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 1520 * be null, so we only do this block if we are working on
1406 * a tail piece. 1521 * a tail piece.
1407 */ 1522 */
1408 1523
1409 /* tail_x and tail_y will only be set in the head object. If 1524 /* 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 1525 * this is the head object and these are set, we proceed
1411 * with logic to only send bottom right. Similarly, if 1526 * with logic to only send bottom right. Similarly, if
1412 * this is one of the more parts but the head has those values 1527 * 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 1528 * 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 1529 * 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 1530 * can always expect that ob->arch->tail_x will be true for all
1416 * object we may want to display. 1531 * object we may want to display.
1417 */ 1532 */
1418 if ((ob->arch->tail_x || ob->arch->tail_y) || 1533 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))) { 1534 {
1420 1535
1421 if (ob->head) head = ob->head; 1536 if (ob->head)
1422 else head = ob; 1537 head = ob->head;
1538 else
1539 head = ob;
1423 1540
1424 /* Basically figure out where the offset is from where we are right 1541 /* 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 1542 * 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 1543 * 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 1544 * 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 1545 * on the bottom right corner. If ob is the head, the clone values
1429 * will be zero, so the right thing will still happen. 1546 * will be zero, so the right thing will still happen.
1430 */ 1547 */
1431 bx = sx + head->arch->tail_x - ob->arch->clone.x; 1548 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1432 by = sy + head->arch->tail_y - ob->arch->clone.y; 1549 by = sy + head->arch->tail_y - ob->arch->clone.y;
1433 1550
1434 /* I don't think this can ever happen, but better to check for it just 1551 /* I don't think this can ever happen, but better to check for it just
1435 * in case. 1552 * in case.
1436 */ 1553 */
1437 if (bx < sx || by < sy) { 1554 if (bx < sx || by < sy)
1555 {
1438 LOG(llevError,"update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", 1556 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); 1557 face_num = 0;
1440 face_num = 0; 1558 }
1441 }
1442 /* single part object, multipart object with non merged faces, 1559 /* single part object, multipart object with non merged faces,
1443 * of multipart object already at lower right. 1560 * of multipart object already at lower right.
1444 */ 1561 */
1445 else if (bx == sx && by == sy) { 1562 else if (bx == sx && by == sy)
1563 {
1446 face_num = ob->face->number; 1564 face_num = ob->face->number;
1447 1565
1448 /* if this face matches one stored away, clear that one away. 1566 /* if this face matches one stored away, clear that one away.
1449 * this code relies on the fact that the map1 commands 1567 * this code relies on the fact that the map1 commands
1450 * goes from 2 down to 0. 1568 * goes from 2 down to 0.
1451 */ 1569 */
1452 for (i=0; i<MAP_LAYERS; i++) 1570 for (i = 0; i < MAP_LAYERS; i++)
1453 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1571 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1454 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1572 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1455 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1573 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1456 } 1574 }
1457 else { 1575 else
1576 {
1458 /* If this head is stored away, clear it - otherwise, 1577 /* If this head is stored away, clear it - otherwise,
1459 * there can be cases where a object is on multiple layers - 1578 * there can be cases where a object is on multiple layers -
1460 * we only want to send it once. 1579 * we only want to send it once.
1461 */ 1580 */
1462 face_num = head->face->number; 1581 face_num = head->face->number;
1463 for (i=0; i<MAP_LAYERS; i++) 1582 for (i = 0; i < MAP_LAYERS; i++)
1464 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1583 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1465 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1584 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1466 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1585 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1467 1586
1468 /* First, try to put the new head on the same layer. If that is used up, 1587 /* First, try to put the new head on the same layer. If that is used up,
1469 * then find another layer. 1588 * then find another layer.
1470 */ 1589 */
1471 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) { 1590 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1591 {
1472 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; 1592 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1473 } else for (i=0; i<MAX_LAYERS; i++) { 1593 }
1594 else
1595 for (i = 0; i < MAX_LAYERS; i++)
1596 {
1474 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || 1597 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1475 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) { 1598 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1599 {
1476 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; 1600 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1477 } 1601 }
1478 } 1602 }
1479 face_num = 0; /* Don't send this object - we'll send the head later */ 1603 face_num = 0; /* Don't send this object - we'll send the head later */
1480 } 1604 }
1481 } else { 1605 }
1606 else
1607 {
1482 /* In this case, we are already at the lower right or single part object, 1608 /* In this case, we are already at the lower right or single part object,
1483 * so nothing special 1609 * so nothing special
1484 */ 1610 */
1485 face_num = ob->face->number; 1611 face_num = ob->face->number;
1486 1612
1487 /* clear out any head entries that have the same face as this one */ 1613 /* clear out any head entries that have the same face as this one */
1488 for (bx=0; bx<layer; bx++) 1614 for (bx = 0; bx < layer; bx++)
1489 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1615 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1490 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1616 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1491 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1617 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1492 } 1618 }
1493 } /* else not already head object or blank face */ 1619 } /* else not already head object or blank face */
1494 1620
1495 /* This is a real hack. Basically, if we have nothing to send for this layer, 1621 /* 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. 1622 * 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 1623 * 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 1624 * 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 1625 * 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. 1626 * This tends to make stacking also work/look better.
1501 */ 1627 */
1502 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]) { 1628 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1629 {
1503 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]->face->number; 1630 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; 1631 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1505 } 1632 }
1506 1633
1507 /* Another hack - because of heads and whatnot, this face may match one 1634 /* 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 1635 * we already sent for a lower layer. In that case, don't send
1509 * this one. 1636 * this one.
1510 */ 1637 */
1511 if (face_num && layer+1<MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer+1] == face_num) { 1638 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1512 face_num = 0; 1639 face_num = 0;
1513 }
1514 1640
1515 /* We've gotten what face we want to use for the object. Now see if 1641 /* 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. 1642 * if it has changed since we last sent it to the client.
1517 */ 1643 */
1518 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) { 1644 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1645 {
1519 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1646 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1520 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1647 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1521 esrv_send_face(ns, face_num, 0); 1648 esrv_send_face (&ns, face_num, 0);
1522 SockList_AddShort(sl, face_num); 1649
1523 return 1; 1650 sl << uint16 (face_num);
1651 return 1;
1524 } 1652 }
1653
1525 /* Nothing changed */ 1654 /* Nothing changed */
1526 return 0; 1655 return 0;
1527} 1656}
1528 1657
1529/** 1658/**
1530 * This function is mainly a copy of update_space, 1659 * This function is mainly a copy of update_space,
1531 * except it handles update of the smoothing updates, 1660 * except it handles update of the smoothing updates,
… …
1543 * layer is the layer to update, with 2 being the floor and 0 the 1672 * 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 1673 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1545 * take. 1674 * take.
1546 */ 1675 */
1547 1676
1677static inline int
1548static inline int update_smooth(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1678update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1549{ 1679{
1550 object *ob; 1680 object *ob;
1551 int smoothlevel; /* old face_num;*/ 1681 int smoothlevel; /* old face_num; */
1552 1682
1553 ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1683 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1554 1684
1555 /* If there is no object for this space, or if the face for the object 1685 /* 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. 1686 * is the blank face, set the smoothlevel to zero.
1557 */ 1687 */
1558 if (!ob || ob->face == blank_face || MAP_NOSMOOTH(mp)) smoothlevel=0; 1688 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1689 smoothlevel = 0;
1559 else { 1690 else
1691 {
1560 smoothlevel = ob->smoothlevel; 1692 smoothlevel = ob->smoothlevel;
1561 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1693 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1562 SendSmooth(ns, ob->face->number); 1694 SendSmooth (&ns, ob->face->number);
1563 } /* else not already head object or blank face */ 1695 } /* else not already head object or blank face */
1564 1696
1565 /* We've gotten what face we want to use for the object. Now see if 1697 /* 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. 1698 * if it has changed since we last sent it to the client.
1567 */ 1699 */
1568 if (smoothlevel>255) 1700 if (smoothlevel > 255)
1569 smoothlevel=255; 1701 smoothlevel = 255;
1570 else if (smoothlevel<0) 1702 else if (smoothlevel < 0)
1571 smoothlevel=0; 1703 smoothlevel = 0;
1704
1572 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) { 1705 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1706 {
1573 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1707 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1574 SockList_AddChar(sl, (uint8) (smoothlevel&0xFF)); 1708 sl << uint8 (smoothlevel);
1575 return 1; 1709 return 1;
1576 } 1710 }
1711
1577 /* Nothing changed */ 1712 /* Nothing changed */
1578 return 0; 1713 return 0;
1579} 1714}
1580 1715
1581/** 1716/**
1582 * Returns the size of a data for a map square as returned by 1717 * Returns the size of a data for a map square as returned by
1583 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1718 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1584 * available. 1719 * available.
1585 */ 1720 */
1721int
1586int getExtendedMapInfoSize(NewSocket* ns){ 1722getExtendedMapInfoSize (client_socket * ns)
1723{
1587 int result=0; 1724 int result = 0;
1725
1588 if (ns->ext_mapinfos){ 1726 if (ns->ext_mapinfos)
1727 {
1589 if (ns->EMI_smooth) 1728 if (ns->EMI_smooth)
1590 result+=1; /*One byte for smoothlevel*/ 1729 result += 1; /*One byte for smoothlevel */
1591 } 1730 }
1592 return result; 1731 return result;
1593} 1732}
1733
1594/** 1734/**
1595 * This function uses the new map1 protocol command to send the map 1735 * 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 1736 * to the client. It is necessary because the old map command supports
1597 * a maximum map size of 15x15. 1737 * a maximum map size of 15x15.
1598 * This function is much simpler than the old one. This is because 1738 * 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 1751 * we use the count value to hold the darkness value. If -1, then this space
1612 * is not viewable. 1752 * is not viewable.
1613 * we use faces[0] faces[1] faces[2] to hold what the three layers 1753 * we use faces[0] faces[1] faces[2] to hold what the three layers
1614 * look like. 1754 * look like.
1615 */ 1755 */
1756void
1616void draw_client_map1(object *pl) 1757draw_client_map1 (object *pl)
1617{ 1758{
1618 int x,y,ax, ay, d, startlen, max_x, max_y, oldlen; 1759 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1619 sint16 nx, ny; 1760 sint16 nx, ny;
1620 int estartlen, eoldlen; 1761 int estartlen, eoldlen;
1621 SockList sl;
1622 SockList esl; /*For extended Map info*/
1623 uint16 mask,emask; 1762 uint16 mask, emask;
1624 uint8 eentrysize; 1763 uint8 eentrysize;
1625 uint16 ewhatstart,ewhatflag; 1764 uint16 ewhatstart, ewhatflag;
1626 uint8 extendedinfos; 1765 uint8 extendedinfos;
1627 mapstruct *m; 1766 maptile *m;
1628 1767
1768 client_socket &socket = *pl->contr->socket;
1769
1629 check_map_change (pl->contr); 1770 check_map_change (pl->contr);
1630 1771
1631 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1772 packet sl;
1632 if (pl->contr->socket.mapmode == Map1Cmd) 1773 packet esl;
1633 strcpy((char*)sl.buf,"map1 "); 1774
1634 else 1775 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1635 strcpy((char*)sl.buf,"map1a ");
1636 sl.len=strlen((char*)sl.buf);
1637 startlen = sl.len; 1776 startlen = sl.length ();
1777
1638 /*Extendedmapinfo structure initialisation*/ 1778 /*Extendedmapinfo structure initialisation */
1639 if (pl->contr->socket.ext_mapinfos){ 1779 if (socket.ext_mapinfos)
1640 esl.buf=(unsigned char*)malloc(MAXSOCKBUF); 1780 {
1641 strcpy((char*)esl.buf,"mapextended ");
1642 esl.len=strlen((char*)esl.buf);
1643 extendedinfos=EMI_NOREDRAW; 1781 extendedinfos = EMI_NOREDRAW;
1782
1644 if (pl->contr->socket.EMI_smooth) 1783 if (socket.EMI_smooth)
1645 extendedinfos|=EMI_SMOOTH; 1784 extendedinfos |= EMI_SMOOTH;
1785
1646 ewhatstart=esl.len; 1786 ewhatstart = esl.length ();
1647 ewhatflag=extendedinfos; /*The EMI_NOREDRAW bit 1787 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1648 could need to be taken away*/ 1788 could need to be taken away */
1649 SockList_AddChar(&esl, extendedinfos);
1650 eentrysize=getExtendedMapInfoSize(&(pl->contr->socket)); 1789 eentrysize = getExtendedMapInfoSize (&socket);
1651 SockList_AddChar(&esl, eentrysize); 1790 esl << "mapextended "
1791 << uint8 (extendedinfos)
1792 << uint8 (eentrysize);
1793
1652 estartlen = esl.len; 1794 estartlen = esl.length ();
1653 } else { 1795 }
1796 else
1797 {
1654 /* suppress compiler warnings */ 1798 /* suppress compiler warnings */
1655 ewhatstart = 0; 1799 ewhatstart = 0;
1656 ewhatflag = 0; 1800 ewhatflag = 0;
1657 estartlen = 0; 1801 estartlen = 0;
1658 } 1802 }
1803
1659 /* Init data to zero */ 1804 /* Init data to zero */
1660 memset(heads, 0, sizeof(object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1805 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1661 1806
1662 /* x,y are the real map locations. ax, ay are viewport relative 1807 /* x,y are the real map locations. ax, ay are viewport relative
1663 * locations. 1808 * locations.
1664 */ 1809 */
1665 ay=0; 1810 ay = 0;
1666 1811
1667 /* We could do this logic as conditionals in the if statement, 1812 /* We could do this logic as conditionals in the if statement,
1668 * but that started to get a bit messy to look at. 1813 * but that started to get a bit messy to look at.
1669 */ 1814 */
1670 max_x = pl->x+(pl->contr->socket.mapx+1)/2; 1815 max_x = pl->x + (socket.mapx + 1) / 2;
1671 max_y = pl->y+(pl->contr->socket.mapy+1)/2; 1816 max_y = pl->y + (socket.mapy + 1) / 2;
1817
1672 if (pl->contr->socket.mapmode == Map1aCmd) { 1818 if (socket.mapmode == Map1aCmd)
1819 {
1673 max_x += MAX_HEAD_OFFSET; 1820 max_x += MAX_HEAD_OFFSET;
1674 max_y += MAX_HEAD_OFFSET; 1821 max_y += MAX_HEAD_OFFSET;
1822 }
1823
1824 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1675 } 1825 {
1826 ax = 0;
1827 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1828 {
1676 1829
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; 1830 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1682 1831
1683 /* If this space is out of the normal viewable area, we only check 1832 /* 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 1833 * the heads value ax or ay will only be greater than what
1685 * the client wants if using the map1a command - this is because 1834 * 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 1835 * if the map1a command is not used, max_x and max_y will be
1687 * set to lower values. 1836 * set to lower values.
1688 */ 1837 */
1689 if (ax >= pl->contr->socket.mapx || ay >= pl->contr->socket.mapy) { 1838 if (ax >= socket.mapx || ay >= socket.mapy)
1690 int i, got_one; 1839 {
1840 int i, got_one;
1691 1841
1692 oldlen = sl.len; 1842 oldlen = sl.length ();
1693 1843
1844 sl << uint16 (mask);
1694 1845
1695 SockList_AddShort(&sl, mask); 1846 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1847 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1848 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1696 1849
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 1850 /* If all we are doing is sending 0 (blank) faces, we don't
1705 * actually need to send that - just the coordinates 1851 * actually need to send that - just the coordinates
1706 * with no faces tells the client to blank out the 1852 * with no faces tells the client to blank out the
1707 * space. 1853 * space.
1708 */ 1854 */
1709 got_one=0; 1855 got_one = 0;
1710 for (i=oldlen+2; i<sl.len; i++) { 1856 for (i = oldlen + 2; i < sl.length (); i++)
1711 if (sl.buf[i]) got_one=1; 1857 if (sl[i])
1712 } 1858 got_one = 1;
1713 1859
1714 if (got_one && (mask & 0xf)) { 1860 if (got_one && (mask & 0xf))
1715 sl.buf[oldlen+1] = mask & 0xff; 1861 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 1862 else
1863 { /*either all faces blank, either no face at all */
1864 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1865 sl.reset (oldlen + 2);
1866 else
1720 sl.len = oldlen; 1867 sl.reset (oldlen);
1721 } 1868 }
1869
1722 /*What concerns extendinfos, nothing to be done for now 1870 /*What concerns extendinfos, nothing to be done for now
1723 * (perhaps effects layer later) 1871 * (perhaps effects layer later)
1724 */ 1872 */
1725 continue; /* don't do processing below */ 1873 continue; /* don't do processing below */
1726 } 1874 }
1727 1875
1876 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1877
1728 d = pl->contr->blocked_los[ax][ay]; 1878 d = pl->contr->blocked_los[ax][ay];
1729 1879
1730 /* If the coordinates are not valid, or it is too dark to see, 1880 /* If the coordinates are not valid, or it is too dark to see,
1731 * we tell the client as such 1881 * we tell the client as such
1732 */ 1882 */
1733 nx=x; 1883 nx = x;
1734 ny=y; 1884 ny = y;
1735 m = get_map_from_coord(pl->map, &nx, &ny); 1885 m = get_map_from_coord (pl->map, &nx, &ny);
1736 if (!m) { 1886
1887 if (!m)
1888 {
1737 /* space is out of map. Update space and clear values 1889 /* space is out of map. Update space and clear values
1738 * if this hasn't already been done. If the space is out 1890 * if this hasn't already been done. If the space is out
1739 * of the map, it shouldn't have a head 1891 * of the map, it shouldn't have a head
1740 */ 1892 */
1741 if (pl->contr->socket.lastmap.cells[ax][ay].count != -1) { 1893 if (lastcell.count != -1)
1742 SockList_AddShort(&sl, mask); 1894 {
1743 map_clearcell(&pl->contr->socket.lastmap.cells[ax][ay],0,0,0,-1); 1895 sl << uint16 (mask);
1744 } 1896 map_clearcell (&lastcell, 0, 0, 0, -1);
1745 } else if (d>3) { 1897 }
1746 int need_send=0, count; 1898 }
1899 else if (d > 3)
1900 {
1901 int need_send = 0, count;
1902
1747 /* This block deals with spaces that are not visible for whatever 1903 /* This block deals with spaces that are not visible for whatever
1748 * reason. Still may need to send the head for this space. 1904 * reason. Still may need to send the head for this space.
1749 */ 1905 */
1750 1906
1751 oldlen = sl.len; 1907 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 1908
1909 sl << uint16 (mask);
1910
1911 if (lastcell.count != -1)
1912 need_send = 1;
1913
1914 count = -1;
1915
1772 if (pl->contr->socket.mapmode == Map1aCmd && have_head(ax, ay)) { 1916 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1917 {
1773 /* Now check to see if any heads need to be sent */ 1918 /* Now check to see if any heads need to be sent */
1774 1919
1775 if (check_head(&sl, &pl->contr->socket, ax, ay, 2)) 1920 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1776 mask |= 0x4; 1921 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1777 if (check_head(&sl, &pl->contr->socket, ax, ay, 1)) 1922 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 1923
1783 } else { 1924 lastcell.count = count;
1784 struct MapCell *cell = &pl->contr->socket.lastmap.cells[ax][ay]; 1925 }
1926 else
1927 {
1785 /* properly clear a previously sent big face */ 1928 /* properly clear a previously sent big face */
1786 if(cell->faces[0] != 0 1929 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1787 || cell->faces[1] != 0 1930 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1788 || cell->faces[2] != 0) 1931 need_send = 1;
1789 need_send = 1;
1790 map_clearcell(&pl->contr->socket.lastmap.cells[ax][ay], 0, 0, 0, count);
1791 }
1792 1932
1933 map_clearcell (&lastcell, 0, 0, 0, count);
1934 }
1935
1793 if ((mask & 0xf) || need_send) { 1936 if ((mask & 0xf) || need_send)
1794 sl.buf[oldlen+1] = mask & 0xff; 1937 sl[oldlen + 1] = mask & 0xff;
1795 } else { 1938 else
1796 sl.len = oldlen; 1939 sl.reset (oldlen);
1797 } 1940 }
1798 } else { 1941 else
1942 {
1799 /* In this block, the space is visible or there are head objects 1943 /* In this block, the space is visible or there are head objects
1800 * we need to send. 1944 * we need to send.
1801 */ 1945 */
1802 1946
1803 /* Rather than try to figure out what everything that we might 1947 /* Rather than try to figure out what everything that we might
1804 * need to send is, then form the packet after that, 1948 * need to send is, then form the packet after that,
1805 * we presume that we will in fact form a packet, and update 1949 * 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, 1950 * 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 1951 * we just back out sl.length () to the old value, and no harm
1808 * is done. 1952 * is done.
1809 * I think this is simpler than doing a bunch of checks to see 1953 * 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 1954 * what if anything we need to send, setting the bits, then
1811 * doing those checks again to add the real data. 1955 * doing those checks again to add the real data.
1812 */ 1956 */
1813 oldlen = sl.len; 1957 oldlen = sl.length ();
1814 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1958 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1815 eoldlen = esl.len; 1959 eoldlen = esl.length ();
1816 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1960 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1817 SockList_AddShort(&sl, mask); 1961 sl << uint16 (mask);
1818 1962
1819 if (pl->contr->socket.ext_mapinfos) 1963 if (socket.ext_mapinfos)
1820 SockList_AddShort(&esl, emask); 1964 esl << uint16 (emask);
1821 1965
1822 /* Darkness changed */ 1966 unsigned char dummy;
1823 if (pl->contr->socket.lastmap.cells[ax][ay].count != d && pl->contr->socket.darkness) { 1967 unsigned char *last_ext = &dummy;
1824 pl->contr->socket.lastmap.cells[ax][ay].count = d;
1825 mask |= 0x8; /* darkness bit */
1826 1968
1827 /* Protocol defines 255 full bright, 0 full dark. 1969 /* Darkness changed */
1828 * We currently don't have that many darkness ranges, 1970 if (lastcell.count != d && socket.darkness)
1829 * so we current what limited values we do have. 1971 {
1830 */ 1972 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 1973
1844 /* Floor face */ 1974 if (socket.extmap)
1975 {
1976 *last_ext |= 0x80;
1977 last_ext = &sl[sl.length ()];
1978 sl << uint8 (d);
1979 }
1980 else
1981 sl << uint8 (255 - 64 * d);
1982 }
1983
1984 lastcell.count = d;
1985
1986 if (socket.extmap)
1987 {
1988 uint8 stat_hp = 0;
1989 uint8 stat_width = 0;
1990 uint8 flags = 0;
1991 UUID player = 0;
1992
1993 // send hp information, if applicable
1994 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1995 {
1996 if (op->head || op->invisible)
1997 ; // do not show
1998 else if (op->type == PLAYER
1999 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
2000 {
2001 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
2002 {
2003 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2004 stat_width = op->arch->tail_x;
2005 }
2006 }
2007
2008 if (op->msg && op->msg[0] == '@')
2009 flags |= 1;
2010
2011 if (op->type == PLAYER && op != pl)
2012 player = op->count;
2013 }
2014
2015 if (lastcell.stat_hp != stat_hp)
2016 {
2017 lastcell.stat_hp = stat_hp;
2018
2019 mask |= 0x8;
2020 *last_ext |= 0x80;
2021 last_ext = &sl[sl.length ()];
2022
2023 sl << uint8 (5) << uint8 (stat_hp);
2024
2025 if (stat_width > 1)
2026 {
2027 *last_ext |= 0x80;
2028 last_ext = &sl[sl.length ()];
2029
2030 sl << uint8 (6) << uint8 (stat_width);
2031 }
2032 }
2033
2034 if (lastcell.player != player)
2035 {
2036 lastcell.player = player;
2037
2038 mask |= 0x8;
2039 *last_ext |= 0x80;
2040 last_ext = &sl[sl.length ()];
2041
2042 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2043 }
2044
2045 if (lastcell.flags != flags)
2046 {
2047 lastcell.flags = flags;
2048
2049 mask |= 0x8;
2050 *last_ext |= 0x80;
2051 last_ext = &sl[sl.length ()];
2052
2053 sl << uint8 (8) << uint8 (flags);
2054 }
2055 }
2056
2057 /* Floor face */
1845 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 2)) 2058 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1846 mask |= 0x4; 2059 mask |= 0x4;
1847 2060
1848 if (pl->contr->socket.EMI_smooth) 2061 if (socket.EMI_smooth)
1849 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 2)){ 2062 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1850 emask |= 0x4; 2063 emask |= 0x4;
1851 }
1852 2064
1853 /* Middle face */ 2065 /* Middle face */
1854 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 1)) 2066 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1855 mask |= 0x2; 2067 mask |= 0x2;
1856 2068
1857 if (pl->contr->socket.EMI_smooth) 2069 if (socket.EMI_smooth)
1858 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 1)){ 2070 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1859 emask |= 0x2; 2071 emask |= 0x2;
1860 }
1861 2072
1862
1863 if(nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) { 2073 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) { 2074 {
1865 pl->contr->socket.lastmap.cells[ax][ay].faces[0] = pl->face->number; 2075 if (lastcell.faces[0] != pl->face->number)
1866 mask |= 0x1; 2076 {
2077 lastcell.faces[0] = pl->face->number;
2078 mask |= 0x1;
2079
1867 if (!(pl->contr->socket.faces_sent[pl->face->number] &NS_FACESENT_FACE)) 2080 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1868 esrv_send_face(&pl->contr->socket, pl->face->number, 0); 2081 esrv_send_face (&socket, pl->face->number, 0);
1869 SockList_AddShort(&sl, pl->face->number); 2082
1870 } 2083 sl << uint16 (pl->face->number);
1871 } 2084 }
1872 /* Top face */ 2085 }
1873 else { 2086 else
2087 {
2088 /* Top face */
1874 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 0)) 2089 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1875 mask |= 0x1; 2090 mask |= 0x1;
1876 if (pl->contr->socket.EMI_smooth) 2091
1877 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 0)){ 2092 if (socket.EMI_smooth)
1878 emask |= 0x1; 2093 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1879 } 2094 emask |= 0x1;
1880 } 2095 }
2096
1881 /* Check to see if we are in fact sending anything for this 2097 /* Check to see if we are in fact sending anything for this
1882 * space by checking the mask. If so, update the mask. 2098 * space by checking the mask. If so, update the mask.
1883 * if not, reset the len to that from before adding the mask 2099 * if not, reset the len to that from before adding the mask
1884 * value, so we don't send those bits. 2100 * value, so we don't send those bits.
1885 */ 2101 */
1886 if (mask & 0xf) { 2102 if (mask & 0xf)
1887 sl.buf[oldlen+1] = mask & 0xff; 2103 sl[oldlen + 1] = mask & 0xff;
1888 } else { 2104 else
1889 sl.len = oldlen; 2105 sl.reset (oldlen);
1890 } 2106
1891 if (emask & 0xf) { 2107 if (emask & 0xf)
1892 esl.buf[eoldlen+1] = emask & 0xff; 2108 esl[eoldlen + 1] = emask & 0xff;
1893 } else { 2109 else
1894 esl.len = eoldlen; 2110 esl.reset (eoldlen);
1895 }
1896 } /* else this is a viewable space */ 2111 } /* else this is a viewable space */
1897 } /* for x loop */ 2112 } /* for x loop */
1898 } /* for y loop */ 2113 } /* for y loop */
1899 2114
1900 /* Verify that we in fact do need to send this */ 2115 /* Verify that we in fact do need to send this */
1901 if (pl->contr->socket.ext_mapinfos){ 2116 if (socket.ext_mapinfos)
2117 {
1902 if (!(sl.len>startlen || pl->contr->socket.sent_scroll)){ 2118 if (!(sl.length () > startlen || socket.sent_scroll))
2119 {
1903 /* No map data will follow, so don't say the client 2120 /* No map data will follow, so don't say the client
1904 * it doesn't need draw! 2121 * it doesn't need draw!
1905 */ 2122 */
1906 ewhatflag&=(~EMI_NOREDRAW); 2123 ewhatflag &= (~EMI_NOREDRAW);
1907 esl.buf[ewhatstart+1] = ewhatflag & 0xff; 2124 esl[ewhatstart + 1] = ewhatflag & 0xff;
1908 } 2125 }
2126
1909 if (esl.len>estartlen) { 2127 if (esl.length () > estartlen)
1910 Send_With_Handling(&pl->contr->socket, &esl); 2128 socket.send_packet (esl);
1911 } 2129 }
1912 free(esl.buf); 2130
2131 if (sl.length () > startlen || socket.sent_scroll)
1913 } 2132 {
1914 if (sl.len>startlen || pl->contr->socket.sent_scroll) { 2133 socket.send_packet (sl);
1915 Send_With_Handling(&pl->contr->socket, &sl); 2134 socket.sent_scroll = 0;
1916 pl->contr->socket.sent_scroll = 0;
1917 } 2135 }
1918 free(sl.buf);
1919} 2136}
1920 2137
1921/** 2138/**
1922 * Draws client map. 2139 * Draws client map.
1923 */ 2140 */
2141void
1924void draw_client_map(object *pl) 2142draw_client_map (object *pl)
1925{ 2143{
1926 int i,j; 2144 int i, j;
1927 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */ 2145 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1928 New_Face *face,*floor; 2146 New_Face *face, *floor;
1929 New_Face *floor2; 2147 New_Face *floor2;
1930 int d, mflags; 2148 int d, mflags;
1931 struct Map newmap; 2149 struct Map newmap;
1932 mapstruct *m, *pm; 2150 maptile *m, *pm;
1933 2151
1934 if (pl->type != PLAYER) { 2152 if (pl->type != PLAYER)
2153 {
1935 LOG(llevError,"draw_client_map called with non player/non eric-server\n"); 2154 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1936 return; 2155 return;
1937 } 2156 }
1938 2157
1939 if (pl->contr->transport) {
1940 pm = pl->contr->transport->map;
1941 }
1942 else
1943 pm = pl->map; 2158 pm = pl->map;
1944 2159
1945 /* If player is just joining the game, he isn't here yet, so the map 2160 /* 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 2161 * can get swapped out. If so, don't try to send them a map. All will
1947 * be OK once they really log in. 2162 * be OK once they really log in.
1948 */ 2163 */
1949 if (pm==NULL || pm->in_memory!=MAP_IN_MEMORY) return; 2164 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2165 return;
1950 2166
1951 memset(&newmap, 0, sizeof(struct Map)); 2167 memset (&newmap, 0, sizeof (struct Map));
1952 2168
1953 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) { 2169 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2170 {
1954 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) { 2171 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
1955 ax=i; 2172 {
1956 ay=j; 2173 ax = i;
2174 ay = j;
1957 m = pm; 2175 m = pm;
1958 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay); 2176 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1959 if (mflags & P_OUT_OF_MAP) 2177 if (mflags & P_OUT_OF_MAP)
1960 continue; 2178 continue;
1961 if (mflags & P_NEED_UPDATE) 2179 if (mflags & P_NEED_UPDATE)
1962 update_position(m, ax, ay); 2180 update_position (m, ax, ay);
1963 /* If a map is visible to the player, we don't want to swap it out 2181 /* 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 2182 * just to reload it. This should really call something like
1965 * swap_map, but this is much more efficient and 'good enough' 2183 * swap_map, but this is much more efficient and 'good enough'
1966 */ 2184 */
1967 if (mflags & P_NEW_MAP) 2185 if (mflags & P_NEW_MAP)
1968 m->timeout = 50; 2186 m->timeout = 50;
1969 } 2187 }
1970 } 2188 }
1971 /* do LOS after calls to update_position */ 2189 /* do LOS after calls to update_position */
1972 if(pl->contr->do_los) { 2190 if (pl->contr->do_los)
2191 {
1973 update_los(pl); 2192 update_los (pl);
1974 pl->contr->do_los = 0; 2193 pl->contr->do_los = 0;
1975 } 2194 }
1976 2195
1977 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) {
1978 /* Big maps need a different drawing mechanism to work */ 2196 /* Big maps need a different drawing mechanism to work */
1979 draw_client_map1(pl); 2197 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} 2198}
2044 2199
2045 2200
2046/*****************************************************************************/ 2201/*****************************************************************************/
2202
2047/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 2203/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2204
2048/* a player. Of course, the client need to know the command to be able to */ 2205/* a player. Of course, the client need to know the command to be able to */
2206
2049/* manage it ! */ 2207/* manage it ! */
2208
2050/*****************************************************************************/ 2209/*****************************************************************************/
2210void
2051void send_plugin_custom_message(object *pl, char *buf) 2211send_plugin_custom_message (object *pl, char *buf)
2052{ 2212{
2053 cs_write_string(&pl->contr->socket,buf,strlen(buf)); 2213 pl->contr->socket->send_packet (buf);
2054} 2214}
2055 2215
2056/** 2216/**
2057 * This sends the skill number to name mapping. We ignore 2217 * This sends the skill number to name mapping. We ignore
2058 * the params - we always send the same info no matter what. 2218 * the params - we always send the same info no matter what.
2059 */ 2219 */
2220void
2060void send_skill_info(NewSocket *ns, char *params) 2221send_skill_info (client_socket *ns, char *params)
2061{ 2222{
2062 SockList sl; 2223 packet sl;
2063 int i; 2224 sl << "replyinfo skill_info\n";
2064 2225
2065 sl.buf = (unsigned char*) malloc(MAXSOCKBUF);
2066 strcpy((char*)sl.buf,"replyinfo skill_info\n");
2067 for (i=1; i< NUM_SKILLS; i++) { 2226 for (int i = 1; i < NUM_SKILLS; i++)
2068 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, 2227 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2069 skill_names[i]); 2228
2070 }
2071 sl.len = strlen((char*)sl.buf);
2072 if (sl.len >= MAXSOCKBUF) { 2229 if (sl.length () >= MAXSOCKBUF)
2230 {
2073 LOG(llevError,"Buffer overflow in send_skill_info!\n"); 2231 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2074 fatal(0); 2232 fatal (0);
2075 } 2233 }
2076 Send_With_Handling(ns, &sl); 2234
2077 free(sl.buf); 2235 ns->send_packet (sl);
2078} 2236}
2079 2237
2080/** 2238/**
2081 * This sends the spell path to name mapping. We ignore 2239 * This sends the spell path to name mapping. We ignore
2082 * the params - we always send the same info no matter what. 2240 * the params - we always send the same info no matter what.
2083 */ 2241 */
2242void
2084void send_spell_paths (NewSocket *ns, char *params) { 2243send_spell_paths (client_socket * ns, char *params)
2085 SockList sl; 2244{
2086 int i; 2245 packet sl;
2087 2246
2088 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2247 sl << "replyinfo spell_paths\n";
2089 strcpy((char*)sl.buf,"replyinfo spell_paths\n"); 2248
2090 for(i=0; i<NRSPELLPATHS; i++) 2249 for (int i = 0; i < NRSPELLPATHS; i++)
2091 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]); 2250 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2092 sl.len = strlen((char*)sl.buf); 2251
2093 if (sl.len >= MAXSOCKBUF) { 2252 if (sl.length () >= MAXSOCKBUF)
2253 {
2094 LOG(llevError,"Buffer overflow in send_spell_paths!\n"); 2254 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2095 fatal(0); 2255 fatal (0);
2096 } 2256 }
2097 Send_With_Handling(ns, &sl); 2257
2098 free(sl.buf); 2258 ns->send_packet (sl);
2099} 2259}
2100 2260
2101/** 2261/**
2102 * This looks for any spells the player may have that have changed their stats. 2262 * 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 2263 * it then sends an updspell packet for each spell that has changed in this way
2104 */ 2264 */
2265void
2105void esrv_update_spells(player *pl) { 2266esrv_update_spells (player *pl)
2106 SockList sl; 2267{
2107 int flags=0;
2108 object *spell;
2109 if (!pl->socket.monitor_spells) return; 2268 if (!pl->socket->monitor_spells)
2269 return;
2270
2110 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2271 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2272 {
2111 if (spell->type == SPELL) { 2273 if (spell->type == SPELL)
2274 {
2275 int flags = 0;
2276
2112 /* check if we need to update it*/ 2277 /* check if we need to update it */
2113 if (spell->last_sp != SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA)) { 2278 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2279 {
2114 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 2280 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2115 flags |= UPD_SP_MANA; 2281 flags |= UPD_SP_MANA;
2116 } 2282 }
2283
2117 if (spell->last_grace != SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE)) { 2284 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2285 {
2118 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 2286 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2119 flags |= UPD_SP_GRACE; 2287 flags |= UPD_SP_GRACE;
2120 } 2288 }
2289
2121 if (spell->last_eat != spell->stats.dam+SP_level_dam_adjust(pl->ob, spell)) { 2290 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2291 {
2122 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2292 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2123 flags |= UPD_SP_DAMAGE; 2293 flags |= UPD_SP_DAMAGE;
2294 }
2295
2296 if (flags)
2297 {
2298 packet sl;
2299
2300 sl << "updspell "
2301 << uint8 (flags)
2302 << uint32 (spell->count);
2303
2304 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2305 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2306 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2307
2308 pl->socket->send_packet (sl);
2309 }
2310 }
2124 } 2311 }
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} 2312}
2141 2313
2314void
2142void esrv_remove_spell(player *pl, object *spell) { 2315esrv_remove_spell (player *pl, object *spell)
2143 SockList sl; 2316{
2144
2145 if (!pl->socket.monitor_spells) return; 2317 if (!pl->socket->monitor_spells)
2318 return;
2319
2146 if (!pl || !spell || spell->env != pl->ob) { 2320 if (!pl || !spell || spell->env != pl->ob)
2321 {
2147 LOG(llevError, "Invalid call to esrv_remove_spell"); 2322 LOG (llevError, "Invalid call to esrv_remove_spell");
2148 return; 2323 return;
2149 } 2324 }
2150 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2325
2151 strcpy((char*)sl.buf,"delspell "); 2326 packet sl;
2152 sl.len=strlen((char*)sl.buf); 2327
2153 SockList_AddInt(&sl, spell->count); 2328 sl << "delspell "
2154 Send_With_Handling(&pl->socket, &sl); 2329 << uint32 (spell->count);
2155 free(sl.buf); 2330
2331 pl->socket->send_packet (sl);
2156} 2332}
2157 2333
2158/* appends the spell *spell to the Socklist we will send the data to. */ 2334/* appends the spell *spell to the Socklist we will send the data to. */
2335static void
2159static void append_spell (player *pl, SockList *sl, object *spell) { 2336append_spell (player *pl, packet &sl, object *spell)
2337{
2160 int len, i, skill=0; 2338 int len, i, skill = 0;
2161 2339
2162 if (!(spell->name)) { 2340 if (!(spell->name))
2341 {
2163 LOG(llevError, "item number %d is a spell with no name.\n", spell->count); 2342 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2164 return; 2343 return;
2165 } 2344 }
2166 SockList_AddInt(sl, spell->count); 2345
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 */ 2346 /* 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); 2347 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); 2348 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); 2349 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 2350
2178 /* figure out which skill it uses, if it uses one */ 2351 /* figure out which skill it uses, if it uses one */
2179 if (spell->skill) { 2352 if (spell->skill)
2353 {
2180 for (i=1; i< NUM_SKILLS; i++) 2354 for (i = 1; i < NUM_SKILLS; i++)
2181 if (!strcmp(spell->skill, skill_names[i])) { 2355 if (!strcmp (spell->skill, skill_names[i]))
2356 {
2182 skill = i+CS_STAT_SKILLINFO; 2357 skill = i + CS_STAT_SKILLINFO;
2183 break; 2358 break;
2359 }
2184 } 2360 }
2185 }
2186 SockList_AddChar(sl, skill);
2187 2361
2188 SockList_AddInt(sl, spell->path_attuned); 2362 /* send the current values */
2189 SockList_AddInt(sl, (spell->face)?spell->face->number:0); 2363 sl << uint32 (spell->count)
2190 2364 << uint16 (spell->level)
2191 len = strlen(spell->name); 2365 << uint16 (spell->casting_time)
2192 SockList_AddChar(sl, (char)len); 2366 << uint16 (spell->last_sp)
2193 memcpy(sl->buf+sl->len, spell->name, len); 2367 << uint16 (spell->last_grace)
2194 sl->len+=len; 2368 << uint16 (spell->last_eat)
2195 2369 << uint8 (skill)
2196 if (!spell->msg) { 2370 << uint32 (spell->path_attuned)
2197 SockList_AddShort(sl, 0); 2371 << uint32 (spell->face ? spell->face->number : 0)
2198 } 2372 << data8 (spell->name)
2199 else { 2373 << 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} 2374}
2206 2375
2207/** 2376/**
2208 * This tells the client to add the spell *ob, if *ob is NULL, then add 2377 * This tells the client to add the spell *ob, if *ob is NULL, then add
2209 * all spells in the player's inventory. 2378 * all spells in the player's inventory.
2210 */ 2379 */
2380void
2211void esrv_add_spells(player *pl, object *spell) { 2381esrv_add_spells (player *pl, object *spell)
2212 SockList sl; 2382{
2213 if (!pl) { 2383 if (!pl)
2384 {
2214 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2385 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2215 return; 2386 return;
2216 } 2387 }
2388
2217 if (!pl->socket.monitor_spells) return; 2389 if (!pl->socket->monitor_spells)
2218 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 2390 return;
2219 strcpy((char*)sl.buf,"addspell "); 2391
2220 sl.len=strlen((char*)sl.buf); 2392 packet sl;
2393
2394 sl << "addspell ";
2395
2221 if (!spell) { 2396 if (!spell)
2397 {
2222 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2398 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2399 {
2223 /* were we to simply keep appending data here, we could exceed 2400 /* were we to simply keep appending data here, we could exceed
2224 * MAXSOCKBUF if the player has enough spells to add, we know that 2401 * MAXSOCKBUF if the player has enough spells to add, we know that
2225 * append_spells will always append 19 data bytes, plus 4 length 2402 * 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 2403 * 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, 2404 * 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, 2405 * 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 2406 * we need to send what we already have, and restart packet formation
2230 */ 2407 */
2231 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 2408 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2232 * to show add_spell is 26 bytes + 2 strings. However, the overun 2409 * 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 2410 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2234 * like it will fix this 2411 * like it will fix this
2235 */ 2412 */
2236 if (spell->type != SPELL) continue; 2413 if (spell->type != SPELL)
2237 if (sl.len >= (MAXSOCKBUF - (26 + strlen(spell->name) + 2414 continue;
2238 (spell->msg?strlen(spell->msg):0)))) { 2415
2239 Send_With_Handling(&pl->socket, &sl); 2416 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2240 strcpy((char*)sl.buf,"addspell "); 2417 {
2241 sl.len=strlen((char*)sl.buf); 2418 pl->socket->send_packet (sl);
2419
2420 sl.reset ();
2421 sl << "addspell ";
2422 }
2423
2424 append_spell (pl, sl, spell);
2425 }
2242 } 2426 }
2427 else if (spell->type != SPELL)
2428 {
2429 LOG (llevError, "Asked to send a non-spell object as a spell");
2430 return;
2431 }
2432 else
2243 append_spell(pl, &sl, spell); 2433 append_spell (pl, sl, spell);
2244 } 2434
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) { 2435 if (sl.length () >= MAXSOCKBUF)
2436 {
2252 LOG(llevError,"Buffer overflow in esrv_add_spells!\n"); 2437 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2253 fatal(0); 2438 fatal (0);
2254 } 2439 }
2440
2255 /* finally, we can send the packet */ 2441 /* finally, we can send the packet */
2256 Send_With_Handling(&pl->socket, &sl); 2442 pl->socket->send_packet (sl);
2257 free(sl.buf);
2258} 2443}
2259 2444

Diff Legend

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