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.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.48 by root, Wed Dec 20 11:36:39 2006 UTC

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

Diff Legend

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