ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC vs.
Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/**	24	/**
26	* \file	25	* \file
27	* Client handling.	26	* Client handling.
…		…
130	}	129	}
131		130
132	static void	131	static void
133	clear_map (player *pl)	132	clear_map (player *pl)
134	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
		137
		138	pl->ns->force_newmap = false;
136		139
137	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
138	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
139		142
140	pl->ns->floorbox_reset ();	143	pl->ns->floorbox_reset ();
…		…
143	/** check for map/region change and send new map data */	146	/** check for map/region change and send new map data */
144	static void	147	static void
145	check_map_change (player *pl)	148	check_map_change (player *pl)
146	{	149	{
147	client &socket = *pl->ns;	150	client &socket = *pl->ns;
148	object *ob = pl->ob;	151	object *ob = pl->observe;
149	char buf[MAX_BUF]; /* eauugggh */
150		152
		153	// first try to aovid a full newmap on tiled map scrolls
151	if (socket.current_map != ob->map)	154	if (socket.current_map != ob->map)
152	{	155	{
		156	rv_vector rv;
		157
		158	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		159
		160	// manhattan distance is very handy here
		161	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		162	{
		163	socket.current_map = ob->map;
		164	socket.current_x = ob->x;
		165	socket.current_y = ob->y;
		166
		167	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		168	socket.floorbox_reset ();
		169	}
		170	}
		171
		172	if (socket.current_map != ob->map || socket.force_newmap)
		173	{
		174	clear_map (pl);
153	socket.current_map = ob->map;	175	socket.current_map = ob->map;
154
155	clear_map (pl);
156		176
157	if (socket.mapinfocmd)	177	if (socket.mapinfocmd)
158	{	178	{
159	if (ob->map && ob->map->path[0])	179	if (ob->map && ob->map->path[0])
160	{	180	{
161	int flags = 0;	181	int flags = 0;
162		182
163	if (ob->map->tile_path[0])	183	if (ob->map->tile_path[0]) flags |= 1;
164	flags |= 1;
165	if (ob->map->tile_path[1])	184	if (ob->map->tile_path[1]) flags |= 2;
166	flags |= 2;
167	if (ob->map->tile_path[2])	185	if (ob->map->tile_path[2]) flags |= 4;
168	flags |= 4;
169	if (ob->map->tile_path[3])	186	if (ob->map->tile_path[3]) flags |= 8;
170	flags |= 8;
171		187
172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	188	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);	189	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		190	ob->map->width, ob->map->height, &ob->map->path);
174	}	191	}
175	else	192	else
176	snprintf (buf, MAX_BUF, "mapinfo current");
177
178	socket.send_packet (buf);	193	socket.send_packet ("mapinfo current");
179	}	194	}
180	}	195	}
181	else if (socket.current_x != ob->x || socket.current_y != ob->y)	196	else if (socket.current_x != ob->x || socket.current_y != ob->y)
182	{	197	{
183	int dx = ob->x - socket.current_x;	198	int dx = ob->x - socket.current_x;
…		…
196	socket.current_y = ob->y;	211	socket.current_y = ob->y;
197		212
198	region *reg = ob->region ();	213	region *reg = ob->region ();
199	if (socket.current_region != reg)	214	if (socket.current_region != reg)
200	{	215	{
		216	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
201	socket.current_region = reg;	217	socket.current_region = reg;
202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203	}	218	}
204	}	219	}
205		220
206	/**	221	/**
207	* RequestInfo is sort of a meta command. There is some specific	222	* RequestInfo is sort of a meta command. There is some specific
208	* request of information, but we call other functions to provide	223	* request of information, but we call other functions to provide
209	* that information.	224	* that information.
210	*/	225	*/
211	void	226	void
212	RequestInfo (char *buf, int len, client * ns)	227	RequestInfo (char *buf, int len, client *ns)
213	{	228	{
214	char *params = NULL, *cp;	229	char *params;
215
216	/* No match */
217	char bigbuf[MAX_BUF];
218	int slen;
219
220	/* Set up replyinfo before we modify any of the buffers - this is used
221	* if we don't find a match.
222	*/
223	strcpy (bigbuf, "replyinfo ");
224	slen = strlen (bigbuf);
225	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226		230
227	/* find the first space, make it null, and update the	231	/* find the first space, make it null, and update the
228	* params pointer.	232	* params pointer.
229	*/	233	*/
230	for (cp = buf; *cp != '\0'; cp++)	234	for (params = buf; *params; params++)
231	if (*cp == ' ')	235	if (*params == ' ')
232	{	236	{
233	*cp = '\0';
234	params = cp + 1;	237	*params++ = 0;
235	break;	238	break;
236	}	239	}
237		240
238	if (!strcmp (buf, "image_info"))	241	if (!strcmp (buf, "image_info"))
239	send_image_info (ns, params);	242	send_image_info (ns, params);
…		…
242	else if (!strcmp (buf, "skill_info"))	245	else if (!strcmp (buf, "skill_info"))
243	send_skill_info (ns, params);	246	send_skill_info (ns, params);
244	else if (!strcmp (buf, "spell_paths"))	247	else if (!strcmp (buf, "spell_paths"))
245	send_spell_paths (ns, params);	248	send_spell_paths (ns, params);
246	else	249	else
247	ns->send_packet (bigbuf, len);	250	{
		251	// undo tokenisation above and send replyinfo with the request unchanged
		252	if (*params)
		253	*--params = ' ';
		254
		255	ns->send_packet_printf ("replyinfo %s", buf);
		256	}
248	}	257	}
249		258
250	void	259	void
251	ExtCmd (char *buf, int len, player *pl)	260	ExtCmd (char *buf, int len, player *pl)
252	{	261	{
…		…
255		264
256	void	265	void
257	ExtiCmd (char *buf, int len, client *ns)	266	ExtiCmd (char *buf, int len, client *ns)
258	{	267	{
259	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	268	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		269	}
		270
		271	void
		272	client::mapinfo_queue_clear ()
		273	{
		274	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		275	free (*i);
		276
		277	mapinfo_queue.clear ();
		278	}
		279
		280	bool
		281	client::mapinfo_try (char *buf)
		282	{
		283	char *token = buf;
		284	buf += strlen (buf) + 9;
		285
		286	// initial map and its origin
		287	maptile *map = pl->observe->map;
		288	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		289	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		290	int max_distance = 8; // limit maximum path length to something generous
		291
		292	while (*buf && map && max_distance)
		293	{
		294	int dir = *buf++ - '1';
		295
		296	if (dir >= 0 && dir <= 3)
		297	{
		298	if (!map->tile_path [dir])
		299	map = 0;
		300	else if (map->tile_available (dir, false))
		301	{
		302	maptile *neigh = map->tile_map [dir];
		303
		304	switch (dir)
		305	{
		306	case 0: mapy -= neigh->height; break;
		307	case 2: mapy += map ->height; break;
		308	case 3: mapx -= neigh->width ; break;
		309	case 1: mapx += map ->width ; break;
		310	}
		311
		312	map = neigh;
		313	--max_distance;
		314	}
		315	else
		316	return 0;
		317	}
		318	else
		319	max_distance = 0;
		320	}
		321
		322	if (!max_distance)
		323	send_packet_printf ("mapinfo %s error", token);
		324	else if (!map || !map->path)
		325	send_packet_printf ("mapinfo %s nomap", token);
		326	else
		327	{
		328	int flags = 0;
		329
		330	if (map->tile_path[0]) flags |= 1;
		331	if (map->tile_path[1]) flags |= 2;
		332	if (map->tile_path[2]) flags |= 4;
		333	if (map->tile_path[3]) flags |= 8;
		334
		335	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		336	}
		337
		338	return 1;
		339	}
		340
		341	void
		342	client::mapinfo_queue_run ()
		343	{
		344	if (mapinfo_queue.empty () || !pl)
		345	return;
		346
		347	for (int i = 0; i < mapinfo_queue.size (); ++i)
		348	if (mapinfo_try (mapinfo_queue [i]))
		349	{
		350	free (mapinfo_queue [i]);
		351	mapinfo_queue.erase (i);
		352	}
		353	else
		354	++i;
260	}	355	}
261		356
262	void	357	void
263	MapInfoCmd (char *buf, int len, player *pl)	358	MapInfoCmd (char *buf, int len, player *pl)
264	{	359	{
265	// <mapinfo tag spatial tile-path	360	// <mapinfo tag spatial tile-path
266	// >mapinfo tag spatial flags x y w h hash	361	// >mapinfo tag spatial flags x y w h hash
267		362
268	char bigbuf[MAX_BUF], *token;
269
270	token = buf;	363	char *token = buf;
271	// copy token	364
272	if (!(buf = strchr (buf, ' ')))	365	if (!(buf = strchr (buf, ' ')))
273	return;	366	return;
274		367
275	*buf++ = 0;
276
277	if (!strncmp (buf, "spatial ", 8))	368	if (!strncmp (buf, " spatial ", 9))
278	{	369	{
279	buf += 8;	370	char *copy = strdup (token);
		371	copy [buf - token] = 0;
280		372
281	// initial map and its origin	373	#if 0
282	maptile *map = pl->ob->map;	374	// this makes only sense when we flush the buffer immediately
283	sint16 dx, dy;	375	if (pl->ns->mapinfo_try (copy))
284	int mapx = pl->ns->mapx / 2 - pl->ob->x;	376	free (copy);
285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
286	int max_distance = 8; // limit maximum path length to something generous
287
288	while (*buf && map && max_distance)
289	{
290	int dir = *buf++;
291
292	switch (dir)
293	{
294	case '1':
295	dx = 0;
296	dy = -1;
297	map = map->xy_find (dx, dy);
298	map && (mapy -= map->height);
299	break;
300	case '2':
301	mapx += map->width;
302	dx = map->width;
303	dy = 0;
304	map = map->xy_find (dx, dy);
305	break;
306	case '3':
307	mapy += map->height;
308	dx = 0;
309	dy = map->height;
310	map = map->xy_find (dx, dy);
311	break;
312	case '4':
313	dx = -1;
314	dy = 0;
315	map = map->xy_find (dx, dy);
316	map && (mapx -= map->width);
317	break;
318	}
319
320	--max_distance;
321	}
322
323	if (!max_distance)
324	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325	else if (map && map->path[0])
326	{
327	int flags = 0;
328
329	if (map->tile_path[0])
330	flags |= 1;
331	if (map->tile_path[1])
332	flags |= 2;
333	if (map->tile_path[2])
334	flags |= 4;
335	if (map->tile_path[3])
336	flags |= 8;
337
338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339	}
340	else	377	else
341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	378	#endif
		379	pl->ns->mapinfo_queue.push_back (copy);
342	}	380	}
343	else	381	else
344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	382	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346	pl->ns->send_packet (bigbuf);
347	}	383	}
348		384
349	/** This is the Setup cmd - easy first implementation */	385	/** This is the Setup cmd */
350	void	386	void
351	SetUp (char *buf, int len, client * ns)	387	SetUp (char *buf, int len, client * ns)
352	{	388	{
353	int s, slen;	389	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354	char *cmd, *param, cmdback[HUGE_BUF];
355
356	/* run through the cmds of setup
357	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358	*
359	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360	* The client then must sort this out
361	*/
362
363	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365	strcpy (cmdback, "setup");
366	for (s = 0; s < len; )
367	{
368	cmd = &buf[s];
369
370	/* find the next space, and put a null there */
371	for (; buf[s] && buf[s] != ' '; s++)
372	;
373
374	buf[s++] = 0;
375
376	while (buf[s] == ' ')
377	s++;
378
379	if (s >= len)
380	break;
381
382	param = &buf[s];
383
384	for (; buf[s] && buf[s] != ' '; s++)
385	;
386
387	buf[s++] = 0;
388
389	while (buf[s] == ' ')
390	s++;
391
392	slen = strlen (cmdback);
393	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397	if (!strcmp (cmd, "sound"))
398	{
399	ns->sound = atoi (param);
400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
401	}
402	else if (!strcmp (cmd, "exp64"))
403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
404	else if (!strcmp (cmd, "spellmon"))
405	{
406	ns->monitor_spells = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "darkness"))
410	{
411	ns->darkness = atoi (param);
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	}
414	else if (!strcmp (cmd, "map1cmd"))
415	{
416	if (atoi (param))
417	ns->mapmode = Map1Cmd;
418	/* if beyond this size, need to use map1cmd no matter what */
419	if (ns->mapx > 11 || ns->mapy > 11)
420	ns->mapmode = Map1Cmd;
421	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422	}
423	else if (!strcmp (cmd, "map1acmd"))
424	{
425	if (atoi (param))
426	ns->mapmode = Map1aCmd;
427	/* if beyond this size, need to use map1acmd no matter what */
428	if (ns->mapx > 11 || ns->mapy > 11)
429	ns->mapmode = Map1aCmd;
430	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431	}
432	else if (!strcmp (cmd, "newmapcmd"))
433	{
434	ns->newmapcmd = atoi (param);
435	safe_strcat (cmdback, param, &slen, HUGE_BUF);
436	}
437	else if (!strcmp (cmd, "mapinfocmd"))
438	{
439	ns->mapinfocmd = atoi (param);
440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441	}
442	else if (!strcmp (cmd, "extcmd"))
443	{
444	ns->extcmd = atoi (param);
445	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446	}
447	else if (!strcmp (cmd, "extmap"))
448	{
449	ns->extmap = atoi (param);
450	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451	}
452	else if (!strcmp (cmd, "facecache"))
453	{
454	ns->facecache = atoi (param);
455	safe_strcat (cmdback, param, &slen, HUGE_BUF);
456	}
457	else if (!strcmp (cmd, "faceset"))
458	{
459	char tmpbuf[20];
460	int q = atoi (param);
461
462	if (is_valid_faceset (q))
463	ns->faceset = q;
464	sprintf (tmpbuf, "%d", ns->faceset);
465	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466	/* if the client is using faceset, it knows about image2 command */
467	ns->image2 = 1;
468	}
469	else if (!strcmp (cmd, "itemcmd"))
470	{
471	/* Version of the item protocol command to use. Currently,
472	* only supported versions are 1 and 2. Using a numeric
473	* value will make it very easy to extend this in the future.
474	*/
475	char tmpbuf[20];
476	int q = atoi (param);
477
478	if (q < 1 || q > 2)
479	{
480	strcpy (tmpbuf, "FALSE");
481	}
482	else
483	{
484	ns->itemcmd = q;
485	sprintf (tmpbuf, "%d", ns->itemcmd);
486	}
487	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488	}
489	else if (!strcmp (cmd, "mapsize"))
490	{
491	int x, y = 0;
492	char tmpbuf[MAX_BUF], *cp;
493
494	x = atoi (param);
495	for (cp = param; *cp != 0; cp++)
496	if (*cp == 'x' || *cp == 'X')
497	{
498	y = atoi (cp + 1);
499	break;
500	}
501
502	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503	{
504	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506	}
507	else
508	{
509	ns->mapx = x;
510	ns->mapy = y;
511	/* better to send back what we are really using and not the
512	* param as given to us in case it gets parsed differently.
513	*/
514	sprintf (tmpbuf, "%dx%d", x, y);
515	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516	/* If beyond this size and still using orig map command, need to
517	* go to map1cmd.
518	*/
519	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520	ns->mapmode = Map1Cmd;
521	}
522	}
523	else if (!strcmp (cmd, "extendedMapInfos"))
524	{
525	/* Added by tchize
526	* prepare to use the mapextended command
527	*/
528	char tmpbuf[20];
529
530	ns->ext_mapinfos = (atoi (param));
531	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533	}
534	else if (!strcmp (cmd, "extendedTextInfos"))
535	{
536	/* Added by tchize
537	* prepare to use the extended text commands
538	* Client toggle this to non zero to get exttext
539	*/
540	char tmpbuf[20];
541
542	ns->has_readable_type = (atoi (param));
543	sprintf (tmpbuf, "%d", ns->has_readable_type);
544	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545	}
546	else
547	{
548	/* Didn't get a setup command we understood -
549	* report a failure to the client.
550	*/
551	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552	}
553	} /* for processing all the setup commands */
554
555	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556	ns->send_packet (cmdback);
557	}	390	}
558		391
559	/**	392	/**
560	* The client has requested to be added to the game.	393	* The client has requested to be added to the game.
561	* This is what takes care of it. We tell the client how things worked out.	394	* This is what takes care of it. We tell the client how things worked out.
562	* I am not sure if this file is the best place for this function. however,	395	* I am not sure if this file is the best place for this function. however,
563	* it either has to be here or init_sockets needs to be exported.	396	* it either has to be here or init_sockets needs to be exported.
564	*/	397	*/
565	void	398	void
566	AddMeCmd (char *buf, int len, client * ns)	399	AddMeCmd (char *buf, int len, client *ns)
567	{	400	{
568	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	401	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569	}	402	}
570		403
571	/** Reply to ExtendedInfos command */	404	/** Reply to ExtendedInfos command */
…		…
683		516
684	ns->send_packet (cmdback);	517	ns->send_packet (cmdback);
685	}	518	}
686		519
687	/**	520	/**
688	* Tells client the picture it has to use
689	* to smooth a picture number given as argument.
690	*/
691	void
692	AskSmooth (char *buf, int len, client *ns)
693	{
694	ns->send_face (atoi (buf));
695	}
696
697	/**
698	* This handles the general commands from the client (ie, north, fire, cast,	521	* This handles the general commands from the client (ie, north, fire, cast,
699	* etc.)	522	* etc.)
700	*/	523	*/
701	void	524	void
702	PlayerCmd (char *buf, int len, player *pl)	525	PlayerCmd (char *buf, int len, player *pl)
…		…
723	* commands.	546	* commands.
724	*/	547	*/
725	pl->count = 0;	548	pl->count = 0;
726	}	549	}
727		550
728
729	/**	551	/**
730	* This handles the general commands from the client (ie, north, fire, cast,	552	* This handles the general commands from the client (ie, north, fire, cast,
731	* etc.). It is a lot like PlayerCmd above, but is called with the	553	* etc.). It is a lot like PlayerCmd above, but is called with the
732	* 'ncom' method which gives more information back to the client so it	554	* 'ncom' method which gives more information back to the client so it
733	* can throttle.	555	* can throttle.
…		…
735	void	557	void
736	NewPlayerCmd (char *buf, int len, player *pl)	558	NewPlayerCmd (char *buf, int len, player *pl)
737	{	559	{
738	if (len <= 6)	560	if (len <= 6)
739	{	561	{
740	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	562	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
741	return;	563	return;
742	}	564	}
743		565
744	uint16 cmdid = net_uint16 ((uint8 *)buf);	566	uint16 cmdid = net_uint16 ((uint8 *)buf);
745	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	567	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
802	{	624	{
803	case ST_PLAYING:	625	case ST_PLAYING:
804	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	626	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805	break;	627	break;
806		628
807	case ST_CHANGE_CLASS:
808	key_change_class (pl->ob, buf[0]);
809	break;
810
811	case ST_GET_PARTY_PASSWORD: /* Get password for party */	629	case ST_GET_PARTY_PASSWORD: /* Get password for party */
812	receive_party_password (pl->ob, 13);	630	receive_party_password (pl->ob, 13);
813	break;	631	break;
814		632
815	default:	633	default:
…		…
854		672
855	cp = strchr (cp + 1, ' ');	673	cp = strchr (cp + 1, ' ');
856		674
857	if (cp)	675	if (cp)
858	{	676	{
859	assign (ns->version, cp + 1);	677	ns->version = cp + 1;
860		678
861	if (ns->sc_version < 1026)	679	if (ns->sc_version < 1026)
862	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	680	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	681	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864	}	682	}
…		…
887	* syntax is: move (to) (tag) (nrof)	705	* syntax is: move (to) (tag) (nrof)
888	*/	706	*/
889	void	707	void
890	MoveCmd (char *buf, int len, player *pl)	708	MoveCmd (char *buf, int len, player *pl)
891	{	709	{
892	int vals[3], i;	710	int to, tag, nrof;
893		711
894	/* A little funky here. We only cycle for 2 records, because	712	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
895	* we obviously are not going to find a space after the third
896	* record. Perhaps we should just replace this with a
897	* sscanf?
898	*/
899	for (i = 0; i < 2; i++)
900	{	713	{
901	vals[i] = atoi (buf);
902
903	if (!(buf = strchr (buf, ' ')))
904	{
905	LOG (llevError, "Incomplete move command: %s\n", buf);	714	LOG (llevError, "Incomplete move command: %s\n", buf);
906	return;	715	return;
907	}
908
909	buf++;
910	}	716	}
911		717
912	vals[2] = atoi (buf);	718	esrv_move_object (pl->ob, to, tag, nrof);
913
914	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
915	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
916	}	719	}
917		720
918	/******************************************************************************	721	/******************************************************************************
919	*	722	*
920	* Start of commands the server sends to the client.	723	* Start of commands the server sends to the client.
…		…
924	/**	727	/**
925	* Asks the client to query the user. This way, the client knows	728	* Asks the client to query the user. This way, the client knows
926	* it needs to send something back (vs just printing out a message)	729	* it needs to send something back (vs just printing out a message)
927	*/	730	*/
928	void	731	void
929	send_query (client *ns, uint8 flags, char *text)	732	send_query (client *ns, uint8 flags, const char *text)
930	{	733	{
931	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	734	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		735	}
		736
		737	/**
		738	* Get player's current range attack in obuf.
		739	*/
		740	static void
		741	rangetostring (player *pl, char *obuf)
		742	{
		743	dynbuf_text buf;
		744
		745	if (pl->ranged_ob)
		746	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		747
		748	if (pl->combat_ob)
		749	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		750
		751	#if 0
		752	//TODO: remove this when slot system is working, this is only for debugging
		753	if (pl->ob->chosen_skill)
		754	buf << " Skill*: " << pl->ob->chosen_skill->name;
		755	#endif
		756
		757	//TODO: maybe golem should become the current_weapon, quite simply?
		758	if (pl->golem)
		759	buf << " Golem*: " << pl->golem->name;
		760
		761	buf << '\0';
		762	buf.linearise (obuf);
932	}	763	}
933		764
934	#define AddIfInt64(Old,New,Type) if (Old != New) {\	765	#define AddIfInt64(Old,New,Type) if (Old != New) {\
935	Old = New; \	766	Old = New; \
936	sl << uint8 (Type) << uint64 (New); \	767	sl << uint8 (Type) << uint64 (New); \
…		…
944	#define AddIfShort(Old,New,Type) if (Old != New) {\	775	#define AddIfShort(Old,New,Type) if (Old != New) {\
945	Old = New; \	776	Old = New; \
946	sl << uint8 (Type) << uint16 (New); \	777	sl << uint8 (Type) << uint16 (New); \
947	}	778	}
948		779
949	#define AddIfFloat(Old,New,Type) if (Old != New) {\	780	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950	Old = New; \	781	Old = New; \
951	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	782	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952	}	783	}
953		784
954	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	785	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955	free(Old); Old = strdup (New);\	786	free(Old); Old = strdup (New);\
956	sl << uint8 (Type) << data8 (New); \	787	sl << uint8 (Type) << data8 (New); \
…		…
970		801
971	client *ns = pl->ns;	802	client *ns = pl->ns;
972	if (!ns)	803	if (!ns)
973	return;	804	return;
974		805
975	object *ob = pl->ob;	806	object *ob = pl->observe;
976	if (!ob)	807	if (!ob)
977	return;	808	return;
		809
		810	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978		811
