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.88 by root, Tue Apr 24 00:42:03 2007 UTC vs.
Revision 1.126 by root, Tue Apr 22 07:01:47 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 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 152
153 if (socket.current_map != ob->map || socket.force_newmap) 153 if (socket.current_map != ob->map || socket.force_newmap)
154 { 154 {
155 clear_map (pl); 155 clear_map (pl);
156 socket.current_map = ob->map; 156 socket.current_map = ob->map;
… …
159 { 159 {
160 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
161 { 161 {
162 int flags = 0; 162 int flags = 0;
163 163
164 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
165 flags |= 1;
166 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
167 flags |= 2;
168 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
169 flags |= 4;
170 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
171 flags |= 8;
172 168
173 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 169 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
174 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
175 } 172 }
176 else 173 else
177 snprintf (buf, MAX_BUF, "mapinfo current");
178
179 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
180 } 175 }
181 } 176 }
182 else if (socket.current_x != ob->x || socket.current_y != ob->y) 177 else if (socket.current_x != ob->x || socket.current_y != ob->y)
183 { 178 {
184 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
… …
197 socket.current_y = ob->y; 192 socket.current_y = ob->y;
198 193
199 region *reg = ob->region (); 194 region *reg = ob->region ();
200 if (socket.current_region != reg) 195 if (socket.current_region != reg)
201 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
202 socket.current_region = reg; 198 socket.current_region = reg;
203 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
204 } 199 }
205} 200}
206 201
207/** 202/**
208 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
210 * that information. 205 * that information.
211 */ 206 */
212void 207void
213RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
214{ 209{
215 char *params = NULL, *cp; 210 char *params;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227 211
228 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
229 * params pointer. 213 * params pointer.
230 */ 214 */
231 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
232 if (*cp == ' ') 216 if (*params == ' ')
233 { 217 {
234 *cp = '\0';
235 params = cp + 1; 218 *params++ = 0;
236 break; 219 break;
237 } 220 }
238 221
239 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
243 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 227 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
247 else 230 else
248 ns->send_packet (bigbuf, len); 231 {
232 // undo tokenisation above and send replyinfo with the request unchanged
233 if (*params)
234 *--params = ' ';
235
236 ns->send_packet_printf ("replyinfo %s", buf);
237 }
249} 238}
250 239
251void 240void
252ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
253{ 242{
… …
256 245
257void 246void
258ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
259{ 248{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 249 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250}
251
252void
253client::mapinfo_queue_clear ()
254{
255 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256 free (*i);
257
258 mapinfo_queue.clear ();
259}
260
261bool
262client::mapinfo_try (char *buf)
263{
264 char *token = buf;
265 buf += strlen (buf) + 9;
266
267 // initial map and its origin
268 maptile *map = pl->observe->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y;
271 int max_distance = 8; // limit maximum path length to something generous
272
273 while (*buf && map && max_distance)
274 {
275 int dir = *buf++ - '1';
276
277 if (dir >= 0 && dir <= 3)
278 {
279 if (!map->tile_path [dir])
280 map = 0;
281 else if (map->tile_available (dir, false))
282 {
283 maptile *neigh = map->tile_map [dir];
284
285 switch (dir)
286 {
287 case 0: mapy -= neigh->height; break;
288 case 2: mapy += map ->height; break;
289 case 3: mapx -= neigh->width ; break;
290 case 1: mapx += map ->width ; break;
291 }
292
293 map = neigh;
294 --max_distance;
295 }
296 else
297 return 0;
298 }
299 else
300 max_distance = 0;
301 }
302
303 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token);
307 else
308 {
309 int flags = 0;
310
311 if (map->tile_path[0]) flags |= 1;
312 if (map->tile_path[1]) flags |= 2;
313 if (map->tile_path[2]) flags |= 4;
314 if (map->tile_path[3]) flags |= 8;
315
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 }
318
319 return 1;
320}
321
322void
323client::mapinfo_queue_run ()
324{
325 if (mapinfo_queue.empty () || !pl)
326 return;
327
328 for (int i = 0; i < mapinfo_queue.size (); ++i)
329 if (mapinfo_try (mapinfo_queue [i]))
330 {
331 free (mapinfo_queue [i]);
332 mapinfo_queue.erase (i);
333 }
334 else
335 ++i;
261} 336}
262 337
263void 338void
264MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
265{ 340{
266 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
268 343
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 344 char *token = buf;
272 // copy token 345
273 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
274 return; 347 return;
275 348
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
279 { 350 {
280 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
281 353
282 // initial map and its origin 354#if 0
283 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous
288
289 while (*buf && map && max_distance)
290 {
291 int dir = *buf++;
292
293 switch (dir)
294 {
295 case '1':
296 dx = 0;
297 dy = -1;
298 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height);
300 break;
301 case '2':
302 mapx += map->width;
303 dx = map->width;
304 dy = 0;
305 map = map->xy_find (dx, dy);
306 break;
307 case '3':
308 mapy += map->height;
309 dx = 0;
310 dy = map->height;
311 map = map->xy_find (dx, dy);
312 break;
313 case '4':
314 dx = -1;
315 dy = 0;
316 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width);
318 break;
319 }
320
321 --max_distance;
322 }
323
324 if (!max_distance)
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0])
327 {
328 int flags = 0;
329
330 if (map->tile_path[0])
331 flags |= 1;
332 if (map->tile_path[1])
333 flags |= 2;
334 if (map->tile_path[2])
335 flags |= 4;
336 if (map->tile_path[3])
337 flags |= 8;
338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 }
341 else 358 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
343 } 361 }
344 else 362 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 364}
349 365
350/** This is the Setup cmd */ 366/** This is the Setup cmd */
351void 367void
352SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
… …
481 497
482 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
483} 499}
484 500
485/** 501/**
486 * client requested an image. send it rate-limited
487 * before flushing.
488 */
489void
490AskFaceCmd (char *buf, int len, client *ns)
491{
492 ns->askface.push_back (atoi (buf));
493}
494
495/**
496 * Tells client the picture it has to use
497 * to smooth a picture number given as argument.
498 */
499void
500AskSmooth (char *buf, int len, client *ns)
501{
502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
504}
505
506/**
507 * This handles the general commands from the client (ie, north, fire, cast, 502 * This handles the general commands from the client (ie, north, fire, cast,
508 * etc.) 503 * etc.)
509 */ 504 */
510void 505void
511PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
532 * commands. 527 * commands.
533 */ 528 */
534 pl->count = 0; 529 pl->count = 0;
535} 530}
536 531
537
538/** 532/**
539 * This handles the general commands from the client (ie, north, fire, cast, 533 * This handles the general commands from the client (ie, north, fire, cast,
540 * etc.). It is a lot like PlayerCmd above, but is called with the 534 * etc.). It is a lot like PlayerCmd above, but is called with the
541 * 'ncom' method which gives more information back to the client so it 535 * 'ncom' method which gives more information back to the client so it
542 * can throttle. 536 * can throttle.
… …
544void 538void
545NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
546{ 540{
547 if (len <= 6) 541 if (len <= 6)
548 { 542 {
549 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
550 return; 544 return;
551 } 545 }
552 546
553 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
554 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
659 653
660 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
661 655
662 if (cp) 656 if (cp)
663 { 657 {
664 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
665 659
666 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
667 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
668 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
669 } 663 }
… …
734send_query (client *ns, uint8 flags, const char *text) 728send_query (client *ns, uint8 flags, const char *text)
735{ 729{
736 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 730 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
737} 731}
738 732
733/**
734 * Get player's current range attack in obuf.
735 */
736static void
737rangetostring (player *pl, char *obuf)
738{
739 dynbuf_text buf;
740
741 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743
744 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746
747#if 0
748 //TODO: remove this when slot system is working, this is only for debugging
749 if (pl->ob->chosen_skill)
750 buf << " Skill*: " << pl->ob->chosen_skill->name;
751#endif
752
753 //TODO: maybe golem should become the current_weapon, quite simply?
754 if (pl->golem)
755 buf << " Golem*: " << pl->golem->name;
756
757 buf << '\0';
758 buf.linearise (obuf);
759}
760
739#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
740 Old = New; \ 762 Old = New; \
741 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
742 } 764 }
743 765
… …
749#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
750 Old = New; \ 772 Old = New; \
751 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
752 } 774 }
753 775
754#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
755 Old = New; \ 777 Old = New; \
756 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
757 } 779 }
758 780
759#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
760 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
761 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
775 797
776 client *ns = pl->ns; 798 client *ns = pl->ns;
777 if (!ns) 799 if (!ns)
778 return; 800 return;
779 801
780 object *ob = pl->ob; 802 object *ob = pl->observe;
781 if (!ob) 803 if (!ob)
782 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
783 807
784 packet sl ("stats"); 808 packet sl ("stats");
785 809
786 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
787 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
796 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
797 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
798 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
799 823
800 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
801 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob[s])
802 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
803 { 827 {
804 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
805 829
806 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
814 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
815 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
816 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
817 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
818 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
819 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
820 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
821 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
822 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
823 847
824 flags = 0; 848 flags = 0;
825 849
826 if (pl->fire_on) 850 if (opl->fire_on)
827 flags |= SF_FIREON; 851 flags |= SF_FIREON;
828 852
829 if (pl->run_on) 853 if (opl->run_on)
830 flags |= SF_RUNON; 854 flags |= SF_RUNON;
831 855
832 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
833 857
834 if (ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
… …
848 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
849 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
850 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
851 } 875 }
852 876
853 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 877 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
854 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
855 set_title (ob, buf); 879 set_title (ob, buf);
856 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
857 881
858 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
… …
862 886
863/** 887/**
864 * Tells the client that here is a player it should start using. 888 * Tells the client that here is a player it should start using.
865 */ 889 */
866void 890void
867esrv_new_player (player *pl, uint32 weight) 891esrv_new_player (player *pl)
868{ 892{
893 sint32 weight = pl->ob->client_weight ();
894
869 packet sl ("player"); 895 packet sl ("player");
870 896
871 sl << uint32 (pl->ob->count) 897 sl << uint32 (pl->ob->count)
872 << uint32 (weight) 898 << uint32 (weight)
873 << uint32 (pl->ob->face) 899 << uint32 (pl->ob->face)
874 << data8 (pl->ob->name); 900 << data8 (pl->ob->name);
875 901
902#if 0
876 pl->ns->last_weight = weight; 903 pl->ns->last_weight = weight;
904#endif
877 pl->ns->send_packet (sl); 905 pl->ns->send_packet (sl);
878 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 906 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
879} 907}
880 908
881/****************************************************************************** 909/******************************************************************************
… …
940 968
941 if (!ns.faces_sent[face_num]) 969 if (!ns.faces_sent[face_num])
942 if (ob) 970 if (ob)
943 ns.send_faces (ob); 971 ns.send_faces (ob);
944 else 972 else
945 ns.send_face (face_num); 973 ns.send_face (face_num, 10);
946 974
947 sl << uint16 (face_num); 975 sl << uint16 (face_num);
948 return 1; 976 return 1;
949 } 977 }
950 978
… …
992{ 1020{
993 prefetch_surrounding_maps (op->map, 3); 1021 prefetch_surrounding_maps (op->map, 3);
994} 1022}
995 1023
996/** 1024/**
997 * This function uses the new map1 protocol command to send the map 1025 * Draws client map.
998 * to the client. It is necessary because the old map command supports
999 * a maximum map size of 15x15.
1000 * This function is much simpler than the old one. This is because
1001 * the old function optimized to send as few face identifiers as possible,
1002 * at the expense of sending more coordinate location (coordinates were
1003 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1004 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1005 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1006 * and use the other 4 bits for other informatiion. For full documentation
1007 * of what we send, see the doc/Protocol file.
1008 * I will describe internally what we do:
1009 * the ns->lastmap shows how the map last looked when sent to the client.
1010 * in the lastmap structure, there is a cells array, which is set to the
1011 * maximum viewable size (As set in config.h).
1012 * in the cells, there are faces and a count value.
1013 * we use the count value to hold the darkness value. If -1, then this space
1014 * is not viewable.
1015 * we use faces[0] faces[1] faces[2] to hold what the three layers
1016 * look like.
1017 */ 1026 */
1018void 1027void
1019draw_client_map1 (object *pl) 1028draw_client_map (player *pl)
1020{ 1029{
1030 object *ob = pl->observe;
1031 if (!ob->active)
1032 return;
1033
1034 maptile *plmap = ob->map;
1035
1036 /* If player is just joining the game, he isn't here yet, so the map
1037 * can get swapped out. If so, don't try to send them a map. All will
1038 * be OK once they really log in.
1039 */
1040 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1041 return;
1042
1021 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1043 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1022 sint16 nx, ny;
1023 int estartlen, eoldlen; 1044 int estartlen, eoldlen;
1024 uint8 eentrysize; 1045 uint8 eentrysize;
1025 uint16 ewhatstart, ewhatflag; 1046 uint16 ewhatstart, ewhatflag;
1026 uint8 extendedinfos; 1047 uint8 extendedinfos;
1027 maptile *m;
1028 1048
1029 client &socket = *pl->contr->ns;
1030
1031 if (!pl->active)
1032 return;
1033
1034 check_map_change (pl->contr); 1049 check_map_change (pl);
1035 prefetch_surrounding_maps (pl); 1050 prefetch_surrounding_maps (pl->ob);
1051
1052 /* do LOS after calls to update_position */
1053 if (ob != pl->ob)
1054 clear_los (pl);
1055 else if (pl->do_los)
1056 {
1057 update_los (ob);
1058 pl->do_los = 0;
1059 }
1060
1061 /**
1062 * This function uses the new map1 protocol command to send the map
1063 * to the client. It is necessary because the old map command supports
1064 * a maximum map size of 15x15.
1065 * This function is much simpler than the old one. This is because
1066 * the old function optimized to send as few face identifiers as possible,
1067 * at the expense of sending more coordinate location (coordinates were
1068 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1069 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1070 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1071 * and use the other 4 bits for other informatiion. For full documentation
1072 * of what we send, see the doc/Protocol file.
1073 * I will describe internally what we do:
1074 * the ns->lastmap shows how the map last looked when sent to the client.
1075 * in the lastmap structure, there is a cells array, which is set to the
1076 * maximum viewable size (As set in config.h).
1077 * in the cells, there are faces and a count value.
1078 * we use the count value to hold the darkness value. If -1, then this space
1079 * is not viewable.
1080 * we use faces[0] faces[1] faces[2] to hold what the three layers
1081 * look like.
1082 */
1083
1084 client &socket = *pl->ns;
1036 1085
1037 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1086 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1038 packet esl; 1087 packet esl;
1039 1088
1040 startlen = sl.length (); 1089 startlen = sl.length ();
… …
1064 ay = 0; 1113 ay = 0;
1065 1114
1066 /* We could do this logic as conditionals in the if statement, 1115 /* We could do this logic as conditionals in the if statement,
1067 * but that started to get a bit messy to look at. 1116 * but that started to get a bit messy to look at.
1068 */ 1117 */
1069 max_x = pl->x + (socket.mapx + 1) / 2; 1118 max_x = ob->x + (socket.mapx + 1) / 2;
1070 max_y = pl->y + (socket.mapy + 1) / 2; 1119 max_y = ob->y + (socket.mapy + 1) / 2;
1071 1120
1072 maptile *plmap = pl->map;
1073
1074 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1121 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1075 { 1122 {
1123 sint16 nx, ny;
1124 maptile *m = 0;
1125
1076 ax = 0; 1126 ax = 0;
1077 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1127 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1078 { 1128 {
1129 // check to see if we can simply go one right quickly
1130 ++nx;
1131 if (m && nx >= m->width)
1132 m = 0;
1133
1134 if (!m)
1135 {
1136 nx = x; ny = y; m = plmap;
1137
1138 if (xy_normalise (m, nx, ny))
1139 m->touch ();
1140 else
1141 m = 0;
1142 }
1143
1079 int emask, mask; 1144 int emask, mask;
1080 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1081 1146
1082 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1083 1148
1084 /* If the coordinates are not valid, or it is too dark to see, 1149 /* If the coordinates are not valid, or it is too dark to see,
1085 * we tell the client as such 1150 * we tell the client as such
1086 */ 1151 */
1087 nx = x;
1088 ny = y;
1089 m = get_map_from_coord (plmap, &nx, &ny);
1090
1091 if (!m) 1152 if (!m)
1092 { 1153 {
1093 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1094 * if this hasn't already been done. If the space is out 1155 * if this hasn't already been done. If the space is out
1095 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head
… …
1101 } 1162 }
1102 1163
1103 continue; 1164 continue;
1104 } 1165 }
1105 1166
1106 m->touch ();
1107
1108 int d = pl->contr->blocked_los[ax][ay]; 1167 int d = pl->blocked_los[ax][ay];
1109 1168
1110 if (d > 3) 1169 if (d > 3)
1111 { 1170 {
1112 1171
1113 int need_send = 0, count; 1172 int need_send = 0, count;
… …
1176 } 1235 }
1177 1236
1178 lastcell.count = d; 1237 lastcell.count = d;
1179 1238
1180 mapspace &ms = m->at (nx, ny); 1239 mapspace &ms = m->at (nx, ny);
1240 ms.update ();
1181 1241
1182 if (socket.extmap) 1242 if (socket.extmap)
1183 { 1243 {
1184 uint8 stat_hp = 0; 1244 uint8 stat_hp = 0;
1185 uint8 stat_width = 0; 1245 uint8 stat_width = 0;
1186 uint8 flags = 0; 1246 uint8 flags = 0;
1187 tag_t player = 0; 1247 tag_t player = 0;
1188 1248
1189 // send hp information, if applicable 1249 // send hp information, if applicable
1190 if (object *op = ms.faces_obj [0]) 1250 if (object *op = ms.faces_obj [0])
1251 if (op->is_head () && !op->invisible)
1191 { 1252 {
1192 if (op->head || op->invisible) 1253 if (op->stats.maxhp > op->stats.hp
1193 ; // do not show 1254 && op->stats.maxhp > 0
1194 else if (op->type == PLAYER 1255 && (op->type == PLAYER
1256 || op->type == DOOR // does not work, have maxhp 0
1195 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1257 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1196 {
1197 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1198 { 1258 {
1199 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1259 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1200 stat_width = op->arch->tail_x; 1260 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1201 } 1261 }
1202 }
1203 1262
1204 if (op->msg && op->msg[0] == '@') 1263 if (op->msg && op->msg[0] == '@')
1205 flags |= 1; 1264 flags |= 1;
1206 1265
1207 if (op->type == PLAYER && op != pl) 1266 if (op->type == PLAYER && op != ob)
1208 player = op->count; 1267 player = op->count;
1209 } 1268 }
1210 1269
1211 if (lastcell.stat_hp != stat_hp) 1270 if (lastcell.stat_hp != stat_hp)
1212 { 1271 {
1213 lastcell.stat_hp = stat_hp; 1272 lastcell.stat_hp = stat_hp;
1214 1273
… …
1256 1315
1257 /* Middle face */ 1316 /* Middle face */
1258 if (update_space (sl, socket, ms, lastcell, 1)) 1317 if (update_space (sl, socket, ms, lastcell, 1))
1259 mask |= 0x2; 1318 mask |= 0x2;
1260 1319
1261 if (ms.player () == pl 1320 if (ms.player () == ob
1262 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1321 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1263 { 1322 {
1264 // force player to be visible to himself if invisible 1323 // force player to be visible to himself if invisible
1265 if (lastcell.faces[0] != pl->face) 1324 if (lastcell.faces[0] != ob->face)
1266 { 1325 {
1267 lastcell.faces[0] = pl->face; 1326 lastcell.faces[0] = ob->face;
1268 1327
1269 mask |= 0x1; 1328 mask |= 0x1;
1270 sl << uint16 (pl->face); 1329 sl << uint16 (ob->face);
1271 1330
1272 socket.send_faces (pl); 1331 socket.send_faces (ob);
1273 } 1332 }
1274 } 1333 }
1275 /* Top face */ 1334 /* Top face */
1276 else if (update_space (sl, socket, ms, lastcell, 0)) 1335 else if (update_space (sl, socket, ms, lastcell, 0))
1277 mask |= 0x1; 1336 mask |= 0x1;
1278
1279 1337
1280 /* Check to see if we are in fact sending anything for this 1338 /* Check to see if we are in fact sending anything for this
1281 * space by checking the mask. If so, update the mask. 1339 * space by checking the mask. If so, update the mask.
1282 * if not, reset the len to that from before adding the mask 1340 * if not, reset the len to that from before adding the mask
1283 * value, so we don't send those bits. 1341 * value, so we don't send those bits.
… …
1342 socket.send_packet (sl); 1400 socket.send_packet (sl);
1343 socket.sent_scroll = 0; 1401 socket.sent_scroll = 0;
1344 } 1402 }
1345} 1403}
1346 1404
1347/**
1348 * Draws client map.
1349 */
1350void
1351draw_client_map (object *pl)
1352{
1353 int i, j;
1354 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1355 int mflags;
1356 struct Map newmap;
1357 maptile *m, *pm;
1358
1359 if (pl->type != PLAYER)
1360 {
1361 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1362 return;
1363 }
1364
1365 pm = pl->map;
1366
1367 /* If player is just joining the game, he isn't here yet, so the map
1368 * can get swapped out. If so, don't try to send them a map. All will
1369 * be OK once they really log in.
1370 */
1371 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1372 return;
1373
1374 memset (&newmap, 0, sizeof (struct Map));
1375
1376 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1377 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1378 {
1379 ax = i;
1380 ay = j;
1381 m = pm;
1382 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1383
1384 if (mflags & P_OUT_OF_MAP)
1385 continue;
1386
1387 /* If a map is visible to the player, we don't want to swap it out
1388 * just to reload it. This should really call something like
1389 * swap_map, but this is much more efficient and 'good enough'
1390 */
1391 if (mflags & P_NEW_MAP)
1392 m->timeout = 50;
1393 }
1394
1395 /* do LOS after calls to update_position */
1396 if (pl->contr->do_los)
1397 {
1398 update_los (pl);
1399 pl->contr->do_los = 0;
1400 }
1401
1402 /* Big maps need a different drawing mechanism to work */
1403 draw_client_map1 (pl);
1404}
1405
1406
1407/*****************************************************************************/ 1405/*****************************************************************************/
1408
1409/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1406/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1410
1411/* a player. Of course, the client need to know the command to be able to */ 1407/* a player. Of course, the client need to know the command to be able to */
1412
1413/* manage it ! */ 1408/* manage it ! */
1414
1415/*****************************************************************************/ 1409/*****************************************************************************/
1416void 1410void
1417send_plugin_custom_message (object *pl, char *buf) 1411send_plugin_custom_message (object *pl, char *buf)
1418{ 1412{
1419 pl->contr->ns->send_packet (buf); 1413 pl->contr->ns->send_packet (buf);
… …
1430 sl << "replyinfo skill_info\n"; 1424 sl << "replyinfo skill_info\n";
1431 1425
1432 for (int i = 1; i < NUM_SKILLS; i++) 1426 for (int i = 1; i < NUM_SKILLS; i++)
1433 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1427 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1434 1428
1435 if (sl.length () >= MAXSOCKBUF) 1429 if (sl.length () > MAXSOCKBUF)
1436 { 1430 {
1437 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1431 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1438 fatal (0); 1432 fatal (0);
1439 } 1433 }
1440 1434
… …
1453 sl << "replyinfo spell_paths\n"; 1447 sl << "replyinfo spell_paths\n";
1454 1448
1455 for (int i = 0; i < NRSPELLPATHS; i++) 1449 for (int i = 0; i < NRSPELLPATHS; i++)
1456 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1450 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1457 1451
1458 if (sl.length () >= MAXSOCKBUF) 1452 if (sl.length () > MAXSOCKBUF)
1459 { 1453 {
1460 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1454 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1461 fatal (0); 1455 fatal (0);
1462 } 1456 }
1463 1457
… …
1571 if (!spell->face) 1565 if (!spell->face)
1572 { 1566 {
1573 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1567 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1574 spell->face = face_find ("burnout.x11", blank_face); 1568 spell->face = face_find ("burnout.x11", blank_face);
1575 } 1569 }
1570
1571 pl->ns->send_face (spell->face);
1576 1572
1577 /* send the current values */ 1573 /* send the current values */
1578 sl << uint32 (spell->count) 1574 sl << uint32 (spell->count)
1579 << uint16 (spell->level) 1575 << uint16 (spell->level)
1580 << uint16 (spell->casting_time) 1576 << uint16 (spell->casting_time)
… …
1616 * bytes and 3 strings (because that is the spec) so we need to 1612 * bytes and 3 strings (because that is the spec) so we need to
1617 * check that the length of those 3 strings, plus the 23 bytes, 1613 * check that the length of those 3 strings, plus the 23 bytes,
1618 * won't take us over the length limit for the socket, if it does, 1614 * won't take us over the length limit for the socket, if it does,
1619 * we need to send what we already have, and restart packet formation 1615 * we need to send what we already have, and restart packet formation
1620 */ 1616 */
1617 if (spell->type != SPELL)
1618 continue;
1619
1621 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1620 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1622 * to show add_spell is 26 bytes + 2 strings. However, the overun 1621 * to show add_spell is 26 bytes + 2 strings. However, the overun
1623 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1622 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1624 * like it will fix this 1623 * like it will fix this
1625 */ 1624 */
1626 if (spell->type != SPELL)
1627 continue;
1628
1629 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1625 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1630 { 1626 {
1627 pl->ns->flush_fx ();
1631 pl->ns->send_packet (sl); 1628 pl->ns->send_packet (sl);
1632 1629
1633 sl.reset (); 1630 sl.reset ();
1634 sl << "addspell "; 1631 sl << "addspell ";
1635 } 1632 }
… …
1643 return; 1640 return;
1644 } 1641 }
1645 else 1642 else
1646 append_spell (pl, sl, spell); 1643 append_spell (pl, sl, spell);
1647 1644
1648 if (sl.length () >= MAXSOCKBUF) 1645 if (sl.length () > MAXSOCKBUF)
1649 { 1646 {
1650 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1647 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1651 fatal (0); 1648 fatal (0);
1652 } 1649 }
1653 1650
1654 /* finally, we can send the packet */ 1651 /* finally, we can send the packet */
1652 pl->ns->flush_fx ();
1655 pl->ns->send_packet (sl); 1653 pl->ns->send_packet (sl);
1656} 1654}
1657 1655

Diff Legend

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