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.102 by root, Sun Jun 3 17:42:39 2007 UTC vs.
Revision 1.137 by root, Sun Aug 31 02:01:41 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors 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)
140 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
141 142
142 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
144}
145
146static void
147send_map_info (player *pl)
148{
149 client &socket = *pl->ns;
150 object *ob = pl->observe;
151
152 if (socket.mapinfocmd)
153 {
154 if (ob->map && ob->map->path[0])
155 {
156 int flags = 0;
157
158 if (ob->map->tile_path[0]) flags |= 1;
159 if (ob->map->tile_path[1]) flags |= 2;
160 if (ob->map->tile_path[2]) flags |= 4;
161 if (ob->map->tile_path[3]) flags |= 8;
162
163 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path);
166 }
167 else
168 socket.send_packet ("mapinfo current");
169 }
143} 170}
144 171
145/** check for map/region change and send new map data */ 172/** check for map/region change and send new map data */
146static void 173static void
147check_map_change (player *pl) 174check_map_change (player *pl)
148{ 175{
149 client &socket = *pl->ns; 176 client &socket = *pl->ns;
150 object *ob = pl->observe; 177 object *ob = pl->observe;
151 178
179 region *reg = ob->region ();
180 if (socket.current_region != reg)
181 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183 socket.current_region = reg;
184 }
185
186 // first try to aovid a full newmap on tiled map scrolls
187 if (socket.current_map != ob->map && !socket.force_newmap)
188 {
189 rv_vector rv;
190
191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
192
193 // manhattan distance is very handy here
194 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
195 {
196 socket.current_map = ob->map;
197 socket.current_x = ob->x;
198 socket.current_y = ob->y;
199
200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
201 socket.floorbox_reset ();
202 send_map_info (pl);
203 }
204 }
205
152 if (socket.current_map != ob->map || socket.force_newmap) 206 if (socket.current_map != ob->map || socket.force_newmap)
153 { 207 {
154 clear_map (pl); 208 clear_map (pl);
155 socket.current_map = ob->map; 209 socket.current_map = ob->map;
156 210 send_map_info (pl);
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0]) flags |= 1;
164 if (ob->map->tile_path[1]) flags |= 2;
165 if (ob->map->tile_path[2]) flags |= 4;
166 if (ob->map->tile_path[3]) flags |= 8;
167
168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 socket.send_packet ("mapinfo current");
174 }
175 } 211 }
176 else if (socket.current_x != ob->x || socket.current_y != ob->y) 212 else if (socket.current_x != ob->x || socket.current_y != ob->y)
177 { 213 {
178 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
179 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
187 } 223 }
188 } 224 }
189 225
190 socket.current_x = ob->x; 226 socket.current_x = ob->x;
191 socket.current_y = ob->y; 227 socket.current_y = ob->y;
192
193 region *reg = ob->region ();
194 if (socket.current_region != reg)
195 {
196 socket.current_region = reg;
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198 }
199} 228}
200 229
201/** 230/**
202 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
204 * that information. 233 * that information.
205 */ 234 */
206void 235void
207RequestInfo (char *buf, int len, client * ns) 236RequestInfo (char *buf, int len, client *ns)
208{ 237{
209 char *params = NULL, *cp; 238 char *params;
210
211 /* No match */
212 char bigbuf[MAX_BUF];
213 int slen;
214
215 /* Set up replyinfo before we modify any of the buffers - this is used
216 * if we don't find a match.
217 */
218 strcpy (bigbuf, "replyinfo ");
219 slen = strlen (bigbuf);
220 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221 239
222 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
223 * params pointer. 241 * params pointer.
224 */ 242 */
225 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
226 if (*cp == ' ') 244 if (*params == ' ')
227 { 245 {
228 *cp = '\0';
229 params = cp + 1; 246 *params++ = 0;
230 break; 247 break;
231 } 248 }
232 249
233 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 255 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
241 else 258 else
242 ns->send_packet (bigbuf, len); 259 {
260 // undo tokenisation above and send replyinfo with the request unchanged
261 if (*params)
262 *--params = ' ';
263
264 ns->send_packet_printf ("replyinfo %s", buf);
265 }
243} 266}
244 267
245void 268void
246ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
247{ 270{
… …
250 273
251void 274void
252ExtiCmd (char *buf, int len, client *ns) 275ExtiCmd (char *buf, int len, client *ns)
253{ 276{
254 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278}
279
280void
281client::mapinfo_queue_clear ()
282{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i);
285
286 mapinfo_queue.clear ();
287}
288
289bool
290client::mapinfo_try (char *buf)
291{
292 char *token = buf;
293 buf += strlen (buf) + 9;
294
295 // initial map and its origin
296 maptile *map = pl->observe->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y;
299 int max_distance = 8; // limit maximum path length to something generous
300
301 while (*buf && map && max_distance)
302 {
303 int dir = *buf++ - '1';
304
305 if (dir >= 0 && dir <= 3)
306 {
307 if (!map->tile_path [dir])
308 map = 0;
309 else if (map->tile_available (dir, false))
310 {
311 maptile *neigh = map->tile_map [dir];
312
313 switch (dir)
314 {
315 case 0: mapy -= neigh->height; break;
316 case 2: mapy += map ->height; break;
317 case 3: mapx -= neigh->width ; break;
318 case 1: mapx += map ->width ; break;
319 }
320
321 map = neigh;
322 --max_distance;
323 }
324 else
325 return 0;
326 }
327 else
328 max_distance = 0;
329 }
330
331 if (!max_distance)
332 send_packet_printf ("mapinfo %s error", token);
333 else if (!map || !map->path)
334 send_packet_printf ("mapinfo %s nomap", token);
335 else
336 {
337 int flags = 0;
338
339 if (map->tile_path[0]) flags |= 1;
340 if (map->tile_path[1]) flags |= 2;
341 if (map->tile_path[2]) flags |= 4;
342 if (map->tile_path[3]) flags |= 8;
343
344 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 }
346
347 return 1;
348}
349
350void
351client::mapinfo_queue_run ()
352{
353 if (mapinfo_queue.empty () || !pl)
354 return;
355
356 for (int i = 0; i < mapinfo_queue.size (); ++i)
357 if (mapinfo_try (mapinfo_queue [i]))
358 {
359 free (mapinfo_queue [i]);
360 mapinfo_queue.erase (i);
361 }
362 else
363 ++i;
255} 364}
256 365
257void 366void
258MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
259{ 368{
260 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
262 371
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 372 char *token = buf;
266 // copy token 373
267 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
268 return; 375 return;
269 376
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
273 { 378 {
274 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
275 381
276 // initial map and its origin 382#if 0
277 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 free (copy);
280 int mapy = pl->ns->mapy / 2 - pl->ob->y;
281 int max_distance = 8; // limit maximum path length to something generous
282
283 while (*buf && map && max_distance)
284 {
285 int dir = *buf++;
286
287 switch (dir)
288 {
289 case '1':
290 dx = 0;
291 dy = -1;
292 map = map->xy_find (dx, dy);
293 map && (mapy -= map->height);
294 break;
295 case '2':
296 mapx += map->width;
297 dx = map->width;
298 dy = 0;
299 map = map->xy_find (dx, dy);
300 break;
301 case '3':
302 mapy += map->height;
303 dx = 0;
304 dy = map->height;
305 map = map->xy_find (dx, dy);
306 break;
307 case '4':
308 dx = -1;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 map && (mapx -= map->width);
312 break;
313 }
314
315 --max_distance;
316 }
317
318 if (!max_distance)
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320 else if (map && map->path[0])
321 {
322 int flags = 0;
323
324 if (map->tile_path[0]) flags |= 1;
325 if (map->tile_path[1]) flags |= 2;
326 if (map->tile_path[2]) flags |= 4;
327 if (map->tile_path[3]) flags |= 8;
328
329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330 }
331 else 386 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
333 } 389 }
334 else 390 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 392}
339 393
340/** This is the Setup cmd */ 394/** This is the Setup cmd */
341void 395void
342SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
… …
471 525
472 ns->send_packet (cmdback); 526 ns->send_packet (cmdback);
473} 527}
474 528
475/** 529/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495
496/**
497 * This handles the general commands from the client (ie, north, fire, cast, 530 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 531 * etc.)
499 */ 532 */
500void 533void
501PlayerCmd (char *buf, int len, player *pl) 534PlayerCmd (char *buf, int len, player *pl)
… …
522 * commands. 555 * commands.
523 */ 556 */
524 pl->count = 0; 557 pl->count = 0;
525} 558}
526 559
527
528/** 560/**
529 * This handles the general commands from the client (ie, north, fire, cast, 561 * This handles the general commands from the client (ie, north, fire, cast,
530 * etc.). It is a lot like PlayerCmd above, but is called with the 562 * etc.). It is a lot like PlayerCmd above, but is called with the
531 * 'ncom' method which gives more information back to the client so it 563 * 'ncom' method which gives more information back to the client so it
532 * can throttle. 564 * can throttle.
… …
534void 566void
535NewPlayerCmd (char *buf, int len, player *pl) 567NewPlayerCmd (char *buf, int len, player *pl)
536{ 568{
537 if (len <= 6) 569 if (len <= 6)
538 { 570 {
539 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 571 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
540 return; 572 return;
541 } 573 }
542 574
543 uint16 cmdid = net_uint16 ((uint8 *)buf); 575 uint16 cmdid = net_uint16 ((uint8 *)buf);
544 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
682 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
683 */ 715 */
684void 716void
685MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
686{ 718{
687 int vals[3], i; 719 int to, tag, nrof;
688 720
689 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
690 * we obviously are not going to find a space after the third
691 * record. Perhaps we should just replace this with a
692 * sscanf?
693 */
694 for (i = 0; i < 2; i++)
695 { 722 {
696 vals[i] = atoi (buf);
697
698 if (!(buf = strchr (buf, ' ')))
699 {
700 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
701 return; 724 return;
702 }
703
704 buf++;
705 } 725 }
706 726
707 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
708
709/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
710 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
711} 728}
712 729
713/****************************************************************************** 730/******************************************************************************
714 * 731 *
715 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
738 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
739 756
740 if (pl->combat_ob) 757 if (pl->combat_ob)
741 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 758 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
742 759
760#if 0
743 //TODO: remove this when slot system is working, this is only for debugging 761 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill) 762 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name; 763 buf << " Skill*: " << pl->ob->chosen_skill->name;
764#endif
746 765
747 //TODO: maybe golem should become the current_weapon, quite simply? 766 //TODO: maybe golem should become the current_weapon, quite simply?
748 if (pl->golem) 767 if (pl->golem)
749 buf << " Golem*: " << pl->golem->name; 768 buf << " Golem*: " << pl->golem->name;
750 769
770 buf << '\0';
751 buf.linearise (obuf); 771 buf.linearise (obuf);
752 obuf [buf.size ()] = 0;
753} 772}
754 773
755#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
756 Old = New; \ 775 Old = New; \
757 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
… …
794 return; 813 return;
795 814
796 object *ob = pl->observe; 815 object *ob = pl->observe;
797 if (!ob) 816 if (!ob)
798 return; 817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
799 820
800 packet sl ("stats"); 821 packet sl ("stats");
801 822
802 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
803 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
812 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
813 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
814 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
815 836
816 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
817 if (object *skill = pl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob[s])
818 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
819 { 840 {
820 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
821 842
822 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
837 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 858 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
838 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 859 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
839 860
840 flags = 0; 861 flags = 0;
841 862
842 if (pl->fire_on) 863 if (opl->fire_on)
843 flags |= SF_FIREON; 864 flags |= SF_FIREON;
844 865
845 if (pl->run_on) 866 if (opl->run_on)
846 flags |= SF_RUNON; 867 flags |= SF_RUNON;
847 868
848 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
849 870
850 if (ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
… …
864 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 885 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
865 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 886 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
866 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 887 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
867 } 888 }
868 889
869 rangetostring (pl, buf); /* we want use the new fire & run system in new client */ 890 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
871 set_title (ob, buf); 892 set_title (ob, buf);
872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
873 894
874 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
… …
878 899
879/** 900/**
880 * Tells the client that here is a player it should start using. 901 * Tells the client that here is a player it should start using.
881 */ 902 */
882void 903void
883esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
884{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
885 packet sl ("player"); 908 packet sl ("player");
886 909
887 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
888 << uint32 (weight) 911 << uint32 (weight)
889 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
890 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
891 914
892 pl->ns->last_weight = weight; 915 pl->ns->last_weight = weight;
893 pl->ns->send_packet (sl); 916 pl->ns->send_packet (sl);
894 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
895} 917}
896 918
897/****************************************************************************** 919/******************************************************************************
898 * 920 *
899 * Start of map related commands. 921 * Start of map related commands.
… …
956 978
957 if (!ns.faces_sent[face_num]) 979 if (!ns.faces_sent[face_num])
958 if (ob) 980 if (ob)
959 ns.send_faces (ob); 981 ns.send_faces (ob);
960 else 982 else
961 ns.send_face (face_num); 983 ns.send_face (face_num, 10);
962 984
963 sl << uint16 (face_num); 985 sl << uint16 (face_num);
964 return 1; 986 return 1;
965 } 987 }
966 988
… …
1023 1045
1024 /* If player is just joining the game, he isn't here yet, so the map 1046 /* If player is just joining the game, he isn't here yet, so the map
1025 * can get swapped out. If so, don't try to send them a map. All will 1047 * can get swapped out. If so, don't try to send them a map. All will
1026 * be OK once they really log in. 1048 * be OK once they really log in.
1027 */ 1049 */
1028 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1050 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1029 return; 1051 return;
1030 1052
1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1053 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1032 sint16 nx, ny;
1033 int estartlen, eoldlen; 1054 int estartlen, eoldlen;
1034 uint8 eentrysize; 1055 uint8 eentrysize;
1035 uint16 ewhatstart, ewhatflag; 1056 uint16 ewhatstart, ewhatflag;
1036 uint8 extendedinfos; 1057 uint8 extendedinfos;
1037 maptile *m;
1038 1058
1039 check_map_change (pl); 1059 check_map_change (pl);
1040 prefetch_surrounding_maps (pl->ob); 1060 prefetch_surrounding_maps (pl->ob);
1041 1061
1042 /* do LOS after calls to update_position */ 1062 /* do LOS after calls to update_position */
… …
1108 max_x = ob->x + (socket.mapx + 1) / 2; 1128 max_x = ob->x + (socket.mapx + 1) / 2;
1109 max_y = ob->y + (socket.mapy + 1) / 2; 1129 max_y = ob->y + (socket.mapy + 1) / 2;
1110 1130
1111 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) 1131 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1112 { 1132 {
1133 sint16 nx, ny;
1134 maptile *m = 0;
1135
1113 ax = 0; 1136 ax = 0;
1114 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1137 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1115 { 1138 {
1139 // check to see if we can simply go one right quickly
1140 ++nx;
1141 if (m && nx >= m->width)
1142 m = 0;
1143
1144 if (!m)
1145 {
1146 nx = x; ny = y; m = plmap;
1147
1148 if (xy_normalise (m, nx, ny))
1149 m->touch ();
1150 else
1151 m = 0;
1152 }
1153
1116 int emask, mask; 1154 int emask, mask;
1117 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1155 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1118 1156
1119 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1157 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1120 1158
1121 /* If the coordinates are not valid, or it is too dark to see, 1159 /* If the coordinates are not valid, or it is too dark to see,
1122 * we tell the client as such 1160 * we tell the client as such
1123 */ 1161 */
1124 nx = x;
1125 ny = y;
1126 m = get_map_from_coord (plmap, &nx, &ny);
1127
1128 if (!m) 1162 if (!m)
1129 { 1163 {
1130 /* space is out of map. Update space and clear values 1164 /* space is out of map. Update space and clear values
1131 * if this hasn't already been done. If the space is out 1165 * if this hasn't already been done. If the space is out
1132 * of the map, it shouldn't have a head 1166 * of the map, it shouldn't have a head
… …
1138 } 1172 }
1139 1173
1140 continue; 1174 continue;
1141 } 1175 }
1142 1176
1143 m->touch ();
1144
1145 int d = pl->blocked_los[ax][ay]; 1177 int d = pl->blocked_los[ax][ay];
1146 1178
1147 if (d > 3) 1179 if (d > 3)
1148 { 1180 {
1149
1150 int need_send = 0, count; 1181 int need_send = 0, count;
1151 1182
1152 /* This block deals with spaces that are not visible for whatever 1183 /* This block deals with spaces that are not visible for whatever
1153 * reason. Still may need to send the head for this space. 1184 * reason. Still may need to send the head for this space.
1154 */ 1185 */
… …
1160 if (lastcell.count != -1) 1191 if (lastcell.count != -1)
1161 need_send = 1; 1192 need_send = 1;
1162 1193
1163 count = -1; 1194 count = -1;
1164 1195
1165 /* properly clear a previously sent big face */
1166 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1196 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1167 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1197 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1168 need_send = 1; 1198 need_send = 1;
1169 1199
1200 /* properly clear a previously sent big face */
1170 map_clearcell (&lastcell, count); 1201 map_clearcell (&lastcell, count);
1171 1202
1172 if ((mask & 0xf) || need_send) 1203 if ((mask & 0xf) || need_send)
1173 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1174 else 1205 else
… …
1213 } 1244 }
1214 1245
1215 lastcell.count = d; 1246 lastcell.count = d;
1216 1247
1217 mapspace &ms = m->at (nx, ny); 1248 mapspace &ms = m->at (nx, ny);
1249 ms.update ();
1218 1250
1219 if (socket.extmap) 1251 if (socket.extmap)
1220 { 1252 {
1221 uint8 stat_hp = 0; 1253 uint8 stat_hp = 0;
1222 uint8 stat_width = 0; 1254 uint8 stat_width = 0;
1223 uint8 flags = 0; 1255 uint8 flags = 0;
1224 tag_t player = 0; 1256 tag_t player = 0;
1225 1257
1226 // send hp information, if applicable 1258 // send hp information, if applicable
1227 if (object *op = ms.faces_obj [0]) 1259 if (object *op = ms.faces_obj [0])
1228 {
1229 if (op->head || op->invisible) 1260 if (op->is_head () && !op->invisible)
1230 ; // do not show
1231 else if (op->type == PLAYER
1232 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1233 { 1261 {
1234 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1262 if (op->stats.maxhp > op->stats.hp
1263 && op->stats.maxhp > 0
1264 && (op->type == PLAYER
1265 || op->type == DOOR // does not work, have maxhp 0
1266 || QUERY_FLAG (op, FLAG_MONSTER)
1267 || QUERY_FLAG (op, FLAG_ALIVE)
1268 || QUERY_FLAG (op, FLAG_GENERATOR)))
1235 { 1269 {
1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1270 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1237 stat_width = op->arch->tail_x; 1271 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1238 } 1272 }
1239 }
1240 1273
1241 if (op->msg && op->msg[0] == '@') 1274 if (op->has_dialogue ())
1242 flags |= 1; 1275 flags |= 1;
1243 1276
1244 if (op->type == PLAYER && op != ob) 1277 if (op->type == PLAYER)
1245 player = op->count; 1278 player = op == ob ? pl->ob->count
1279 : op == pl->ob ? ob->count
1280 : op->count;
1246 } 1281 }
1247 1282
1248 if (lastcell.stat_hp != stat_hp) 1283 if (lastcell.stat_hp != stat_hp)
1249 { 1284 {
1250 lastcell.stat_hp = stat_hp; 1285 lastcell.stat_hp = stat_hp;
1251 1286
… …
1402 sl << "replyinfo skill_info\n"; 1437 sl << "replyinfo skill_info\n";
1403 1438
1404 for (int i = 1; i < NUM_SKILLS; i++) 1439 for (int i = 1; i < NUM_SKILLS; i++)
1405 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1440 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1406 1441
1407 if (sl.length () >= MAXSOCKBUF) 1442 if (sl.length () > MAXSOCKBUF)
1408 { 1443 {
1409 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1444 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1410 fatal (0); 1445 fatal (0);
1411 } 1446 }
1412 1447
… …
1425 sl << "replyinfo spell_paths\n"; 1460 sl << "replyinfo spell_paths\n";
1426 1461
1427 for (int i = 0; i < NRSPELLPATHS; i++) 1462 for (int i = 0; i < NRSPELLPATHS; i++)
1428 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1463 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1429 1464
1430 if (sl.length () >= MAXSOCKBUF) 1465 if (sl.length () > MAXSOCKBUF)
1431 { 1466 {
1432 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1467 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1433 fatal (0); 1468 fatal (0);
1434 } 1469 }
1435 1470
… …
1454 if (spell->type == SPELL) 1489 if (spell->type == SPELL)
1455 { 1490 {
1456 int flags = 0; 1491 int flags = 0;
1457 1492
1458 /* check if we need to update it */ 1493 /* check if we need to update it */
1459 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1494 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1460 { 1495 {
1461 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1496 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1462 flags |= UPD_SP_MANA; 1497 flags |= UPD_SP_MANA;
1463 } 1498 }
1464 1499
1465 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1500 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1466 { 1501 {
1467 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1502 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1468 flags |= UPD_SP_GRACE; 1503 flags |= UPD_SP_GRACE;
1469 } 1504 }
1470 1505
1471 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1506 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1472 { 1507 {
1473 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1508 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1474 flags |= UPD_SP_DAMAGE; 1509 flags |= UPD_SP_DAMAGE;
1475 } 1510 }
1476 1511
1477 if (flags) 1512 if (flags)
1478 { 1513 {
… …
1480 1515
1481 sl << "updspell " 1516 sl << "updspell "
1482 << uint8 (flags) 1517 << uint8 (flags)
1483 << uint32 (spell->count); 1518 << uint32 (spell->count);
1484 1519
1485 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1520 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1486 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1521 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1487 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1522 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1488 1523
1489 pl->ns->send_packet (sl); 1524 pl->ns->send_packet (sl);
1490 } 1525 }
1491 } 1526 }
1492 } 1527 }
… …
1522 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1557 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1523 return; 1558 return;
1524 } 1559 }
1525 1560
1526 /* store costs and damage in the object struct, to compare to later */ 1561 /* store costs and damage in the object struct, to compare to later */
1527 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1562 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1528 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1563 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1529 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1564 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1530 1565
1531 /* figure out which skill it uses, if it uses one */ 1566 /* figure out which skill it uses, if it uses one */
1532 if (spell->skill) 1567 if (spell->skill)
1533 { 1568 {
1534 for (i = 1; i < NUM_SKILLS; i++) 1569 for (i = 1; i < NUM_SKILLS; i++)
… …
1544 { 1579 {
1545 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1580 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1546 spell->face = face_find ("burnout.x11", blank_face); 1581 spell->face = face_find ("burnout.x11", blank_face);
1547 } 1582 }
1548 1583
1584 pl->ns->send_face (spell->face);
1585
1549 /* send the current values */ 1586 /* send the current values */
1550 sl << uint32 (spell->count) 1587 sl << uint32 (spell->count)
1551 << uint16 (spell->level) 1588 << uint16 (spell->level)
1552 << uint16 (spell->casting_time) 1589 << uint16 (spell->casting_time)
1553 << uint16 (spell->last_sp) 1590 << uint16 (spell->cached_sp)
1554 << uint16 (spell->last_grace) 1591 << uint16 (spell->cached_grace)
1555 << uint16 (spell->last_eat) 1592 << uint16 (spell->cached_eat)
1556 << uint8 (skill) 1593 << uint8 (skill)
1557 << uint32 (spell->path_attuned) 1594 << uint32 (spell->path_attuned)
1558 << uint32 (spell->face) 1595 << uint32 (spell->face)
1559 << data8 (spell->name) 1596 << data8 (spell->name)
1560 << data16 (spell->msg); 1597 << data16 (spell->msg);
… …
1588 * bytes and 3 strings (because that is the spec) so we need to 1625 * bytes and 3 strings (because that is the spec) so we need to
1589 * check that the length of those 3 strings, plus the 23 bytes, 1626 * check that the length of those 3 strings, plus the 23 bytes,
1590 * won't take us over the length limit for the socket, if it does, 1627 * won't take us over the length limit for the socket, if it does,
1591 * we need to send what we already have, and restart packet formation 1628 * we need to send what we already have, and restart packet formation
1592 */ 1629 */
1630 if (spell->type != SPELL)
1631 continue;
1632
1593 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1633 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1594 * to show add_spell is 26 bytes + 2 strings. However, the overun 1634 * to show add_spell is 26 bytes + 2 strings. However, the overun
1595 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1635 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1596 * like it will fix this 1636 * like it will fix this
1597 */ 1637 */
1598 if (spell->type != SPELL)
1599 continue;
1600
1601 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1638 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1602 { 1639 {
1640 pl->ns->flush_fx ();
1603 pl->ns->send_packet (sl); 1641 pl->ns->send_packet (sl);
1604 1642
1605 sl.reset (); 1643 sl.reset ();
1606 sl << "addspell "; 1644 sl << "addspell ";
1607 } 1645 }
… …
1615 return; 1653 return;
1616 } 1654 }
1617 else 1655 else
1618 append_spell (pl, sl, spell); 1656 append_spell (pl, sl, spell);
1619 1657
1620 if (sl.length () >= MAXSOCKBUF) 1658 if (sl.length () > MAXSOCKBUF)
1621 { 1659 {
1622 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1660 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1623 fatal (0); 1661 fatal (0);
1624 } 1662 }
1625 1663
1626 /* finally, we can send the packet */ 1664 /* finally, we can send the packet */
1665 pl->ns->flush_fx ();
1627 pl->ns->send_packet (sl); 1666 pl->ns->send_packet (sl);
1628} 1667}
1629 1668

Diff Legend

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