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

Diff Legend

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