ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.59 by root, Sat Dec 23 07:36:35 2006 UTC vs.
Revision 1.136 by root, Wed May 16 11:10:01 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <sounds.h> 27#include <sounds.h>
28#include <living.h> 28#include <living.h>
29#include <object.h> 29#include <object.h>
30#include <spells.h> 30#include <spells.h>
31#include <skills.h> 31#include <skills.h>
32 32
33#include <algorithm> 33#include <algorithm>
34#include <functional> 34#include <functional>
35 35
36player * 36playervec players;
37find_player (const char *plname)
38{
39 player *pl;
40
41 for (pl = first_player; pl; pl = pl->next)
42 if (pl->ob && !strcmp (query_name (pl->ob), plname))
43 return pl;
44
45 return 0;
46}
47 37
48void 38void
49display_motd (const object *op) 39display_motd (const object *op)
50{ 40{
51 char buf[MAX_BUF]; 41 char buf[MAX_BUF];
… …
125 115
126 news[0] = '\0'; 116 news[0] = '\0';
127 subject[0] = '\0'; 117 subject[0] = '\0';
128 size = 0; 118 size = 0;
129 119
130 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
131 { 121 {
132 if (*buf == '#') 122 if (*buf == '#')
133 continue; 123 continue;
134 124
135 if (*buf == '%') 125 if (*buf == '%')
136 { /* send one news */ 126 { /* send one news */
137 if (size > 0) 127 if (size > 0)
138 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 128 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
129
139 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
140 strip_endline (subject); 131 strip_endline (subject);
141 size = 0; 132 size = 0;
142 news[0] = '\0'; 133 news[0] = '\0';
143 } 134 }
… …
152 size += strlen (buf); 143 size += strlen (buf);
153 } 144 }
154 } 145 }
155 146
156 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
157 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
158 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
150}
151
152float
153player::weapon_speed () const
154{
155 return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
159} 156}
160 157
161/* This loads the first map an puts the player on it. */ 158/* This loads the first map an puts the player on it. */
162static void 159static void
163set_first_map (object *op) 160set_first_map (object *op)
164{ 161{
165 strcpy (op->contr->maplevel, first_map_path); 162 op->contr->maplevel = first_map_path;
166 op->x = -1; 163 op->x = -1;
167 op->y = -1; 164 op->y = -1;
165}
166
167void
168player::enter_map ()
169{
170 object *tmp = object::create ();
171
172 EXIT_PATH (tmp) = maplevel;
173 EXIT_X (tmp) = ob->x;
174 EXIT_Y (tmp) = ob->y;
168 enter_exit (op, 0); 175 ob->enter_exit (tmp);
176
177 tmp->destroy ();
178}
179
180void
181player::activate ()
182{
183 if (active)
184 return;
185
186 players.insert (this);
187 ob->remove ();
188 ob->map = 0;
189 ob->activate_recursive ();
190 CLEAR_FLAG (ob, FLAG_FRIENDLY);
191 add_friendly_object (ob);
192 enter_map ();
193}
194
195void
196player::deactivate ()
197{
198 if (!active)
199 return;
200
201 terminate_all_pets (ob);
202 remove_friendly_object (ob);
203 ob->deactivate_recursive ();
204
205 if (ob->map)
206 maplevel = ob->map->path;
207
208 ob->remove ();
209 ob->map = 0;
210 party = 0;
211
212 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
213
214 players.erase (this);
169} 215}
170 216
171// connect the player with a specific client 217// connect the player with a specific client
172// also changed, rationalises, and fixes some incorrect settings 218// also changes, rationalises, and fixes some incorrect settings
173void 219void
174player::connect (client *ns) 220player::connect (client *ns)
175{ 221{
176 this->ns = ns; 222 this->ns = ns;
177 ns->pl = this; 223 ns->pl = this;
178 224
179 next = first_player; 225 run_on = 0;
180 first_player = this; 226 fire_on = 0;
227 ob->close_container (); //TODO: client-specific
181 228
182 ns->update_look = 0; 229 ns->update_look = 0;
183 ns->look_position = 0; 230 ns->look_position = 0;
184 231
185 clear_los (ob); 232 clear_los (ob);
233
234 ns->reset_stats ();
186 235
187 /* make sure he's a player -- needed because of class change. */ 236 /* make sure he's a player -- needed because of class change. */
188 ob->type = PLAYER; // we are paranoid 237 ob->type = PLAYER; // we are paranoid
189 ob->race = ob->arch->clone.race; 238 ob->race = ob->arch->clone.race;
190 239
191 if (!legal_range (ob, shoottype))
192 shoottype = range_none;
193
194 ob->carrying = sum_weight (ob); 240 ob->carrying = sum_weight (ob);
195 link_player_skills (ob); 241 link_player_skills (ob);
196 242
197 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 243 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
198 ob->update_stats ();
199 update_ob_speed (ob);
200 244
201 assign (title, ob->arch->clone.name); 245 assign (title, ob->arch->clone.name);
202
203 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
204 * from the class, and not race. I don't see any way to get the class information
205 * to then update this. I don't think this will actually break anything - anyone
206 * that can use armour should be able to use a shield. What this may 'break'
207 * are features new characters get, eg, if someone starts up with a Q, they
208 * should be able to use a shield. However, old Q's won't get that advantage.
209 */
210 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
211 SET_FLAG (ob, FLAG_USE_SHIELD);
212 246
213 /* if it's a dragon player, set the correct title here */ 247 /* if it's a dragon player, set the correct title here */
214 if (is_dragon_pl (ob)) 248 if (is_dragon_pl (ob))
215 { 249 {
216 object *tmp, *abil = 0, *skin = 0; 250 object *tmp, *abil = 0, *skin = 0;
… …
226 skin = tmp; 260 skin = tmp;
227 261
228 set_dragon_name (ob, abil, skin); 262 set_dragon_name (ob, abil, skin);
229 } 263 }
230 264
231 CLEAR_FLAG (ob, FLAG_FRIENDLY);
232 add_friendly_object (ob);
233
234 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
235
236 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 265 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
237 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
238 266
267 esrv_new_player (this, ob->weight + ob->carrying);
268
269 for (object *op = ob->inv; op; op = op->below)
270 if (op->flag [FLAG_APPLIED])
271 switch (op->type)
272 {
273 case WAND:
274 case ROD:
275 case HORN:
276 case BOW:
277 case SKILL:
278 case SKILL_TOOL:
279 case WEAPON:
280 apply_special (ob, op, AP_UNAPPLY);
281 apply_special (ob, op, AP_APPLY);
282 break;
283 }
284
285 ob->update_stats ();
239 ns->floorbox_update (); 286 ns->floorbox_update ();
240 287
241 esrv_new_player (this, ob->weight + ob->carrying);
242 esrv_send_inventory (ob, ob); 288 esrv_send_inventory (ob, ob);
243 esrv_add_spells (this, 0); 289 esrv_add_spells (this, 0);
244 290
245 enter_exit (ob, 0); 291 activate ();
246 292
247 send_rules (ob); 293 send_rules (ob);
248 send_news (ob); 294 send_news (ob);
249 display_motd (ob); 295 display_motd (ob);
296
297 INVOKE_PLAYER (CONNECT, this);
250 INVOKE_PLAYER (LOGIN, this); 298 INVOKE_PLAYER (LOGIN, this);
299}
300
301void
302player::disconnect ()
303{
304 if (ns)
305 {
306 if (active)
307 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
308
309 INVOKE_PLAYER (DISCONNECT, this);
310
311 ns->reset_stats ();
312 ns->pl = 0;
313 ns = 0;
314 }
315
316 if (ob)
317 ob->close_container (); //TODO: client-specific
318
319 deactivate ();
251} 320}
252 321
253// the need for this function can be explained 322// the need for this function can be explained
254// by load_object not returning the object 323// by load_object not returning the object
255void 324void
256player::set_object (object *op) 325player::set_object (object *op)
257{ 326{
258 ob = op; 327 ob = op;
259 ob->contr = this; /* this aren't yet in archetype */ 328 ob->contr = this; /* this aren't yet in archetype */
260 329
261 ob->speed_left = 0.5; 330 ob->speed_left = 0.5f;
262 ob->speed = 1.0; 331 ob->speed = 1.0f;
263 ob->direction = 5; /* So player faces south */ 332 ob->direction = 5; /* So player faces south */
264 ob->stats.wc = 2;
265 ob->run_away = 25; /* Then we panick... */
266
267 set_first_map (ob);
268
269 ob->roll_stats ();
270} 333}
271 334
272player::player () 335player::player ()
273{ 336{
274 /* There are some elements we want initialized to non zero value - 337 /* There are some elements we want initialised to non zero value -
275 * we deal with that below this point. 338 * we deal with that below this point.
276 */ 339 */
277 outputs_sync = 16; /* Every 2 seconds */ 340 outputs_sync = 4;
278 outputs_count = 8; /* Keeps present behaviour */ 341 outputs_count = 4;
279 unapply = unapply_nochoice; 342 unapply = unapply_nochoice;
280 343
281 assign (savebed_map, first_map_path); /* Init. respawn position */ 344 savebed_map = first_map_path; /* Init. respawn position */
282 345
283 gen_sp_armour = 10; 346 gen_sp_armour = 10;
284 last_speed = -1;
285 shoottype = range_none;
286 bowtype = bow_normal; 347 bowtype = bow_normal;
287 petmode = pet_normal; 348 petmode = pet_normal;
288 listening = 10; 349 listening = 10;
289 usekeys = containers; 350 usekeys = containers;
290 last_weapon_sp = -1;
291 peaceful = 1; /* default peaceful */ 351 peaceful = 1; /* default peaceful */
292 do_los = 1; 352 do_los = 1;
353}
293 354
294 /* we need to clear these to -1 and not zero - otherwise, 355void
295 * if a player quits and starts a new character, we wont 356player::do_destroy ()
296 * send new values to the client, as things like exp start 357{
297 * at zero. 358 disconnect ();
298 */
299 for (int i = 0; i < NUM_SKILLS; i++)
300 last_skill_exp[i] = -1;
301 359
302 for (int i = 0; i < NROFATTACKS; i++) 360 attachable::do_destroy ();
303 last_resist[i] = -1;
304 361
305 last_stats.exp = -1; 362 if (ob)
306 last_weight = (uint32) - 1; 363 {
364 ob->destroy_inv (false);
365 ob->destroy ();
366 }
307} 367}
308 368
309player::~player () 369player::~player ()
310{ 370{
311 terminate_all_pets (ob);
312
313 if (first_player != this)
314 {
315 player *prev = first_player;
316
317 while (prev && prev->next && prev->next != this)
318 prev = prev->next;
319
320 if (prev->next != this)
321 {
322 LOG (llevError, "Free_player: Can't find previous player.\n");
323 abort ();
324 }
325
326 prev->next = next;
327 }
328 else
329 first_player = next;
330
331 if (ob)
332 {
333 ob->contr = 0;
334 ob->destroy (1);
335 }
336
337 if (ns)
338 {
339 ns->send_packet ("goodbye");
340 ns->flush ();
341 ns->pl = 0;
342 ns->destroy ();
343 }
344
345 /* Clear item stack */ 371 /* Clear item stack */
346 free (stack_items); 372 free (stack_items);
347} 373}
348 374
349/* Tries to add player on the connection passed in ns. 375/* Tries to add player on the connection passed in ns.
… …
354player::create () 380player::create ()
355{ 381{
356 player *pl = new player; 382 player *pl = new player;
357 383
358 pl->set_object (arch_to_object (get_player_archetype (0))); 384 pl->set_object (arch_to_object (get_player_archetype (0)));
385
386 pl->ob->roll_stats ();
387 pl->ob->stats.wc = 2;
388 pl->ob->run_away = 25; /* Then we panick... */
389
390 set_first_map (pl->ob);
359 391
360 return pl; 392 return pl;
361} 393}
362 394
363/* 395/*
… …
390 422
391object * 423object *
392get_nearest_player (object *mon) 424get_nearest_player (object *mon)
393{ 425{
394 object *op = NULL; 426 object *op = NULL;
395 player *pl = NULL;
396 objectlink *ol; 427 objectlink *ol;
397 unsigned lastdist; 428 unsigned lastdist;
398 rv_vector rv; 429 rv_vector rv;
399 430
400 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
401 { 432 {
402 /* We should not find free objects on this friendly list, but it 433 /* We should not find free objects on this friendly list, but it
403 * does periodically happen. Given that, lets deal with it. 434 * does periodically happen. Given that, lets deal with it.
404 * While unlikely, it is possible the next object on the friendly 435 * While unlikely, it is possible the next object on the friendly
405 * list is also free, so encapsulate this in a while loop. 436 * list is also free, so encapsulate this in a while loop.
… …
409 object *tmp = ol->ob; 440 object *tmp = ol->ob;
410 441
411 /* Can't do much more other than log the fact, because the object 442 /* Can't do much more other than log the fact, because the object
412 * itself will have been cleared. 443 * itself will have been cleared.
413 */ 444 */
414 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 445 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
446 tmp->debug_desc ());
415 ol = ol->next; 447 ol = ol->next;
416 remove_friendly_object (tmp); 448 remove_friendly_object (tmp);
417 if (!ol) 449 if (!ol)
418 return op; 450 return op;
419 } 451 }
… …
432 { 464 {
433 op = ol->ob; 465 op = ol->ob;
434 lastdist = rv.distance; 466 lastdist = rv.distance;
435 } 467 }
436 } 468 }
437 for (pl = first_player; pl != NULL; pl = pl->next) 469
438 { 470 for_all_players (pl)
439 if (can_detect_enemy (mon, pl->ob, &rv)) 471 if (can_detect_enemy (mon, pl->ob, &rv))
440 {
441
442 if (lastdist > rv.distance) 472 if (lastdist > rv.distance)
443 { 473 {
444 op = pl->ob; 474 op = pl->ob;
445 lastdist = rv.distance; 475 lastdist = rv.distance;
446 } 476 }
447 } 477
448 }
449#if 0 478#if 0
450 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 479 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
451#endif 480#endif
452 return op; 481 return op;
453} 482}
… …
511 x = mon->x; 540 x = mon->x;
512 y = mon->y; 541 y = mon->y;
513 m = mon->map; 542 m = mon->map;
514 dir = rv.direction; 543 dir = rv.direction;
515 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 544 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
516 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 545 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
546
517 /* If we can't solve it within the search distance, return now. */ 547 /* If we can't solve it within the search distance, return now. */
518 if (diff > max) 548 if (diff > max)
519 return 0; 549 return 0;
550
520 while (diff > 1 && max > 0) 551 while (diff > 1 && max > 0)
521 { 552 {
522 lastx = x; 553 lastx = x;
523 lasty = y; 554 lasty = y;
524 lastmap = m; 555 lastmap = m;
… …
606 max--; 637 max--;
607 lastdir = dir; 638 lastdir = dir;
608 if (!firstdir) 639 if (!firstdir)
609 firstdir = dir; 640 firstdir = dir;
610 } 641 }
642
611 if (diff <= 1) 643 if (diff <= 1)
612 { 644 {
613 /* Recalculate diff (distance) because we may not have actually 645 /* Recalculate diff (distance) because we may not have actually
614 * headed toward player for entire distance. 646 * headed toward player for entire distance.
615 */ 647 */
616 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 648 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
617 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 649 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
618 } 650 }
651
619 if (diff > max) 652 if (diff > max)
620 return 0; 653 return 0;
621 } 654 }
655
622 /* If we reached the max, didn't find a direction in time */ 656 /* If we reached the max, didn't find a direction in time */
623 if (!max) 657 if (!max)
624 return 0; 658 return 0;
625 659
626 return firstdir; 660 return firstdir;
… …
740roll_stat (void) 774roll_stat (void)
741{ 775{
742 int a[4], i, j, k; 776 int a[4], i, j, k;
743 777
744 for (i = 0; i < 4; i++) 778 for (i = 0; i < 4; i++)
745 a[i] = (int) RANDOM () % 6 + 1; 779 a[i] = (int) rndm (6) + 1;
746 780
747 for (i = 0, j = 0, k = 7; i < 4; i++) 781 for (i = 0, j = 0, k = 7; i < 4; i++)
748 if (a[i] < k) 782 if (a[i] < k)
749 k = a[i], j = i; 783 k = a[i], j = i;
750 784
… …
756} 790}
757 791
758void 792void
759object::roll_stats () 793object::roll_stats ()
760{ 794{
761 int statsort [7]; 795 int statsort [NUM_STATS];
762 796
763 for (;;) 797 for (;;)
764 { 798 {
765 int sum = 0; 799 int sum = 0;
766 for (int i = 7; i--; ) 800 for (int i = NUM_STATS; i--; )
767 sum += statsort [i] = roll_stat (); 801 sum += statsort [i] = roll_stat ();
768 802
769 if (sum >= 82 && sum <= 116) 803 if (sum >= 82 && sum <= 116)
770 break; 804 break;
771 } 805 }
772 806
773 // Sort the stats so that rerolling is easier... 807 // Sort the stats so that rerolling is easier...
774 std::sort (statsort, statsort + 7, std::greater<int>()); 808 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
775 809
810 for (int i = 0; i < NUM_STATS; ++i)
776 stats.Str = statsort[0]; 811 stats.stat (i) = statsort [i];
777 stats.Dex = statsort[1];
778 stats.Con = statsort[2];
779 stats.Int = statsort[3];
780 stats.Wis = statsort[4];
781 stats.Pow = statsort[5];
782 stats.Cha = statsort[6];
783 812
784 stats.exp = 0; 813 stats.exp = 0;
785 stats.ac = 0; 814 stats.ac = 0;
786 815
787 stats.hp = stats.maxhp; 816 stats.hp = stats.maxhp;
… …
799} 828}
800 829
801void 830void
802object::swap_stats (int a, int b) 831object::swap_stats (int a, int b)
803{ 832{
804 int tmp = get_attr_value (&contr->orig_stats, a); 833 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
805 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
806 set_attr_value (&contr->orig_stats, b, tmp);
807 834
835 for (int i = 0; i < NUM_STATS; ++i)
808 stats.Str = contr->orig_stats.Str; 836 stats.stat (i) = contr->orig_stats.stat (i);
809 stats.Dex = contr->orig_stats.Dex;
810 stats.Con = contr->orig_stats.Con;
811 stats.Int = contr->orig_stats.Int;
812 stats.Wis = contr->orig_stats.Wis;
813 stats.Pow = contr->orig_stats.Pow;
814 stats.Cha = contr->orig_stats.Cha;
815 837
816 //TODO: the following code looks so borked and should, at the very least, 838 //TODO: the following code looks so borked and should, at the very least,
817 // be merged with the similar code in roll_stats 839 // be merged with the similar code in roll_stats
818 stats.ac = 0; 840 stats.ac = 0;
819 841
… …
831 contr->levsp[1] = 6; 853 contr->levsp[1] = 6;
832 contr->levgrace[1] = 3; 854 contr->levgrace[1] = 3;
833 855
834 contr->orig_stats = stats; 856 contr->orig_stats = stats;
835 } 857 }
858}
859
860static void
861start_info (object *op)
862{
863 char buf[MAX_BUF];
864
865 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
866 new_draw_info (NDI_UNIQUE, 0, op, buf);
867 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
868 //new_draw_info (NDI_UNIQUE, 0, op, " ");
836} 869}
837 870
838/* This function takes the key that is passed, and does the 871/* This function takes the key that is passed, and does the
839 * appropriate action with it (change race, or other things). 872 * appropriate action with it (change race, or other things).
840 * The function name is for historical reasons - now we have 873 * The function name is for historical reasons - now we have
841 * separate race and class; this actually changes the RACE, 874 * separate race and class; this actually changes the RACE,
842 * not the class. 875 * not the class.
843 */ 876 */
844int 877void
845key_change_class (object *op, char key) 878player::chargen_race_done ()
846{ 879{
847 int tmp_loop;
848
849 if (key == 'd' || key == 'D')
850 {
851 char buf[MAX_BUF];
852
853 /* this must before then initial items are given */ 880 /* this must before then initial items are given */
854 esrv_new_player (op->contr, op->weight + op->carrying); 881 esrv_new_player (ob->contr, ob->weight + ob->carrying);
855 882
856 treasurelist *tl = find_treasurelist ("starting_wealth"); 883 treasurelist *tl = treasurelist::find ("starting_wealth");
857 if (tl) 884 if (tl)
858 create_treasure (tl, op, 0, 0, 0); 885 create_treasure (tl, ob, 0, 0, 0);
859 886
860 INVOKE_PLAYER (BIRTH, op->contr); 887 INVOKE_PLAYER (BIRTH, ob->contr);
861 INVOKE_PLAYER (LOGIN, op->contr); 888 INVOKE_PLAYER (LOGIN, ob->contr);
862 889
863 op->contr->ns->state = ST_PLAYING; 890 ob->contr->ns->state = ST_PLAYING;
864 891
865 if (op->msg) 892 if (ob->msg)
866 op->msg = NULL; 893 ob->msg = 0;
867 894
868 /* We create this now because some of the unique maps will need it 895 /* We create this now because some of the unique maps will need it
869 * to save here. 896 * to save here.
870 */ 897 */
898 {
899 char buf[MAX_BUF];
871 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 900 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
872 make_path_to_file (buf); 901 make_path_to_file (buf);
902 }
873 903
874#ifdef AUTOSAVE
875 op->contr->last_save_tick = pticks;
876#endif
877 start_info (op); 904 start_info (ob);
878 CLEAR_FLAG (op, FLAG_WIZ); 905 CLEAR_FLAG (ob, FLAG_WIZ);
879 give_initial_items (op, op->randomitems); 906 give_initial_items (ob, ob->randomitems);
880 link_player_skills (op); 907 link_player_skills (ob);
881 esrv_send_inventory (op, op); 908 esrv_send_inventory (ob, ob);
882 op->update_stats (); 909 ob->update_stats ();
883 910
884 /* This moves the player to a different start map, if there 911 /* This moves the player to a different start map, if there
885 * is one for this race 912 * is one for this race
886 */ 913 */
887 if (*first_map_ext_path) 914 if (*first_map_ext_path)
888 { 915 {
889 object *tmp; 916 object *tmp;
890 char mapname[MAX_BUF]; 917 char mapname[MAX_BUF];
891 918
892 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 919 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
893 tmp = object::create (); 920 tmp = object::create ();
894 EXIT_PATH (tmp) = mapname; 921 EXIT_PATH (tmp) = mapname;
895 EXIT_X (tmp) = op->x; 922 EXIT_X (tmp) = ob->x;
896 EXIT_Y (tmp) = op->y; 923 EXIT_Y (tmp) = ob->y;
897 enter_exit (op, tmp); /* we don't really care if it succeeded; 924 ob->enter_exit (tmp); /* we don't really care if it succeeded;
898 * if the map isn't there, then stay on the 925 * if the map isn't there, then stay on the
899 * default initial map */ 926 * default initial map */
900 tmp->destroy (); 927 tmp->destroy ();
901 } 928 }
902 else 929 else
903 LOG (llevDebug, "first_map_ext_path not set\n"); 930 LOG (llevDebug, "first_map_ext_path not set\n");
931}
904 932
905 return 0; 933void
906 } 934player::chargen_race_next ()
907 935{
908 /* Following actually changes the race - this is the default command 936 /* Following actually changes the race - this is the default command
909 * if we don't match with one of the options above. 937 * if we don't match with one of the options above.
910 */ 938 */
911 939
912 tmp_loop = 0; 940 do
913 while (!tmp_loop)
914 { 941 {
915 shstr name = op->name; 942 shstr name = ob->name;
916 int x = op->x, y = op->y; 943 int x = ob->x, y = ob->y;
917 944
918 op->remove_statbonus (); 945 ob->remove_statbonus ();
919 op->remove (); 946 ob->remove ();
920 op->arch = get_player_archetype (op->arch); 947 ob->arch = get_player_archetype (ob->arch);
921 op->arch->clone.copy_to (op); 948 ob->arch->clone.copy_to (ob);
922 op->instantiate (); 949 ob->instantiate ();
923 op->stats = op->contr->orig_stats; 950 ob->stats = ob->contr->orig_stats;
924 op->name = op->name_pl = name; 951 ob->name = ob->name_pl = name;
925 op->x = x; 952 ob->x = x;
926 op->y = y; 953 ob->y = y;
927 SET_ANIMATION (op, 2); /* So player faces south */ 954 SET_ANIMATION (ob, 2); /* So player faces south */
928 insert_ob_in_map (op, op->map, op, 0); 955 insert_ob_in_map (ob, ob->map, ob, 0);
929 assign (op->contr->title, op->arch->clone.name); 956 assign (ob->contr->title, ob->arch->clone.name);
930 op->add_statbonus (); 957 ob->add_statbonus ();
931 tmp_loop = allowed_class (op);
932 } 958 }
959 while (!allowed_class (ob));
933 960
934 update_object (op, UP_OBJ_FACE); 961 update_object (ob, UP_OBJ_FACE);
935 esrv_update_item (UPD_FACE, op, op); 962 esrv_update_item (UPD_FACE, ob, ob);
936 op->update_stats (); 963 ob->update_stats ();
937 op->stats.hp = op->stats.maxhp; 964 ob->stats.hp = ob->stats.maxhp;
938 op->stats.sp = op->stats.maxsp; 965 ob->stats.sp = ob->stats.maxsp;
939 op->stats.grace = 0; 966 ob->stats.grace = 0;
940
941 if (op->msg)
942 new_draw_info (NDI_BLUE, 0, op, op->msg);
943
944 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
945 return 0;
946}
947
948int
949key_confirm_quit (object *op, char key)
950{
951 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
952 {
953 op->contr->ns->state = ST_PLAYING;
954 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
955 return 1;
956 }
957
958 INVOKE_PLAYER (LOGOUT, op->contr);
959 INVOKE_PLAYER (QUIT, op->contr);
960
961 terminate_all_pets (op);
962 leave_map (op);
963 op->direction = 0;
964 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
965
966 strcpy (op->contr->killer, "quit");
967 check_score (op);
968 op->contr->party = 0;
969 op->contr->own_title[0] = '\0';
970
971 object_ptr ob = op;
972
973 delete ob->contr;
974
975 /* We need to hunt for any per player unique maps in memory and
976 * get rid of them. The trailing slash in the path is intentional,
977 * so that players named 'Ab' won't match against players 'Abe' pathname
978 */
979 char buf[MAX_BUF];
980 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
981
982 for (maptile *next, *mp = first_map; mp; mp = next)
983 {
984 next = mp->next;
985
986 if (!strncmp (mp->path, buf, strlen (buf)))
987 delete_map (mp);
988 }
989
990 delete_character (ob->name, 1);
991
992 return 1;
993} 967}
994 968
995void 969void
996flee_player (object *op) 970flee_player (object *op)
997{ 971{
… …
1044 /* Cornered, get rid of scared */ 1018 /* Cornered, get rid of scared */
1045 CLEAR_FLAG (op, FLAG_SCARED); 1019 CLEAR_FLAG (op, FLAG_SCARED);
1046 op->enemy = NULL; 1020 op->enemy = NULL;
1047} 1021}
1048 1022
1049
1050/* check_pick sees if there is stuff to be picked up/picks up stuff. 1023/* check_pick sees if there is stuff to be picked up/picks up stuff.
1051 * IT returns 1 if the player should keep on moving, 0 if he should 1024 * It returns 1 if the player should keep on moving, 0 if he should
1052 * stop. 1025 * stop.
1053 */ 1026 */
1054int 1027int
1055check_pick (object *op) 1028check_pick (object *op)
1056{ 1029{
1057 object *tmp, *next; 1030 object *tmp, *next;
1058 int stop = 0; 1031 int stop = 0;
1059 int j, k, wvratio; 1032 int wvratio;
1060 char putstring[128], tmpstr[16]; 1033 char putstring[128];
1061 1034
1062 /* if you're flying, you cna't pick up anything */ 1035 /* if you're flying, you cna't pick up anything */
1063 if (op->move_type & MOVE_FLYING) 1036 if (op->move_type & MOVE_FLYING)
1064 return 1; 1037 return 1;
1065 1038
… …
1402 * found object is returned. 1375 * found object is returned.
1403 */ 1376 */
1404object * 1377object *
1405find_arrow (object *op, const char *type) 1378find_arrow (object *op, const char *type)
1406{ 1379{
1407 object *tmp = NULL; 1380 object *tmp = 0;
1408 1381
1409 for (op = op->inv; op; op = op->below) 1382 for (op = op->inv; op; op = op->below)
1410 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1411 tmp = find_arrow (op, type); 1384 tmp = find_arrow (op, type);
1412 else if (op->type == ARROW && op->race == type) 1385 else if (op->type == ARROW && op->race == type)
1413 return op; 1386 return op;
1387
1414 return tmp; 1388 return tmp;
1415} 1389}
1416 1390
1417/* 1391/*
1418 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1392 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1419 * against the target. A full test is not performed, simply a basic test 1393 * against the target. A full test is not performed, simply a basic test
1420 * of resistances. The archer is making a quick guess at what he sees down 1394 * of resistances. The archer is making a quick guess at what he sees down
1421 * the hall. Failing that it does it's best to pick the highest plus arrow. 1395 * the hall. Failing that it does it's best to pick the highest plus arrow.
1422 */ 1396 */
1423
1424object * 1397object *
1425find_better_arrow (object *op, object *target, const char *type, int *better) 1398find_better_arrow (object *op, object *target, const char *type, int *better)
1426{ 1399{
1427 object *tmp = NULL, *arrow, *ntmp; 1400 object *tmp = NULL, *arrow, *ntmp;
1428 int attacknum, attacktype, betterby = 0, i; 1401 int attacknum, attacktype, betterby = 0, i;
… …
1494 * find_better_arrow to find a decent arrow to use. 1467 * find_better_arrow to find a decent arrow to use.
1495 * op = the shooter 1468 * op = the shooter
1496 * type = bow->race 1469 * type = bow->race
1497 * dir = fire direction 1470 * dir = fire direction
1498 */ 1471 */
1499
1500object * 1472object *
1501pick_arrow_target (object *op, const char *type, int dir) 1473pick_arrow_target (object *op, const char *type, int dir)
1502{ 1474{
1503 object *tmp = NULL; 1475 object *tmp = NULL;
1504 maptile *m; 1476 maptile *m;
… …
1569 */ 1541 */
1570int 1542int
1571fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1543fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1572{ 1544{
1573 object *left, *bow; 1545 object *left, *bow;
1574 int bowspeed, mflags; 1546 int mflags;
1575 maptile *m; 1547 maptile *m;
1576 1548
1577 if (!dir) 1549 if (!dir)
1578 { 1550 {
1579 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1551 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1580 return 0; 1552 return 0;
1581 } 1553 }
1582 1554
1583 if (op->type == PLAYER) 1555 if (op->contr)
1584 bow = op->contr->ranges[range_bow]; 1556 bow = op->current_weapon;
1585 else 1557 else
1586 { 1558 {
1587 for (bow = op->inv; bow; bow = bow->below) 1559 for (bow = op->inv; bow; bow = bow->below)
1588 /* Don't check for applied - monsters don't apply bows - in that way, they 1560 /* Don't check for applied - monsters don't apply bows - in that way, they
1589 * don't need to switch back and forth between bows and weapons. 1561 * don't need to switch back and forth between bows and weapons.
… …
1594 if (!bow) 1566 if (!bow)
1595 { 1567 {
1596 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1568 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1597 return 0; 1569 return 0;
1598 } 1570 }
1571
1572 // optimisation: move object to top so we will find it quickly again
1573 if (bow->below)
1574 {
1575 bow->remove ();
1576 op->insert (bow);
1577 }
1578
1599 } 1579 }
1600 1580
1601 if (!bow->race || !bow->skill) 1581 if (!bow->race || !bow->skill)
1602 { 1582 {
1603 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1604 return 0; 1584 return 0;
1605 } 1585 }
1606
1607 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1608
1609 /* penalize ROF for bestarrow */
1610 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1611 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1612
1613 if (bowspeed < 1)
1614 bowspeed = 1;
1615 1586
1616 if (arrow == NULL) 1587 if (arrow == NULL)
1617 { 1588 {
1618 if ((arrow = find_arrow (op, bow->race)) == NULL) 1589 if ((arrow = find_arrow (op, bow->race)) == NULL)
1619 { 1590 {
1620 if (op->type == PLAYER) 1591 if (op->type == PLAYER)
1621 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1592 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1622 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1593 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1623 else 1594 else
1624 CLEAR_FLAG (op, FLAG_READY_BOW); 1595 CLEAR_FLAG (op, FLAG_READY_BOW);
1596
1625 return 0; 1597 return 0;
1626 } 1598 }
1627 } 1599 }
1628 1600
1629 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1601 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1651 return 0; 1623 return 0;
1652 } 1624 }
1653 1625
1654 arrow->set_owner (op); 1626 arrow->set_owner (op);
1655 arrow->skill = bow->skill; 1627 arrow->skill = bow->skill;
1656
1657 arrow->direction = dir; 1628 arrow->direction = dir;
1658 arrow->x = sx; 1629
1659 arrow->y = sy; 1630 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1631 arrow->stats.hp = arrow->stats.dam;
1632 arrow->stats.grace = arrow->attacktype;
1633
1634 if (arrow->slaying)
1635 arrow->spellarg = strdup (arrow->slaying);
1636
1637 if (player *pl = op->contr)
1638 {
1639 if (!pl->has_hit)
1640 {
1641 pl->has_hit = 1;
1642 pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1643 }
1644#if 0
1645 float speed = pl->weapon_sp;
1646
1647 /* penalize ROF for bestarrow */
1648 if (pl->bowtype == bow_bestarrow)
1649 speed *= .9f;
1650 else
1651 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1652
1653 op->speed_left += speed - op->speed;
1654#endif
1655 }
1656
1657 SET_ANIMATION (arrow, arrow->direction);
1658
1659 /* update the speed */
1660 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1661 + bow->stats.dam / 7.0;
1662
1663 arrow->set_speed (max (arrow->speed, 2.0));
1664 arrow->speed_left = 0;
1665
1666 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1660 1667
1661 if (op->type == PLAYER) 1668 if (op->type == PLAYER)
1662 { 1669 {
1663 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1664 op->update_stats ();
1665 }
1666
1667 SET_ANIMATION (arrow, arrow->direction);
1668 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1669 arrow->stats.hp = arrow->stats.dam;
1670 arrow->stats.grace = arrow->attacktype;
1671 if (arrow->slaying != NULL)
1672 arrow->spellarg = strdup (arrow->slaying);
1673
1674 /* Note that this was different for monsters - they got their level
1675 * added to the damage. I think the strength bonus is more proper.
1676 */
1677
1678 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1679
1680 /* update the speed */
1681 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1682 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1683
1684 if (arrow->speed < 1.0)
1685 arrow->speed = 1.0;
1686 update_ob_speed (arrow);
1687 arrow->speed_left = 0;
1688
1689 if (op->type == PLAYER)
1690 {
1691 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1692 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1693 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1694
1695 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1670 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1671 wc -= dex_bonus[op->stats.Dex];
1672
1673 if (!arrow->slaying)
1674 arrow->slaying = op->slaying;
1675
1676 arrow->attacktype |= op->attacktype;
1696 } 1677 }
1697 else 1678 else
1698 { 1679 {
1699 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1700 arrow->level = op->level; 1680 arrow->level = op->level;
1701 } 1681 arrow->stats.wc -= bow->magic;
1702 1682
1703 if (arrow->attacktype == AT_PHYSICAL) 1683 if (!arrow->slaying)
1684 arrow->slaying = bow->slaying;
1685
1704 arrow->attacktype |= bow->attacktype; 1686 arrow->attacktype |= bow->attacktype;
1687 }
1705 1688
1706 if (bow->slaying) 1689 wc -= arrow->level;
1707 arrow->slaying = bow->slaying; 1690 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1708 1691
1709 arrow->map = m; 1692 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1710 arrow->move_type = MOVE_FLY_LOW; 1693 arrow->move_type = MOVE_FLY_LOW;
1711 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1694 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1712 1695
1713 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1696 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1714 insert_ob_in_map (arrow, m, op, 0); 1697 m->insert (arrow, sx, sy, op);
1715 1698
1716 if (!arrow->destroyed ()) 1699 if (!arrow->destroyed ())
1717 move_arrow (arrow); 1700 move_arrow (arrow);
1718 1701
1719 if (op->type == PLAYER) 1702 if (op->type == PLAYER)
… …
1739{ 1722{
1740 int ret = 0, wcmod = 0; 1723 int ret = 0, wcmod = 0;
1741 1724
1742 if (op->contr->bowtype == bow_bestarrow) 1725 if (op->contr->bowtype == bow_bestarrow)
1743 { 1726 {
1744 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1727 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1745 } 1728 }
1746 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1729 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1747 { 1730 {
1748 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1731 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1749 wcmod = -1; 1732 wcmod = -1;
1733
1750 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1734 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1751 } 1735 }
1752 else if (op->contr->bowtype == bow_threewide) 1736 else if (op->contr->bowtype == bow_threewide)
1753 { 1737 {
1754 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1738 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1758 else if (op->contr->bowtype == bow_spreadshot) 1742 else if (op->contr->bowtype == bow_spreadshot)
1759 { 1743 {
1760 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1744 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1761 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1745 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1762 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1746 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1763
1764 } 1747 }
1765 else 1748 else
1766 { 1749 {
1767 /* Simple case */ 1750 /* Simple case */
1768 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1751 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1769 } 1752 }
1753
1770 return ret; 1754 return ret;
1771} 1755}
1772
1773 1756
1774/* Fires a misc (wand/rod/horn) object in 'dir'. 1757/* Fires a misc (wand/rod/horn) object in 'dir'.
1775 * Broken apart from 'fire' to keep it more readable. 1758 * Broken apart from 'fire' to keep it more readable.
1776 */ 1759 */
1777void 1760void
1778fire_misc_object (object *op, int dir) 1761fire_misc_object (object *op, int dir)
1779{ 1762{
1780 object *item; 1763 object *item = op->contr->ranged_ob;
1781 1764
1782 if (!op->contr->ranges[range_misc]) 1765 if (!item)
1783 { 1766 {
1784 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1767 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1785 return; 1768 return;
1786 } 1769 }
1787 1770
1788 item = op->contr->ranges[range_misc];
1789 if (!item->inv) 1771 if (!item->inv)
1790 { 1772 {
1791 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1773 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1792 return; 1774 return;
1793 } 1775 }
1776
1777 if (!op->change_weapon (item))
1778 return;
1779
1794 if (item->type == WAND) 1780 if (item->type == WAND)
1795 { 1781 {
1796 if (item->stats.food <= 0) 1782 if (item->stats.food <= 0)
1797 { 1783 {
1798 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1784 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1799 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1785 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1786
1800 return; 1787 return;
1801 } 1788 }
1802 } 1789 }
1803 else if (item->type == ROD || item->type == HORN) 1790 else if (item->type == ROD || item->type == HORN)
1804 { 1791 {
1805 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1792 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1806 { 1793 {
1807 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1794 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1795
1808 if (item->type == ROD) 1796 if (item->type == ROD)
1809 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1797 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1810 else 1798 else
1811 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1799 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1800
1812 return; 1801 return;
1813 } 1802 }
1814 } 1803 }
1815 1804
1816 if (cast_spell (op, item, dir, item->inv, NULL)) 1805 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1824 1813
1825 if (item->arch) 1814 if (item->arch)
1826 { 1815 {
1827 CLEAR_FLAG (item, FLAG_ANIMATE); 1816 CLEAR_FLAG (item, FLAG_ANIMATE);
1828 item->face = item->arch->clone.face; 1817 item->face = item->arch->clone.face;
1829 item->speed = 0; 1818 item->set_speed (0);
1830 update_ob_speed (item);
1831 } 1819 }
1820
1832 if ((tmp = item->in_player ())) 1821 if ((tmp = item->in_player ()))
1833 esrv_update_item (UPD_ANIM, tmp, item); 1822 esrv_update_item (UPD_ANIM, tmp, item);
1834 } 1823 }
1835 } 1824 }
1836 else if (item->type == ROD || item->type == HORN) 1825 else if (item->type == ROD || item->type == HORN)
1837 {
1838 drain_rod_charge (item); 1826 drain_rod_charge (item);
1839 }
1840 } 1827 }
1841} 1828}
1842 1829
1843/* Received a fire command for the player - go and do it. 1830/* Received a fire command for the player - go and do it.
1844 */ 1831 */
… …
1849 1836
1850 /* check for loss of invisiblity/hide */ 1837 /* check for loss of invisiblity/hide */
1851 if (action_makes_visible (op)) 1838 if (action_makes_visible (op))
1852 make_visible (op); 1839 make_visible (op);
1853 1840
1854 switch (op->contr->shoottype) 1841 player *pl = op->contr;
1842
1843 if (pl->golem)
1855 { 1844 {
1856 case range_none: 1845 control_golem (op->contr->golem, dir);
1857 return; 1846 return;
1847 }
1858 1848
1859 case range_bow: 1849 object *ob = pl->ranged_ob;
1850
1851 if (!ob)
1852 return;
1853
1854 if (!op->change_weapon (ob))
1855 return;
1856
1857 switch (ob->type)
1858 {
1859 case BOW:
1860 player_fire_bow (op, dir); 1860 player_fire_bow (op, dir);
1861 return; 1861 break;
1862 1862
1863 case range_magic: /* Casting spells */ 1863 case SPELL:
1864 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1864 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1865 return; 1865 break;
1866 1866
1867 case range_misc: 1867 case BUILDER:
1868 apply_map_builder (op, dir);
1869 break;
1870
1871 case SKILL:
1872 do_skill (op, op, ob, dir, 0);
1873 break;
1874
1875 default:
1868 fire_misc_object (op, dir); 1876 fire_misc_object (op, dir);
1869 return; 1877 break;
1870
1871 case range_golem: /* Control summoned monsters from scrolls */
1872 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1873 {
1874 op->contr->ranges[range_golem] = 0;
1875 op->contr->shoottype = range_none;
1876 }
1877 else
1878 control_golem (op->contr->ranges[range_golem], dir);
1879 return;
1880
1881 case range_skill:
1882 if (!op->chosen_skill)
1883 {
1884 if (op->type == PLAYER)
1885 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1886 return;
1887 }
1888 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1889 return;
1890 case range_builder:
1891 apply_map_builder (op, dir);
1892 return;
1893 default:
1894 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1895 return;
1896 } 1878 }
1897} 1879}
1898
1899
1900 1880
1901/* find_key 1881/* find_key
1902 * We try to find a key for the door as passed. If we find a key 1882 * We try to find a key for the door as passed. If we find a key
1903 * and successfully use it, we return the key, otherwise NULL 1883 * and successfully use it, we return the key, otherwise NULL
1904 * This function merges both normal and locked door, since the logic 1884 * This function merges both normal and locked door, since the logic
… …
1906 * pl is the player, 1886 * pl is the player,
1907 * inv is the objects inventory to searched 1887 * inv is the objects inventory to searched
1908 * door is the door we are trying to match against. 1888 * door is the door we are trying to match against.
1909 * This function can be called recursively to search containers. 1889 * This function can be called recursively to search containers.
1910 */ 1890 */
1911
1912object * 1891object *
1913find_key (object *pl, object *container, object *door) 1892find_key (object *pl, object *container, object *door)
1914{ 1893{
1915 object *tmp, *key; 1894 object *tmp, *key;
1916 1895
1917 /* Should not happen, but sanity checking is never bad */ 1896 /* Should not happen, but sanity checking is never bad */
1918 if (container->inv == NULL) 1897 if (!container->inv)
1919 return NULL; 1898 return 0;
1920 1899
1921 /* First, lets try to find a key in the top level inventory */ 1900 /* First, lets try to find a key in the top level inventory */
1922 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1901 for (tmp = container->inv; tmp; tmp = tmp->below)
1923 { 1902 {
1924 if (door->type == DOOR && tmp->type == KEY) 1903 if (door->type == DOOR && tmp->type == KEY)
1925 break; 1904 break;
1926 /* For sanity, we should really check door type, but other stuff 1905 /* For sanity, we should really check door type, but other stuff
1927 * (like containers) can be locked with special keys 1906 * (like containers) can be locked with special keys
1928 */ 1907 */
1929 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1908 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1930 break; 1909 break;
1931 } 1910 }
1911
1932 /* No key found - lets search inventories now */ 1912 /* No key found - lets search inventories now */
1933 /* If we find and use a key in an inventory, return at that time. 1913 /* If we find and use a key in an inventory, return at that time.
1934 * otherwise, if we search all the inventories and still don't find 1914 * otherwise, if we search all the inventories and still don't find
1935 * a key, return 1915 * a key, return
1936 */ 1916 */
1937 if (!tmp) 1917 if (!tmp)
1938 { 1918 {
1939 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1919 for (tmp = container->inv; tmp; tmp = tmp->below)
1940 { 1920 {
1941 /* No reason to search empty containers */ 1921 /* No reason to search empty containers */
1942 if (tmp->type == CONTAINER && tmp->inv) 1922 if (tmp->type == CONTAINER && tmp->inv)
1943 { 1923 {
1944 if ((key = find_key (pl, tmp, door)) != NULL) 1924 if ((key = find_key (pl, tmp, door)))
1945 return key; 1925 return key;
1946 } 1926 }
1947 } 1927 }
1928
1948 if (!tmp) 1929 if (!tmp)
1949 return NULL; 1930 return NULL;
1950 } 1931 }
1932
1951 /* We get down here if we have found a key. Now if its in a container, 1933 /* We get down here if we have found a key. Now if its in a container,
1952 * see if we actually want to use it 1934 * see if we actually want to use it
1953 */ 1935 */
1954 if (pl != container) 1936 if (pl != container)
1955 { 1937 {
… …
1976 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1958 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1977 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1959 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1978 return NULL; 1960 return NULL;
1979 } 1961 }
1980 } 1962 }
1963
1981 return tmp; 1964 return tmp;
1982} 1965}
1983 1966
1984/* moved door processing out of move_player_attack. 1967/* moved door processing out of move_player_attack.
1985 * returns 1 if player has opened the door with a key 1968 * returns 1 if player has opened the door with a key
… …
1999 if (key) 1982 if (key)
2000 { 1983 {
2001 object *container = key->env; 1984 object *container = key->env;
2002 1985
2003 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1986 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1987
2004 if (action_makes_visible (op)) 1988 if (action_makes_visible (op))
2005 make_visible (op); 1989 make_visible (op);
1990
2006 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1991 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2007 spring_trap (door->inv, op); 1992 spring_trap (door->inv, op);
1993
2008 if (door->type == DOOR) 1994 if (door->type == DOOR)
2009 {
2010 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1995 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2011 }
2012 else if (door->type == LOCKED_DOOR) 1996 else if (door->type == LOCKED_DOOR)
2013 { 1997 {
2014 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1998 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2015 remove_door2 (door); /* remove door without violence ;-) */ 1999 remove_door2 (door); /* remove door without violence ;-) */
2016 } 2000 }
2001
2017 /* Do this after we print the message */ 2002 /* Do this after we print the message */
2018 decrease_ob (key); /* Use up one of the keys */ 2003 decrease_ob (key); /* Use up one of the keys */
2019 /* Need to update the weight the container the key was in */ 2004 /* Need to update the weight the container the key was in */
2020 if (container != op) 2005 if (container != op)
2021 esrv_update_item (UPD_WEIGHT, op, container); 2006 esrv_update_item (UPD_WEIGHT, op, container);
2007
2022 return 1; /* Nothing more to do below */ 2008 return 1; /* Nothing more to do below */
2023 } 2009 }
2024 else if (door->type == LOCKED_DOOR) 2010 else if (door->type == LOCKED_DOOR)
2025 { 2011 {
2026 /* Might as well return now - no other way to open this */ 2012 /* Might as well return now - no other way to open this */
2027 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2013 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2028 return 1; 2014 return 1;
2029 } 2015 }
2016
2030 return 0; 2017 return 0;
2031} 2018}
2032 2019
2033/* This function is just part of a breakup from move_player. 2020/* This function is just part of a breakup from move_player.
2034 * It should keep the code cleaner. 2021 * It should keep the code cleaner.
… …
2038 */ 2025 */
2039void 2026void
2040move_player_attack (object *op, int dir) 2027move_player_attack (object *op, int dir)
2041{ 2028{
2042 object *tmp, *mon; 2029 object *tmp, *mon;
2043 sint16 nx, ny;
2044 int on_battleground; 2030 int on_battleground;
2045 maptile *m; 2031 maptile *m;
2046 2032
2047 nx = freearr_x[dir] + op->x; 2033 sint16 nx = freearr_x[dir] + op->x;
2048 ny = freearr_y[dir] + op->y; 2034 sint16 ny = freearr_y[dir] + op->y;
2049 2035
2050 on_battleground = op_on_battleground (op, 0, 0); 2036 on_battleground = op_on_battleground (op, 0, 0);
2051 2037
2052 /* If braced, or can't move to the square, and it is not out of the 2038 /* If braced, or can't move to the square, and it is not out of the
2053 * map, attack it. Note order of if statement is important - don't 2039 * map, attack it. Note order of if statement is important - don't
… …
2060 */ 2046 */
2061 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2047 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2062 { 2048 {
2063 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2049 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2064 { 2050 {
2065 m = get_map_from_coord (op->map, &nx, &ny); 2051 m = op->map->xy_find (nx, ny);
2066 if (!m) 2052 if (!m)
2067 return; /* Don't think this should happen */ 2053 return; /* Don't think this should happen */
2068 } 2054 }
2069 else 2055 else
2070 m = op->map; 2056 m = op->map;
2071 2057
2072 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL) 2058 if (!(tmp = m->at (nx, ny).bot))
2073 {
2074 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2075 return; 2059 return;
2076 }
2077 2060
2078 mon = 0; 2061 mon = 0;
2079 /* Go through all the objects, and find ones of interest. Only stop if 2062 /* Go through all the objects, and find ones of interest. Only stop if
2080 * we find a monster - that is something we know we want to attack. 2063 * we find a monster - that is something we know we want to attack.
2081 * if its a door or barrel (can roll) see if there may be monsters 2064 * if its a door or barrel (can roll) see if there may be monsters
… …
2134 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2117 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2135 { 2118 {
2136 /* If we're braced, we don't want to switch places with it */ 2119 /* If we're braced, we don't want to switch places with it */
2137 if (op->contr->braced) 2120 if (op->contr->braced)
2138 return; 2121 return;
2122
2139 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2123 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2140 (void) push_ob (mon, dir, op); 2124 push_ob (mon, dir, op);
2141 if (op->contr->tmp_invis || op->hide) 2125 if (op->contr->tmp_invis || op->hide)
2142 make_visible (op); 2126 make_visible (op);
2127
2143 return; 2128 return;
2144 } 2129 }
2145 2130
2146 /* in certain circumstances, you shouldn't attack friendly 2131 /* in certain circumstances, you shouldn't attack friendly
2147 * creatures. Note that if you are braced, you can't push 2132 * creatures. Note that if you are braced, you can't push
… …
2161 !on_battleground)) 2146 !on_battleground))
2162 { 2147 {
2163 if (!op->contr->braced) 2148 if (!op->contr->braced)
2164 { 2149 {
2165 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2150 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2166 (void) push_ob (mon, dir, op); 2151 push_ob (mon, dir, op);
2167 } 2152 }
2168 else 2153 else
2169 new_draw_info (0, 0, op, "You withhold your attack"); 2154 new_draw_info (0, 0, op, "You withhold your attack");
2170 2155
2171 if (op->contr->tmp_invis || op->hide) 2156 if (op->contr->tmp_invis || op->hide)
… …
2186 * Way it works is like this: First, it must have some hit points 2171 * Way it works is like this: First, it must have some hit points
2187 * and be living. Then, it must be one of the following: 2172 * and be living. Then, it must be one of the following:
2188 * 1) Not a player, 2) A player, but of a different party. Note 2173 * 1) Not a player, 2) A player, but of a different party. Note
2189 * that party_number -1 is no party, so attacks can still happen. 2174 * that party_number -1 is no party, so attacks can still happen.
2190 */ 2175 */
2191
2192 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2176 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2193 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2177 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2194 { 2178 {
2195
2196 /* If the player hasn't hit something this tick, and does
2197 * so, give them speed boost based on weapon speed. Doing
2198 * it here is better than process_players2, which basically
2199 * incurred a 1 tick offset.
2200 */
2201 if (!op->contr->has_hit) 2179 if (!op->contr->has_hit)
2202 { 2180 {
2181 op->contr->has_hit = 1;
2203 op->speed_left += op->speed / op->contr->weapon_sp; 2182 op->speed_left += op->contr->weapon_speed () - op->speed;
2204
2205 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2206 } 2183 }
2207 2184
2208 skill_attack (mon, op, 0, 0, 0); 2185 skill_attack (mon, op, 0, 0, 0);
2209 2186
2210 /* If attacking another player, that player gets automatic 2187 /* If attacking another player, that player gets automatic
… …
2230int 2207int
2231move_player (object *op, int dir) 2208move_player (object *op, int dir)
2232{ 2209{
2233 int pick; 2210 int pick;
2234 2211
2235 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2212 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2236 return 0; 2213 return 0;
2237 2214
2238 /* Sanity check: make sure dir is valid */ 2215 /* Sanity check: make sure dir is valid */
2239 if ((dir < 0) || (dir >= 9)) 2216 if ((dir < 0) || (dir >= 9))
2240 { 2217 {
2241 LOG (llevError, "move_player: invalid direction %d\n", dir); 2218 LOG (llevError, "move_player: invalid direction %d\n", dir);
2242 return 0; 2219 return 0;
2243 } 2220 }
2244 2221
2245 /* peterm: added following line */ 2222 /* peterm: added following line */
2246 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2223 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2247 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2224 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2248 2225
2249 op->facing = dir; 2226 op->facing = dir;
2250 2227
2251 if (op->hide) 2228 if (op->hide)
2252 do_hidden_move (op); 2229 do_hidden_move (op);
… …
2285 * Returns true if there are more actions we can do. 2262 * Returns true if there are more actions we can do.
2286 */ 2263 */
2287int 2264int
2288handle_newcs_player (object *op) 2265handle_newcs_player (object *op)
2289{ 2266{
2290 if (op->contr->hidden)
2291 {
2292 op->invisible = 1000;
2293 /* the socket code flashes the player visible/invisible
2294 * depending on the value of invisible, so we need to
2295 * alternate it here for it to work correctly.
2296 */
2297 if (pticks & 2)
2298 op->invisible--;
2299 }
2300 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2301 {
2302 op->invisible--;
2303 if (!op->invisible)
2304 {
2305 make_visible (op);
2306 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2307 }
2308 }
2309
2310 if (QUERY_FLAG (op, FLAG_SCARED)) 2267 if (QUERY_FLAG (op, FLAG_SCARED))
2311 { 2268 {
2312 flee_player (op); 2269 flee_player (op);
2270
2313 /* If player is still scared, that is his action for this tick */ 2271 /* If player is still scared, that is his action for this tick */
2314 if (QUERY_FLAG (op, FLAG_SCARED)) 2272 if (op->flag [FLAG_SCARED])
2315 { 2273 {
2316 op->speed_left--; 2274 --op->speed_left;
2317 return 0; 2275 return 0;
2318 } 2276 }
2319 } 2277 }
2320
2321 /* I've been seeing crashes where the golem has been destroyed, but
2322 * the player object still points to the defunct golem. The code that
2323 * destroys the golem looks correct, and it doesn't always happen, so
2324 * put this in a a workaround to clean up the golem pointer.
2325 */
2326 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2327 op->contr->ranges[range_golem] = 0;
2328 2278
2329 /* call this here - we also will call this in do_ericserver, but 2279 /* call this here - we also will call this in do_ericserver, but
2330 * the players time has been increased when doericserver has been 2280 * the players time has been increased when doericserver has been
2331 * called, so we recheck it here. 2281 * called, so we recheck it here.
2332 */ 2282 */
2333 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2283 if (op->contr->ns->handle_command ())
2334 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2335 ;
2336
2337 if (op->speed_left < 0)
2338 return 0; 2284 return 1;
2339 2285
2286 if (op->speed_left > 0.f)
2287 {
2340 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2288 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2341 { 2289 {
2342 /* All move commands take 1 tick, at least for now */ 2290 /* All move commands take 1 tick, at least for now */
2343 op->speed_left--; 2291 --op->speed_left;
2344 2292
2345 /* Instead of all the stuff below, let move_player take care 2293 /* Instead of all the stuff below, let move_player take care
2346 * of it. Also, some of the skill stuff is only put in 2294 * of it. Also, some of the skill stuff is only put in
2347 * there, as well as the confusion stuff. 2295 * there, as well as the confusion stuff.
2348 */ 2296 */
2349 move_player (op, op->direction); 2297 move_player (op, op->direction);
2350 if (op->speed_left > 0) 2298
2351 return 1; 2299 return op->speed_left > 0.f;
2352 else 2300 }
2353 return 0;
2354 } 2301 }
2355 2302
2356 return 0; 2303 return 0;
2357} 2304}
2358 2305
… …
2396 * from. 2343 * from.
2397 */ 2344 */
2398void 2345void
2399remove_unpaid_objects (object *op, object *env) 2346remove_unpaid_objects (object *op, object *env)
2400{ 2347{
2401 object *next;
2402
2403 while (op) 2348 while (op)
2404 { 2349 {
2405 next = op->below; /* Make sure we have a good value, in case 2350 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2406 * we remove object 'op' 2351
2407 */
2408 if (QUERY_FLAG (op, FLAG_UNPAID)) 2352 if (QUERY_FLAG (op, FLAG_UNPAID))
2409 { 2353 {
2410 op->remove ();
2411 op->x = env->x;
2412 op->y = env->y;
2413 if (env->type == PLAYER) 2354 if (env->type == PLAYER)
2414 esrv_del_item (env->contr, op->count); 2355 esrv_del_item (env->contr, op->count);
2415 insert_ob_in_map (op, env->map, NULL, 0); 2356
2357 op->insert_at (env);
2416 } 2358 }
2417 else if (op->inv) 2359 else if (op->inv)
2418 remove_unpaid_objects (op->inv, env); 2360 remove_unpaid_objects (op->inv, env);
2419 2361
2420 op = next; 2362 op = next;
… …
2476 int rate_grace = 2000; 2418 int rate_grace = 2000;
2477 const int max_hp = 1; 2419 const int max_hp = 1;
2478 const int max_sp = 1; 2420 const int max_sp = 1;
2479 const int max_grace = 1; 2421 const int max_grace = 1;
2480 2422
2481 if (op->contr->outputs_sync) 2423 if (op->contr->hidden)
2424 {
2425 op->invisible = 1000;
2426 /* the socket code flashes the player visible/invisible
2427 * depending on the value of invisible, so we need to
2428 * alternate it here for it to work correctly.
2429 */
2430 if (pticks & 2)
2431 op->invisible--;
2482 { 2432 }
2483 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2433 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2484 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2434 {
2485 flush_output_element (op, &op->contr->outputs[i]); 2435 if (!op->invisible--)
2436 {
2437 make_visible (op);
2438 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2439 }
2486 } 2440 }
2487 2441
2488 if (op->contr->ns->state == ST_PLAYING) 2442 if (op->contr->ns->state == ST_PLAYING)
2489 { 2443 {
2490 /* these next three if clauses make it possible to SLOW DOWN 2444 /* these next three if clauses make it possible to SLOW DOWN
… …
2512 gen_grace = op->stats.maxgrace; 2466 gen_grace = op->stats.maxgrace;
2513 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2467 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2514 } 2468 }
2515 2469
2516 /* Regenerate Spell Points */ 2470 /* Regenerate Spell Points */
2517 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2471 if (!op->contr->golem && --op->last_sp < 0)
2518 { 2472 {
2519 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2473 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2520 if (op->stats.sp < op->stats.maxsp) 2474 if (op->stats.sp < op->stats.maxsp)
2521 { 2475 {
2522 op->stats.sp++; 2476 op->stats.sp++;
… …
2713 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2667 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2714 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2668 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2715 2669
2716 /* restore player */ 2670 /* restore player */
2717 at = archetype::find ("poisoning"); 2671 at = archetype::find ("poisoning");
2718 tmp = present_arch_in_ob (at, op); 2672 if (object *tmp = present_arch_in_ob (at, op))
2719 if (tmp)
2720 { 2673 {
2721 tmp->destroy (); 2674 tmp->destroy ();
2722 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2675 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2723 } 2676 }
2724 2677
2725 at = archetype::find ("confusion"); 2678 at = archetype::find ("confusion");
2726 tmp = present_arch_in_ob (at, op); 2679 if (object *tmp = present_arch_in_ob (at, op))
2727 if (tmp)
2728 { 2680 {
2729 tmp->destroy (); 2681 tmp->destroy ();
2730 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2682 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2731 } 2683 }
2732 2684
… …
2734 op->stats.hp = op->stats.maxhp; 2686 op->stats.hp = op->stats.maxhp;
2735 if (op->stats.food <= 0) 2687 if (op->stats.food <= 0)
2736 op->stats.food = 999; 2688 op->stats.food = 999;
2737 2689
2738 /* create a bodypart-trophy to make the winner happy */ 2690 /* create a bodypart-trophy to make the winner happy */
2739 tmp = arch_to_object (archetype::find ("finger")); 2691 if (object *tmp = arch_to_object (archetype::find ("finger")))
2740 if (tmp != NULL)
2741 { 2692 {
2742 sprintf (buf, "%s's finger", &op->name); 2693 sprintf (buf, "%s's finger", &op->name);
2743 tmp->name = buf; 2694 tmp->name = buf;
2744 sprintf (buf, " This finger has been cut off %s\n" 2695 sprintf (buf, " This finger has been cut off %s\n"
2745 " the %s, when he was defeated at\n level %d by %s.\n", 2696 " the %s, when he was defeated at\n level %d by %s.\n",
2746 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2697 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2747 tmp->msg = buf; 2698 tmp->msg = buf;
2748 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2699 tmp->value = 0, tmp->type = 0;
2749 tmp->materialname = NULL; 2700 tmp->materialname = "organics";
2750 tmp->x = op->x, tmp->y = op->y; 2701 tmp->insert_at (op, tmp);
2751 insert_ob_in_map (tmp, op->map, op, 0);
2752 } 2702 }
2753 2703
2754 /* teleport defeated player to new destination */ 2704 /* teleport defeated player to new destination */
2755 transfer_ob (op, x, y, 0, NULL); 2705 transfer_ob (op, x, y, 0, NULL);
2756 op->contr->braced = 0; 2706 op->contr->braced = 0;
… …
2761 2711
2762 command_kill_pets (op, 0); 2712 command_kill_pets (op, 0);
2763 2713
2764 if (op->stats.food < 0) 2714 if (op->stats.food < 0)
2765 { 2715 {
2766 if (op->contr->explore)
2767 {
2768 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2769 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2770 op->stats.food = 999;
2771 return;
2772 }
2773 sprintf (buf, "%s starved to death.", &op->name); 2716 sprintf (buf, "%s starved to death.", &op->name);
2774 strcpy (op->contr->killer, "starvation"); 2717 strcpy (op->contr->killer, "starvation");
2775 } 2718 }
2776 else 2719 else
2777 {
2778 if (op->contr->explore)
2779 {
2780 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2781 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2782 op->stats.hp = op->stats.maxhp;
2783 return;
2784 }
2785 sprintf (buf, "%s died.", &op->name); 2720 sprintf (buf, "%s died.", &op->name);
2786 } 2721
2787 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2722 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2788 2723
2789 /* save the map location for corpse, gravestone */ 2724 /* save the map location for corpse, gravestone */
2790 x = op->x; 2725 x = op->x;
2791 y = op->y; 2726 y = op->y;
2792 map = op->map; 2727 map = op->map;
2793
2794 2728
2795 /* NOT_PERMADEATH code. This basically brings the character back to 2729 /* NOT_PERMADEATH code. This basically brings the character back to
2796 * life if they are dead - it takes some exp and a random stat. 2730 * life if they are dead - it takes some exp and a random stat.
2797 * See the config.h file for a little more in depth detail about this. 2731 * See the config.h file for a little more in depth detail about this.
2798 */ 2732 */
… …
2815 num_stats_lose = 1; 2749 num_stats_lose = 1;
2816 else 2750 else
2817 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2751 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2818 } 2752 }
2819 else 2753 else
2820 {
2821 num_stats_lose = 1; 2754 num_stats_lose = 1;
2822 } 2755
2823 lost_a_stat = 0; 2756 lost_a_stat = 0;
2824 2757
2825 for (z = 0; z < num_stats_lose; z++) 2758 for (z = 0; z < num_stats_lose; z++)
2826 { 2759 {
2827 i = RANDOM () % NUM_STATS; 2760 i = RANDOM () % NUM_STATS;
… …
2968 op->stats.hp = op->stats.maxhp; 2901 op->stats.hp = op->stats.maxhp;
2969 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2902 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2970 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2903 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2971 2904
2972 /* 2905 /*
2973 * Check to see if the player is in a shop. IF so, then check to see if
2974 * the player has any unpaid items. If so, remove them and put them back 2906 * Check to see if the player has any unpaid items. If so, remove them
2975 * in the map. 2907 * and put them back in the map.
2976 */ 2908 */
2977
2978 if (is_in_shop (op))
2979 remove_unpaid_objects (op->inv, op); 2909 remove_unpaid_objects (op->inv, op);
2980 2910
2981 /****************************************/ 2911 /****************************************/
2982 /* */ 2912 /* */
2983 /* Move player to his current respawn- */ 2913 /* Move player to his current respawn- */
2984 /* position (usually last savebed) */ 2914 /* position (usually last savebed) */
2985 /* */ 2915 /* */
2986 /****************************************/ 2916 /****************************************/
2987 2917
2988 enter_player_savebed (op); 2918 enter_player_savebed (op);
2989 2919
2990 /* Save the player before inserting the force to reduce
2991 * chance of abuse.
2992 */
2993 op->contr->braced = 0; 2920 op->contr->braced = 0;
2994 op->contr->save ();
2995 2921
2996 /* it is possible that the player has blown something up 2922 /* it is possible that the player has blown something up
2997 * at his savebed location, and that can have long lasting 2923 * at his savebed location, and that can have long lasting
2998 * spell effects. So first see if there is a spell effect 2924 * spell effects. So first see if there is a spell effect
2999 * on the space that might harm the player. 2925 * on the space that might harm the player.
… …
3008 object *force; 2934 object *force;
3009 int at; 2935 int at;
3010 2936
3011 force = get_archetype (FORCE_NAME); 2937 force = get_archetype (FORCE_NAME);
3012 /* 50 ticks should be enough time for the spell to abate */ 2938 /* 50 ticks should be enough time for the spell to abate */
3013 force->speed = 0.1; 2939 force->speed = 0.1f;
3014 force->speed_left = -5.0; 2940 force->speed_left = -5.f;
3015 SET_FLAG (force, FLAG_APPLIED); 2941 SET_FLAG (force, FLAG_APPLIED);
3016 for (at = 0; at < NROFATTACKS; at++) 2942 for (at = 0; at < NROFATTACKS; at++)
3017 if (will_kill_again & (1 << at)) 2943 if (will_kill_again & (1 << at))
3018 force->resist[at] = 100; 2944 force->resist[at] = 100;
3019 2945
… …
3028void 2954void
3029loot_object (object *op) 2955loot_object (object *op)
3030{ /* Grab and destroy some treasure */ 2956{ /* Grab and destroy some treasure */
3031 object *tmp, *tmp2, *next; 2957 object *tmp, *tmp2, *next;
3032 2958
3033 if (op->container) 2959 op->close_container (); /* close open sack first */
3034 esrv_apply_container (op, op->container); /* close open sack first */
3035 2960
3036 for (tmp = op->inv; tmp; tmp = next) 2961 for (tmp = op->inv; tmp; tmp = next)
3037 { 2962 {
3038 next = tmp->below; 2963 next = tmp->below;
3039 2964
3040 if (tmp->invisible) 2965 if (tmp->invisible)
3041 continue; 2966 continue;
3042 2967
3043 tmp->remove (); 2968 tmp->remove ();
3044 tmp->x = op->x, tmp->y = op->y; 2969 tmp->x = op->x, tmp->y = op->y;
2970
3045 if (tmp->type == CONTAINER) 2971 if (tmp->type == CONTAINER)
3046 { /* empty container to ground */ 2972 loot_object (tmp); /* empty container to ground */
3047 loot_object (tmp); 2973
3048 }
3049 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2974 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3050 { 2975 {
3051 if (tmp->nrof > 1) 2976 if (tmp->nrof > 1)
3052 { 2977 {
3053 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2978 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3054 tmp2->destroy (); 2979 tmp2->destroy ();
… …
3065/* 2990/*
3066 * fix_weight(): Check recursively the weight of all players, and fix 2991 * fix_weight(): Check recursively the weight of all players, and fix
3067 * what needs to be fixed. Refresh windows and fix speed if anything 2992 * what needs to be fixed. Refresh windows and fix speed if anything
3068 * was changed. 2993 * was changed.
3069 */ 2994 */
3070
3071void 2995void
3072fix_weight (void) 2996fix_weight (void)
3073{ 2997{
3074 for (player *pl = first_player; pl; pl = pl->next) 2998 for_all_players (pl)
3075 { 2999 {
3076 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 3000 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3077 3001
3078 if (old == sum) 3002 if (old == sum)
3079 continue; 3003 continue;
… …
3083} 3007}
3084 3008
3085void 3009void
3086fix_luck (void) 3010fix_luck (void)
3087{ 3011{
3088 for (player *pl = first_player; pl; pl = pl->next) 3012 for_all_players (pl)
3089 if (!pl->ob->contr->ns->state) 3013 if (!pl->ob->contr->ns->state)
3090 pl->ob->change_luck (0); 3014 pl->ob->change_luck (0);
3091} 3015}
3092 3016
3093/* cast_dust() - handles op throwing objects of type 'DUST'. 3017/* cast_dust() - handles op throwing objects of type 'DUST'.
… …
3135 if (op->type == PLAYER) 3059 if (op->type == PLAYER)
3136 { 3060 {
3137 op->contr->tmp_invis = 0; 3061 op->contr->tmp_invis = 0;
3138 op->contr->invis_race = 0; 3062 op->contr->invis_race = 0;
3139 } 3063 }
3064
3140 update_object (op, UP_OBJ_FACE); 3065 update_object (op, UP_OBJ_CHANGE);
3141} 3066}
3142 3067
3143int 3068int
3144is_true_undead (object *op) 3069is_true_undead (object *op)
3145{ 3070{
3146 object *tmp = NULL;
3147
3148 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3071 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3149 return 1; 3072 return 1;
3150 3073
3151 return 0; 3074 return 0;
3152} 3075}
… …
3211 3134
3212 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3135 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3213 3136
3214 /* its *extremely* hard to run and sneak/hide at the same time! */ 3137 /* its *extremely* hard to run and sneak/hide at the same time! */
3215 if (op->type == PLAYER && op->contr->run_on) 3138 if (op->type == PLAYER && op->contr->run_on)
3216 {
3217 if (!skop || num >= skop->level) 3139 if (!skop || num >= skop->level)
3218 { 3140 {
3219 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3141 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3220 make_visible (op); 3142 make_visible (op);
3221 return; 3143 return;
3222 } 3144 }
3223 else 3145 else
3224 num += 20; 3146 num += 20;
3225 } 3147
3226 num += op->map->difficulty; 3148 num += op->map->difficulty;
3227 hide = hideability (op); /* modify by terrain hidden level */ 3149 hide = hideability (op); /* modify by terrain hidden level */
3228 num -= hide; 3150 num -= hide;
3151
3229 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3152 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3230 { 3153 {
3231 make_visible (op); 3154 make_visible (op);
3232 if (op->type == PLAYER) 3155 if (op->type == PLAYER)
3233 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3156 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3234 } 3157 }
3235 else if (op->type == PLAYER && skop) 3158 else if (op->type == PLAYER && skop)
3236 {
3237 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3159 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3238 }
3239} 3160}
3240 3161
3241/* determine if who is standing near a hostile creature. */ 3162/* determine if who is standing near a hostile creature. */
3242 3163
3243int 3164int
… …
3310 if (pl->type != PLAYER) 3231 if (pl->type != PLAYER)
3311 { 3232 {
3312 LOG (llevError, "player_can_view() called for non-player object\n"); 3233 LOG (llevError, "player_can_view() called for non-player object\n");
3313 return -1; 3234 return -1;
3314 } 3235 }
3236
3315 if (!pl || !op) 3237 if (!pl || !op)
3316 return 0; 3238 return 0;
3317 3239
3318 if (op->head)
3319 {
3320 op = op->head; 3240 op = op->head_ ();
3321 } 3241
3322 get_rangevector (pl, op, &rv, 0x1); 3242 get_rangevector (pl, op, &rv, 0x1);
3323 3243
3324 /* starting with the 'head' part, lets loop 3244 /* starting with the 'head' part, lets loop
3325 * through the object and find if it has any 3245 * through the object and find if it has any
3326 * part that is in the los array but isnt on 3246 * part that is in the los array but isnt on
… …
3443 char buf[MAX_BUF]; /* tmp. string buffer */ 3363 char buf[MAX_BUF]; /* tmp. string buffer */
3444 int i = 0, j = 0; 3364 int i = 0, j = 0;
3445 3365
3446 /* get the appropriate treasurelist */ 3366 /* get the appropriate treasurelist */
3447 if (atnr == ATNR_FIRE) 3367 if (atnr == ATNR_FIRE)
3448 trlist = find_treasurelist ("dragon_ability_fire"); 3368 trlist = treasurelist::find ("dragon_ability_fire");
3449 else if (atnr == ATNR_COLD) 3369 else if (atnr == ATNR_COLD)
3450 trlist = find_treasurelist ("dragon_ability_cold"); 3370 trlist = treasurelist::find ("dragon_ability_cold");
3451 else if (atnr == ATNR_ELECTRICITY) 3371 else if (atnr == ATNR_ELECTRICITY)
3452 trlist = find_treasurelist ("dragon_ability_elec"); 3372 trlist = treasurelist::find ("dragon_ability_elec");
3453 else if (atnr == ATNR_POISON) 3373 else if (atnr == ATNR_POISON)
3454 trlist = find_treasurelist ("dragon_ability_poison"); 3374 trlist = treasurelist::find ("dragon_ability_poison");
3455 3375
3456 if (trlist == NULL || who->type != PLAYER) 3376 if (trlist == NULL || who->type != PLAYER)
3457 return; 3377 return;
3458 3378
3459 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3379 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3460 3380
3461 if (tr == NULL || tr->item == NULL) 3381 if (!tr || !tr->item)
3462 { 3382 {
3463 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3383 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3464 return; 3384 return;
3465 } 3385 }
3466 3386
… …
3591 * not readied. 3511 * not readied.
3592 */ 3512 */
3593void 3513void
3594player_unready_range_ob (player *pl, object *ob) 3514player_unready_range_ob (player *pl, object *ob)
3595{ 3515{
3596 rangetype i; 3516 if (pl->ob->current_weapon == ob)
3517 pl->ob->current_weapon = 0;
3597 3518
3598 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3519 if (pl->combat_ob == ob)
3599 { 3520 pl->combat_ob = 0;
3521
3600 if (pl->ranges[i] == ob) 3522 if (pl->ranged_ob == ob)
3601 { 3523 pl->ranged_ob = 0;
3602 pl->ranges[i] = NULL;
3603 if (pl->shoottype == i)
3604 {
3605 pl->shoottype = range_none;
3606 }
3607 }
3608 }
3609} 3524}
3525
3526sint8
3527player::visibility_at (maptile *map, int x, int y) const
3528{
3529 if (!ns)
3530 return 0;
3531
3532 int dx, dy;
3533 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3534 return 0;
3535
3536 x += dx - ns->current_x + ns->mapx / 2;
3537 y += dy - ns->current_y + ns->mapy / 2;
3538
3539 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3540 return 0;
3541
3542 return 100 - blocked_los [x][y];
3543}

Diff Legend

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