979	packet sl ("stats");	812	packet sl ("stats");
980		813
981	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	814	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	815	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
991	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	824	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	825	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	826	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994		827
995	for (int s = 0; s < NUM_SKILLS; s++)	828	for (int s = 0; s < NUM_SKILLS; s++)
996	if (object *skill = pl->last_skill_ob[s])	829	if (object *skill = opl->last_skill_ob[s])
997	if (skill->stats.exp != ns->last_skill_exp [s])	830	if (skill->stats.exp != ns->last_skill_exp [s])
998	{	831	{
999	ns->last_skill_exp [s] = skill->stats.exp;	832	ns->last_skill_exp [s] = skill->stats.exp;
1000		833
1001	/* Always send along the level if exp changes. This is only	834	/* Always send along the level if exp changes. This is only
…		…
1009	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	842	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	843	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	844	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	845	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	846	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	847	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1015	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	848	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	849	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1017	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	850	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018		851
1019	flags = 0;	852	flags = 0;
1020		853
1021	if (pl->fire_on)	854	if (opl->fire_on)
1022	flags |= SF_FIREON;	855	flags |= SF_FIREON;
1023		856
1024	if (pl->run_on)	857	if (opl->run_on)
1025	flags |= SF_RUNON;	858	flags |= SF_RUNON;
1026		859
1027	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	860	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028		861
1029	if (ns->sc_version < 1025)	862	if (ns->sc_version < 1025)
…		…
1043	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	876	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1044	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	877	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1045	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	878	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1046	}	879	}
1047		880
1048	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	881	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1049	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	882	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050	set_title (ob, buf);	883	set_title (ob, buf);
1051	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	884	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052		885
1053	/* Only send it away if we have some actual data */	886	/* Only send it away if we have some actual data */
…		…
1057		890
1058	/**	891	/**
1059	* Tells the client that here is a player it should start using.	892	* Tells the client that here is a player it should start using.
1060	*/	893	*/
1061	void	894	void
1062	esrv_new_player (player *pl, uint32 weight)	895	esrv_new_player (player *pl)
1063	{	896	{
		897	sint32 weight = pl->ob->client_weight ();
		898
1064	packet sl ("player");	899	packet sl ("player");
1065		900
1066	sl << uint32 (pl->ob->count)	901	sl << uint32 (pl->ob->count)
1067	<< uint32 (weight)	902	<< uint32 (weight)
1068	<< uint32 (pl->ob->face)	903	<< uint32 (pl->ob->face)
…		…
1081		916
1082	/** Clears a map cell */	917	/** Clears a map cell */
1083	static void	918	static void
1084	map_clearcell (struct MapCell *cell, int count)	919	map_clearcell (struct MapCell *cell, int count)
1085	{	920	{
1086	cell->faces[0] = 0;	921	cell->faces[0] = 0;
1087	cell->faces[1] = 0;	922	cell->faces[1] = 0;
1088	cell->faces[2] = 0;	923	cell->faces[2] = 0;
		924	cell->smooth[0] = 0;
		925	cell->smooth[1] = 0;
		926	cell->smooth[2] = 0;
1089	cell->count = count;	927	cell->count = count;
1090	cell->stat_hp = 0;	928	cell->stat_hp = 0;
1091	cell->flags = 0;	929	cell->flags = 0;
1092	cell->player = 0;	930	cell->player = 0;
1093	}	931	}
1094		932
1095	#define MAX_LAYERS 3	933	#define MAX_LAYERS 3
1096		934
1097	/**	935	/**
…		…
1100	* it was.	938	* it was.
1101	* sl is the socklist this data is going into.	939	* sl is the socklist this data is going into.
1102	* ns is the socket we are working on - all the info we care	940	* ns is the socket we are working on - all the info we care
1103	* about is in this socket structure, so now need not pass the	941	* about is in this socket structure, so now need not pass the
1104	* entire player object.	942	* entire player object.
1105	* mx and my are map coordinate offsets for map mp
1106	* sx and sy are the offsets into the socket structure that
1107	* holds the old values.
1108	* layer is the layer to update, with 2 being the floor and 0 the	943	* layer is the layer to update, with 2 being the floor and 0 the
1109	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	944	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1110	* take. Interesting to note that before this function, the map1 function	945	* take. Interesting to note that before this function, the map1 function
1111	* numbers the spaces differently - I think this was a leftover from	946	* numbers the spaces differently - I think this was a leftover from
1112	* the map command, where the faces stack up. Sinces that is no longer	947	* the map command, where the faces stack up. Sinces that is no longer
1113	* the case, it seems to make more sense to have these layer values	948	* the case, it seems to make more sense to have these layer values
1114	* actually match.	949	* actually match.
1115	*/	950	*/
1116	static int	951	static int
1117	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	952	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1118	{	953	{
1119	uint16 face_num;	954	object *ob = ms.faces_obj [layer];
1120	int bx, by, i;
1121
1122	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123		955
1124	/* If there is no object for this space, or if the face for the object	956	/* If there is no object for this space, or if the face for the object
1125	* is the blank face, set the face number to zero.	957	* is the blank face, set the face number to zero.
1126	* else if we have the stored head object for this space, that takes	958	* else if we have the stored head object for this space, that takes
1127	* precedence over the other object for this space.	959	* precedence over the other object for this space.
1128	* otherwise, we do special head processing	960	* otherwise, we do special head processing
1129	*/	961	*/
1130	if (!ob || ob->face == blank_face)	962	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131	face_num = 0;
1132	else
1133	/* In this case, we are already at the lower right or single part object,
1134	* so nothing special
1135	*/
1136	face_num = ob->face;
1137		963
1138	/* We've gotten what face we want to use for the object. Now see if	964	/* We've gotten what face we want to use for the object. Now see if
1139	* if it has changed since we last sent it to the client.	965	* if it has changed since we last sent it to the client.
1140	*/	966	*/
1141	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	967	if (lastcell.faces[layer] != face_num)
1142	{	968	{
1143	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	969	lastcell.faces[layer] = face_num;
1144		970
1145	if (!ns.faces_sent[face_num])	971	if (!ns.faces_sent[face_num])
1146	if (ob)	972	if (ob)
1147	ns.send_faces (ob);	973	ns.send_faces (ob);
1148	else	974	else
1149	ns.send_face (face_num);	975	ns.send_face (face_num, 10);
1150		976
1151	sl << uint16 (face_num);	977	sl << uint16 (face_num);
1152	return 1;
1153	}
1154
1155	/* Nothing changed */
1156	return 0;
1157	}
1158
1159	/**
1160	* This function is mainly a copy of update_space,
1161	* except it handles update of the smoothing updates,
1162	* not the face updates.
1163	* Removes the need to replicate the same code for each layer.
1164	* this returns true if this smooth is now in fact different
1165	* than it was.
1166	* sl is the socklist this data is going into.
1167	* ns is the socket we are working on - all the info we care
1168	* about is in this socket structure, so know need to pass the
1169	* entire player object.
1170	* mx and my are map coordinate offsets for map mp
1171	* sx and sy are the offsets into the socket structure that
1172	* holds the old values.
1173	* layer is the layer to update, with 2 being the floor and 0 the
1174	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175	* take.
1176	*/
1177	static inline int
1178	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179	{
1180	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182	/* If there is no object for this space, or if the face for the object
1183	* is the blank face, set the smoothlevel to zero.
1184	*/
1185	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187	/* We've gotten what face we want to use for the object. Now see if
1188	* if it has changed since we last sent it to the client.
1189	*/
1190	if (smoothlevel > 255)
1191	smoothlevel = 255;
1192	else if (smoothlevel < 0)
1193	smoothlevel = 0;
1194
1195	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196	{
1197	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1198	sl << uint8 (smoothlevel);
1199	return 1;	978	return 1;
1200	}	979	}
1201		980
1202	/* Nothing changed */	981	/* Nothing changed */
1203	return 0;	982	return 0;
…		…
1243	{	1022	{
1244	prefetch_surrounding_maps (op->map, 3);	1023	prefetch_surrounding_maps (op->map, 3);
1245	}	1024	}
1246		1025
1247	/**	1026	/**
1248	* This function uses the new map1 protocol command to send the map	1027	* Draws client map.
1249	* to the client. It is necessary because the old map command supports
1250	* a maximum map size of 15x15.
1251	* This function is much simpler than the old one. This is because
1252	* the old function optimized to send as few face identifiers as possible,
1253	* at the expense of sending more coordinate location (coordinates were
1254	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1255	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1256	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1257	* and use the other 4 bits for other informatiion. For full documentation
1258	* of what we send, see the doc/Protocol file.
1259	* I will describe internally what we do:
1260	* the ns->lastmap shows how the map last looked when sent to the client.
1261	* in the lastmap structure, there is a cells array, which is set to the
1262	* maximum viewable size (As set in config.h).
1263	* in the cells, there are faces and a count value.
1264	* we use the count value to hold the darkness value. If -1, then this space
1265	* is not viewable.
1266	* we use faces[0] faces[1] faces[2] to hold what the three layers
1267	* look like.
1268	*/	1028	*/
1269	void	1029	void
1270	draw_client_map1 (object *pl)	1030	draw_client_map (player *pl)
1271	{	1031	{
		1032	object *ob = pl->observe;
		1033	if (!ob->active)
		1034	return;
		1035
		1036	maptile *plmap = ob->map;
		1037
		1038	/* If player is just joining the game, he isn't here yet, so the map
		1039	* can get swapped out. If so, don't try to send them a map. All will
		1040	* be OK once they really log in.
		1041	*/
		1042	if (!plmap || plmap->in_memory != MAP_ACTIVE)
		1043	return;
		1044
1272	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1045	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1273	sint16 nx, ny;
1274	int estartlen, eoldlen;	1046	int estartlen, eoldlen;
1275	uint8 eentrysize;	1047	uint8 eentrysize;
1276	uint16 ewhatstart, ewhatflag;	1048	uint16 ewhatstart, ewhatflag;
1277	uint8 extendedinfos;	1049	uint8 extendedinfos;
1278	maptile *m;
1279		1050
1280	client &socket = *pl->contr->ns;
1281
1282	if (!pl->active)
1283	return;
1284
1285	check_map_change (pl->contr);	1051	check_map_change (pl);
1286	prefetch_surrounding_maps (pl);	1052	prefetch_surrounding_maps (pl->ob);
		1053
		1054	/* do LOS after calls to update_position */
		1055	if (ob != pl->ob)
		1056	clear_los (pl);
		1057	else if (pl->do_los)
		1058	{
		1059	update_los (ob);
		1060	pl->do_los = 0;
		1061	}
		1062
		1063	/**
		1064	* This function uses the new map1 protocol command to send the map
		1065	* to the client. It is necessary because the old map command supports
		1066	* a maximum map size of 15x15.
		1067	* This function is much simpler than the old one. This is because
		1068	* the old function optimized to send as few face identifiers as possible,
		1069	* at the expense of sending more coordinate location (coordinates were
		1070	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1071	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1072	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1073	* and use the other 4 bits for other informatiion. For full documentation
		1074	* of what we send, see the doc/Protocol file.
		1075	* I will describe internally what we do:
		1076	* the ns->lastmap shows how the map last looked when sent to the client.
		1077	* in the lastmap structure, there is a cells array, which is set to the
		1078	* maximum viewable size (As set in config.h).
		1079	* in the cells, there are faces and a count value.
		1080	* we use the count value to hold the darkness value. If -1, then this space
		1081	* is not viewable.
		1082	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1083	* look like.
		1084	*/
		1085
		1086	client &socket = *pl->ns;
1287		1087
1288	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1088	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1289	packet esl;	1089	packet esl;
1290		1090
1291	startlen = sl.length ();	1091	startlen = sl.length ();
…		…
1306	<< uint8 (extendedinfos)	1106	<< uint8 (extendedinfos)
1307	<< uint8 (eentrysize);	1107	<< uint8 (eentrysize);
1308		1108
1309	estartlen = esl.length ();	1109	estartlen = esl.length ();
1310	}	1110	}
1311	else
1312	{
1313	/* suppress compiler warnings */
1314	ewhatstart = 0;
1315	ewhatflag = 0;
1316	estartlen = 0;
1317	}
1318		1111
1319	/* x,y are the real map locations. ax, ay are viewport relative	1112	/* x,y are the real map locations. ax, ay are viewport relative
1320	* locations.	1113	* locations.
1321	*/	1114	*/
1322	ay = 0;	1115	ay = 0;
1323		1116
1324	/* We could do this logic as conditionals in the if statement,	1117	/* We could do this logic as conditionals in the if statement,
1325	* but that started to get a bit messy to look at.	1118	* but that started to get a bit messy to look at.
1326	*/	1119	*/
1327	max_x = pl->x + (socket.mapx + 1) / 2;	1120	max_x = ob->x + (socket.mapx + 1) / 2;
1328	max_y = pl->y + (socket.mapy + 1) / 2;	1121	max_y = ob->y + (socket.mapy + 1) / 2;
1329		1122
1330	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1123	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1331	{	1124	{
		1125	sint16 nx, ny;
		1126	maptile *m = 0;
		1127
1332	ax = 0;	1128	ax = 0;
1333	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1129	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1334	{	1130	{
		1131	// check to see if we can simply go one right quickly
		1132	++nx;
		1133	if (m && nx >= m->width)
		1134	m = 0;
		1135
		1136	if (!m)
		1137	{
		1138	nx = x; ny = y; m = plmap;
		1139
		1140	if (xy_normalise (m, nx, ny))
		1141	m->touch ();
		1142	else
		1143	m = 0;
		1144	}
		1145
1335	int emask, mask;	1146	int emask, mask;
1336	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1147	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1337		1148
1338	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1149	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1339		1150
1340	/* If the coordinates are not valid, or it is too dark to see,	1151	/* If the coordinates are not valid, or it is too dark to see,
1341	* we tell the client as such	1152	* we tell the client as such
1342	*/	1153	*/
1343	nx = x;
1344	ny = y;
1345	m = get_map_from_coord (pl->map, &nx, &ny);
1346
1347	if (!m)	1154	if (!m)
1348	{	1155	{
1349	/* space is out of map. Update space and clear values	1156	/* space is out of map. Update space and clear values
1350	* if this hasn't already been done. If the space is out	1157	* if this hasn't already been done. If the space is out
1351	* of the map, it shouldn't have a head	1158	* of the map, it shouldn't have a head
…		…
1357	}	1164	}
1358		1165
1359	continue;	1166	continue;
1360	}	1167	}
1361		1168
1362	m->touch ();
1363
1364	int d = pl->contr->blocked_los[ax][ay];	1169	int d = pl->blocked_los[ax][ay];
1365		1170
1366	if (d > 3)	1171	if (d > 3)
1367	{	1172	{
1368		1173
1369	int need_send = 0, count;	1174	int need_send = 0, count;
…		…
1411	oldlen = sl.length ();	1216	oldlen = sl.length ();
1412	eoldlen = esl.length ();	1217	eoldlen = esl.length ();
1413		1218
1414	sl << uint16 (mask);	1219	sl << uint16 (mask);
1415		1220
1416	if (socket.ext_mapinfos)
1417	esl << uint16 (emask);
1418
1419	unsigned char dummy;	1221	unsigned char dummy;
1420	unsigned char *last_ext = &dummy;	1222	unsigned char *last_ext = &dummy;
1421		1223
1422	/* Darkness changed */	1224	/* Darkness changed */
1423	if (lastcell.count != d && socket.darkness)	1225	if (lastcell.count != d && socket.darkness)
…		…
1434	sl << uint8 (255 - 64 * d);	1236	sl << uint8 (255 - 64 * d);
1435	}	1237	}
1436		1238
1437	lastcell.count = d;	1239	lastcell.count = d;
1438		1240
		1241	mapspace &ms = m->at (nx, ny);
		1242	ms.update ();
		1243
1439	if (socket.extmap)	1244	if (socket.extmap)
1440	{	1245	{
1441	uint8 stat_hp = 0;	1246	uint8 stat_hp = 0;
1442	uint8 stat_width = 0;	1247	uint8 stat_width = 0;
1443	uint8 flags = 0;	1248	uint8 flags = 0;
1444	UUID player = 0;	1249	tag_t player = 0;
1445		1250
1446	// send hp information, if applicable	1251	// send hp information, if applicable
1447	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1252	if (object *op = ms.faces_obj [0])
		1253	if (op->is_head () && !op->invisible)
1448	{	1254	{
1449	if (op->head || op->invisible)	1255	if (op->stats.maxhp > op->stats.hp
1450	; // do not show	1256	&& op->stats.maxhp > 0
1451	else if (op->type == PLAYER	1257	&& (op->type == PLAYER
		1258	|| op->type == DOOR // does not work, have maxhp 0
1452	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1259	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1453	{
1454	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1455	{	1260	{
1456	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1261	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1457	stat_width = op->arch->tail_x;	1262	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1458	}	1263	}
1459	}
1460		1264
1461	if (op->msg && op->msg[0] == '@')	1265	if (op->msg && op->msg[0] == '@')
1462	flags |= 1;	1266	flags |= 1;
1463		1267
1464	if (op->type == PLAYER && op != pl)	1268	if (op->type == PLAYER && op != ob)
1465	player = op->count;	1269	player = op->count;
1466	}	1270	}
1467		1271
1468	if (lastcell.stat_hp != stat_hp)	1272	if (lastcell.stat_hp != stat_hp)
1469	{	1273	{
1470	lastcell.stat_hp = stat_hp;	1274	lastcell.stat_hp = stat_hp;
1471		1275
…		…
1490		1294
1491	mask |= 0x8;	1295	mask |= 0x8;
1492	*last_ext |= 0x80;	1296	*last_ext |= 0x80;
1493	last_ext = &sl[sl.length ()];	1297	last_ext = &sl[sl.length ()];
1494		1298
1495	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1299	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1496	}	1300	}
1497		1301
1498	if (lastcell.flags != flags)	1302	if (lastcell.flags != flags)
1499	{	1303	{
1500	lastcell.flags = flags;	1304	lastcell.flags = flags;
…		…
1506	sl << uint8 (8) << uint8 (flags);	1310	sl << uint8 (8) << uint8 (flags);
1507	}	1311	}
1508	}	1312	}
1509		1313
1510	/* Floor face */	1314	/* Floor face */
1511	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1315	if (update_space (sl, socket, ms, lastcell, 2))
1512	mask |= 0x4;	1316	mask |= 0x4;
1513		1317
1514	if (socket.EMI_smooth)
1515	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1516	emask |= 0x4;
1517
1518	/* Middle face */	1318	/* Middle face */
1519	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1319	if (update_space (sl, socket, ms, lastcell, 1))
1520	mask |= 0x2;	1320	mask |= 0x2;
1521		1321
1522	if (socket.EMI_smooth)	1322	if (ms.player () == ob
1523	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1323	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1524	emask |= 0x2;
1525
1526	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1527	{	1324	{
		1325	// force player to be visible to himself if invisible
1528	if (lastcell.faces[0] != pl->face)	1326	if (lastcell.faces[0] != ob->face)
1529	{	1327	{
1530	lastcell.faces[0] = pl->face;	1328	lastcell.faces[0] = ob->face;
		1329
1531	mask |= 0x1;	1330	mask |= 0x1;
1532
1533	socket.send_faces (pl);
1534
1535	sl << uint16 (pl->face);	1331	sl << uint16 (ob->face);
		1332
		1333	socket.send_faces (ob);
1536	}	1334	}
1537	}	1335	}
1538	else
1539	{
1540	/* Top face */	1336	/* Top face */
1541	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1337	else if (update_space (sl, socket, ms, lastcell, 0))
1542	mask |= 0x1;	1338	mask |= 0x1;
1543
1544	if (socket.EMI_smooth)
1545	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1546	emask |= 0x1;
1547	}
1548		1339
1549	/* Check to see if we are in fact sending anything for this	1340	/* Check to see if we are in fact sending anything for this
1550	* space by checking the mask. If so, update the mask.	1341	* space by checking the mask. If so, update the mask.
1551	* if not, reset the len to that from before adding the mask	1342	* if not, reset the len to that from before adding the mask
1552	* value, so we don't send those bits.	1343	* value, so we don't send those bits.
…		…
1554	if (mask & 0xf)	1345	if (mask & 0xf)
1555	sl[oldlen + 1] = mask & 0xff;	1346	sl[oldlen + 1] = mask & 0xff;
1556	else	1347	else
1557	sl.reset (oldlen);	1348	sl.reset (oldlen);
1558		1349
		1350	if (socket.ext_mapinfos)
		1351	esl << uint16 (emask);
		1352
		1353	if (socket.EMI_smooth)
		1354	{
		1355	for (int layer = 2+1; layer--; )
		1356	{
		1357	object *ob = ms.faces_obj [layer];
		1358
		1359	// If there is no object for this space, or if the face for the object
		1360	// is the blank face, set the smoothlevel to zero.
		1361	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1362
		1363	// We've gotten what face we want to use for the object. Now see if
		1364	// if it has changed since we last sent it to the client.
		1365	if (lastcell.smooth[layer] != smoothlevel)
		1366	{
		1367	lastcell.smooth[layer] = smoothlevel;
		1368	esl << uint8 (smoothlevel);
		1369	emask |= 1 << layer;
		1370	}
		1371	}
		1372
1559	if (emask & 0xf)	1373	if (emask & 0xf)
1560	esl[eoldlen + 1] = emask & 0xff;	1374	esl[eoldlen + 1] = emask & 0xff;
1561	else	1375	else
1562	esl.reset (eoldlen);	1376	esl.reset (eoldlen);
		1377	}
1563	} /* else this is a viewable space */	1378	} /* else this is a viewable space */
1564	} /* for x loop */	1379	} /* for x loop */
1565	} /* for y loop */	1380	} /* for y loop */
		1381
		1382	socket.flush_fx ();
1566		1383
1567	/* Verify that we in fact do need to send this */	1384	/* Verify that we in fact do need to send this */
1568	if (socket.ext_mapinfos)	1385	if (socket.ext_mapinfos)
1569	{	1386	{
1570	if (!(sl.length () > startlen || socket.sent_scroll))	1387	if (!(sl.length () > startlen || socket.sent_scroll))
…		…
1585	socket.send_packet (sl);	1402	socket.send_packet (sl);
1586	socket.sent_scroll = 0;	1403	socket.sent_scroll = 0;
1587	}	1404	}
1588	}	1405	}
1589		1406
1590	/**
1591	* Draws client map.
1592	*/
1593	void
1594	draw_client_map (object *pl)
1595	{
1596	int i, j;
1597	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1598	int mflags;
1599	struct Map newmap;
1600	maptile *m, *pm;
1601
1602	if (pl->type != PLAYER)
1603	{
1604	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1605	return;
1606	}
1607
1608	pm = pl->map;
1609
1610	/* If player is just joining the game, he isn't here yet, so the map
1611	* can get swapped out. If so, don't try to send them a map. All will
1612	* be OK once they really log in.
1613	*/
1614	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1615	return;
1616
1617	memset (&newmap, 0, sizeof (struct Map));
1618
1619	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1620	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1621	{
1622	ax = i;
1623	ay = j;
1624	m = pm;
1625	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1626
1627	if (mflags & P_OUT_OF_MAP)
1628	continue;
1629
1630	/* If a map is visible to the player, we don't want to swap it out
1631	* just to reload it. This should really call something like
1632	* swap_map, but this is much more efficient and 'good enough'
1633	*/
1634	if (mflags & P_NEW_MAP)
1635	m->timeout = 50;
1636	}
1637
1638	/* do LOS after calls to update_position */
1639	if (pl->contr->do_los)
1640	{
1641	update_los (pl);
1642	pl->contr->do_los = 0;
1643	}
1644
1645	/* Big maps need a different drawing mechanism to work */
1646	draw_client_map1 (pl);
1647	}
1648
1649
1650	/*****************************************************************************/	1407	/*****************************************************************************/
1651
1652	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1408	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1653
1654	/* a player. Of course, the client need to know the command to be able to */	1409	/* a player. Of course, the client need to know the command to be able to */
1655
1656	/* manage it ! */	1410	/* manage it ! */
1657
1658	/*****************************************************************************/	1411	/*****************************************************************************/
1659	void	1412	void
1660	send_plugin_custom_message (object *pl, char *buf)	1413	send_plugin_custom_message (object *pl, char *buf)
1661	{	1414	{
1662	pl->contr->ns->send_packet (buf);	1415	pl->contr->ns->send_packet (buf);
…		…
1673	sl << "replyinfo skill_info\n";	1426	sl << "replyinfo skill_info\n";
1674		1427
1675	for (int i = 1; i < NUM_SKILLS; i++)	1428	for (int i = 1; i < NUM_SKILLS; i++)
1676	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1429	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1677		1430
1678	if (sl.length () >= MAXSOCKBUF)	1431	if (sl.length () > MAXSOCKBUF)
1679	{	1432	{
1680	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1433	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1681	fatal (0);	1434	fatal (0);
1682	}	1435	}
1683		1436
…		…
1696	sl << "replyinfo spell_paths\n";	1449	sl << "replyinfo spell_paths\n";
1697		1450
1698	for (int i = 0; i < NRSPELLPATHS; i++)	1451	for (int i = 0; i < NRSPELLPATHS; i++)
1699	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1452	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1700		1453
1701	if (sl.length () >= MAXSOCKBUF)	1454	if (sl.length () > MAXSOCKBUF)
1702	{	1455	{
1703	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1456	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1704	fatal (0);	1457	fatal (0);
1705	}	1458	}
1706		1459
…		…
1814	if (!spell->face)	1567	if (!spell->face)
1815	{	1568	{
1816	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1569	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1817	spell->face = face_find ("burnout.x11", blank_face);	1570	spell->face = face_find ("burnout.x11", blank_face);
1818	}	1571	}
		1572
		1573	pl->ns->send_face (spell->face);
1819		1574
1820	/* send the current values */	1575	/* send the current values */
1821	sl << uint32 (spell->count)	1576	sl << uint32 (spell->count)
1822	<< uint16 (spell->level)	1577	<< uint16 (spell->level)
1823	<< uint16 (spell->casting_time)	1578	<< uint16 (spell->casting_time)
…		…
1859	* bytes and 3 strings (because that is the spec) so we need to	1614	* bytes and 3 strings (because that is the spec) so we need to
1860	* check that the length of those 3 strings, plus the 23 bytes,	1615	* check that the length of those 3 strings, plus the 23 bytes,
1861	* won't take us over the length limit for the socket, if it does,	1616	* won't take us over the length limit for the socket, if it does,
1862	* we need to send what we already have, and restart packet formation	1617	* we need to send what we already have, and restart packet formation
1863	*/	1618	*/
		1619	if (spell->type != SPELL)
		1620	continue;
		1621
1864	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1622	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1865	* to show add_spell is 26 bytes + 2 strings. However, the overun	1623	* to show add_spell is 26 bytes + 2 strings. However, the overun
1866	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1624	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1867	* like it will fix this	1625	* like it will fix this
1868	*/	1626	*/
1869	if (spell->type != SPELL)
1870	continue;
1871
1872	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1627	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1873	{	1628	{
		1629	pl->ns->flush_fx ();
1874	pl->ns->send_packet (sl);	1630	pl->ns->send_packet (sl);
1875		1631
1876	sl.reset ();	1632	sl.reset ();
1877	sl << "addspell ";	1633	sl << "addspell ";
1878	}	1634	}
…		…
1886	return;	1642	return;
1887	}	1643	}
1888	else	1644	else
1889	append_spell (pl, sl, spell);	1645	append_spell (pl, sl, spell);
1890		1646
1891	if (sl.length () >= MAXSOCKBUF)	1647	if (sl.length () > MAXSOCKBUF)
1892	{	1648	{
1893	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1649	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1894	fatal (0);	1650	fatal (0);
1895	}	1651	}
1896		1652
1897	/* finally, we can send the packet */	1653	/* finally, we can send the packet */
		1654	pl->ns->flush_fx ();
1898	pl->ns->send_packet (sl);	1655	pl->ns->send_packet (sl);
1899	}	1656	}
1900		1657

Diff Legend

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