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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.38 by root, Thu Dec 14 22:45:41 2006 UTC

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

Diff Legend

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