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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.37 by root, Thu Dec 14 20:39:54 2006 UTC

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

Diff Legend

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