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.90 by root, Fri Apr 27 00:49:58 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
132static void 131static void
133clear_map (player *pl) 132clear_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));
136 137
137 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
138 139
139 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
145/** check for map/region change and send new map data */ 146/** check for map/region change and send new map data */
146static void 147static void
147check_map_change (player *pl) 148check_map_change (player *pl)
148{ 149{
149 client &socket = *pl->ns; 150 client &socket = *pl->ns;
150 object *ob = pl->ob; 151 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */ 152
153 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map)
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 }
152 171
153 if (socket.current_map != ob->map || socket.force_newmap) 172 if (socket.current_map != ob->map || socket.force_newmap)
154 { 173 {
155 clear_map (pl); 174 clear_map (pl);
156 socket.current_map = ob->map; 175 socket.current_map = ob->map;
… …
164 if (ob->map->tile_path[0]) flags |= 1; 183 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2; 184 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4; 185 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8; 186 if (ob->map->tile_path[3]) flags |= 8;
168 187
169 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",
170 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);
171 } 191 }
172 else 192 else
173 snprintf (buf, MAX_BUF, "mapinfo current");
174
175 socket.send_packet (buf); 193 socket.send_packet ("mapinfo current");
176 } 194 }
177 } 195 }
178 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)
179 { 197 {
180 int dx = ob->x - socket.current_x; 198 int dx = ob->x - socket.current_x;
… …
193 socket.current_y = ob->y; 211 socket.current_y = ob->y;
194 212
195 region *reg = ob->region (); 213 region *reg = ob->region ();
196 if (socket.current_region != reg) 214 if (socket.current_region != reg)
197 { 215 {
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
198 socket.current_region = reg; 217 socket.current_region = reg;
199 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
200 } 218 }
201} 219}
202 220
203/** 221/**
204 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
205 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
206 * that information. 224 * that information.
207 */ 225 */
208void 226void
209RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
210{ 228{
211 char *params = NULL, *cp; 229 char *params;
212
213 /* No match */
214 char bigbuf[MAX_BUF];
215 int slen;
216
217 /* Set up replyinfo before we modify any of the buffers - this is used
218 * if we don't find a match.
219 */
220 strcpy (bigbuf, "replyinfo ");
221 slen = strlen (bigbuf);
222 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
223 230
224 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
225 * params pointer. 232 * params pointer.
226 */ 233 */
227 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
228 if (*cp == ' ') 235 if (*params == ' ')
229 { 236 {
230 *cp = '\0';
231 params = cp + 1; 237 *params++ = 0;
232 break; 238 break;
233 } 239 }
234 240
235 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
236 send_image_info (ns, params); 242 send_image_info (ns, params);
… …
239 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
240 send_skill_info (ns, params); 246 send_skill_info (ns, params);
241 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
242 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
243 else 249 else
244 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 }
245} 257}
246 258
247void 259void
248ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
249{ 261{
… …
252 264
253void 265void
254ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
255{ 267{
256 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::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
280bool
281client::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
341void
342client::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;
257} 355}
258 356
259void 357void
260MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
261{ 359{
262 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
263 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
264 362
265 char bigbuf[MAX_BUF], *token;
266
267 token = buf; 363 char *token = buf;
268 // copy token 364
269 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
270 return; 366 return;
271 367
272 *buf++ = 0;
273
274 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
275 { 369 {
276 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
277 372
278 // initial map and its origin 373#if 0
279 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
280 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
281 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 free (copy);
282 int mapy = pl->ns->mapy / 2 - pl->ob->y;
283 int max_distance = 8; // limit maximum path length to something generous
284
285 while (*buf && map && max_distance)
286 {
287 int dir = *buf++;
288
289 switch (dir)
290 {
291 case '1':
292 dx = 0;
293 dy = -1;
294 map = map->xy_find (dx, dy);
295 map && (mapy -= map->height);
296 break;
297 case '2':
298 mapx += map->width;
299 dx = map->width;
300 dy = 0;
301 map = map->xy_find (dx, dy);
302 break;
303 case '3':
304 mapy += map->height;
305 dx = 0;
306 dy = map->height;
307 map = map->xy_find (dx, dy);
308 break;
309 case '4':
310 dx = -1;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 map && (mapx -= map->width);
314 break;
315 }
316
317 --max_distance;
318 }
319
320 if (!max_distance)
321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
322 else if (map && map->path[0])
323 {
324 int flags = 0;
325
326 if (map->tile_path[0]) flags |= 1;
327 if (map->tile_path[1]) flags |= 2;
328 if (map->tile_path[2]) flags |= 4;
329 if (map->tile_path[3]) flags |= 8;
330
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
332 }
333 else 377 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
335 } 380 }
336 else 381 else
337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
338
339 pl->ns->send_packet (bigbuf);
340} 383}
341 384
342/** This is the Setup cmd */ 385/** This is the Setup cmd */
343void 386void
344SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
… …
473 516
474 ns->send_packet (cmdback); 517 ns->send_packet (cmdback);
475} 518}
476 519
477/** 520/**
478 * client requested an image. send it rate-limited
479 * before flushing.
480 */
481void
482AskFaceCmd (char *buf, int len, client *ns)
483{
484 ns->askface.push_back (atoi (buf));
485}
486
487/**
488 * Tells client the picture it has to use
489 * to smooth a picture number given as argument.
490 */
491void
492AskSmooth (char *buf, int len, client *ns)
493{
494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
496}
497
498/**
499 * 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,
500 * etc.) 522 * etc.)
501 */ 523 */
502void 524void
503PlayerCmd (char *buf, int len, player *pl) 525PlayerCmd (char *buf, int len, player *pl)
… …
524 * commands. 546 * commands.
525 */ 547 */
526 pl->count = 0; 548 pl->count = 0;
527} 549}
528 550
529
530/** 551/**
531 * 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,
532 * 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
533 * '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
534 * can throttle. 555 * can throttle.
… …
536void 557void
537NewPlayerCmd (char *buf, int len, player *pl) 558NewPlayerCmd (char *buf, int len, player *pl)
538{ 559{
539 if (len <= 6) 560 if (len <= 6)
540 { 561 {
541 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);
542 return; 563 return;
543 } 564 }
544 565
545 uint16 cmdid = net_uint16 ((uint8 *)buf); 566 uint16 cmdid = net_uint16 ((uint8 *)buf);
546 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 567 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
684 * syntax is: move (to) (tag) (nrof) 705 * syntax is: move (to) (tag) (nrof)
685 */ 706 */
686void 707void
687MoveCmd (char *buf, int len, player *pl) 708MoveCmd (char *buf, int len, player *pl)
688{ 709{
689 int vals[3], i; 710 int to, tag, nrof;
690 711
691 /* A little funky here. We only cycle for 2 records, because 712 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
692 * we obviously are not going to find a space after the third
693 * record. Perhaps we should just replace this with a
694 * sscanf?
695 */
696 for (i = 0; i < 2; i++)
697 { 713 {
698 vals[i] = atoi (buf);
699
700 if (!(buf = strchr (buf, ' ')))
701 {
702 LOG (llevError, "Incomplete move command: %s\n", buf); 714 LOG (llevError, "Incomplete move command: %s\n", buf);
703 return; 715 return;
704 }
705
706 buf++;
707 } 716 }
708 717
709 vals[2] = atoi (buf); 718 esrv_move_object (pl->ob, to, tag, nrof);
710
711/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
712 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
713} 719}
714 720
715/****************************************************************************** 721/******************************************************************************
716 * 722 *
717 * Start of commands the server sends to the client. 723 * Start of commands the server sends to the client.
… …
726send_query (client *ns, uint8 flags, const char *text) 732send_query (client *ns, uint8 flags, const char *text)
727{ 733{
728 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 734 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
729} 735}
730 736
737/**
738 * Get player's current range attack in obuf.
739 */
740static void
741rangetostring (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);
763}
764
731#define AddIfInt64(Old,New,Type) if (Old != New) {\ 765#define AddIfInt64(Old,New,Type) if (Old != New) {\
732 Old = New; \ 766 Old = New; \
733 sl << uint8 (Type) << uint64 (New); \ 767 sl << uint8 (Type) << uint64 (New); \
734 } 768 }
735 769
… …
741#define AddIfShort(Old,New,Type) if (Old != New) {\ 775#define AddIfShort(Old,New,Type) if (Old != New) {\
742 Old = New; \ 776 Old = New; \
743 sl << uint8 (Type) << uint16 (New); \ 777 sl << uint8 (Type) << uint16 (New); \
744 } 778 }
745 779
746#define AddIfFloat(Old,New,Type) if (Old != New) {\ 780#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
747 Old = New; \ 781 Old = New; \
748 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 782 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
749 } 783 }
750 784
751#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 785#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
752 free(Old); Old = strdup (New);\ 786 free(Old); Old = strdup (New);\
753 sl << uint8 (Type) << data8 (New); \ 787 sl << uint8 (Type) << data8 (New); \
… …
767 801
768 client *ns = pl->ns; 802 client *ns = pl->ns;
769 if (!ns) 803 if (!ns)
770 return; 804 return;
771 805
772 object *ob = pl->ob; 806 object *ob = pl->observe;
773 if (!ob) 807 if (!ob)
774 return; 808 return;
809
810 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
775 811
776 packet sl ("stats"); 812 packet sl ("stats");
777 813
778 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 814 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
779 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 815 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
788 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
789 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
790 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
791 827
792 for (int s = 0; s < NUM_SKILLS; s++) 828 for (int s = 0; s < NUM_SKILLS; s++)
793 if (object *skill = pl->last_skill_ob[s]) 829 if (object *skill = opl->last_skill_ob[s])
794 if (skill->stats.exp != ns->last_skill_exp [s]) 830 if (skill->stats.exp != ns->last_skill_exp [s])
795 { 831 {
796 ns->last_skill_exp [s] = skill->stats.exp; 832 ns->last_skill_exp [s] = skill->stats.exp;
797 833
798 /* Always send along the level if exp changes. This is only 834 /* Always send along the level if exp changes. This is only
… …
806 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 842 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
807 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 843 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
808 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 844 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
809 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 845 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
810 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 846 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
811 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 847 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
812 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 848 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
813 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);
814 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);
815 851
816 flags = 0; 852 flags = 0;
817 853
818 if (pl->fire_on) 854 if (opl->fire_on)
819 flags |= SF_FIREON; 855 flags |= SF_FIREON;
820 856
821 if (pl->run_on) 857 if (opl->run_on)
822 flags |= SF_RUNON; 858 flags |= SF_RUNON;
823 859
824 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 860 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
825 861
826 if (ns->sc_version < 1025) 862 if (ns->sc_version < 1025)
… …
840 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);
841 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);
842 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);
843 } 879 }
844 880
845 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 */
846 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 882 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
847 set_title (ob, buf); 883 set_title (ob, buf);
848 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 884 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
849 885
850 /* Only send it away if we have some actual data */ 886 /* Only send it away if we have some actual data */
… …
854 890
855/** 891/**
856 * 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.
857 */ 893 */
858void 894void
859esrv_new_player (player *pl, uint32 weight) 895esrv_new_player (player *pl)
860{ 896{
897 sint32 weight = pl->ob->client_weight ();
898
861 packet sl ("player"); 899 packet sl ("player");
862 900
863 sl << uint32 (pl->ob->count) 901 sl << uint32 (pl->ob->count)
864 << uint32 (weight) 902 << uint32 (weight)
865 << uint32 (pl->ob->face) 903 << uint32 (pl->ob->face)
… …
932 970
933 if (!ns.faces_sent[face_num]) 971 if (!ns.faces_sent[face_num])
934 if (ob) 972 if (ob)
935 ns.send_faces (ob); 973 ns.send_faces (ob);
936 else 974 else
937 ns.send_face (face_num); 975 ns.send_face (face_num, 10);
938 976
939 sl << uint16 (face_num); 977 sl << uint16 (face_num);
940 return 1; 978 return 1;
941 } 979 }
942 980
… …
984{ 1022{
985 prefetch_surrounding_maps (op->map, 3); 1023 prefetch_surrounding_maps (op->map, 3);
986} 1024}
987 1025
988/** 1026/**
989 * This function uses the new map1 protocol command to send the map 1027 * Draws client map.
990 * to the client. It is necessary because the old map command supports
991 * a maximum map size of 15x15.
992 * This function is much simpler than the old one. This is because
993 * the old function optimized to send as few face identifiers as possible,
994 * at the expense of sending more coordinate location (coordinates were
995 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
996 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
997 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
998 * and use the other 4 bits for other informatiion. For full documentation
999 * of what we send, see the doc/Protocol file.
1000 * I will describe internally what we do:
1001 * the ns->lastmap shows how the map last looked when sent to the client.
1002 * in the lastmap structure, there is a cells array, which is set to the
1003 * maximum viewable size (As set in config.h).
1004 * in the cells, there are faces and a count value.
1005 * we use the count value to hold the darkness value. If -1, then this space
1006 * is not viewable.
1007 * we use faces[0] faces[1] faces[2] to hold what the three layers
1008 * look like.
1009 */ 1028 */
1010void 1029void
1011draw_client_map1 (object *pl) 1030draw_client_map (player *pl)
1012{ 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
1013 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1014 sint16 nx, ny;
1015 int estartlen, eoldlen; 1046 int estartlen, eoldlen;
1016 uint8 eentrysize; 1047 uint8 eentrysize;
1017 uint16 ewhatstart, ewhatflag; 1048 uint16 ewhatstart, ewhatflag;
1018 uint8 extendedinfos; 1049 uint8 extendedinfos;
1019 maptile *m;
1020 1050
1021 client &socket = *pl->contr->ns;
1022
1023 if (!pl->active)
1024 return;
1025
1026 check_map_change (pl->contr); 1051 check_map_change (pl);
1027 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;
1028 1087
1029 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1088 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1030 packet esl; 1089 packet esl;
1031 1090
1032 startlen = sl.length (); 1091 startlen = sl.length ();
… …
1056 ay = 0; 1115 ay = 0;
1057 1116
1058 /* We could do this logic as conditionals in the if statement, 1117 /* We could do this logic as conditionals in the if statement,
1059 * but that started to get a bit messy to look at. 1118 * but that started to get a bit messy to look at.
1060 */ 1119 */
1061 max_x = pl->x + (socket.mapx + 1) / 2; 1120 max_x = ob->x + (socket.mapx + 1) / 2;
1062 max_y = pl->y + (socket.mapy + 1) / 2; 1121 max_y = ob->y + (socket.mapy + 1) / 2;
1063 1122
1064 maptile *plmap = pl->map;
1065
1066 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++)
1067 { 1124 {
1125 sint16 nx, ny;
1126 maptile *m = 0;
1127
1068 ax = 0; 1128 ax = 0;
1069 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++)
1070 { 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
1071 int emask, mask; 1146 int emask, mask;
1072 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1073 1148
1074 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1149 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1075 1150
1076 /* 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,
1077 * we tell the client as such 1152 * we tell the client as such
1078 */ 1153 */
1079 nx = x;
1080 ny = y;
1081 m = get_map_from_coord (plmap, &nx, &ny);
1082
1083 if (!m) 1154 if (!m)
1084 { 1155 {
1085 /* space is out of map. Update space and clear values 1156 /* space is out of map. Update space and clear values
1086 * 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
1087 * of the map, it shouldn't have a head 1158 * of the map, it shouldn't have a head
… …
1093 } 1164 }
1094 1165
1095 continue; 1166 continue;
1096 } 1167 }
1097 1168
1098 m->touch ();
1099
1100 int d = pl->contr->blocked_los[ax][ay]; 1169 int d = pl->blocked_los[ax][ay];
1101 1170
1102 if (d > 3) 1171 if (d > 3)
1103 { 1172 {
1104 1173
1105 int need_send = 0, count; 1174 int need_send = 0, count;
… …
1168 } 1237 }
1169 1238
1170 lastcell.count = d; 1239 lastcell.count = d;
1171 1240
1172 mapspace &ms = m->at (nx, ny); 1241 mapspace &ms = m->at (nx, ny);
1242 ms.update ();
1173 1243
1174 if (socket.extmap) 1244 if (socket.extmap)
1175 { 1245 {
1176 uint8 stat_hp = 0; 1246 uint8 stat_hp = 0;
1177 uint8 stat_width = 0; 1247 uint8 stat_width = 0;
1178 uint8 flags = 0; 1248 uint8 flags = 0;
1179 tag_t player = 0; 1249 tag_t player = 0;
1180 1250
1181 // send hp information, if applicable 1251 // send hp information, if applicable
1182 if (object *op = ms.faces_obj [0]) 1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1183 { 1254 {
1184 if (op->head || op->invisible) 1255 if (op->stats.maxhp > op->stats.hp
1185 ; // do not show 1256 && op->stats.maxhp > 0
1186 else if (op->type == PLAYER 1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1187 || 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)))
1188 {
1189 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1190 { 1260 {
1191 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1192 stat_width = op->arch->tail_x; 1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1193 } 1263 }
1194 }
1195 1264
1196 if (op->msg && op->msg[0] == '@') 1265 if (op->msg && op->msg[0] == '@')
1197 flags |= 1; 1266 flags |= 1;
1198 1267
1199 if (op->type == PLAYER && op != pl) 1268 if (op->type == PLAYER && op != ob)
1200 player = op->count; 1269 player = op->count;
1201 } 1270 }
1202 1271
1203 if (lastcell.stat_hp != stat_hp) 1272 if (lastcell.stat_hp != stat_hp)
1204 { 1273 {
1205 lastcell.stat_hp = stat_hp; 1274 lastcell.stat_hp = stat_hp;
1206 1275
… …
1248 1317
1249 /* Middle face */ 1318 /* Middle face */
1250 if (update_space (sl, socket, ms, lastcell, 1)) 1319 if (update_space (sl, socket, ms, lastcell, 1))
1251 mask |= 0x2; 1320 mask |= 0x2;
1252 1321
1253 if (ms.player () == pl 1322 if (ms.player () == ob
1254 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1255 { 1324 {
1256 // force player to be visible to himself if invisible 1325 // force player to be visible to himself if invisible
1257 if (lastcell.faces[0] != pl->face) 1326 if (lastcell.faces[0] != ob->face)
1258 { 1327 {
1259 lastcell.faces[0] = pl->face; 1328 lastcell.faces[0] = ob->face;
1260 1329
1261 mask |= 0x1; 1330 mask |= 0x1;
1262 sl << uint16 (pl->face); 1331 sl << uint16 (ob->face);
1263 1332
1264 socket.send_faces (pl); 1333 socket.send_faces (ob);
1265 } 1334 }
1266 } 1335 }
1267 /* Top face */ 1336 /* Top face */
1268 else if (update_space (sl, socket, ms, lastcell, 0)) 1337 else if (update_space (sl, socket, ms, lastcell, 0))
1269 mask |= 0x1; 1338 mask |= 0x1;
1270
1271 1339
1272 /* 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
1273 * space by checking the mask. If so, update the mask. 1341 * space by checking the mask. If so, update the mask.
1274 * 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
1275 * value, so we don't send those bits. 1343 * value, so we don't send those bits.
… …
1334 socket.send_packet (sl); 1402 socket.send_packet (sl);
1335 socket.sent_scroll = 0; 1403 socket.sent_scroll = 0;
1336 } 1404 }
1337} 1405}
1338 1406
1339/**
1340 * Draws client map.
1341 */
1342void
1343draw_client_map (object *pl)
1344{
1345 int i, j;
1346 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1347 int mflags;
1348 struct Map newmap;
1349 maptile *m, *pm;
1350
1351 if (pl->type != PLAYER)
1352 {
1353 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1354 return;
1355 }
1356
1357 pm = pl->map;
1358
1359 /* If player is just joining the game, he isn't here yet, so the map
1360 * can get swapped out. If so, don't try to send them a map. All will
1361 * be OK once they really log in.
1362 */
1363 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1364 return;
1365
1366 memset (&newmap, 0, sizeof (struct Map));
1367
1368 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1369 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1370 {
1371 ax = i;
1372 ay = j;
1373 m = pm;
1374 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1375
1376 if (mflags & P_OUT_OF_MAP)
1377 continue;
1378
1379 /* If a map is visible to the player, we don't want to swap it out
1380 * just to reload it. This should really call something like
1381 * swap_map, but this is much more efficient and 'good enough'
1382 */
1383 if (mflags & P_NEW_MAP)
1384 m->timeout = 50;
1385 }
1386
1387 /* do LOS after calls to update_position */
1388 if (pl->contr->do_los)
1389 {
1390 update_los (pl);
1391 pl->contr->do_los = 0;
1392 }
1393
1394 /* Big maps need a different drawing mechanism to work */
1395 draw_client_map1 (pl);
1396}
1397
1398
1399/*****************************************************************************/ 1407/*****************************************************************************/
1400
1401/* 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*/
1402
1403/* 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 */
1404
1405/* manage it ! */ 1410/* manage it ! */
1406
1407/*****************************************************************************/ 1411/*****************************************************************************/
1408void 1412void
1409send_plugin_custom_message (object *pl, char *buf) 1413send_plugin_custom_message (object *pl, char *buf)
1410{ 1414{
1411 pl->contr->ns->send_packet (buf); 1415 pl->contr->ns->send_packet (buf);
… …
1422 sl << "replyinfo skill_info\n"; 1426 sl << "replyinfo skill_info\n";
1423 1427
1424 for (int i = 1; i < NUM_SKILLS; i++) 1428 for (int i = 1; i < NUM_SKILLS; i++)
1425 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]);
1426 1430
1427 if (sl.length () >= MAXSOCKBUF) 1431 if (sl.length () > MAXSOCKBUF)
1428 { 1432 {
1429 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1433 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1430 fatal (0); 1434 fatal (0);
1431 } 1435 }
1432 1436
… …
1445 sl << "replyinfo spell_paths\n"; 1449 sl << "replyinfo spell_paths\n";
1446 1450
1447 for (int i = 0; i < NRSPELLPATHS; i++) 1451 for (int i = 0; i < NRSPELLPATHS; i++)
1448 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1452 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1449 1453
1450 if (sl.length () >= MAXSOCKBUF) 1454 if (sl.length () > MAXSOCKBUF)
1451 { 1455 {
1452 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1456 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1453 fatal (0); 1457 fatal (0);
1454 } 1458 }
1455 1459
… …
1563 if (!spell->face) 1567 if (!spell->face)
1564 { 1568 {
1565 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);
1566 spell->face = face_find ("burnout.x11", blank_face); 1570 spell->face = face_find ("burnout.x11", blank_face);
1567 } 1571 }
1572
1573 pl->ns->send_face (spell->face);
1568 1574
1569 /* send the current values */ 1575 /* send the current values */
1570 sl << uint32 (spell->count) 1576 sl << uint32 (spell->count)
1571 << uint16 (spell->level) 1577 << uint16 (spell->level)
1572 << uint16 (spell->casting_time) 1578 << uint16 (spell->casting_time)
… …
1608 * 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
1609 * 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,
1610 * 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,
1611 * 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
1612 */ 1618 */
1619 if (spell->type != SPELL)
1620 continue;
1621
1613 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1622 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1614 * 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
1615 * 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
1616 * like it will fix this 1625 * like it will fix this
1617 */ 1626 */
1618 if (spell->type != SPELL)
1619 continue;
1620
1621 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))))
1622 { 1628 {
1629 pl->ns->flush_fx ();
1623 pl->ns->send_packet (sl); 1630 pl->ns->send_packet (sl);
1624 1631
1625 sl.reset (); 1632 sl.reset ();
1626 sl << "addspell "; 1633 sl << "addspell ";
1627 } 1634 }
… …
1635 return; 1642 return;
1636 } 1643 }
1637 else 1644 else
1638 append_spell (pl, sl, spell); 1645 append_spell (pl, sl, spell);
1639 1646
1640 if (sl.length () >= MAXSOCKBUF) 1647 if (sl.length () > MAXSOCKBUF)
1641 { 1648 {
1642 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1649 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1643 fatal (0); 1650 fatal (0);
1644 } 1651 }
1645 1652
1646 /* finally, we can send the packet */ 1653 /* finally, we can send the packet */
1654 pl->ns->flush_fx ();
1647 pl->ns->send_packet (sl); 1655 pl->ns->send_packet (sl);
1648} 1656}
1649 1657

Diff Legend

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