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.45 by root, Tue Dec 19 04:58:05 2006 UTC

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

Diff Legend

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