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.8 by root, Thu Aug 24 10:58:39 2006 UTC vs.
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC

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

Diff Legend

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