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.57 by root, Sat Dec 23 06:21:02 2006 UTC vs.
Revision 1.133 by root, Sat May 12 22:04:20 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);
159} 150}
160 151
161/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
162static void 153static void
163set_first_map (object *op) 154set_first_map (object *op)
164{ 155{
165 strcpy (op->contr->maplevel, first_map_path); 156 op->contr->maplevel = first_map_path;
166 op->x = -1; 157 op->x = -1;
167 op->y = -1; 158 op->y = -1;
159}
160
161void
162player::enter_map ()
163{
164 object *tmp = object::create ();
165
166 EXIT_PATH (tmp) = maplevel;
167 EXIT_X (tmp) = ob->x;
168 EXIT_Y (tmp) = ob->y;
168 enter_exit (op, 0); 169 ob->enter_exit (tmp);
170
171 tmp->destroy ();
172}
173
174void
175player::activate ()
176{
177 if (active)
178 return;
179
180 players.insert (this);
181 ob->remove ();
182 ob->map = 0;
183 ob->activate_recursive ();
184 CLEAR_FLAG (ob, FLAG_FRIENDLY);
185 add_friendly_object (ob);
186 enter_map ();
187}
188
189void
190player::deactivate ()
191{
192 if (!active)
193 return;
194
195 terminate_all_pets (ob);
196 remove_friendly_object (ob);
197 ob->deactivate_recursive ();
198
199 if (ob->map)
200 maplevel = ob->map->path;
201
202 ob->remove ();
203 ob->map = 0;
204 party = 0;
205
206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
207
208 players.erase (this);
169} 209}
170 210
171// connect the player with a specific client 211// connect the player with a specific client
172// also changed, rationalises, and fixes some incorrect settings 212// also changes, rationalises, and fixes some incorrect settings
173void 213void
174player::connect (client *ns) 214player::connect (client *ns)
175{ 215{
176 this->ns = ns; 216 this->ns = ns;
177 ns->pl = this; 217 ns->pl = this;
178 218
179 next = first_player; 219 run_on = 0;
180 first_player = this; 220 fire_on = 0;
221 ob->close_container (); //TODO: client-specific
181 222
182 ns->update_look = 0; 223 ns->update_look = 0;
183 ns->look_position = 0; 224 ns->look_position = 0;
184 225
185 clear_los (ob); 226 clear_los (ob);
227
228 ns->reset_stats ();
186 229
187 /* make sure he's a player -- needed because of class change. */ 230 /* make sure he's a player -- needed because of class change. */
188 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
189 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
190 233
191 if (!legal_range (ob, shoottype))
192 shoottype = range_none;
193
194 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
195 link_player_skills (ob); 235 link_player_skills (ob);
196 236
197 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
198 ob->update_stats ();
199 update_ob_speed (ob);
200 238
201 assign (title, ob->arch->clone.name); 239 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 240
213 /* if it's a dragon player, set the correct title here */ 241 /* if it's a dragon player, set the correct title here */
214 if (is_dragon_pl (ob)) 242 if (is_dragon_pl (ob))
215 { 243 {
216 object *tmp, *abil = 0, *skin = 0; 244 object *tmp, *abil = 0, *skin = 0;
… …
226 skin = tmp; 254 skin = tmp;
227 255
228 set_dragon_name (ob, abil, skin); 256 set_dragon_name (ob, abil, skin);
229 } 257 }
230 258
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!"); 259 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 260
261 esrv_new_player (this, ob->weight + ob->carrying);
262
263 for (object *op = ob->inv; op; op = op->below)
264 if (op->flag [FLAG_APPLIED])
265 switch (op->type)
266 {
267 case WAND:
268 case ROD:
269 case HORN:
270 case BOW:
271 case SKILL:
272 case SKILL_TOOL:
273 case WEAPON:
274 apply_special (ob, op, AP_UNAPPLY);
275 apply_special (ob, op, AP_APPLY);
276 break;
277 }
278
279 ob->update_stats ();
239 ns->floorbox_update (); 280 ns->floorbox_update ();
240 281
241 esrv_new_player (this, ob->weight + ob->carrying);
242 esrv_send_inventory (ob, ob); 282 esrv_send_inventory (ob, ob);
243 esrv_add_spells (this, 0); 283 esrv_add_spells (this, 0);
244 284
245 enter_exit (ob, 0); 285 activate ();
246 286
247// send_rules (ob);//TODO 287 send_rules (ob);
248// send_news (ob);//TODO 288 send_news (ob);
249// display_motd (ob);//TODO 289 display_motd (ob);
290
291 INVOKE_PLAYER (CONNECT, this);
250 INVOKE_PLAYER (LOGIN, this); 292 INVOKE_PLAYER (LOGIN, this);
293}
294
295void
296player::disconnect ()
297{
298 if (ns)
299 {
300 if (active)
301 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303 INVOKE_PLAYER (DISCONNECT, this);
304
305 ns->reset_stats ();
306 ns->pl = 0;
307 ns = 0;
308 }
309
310 if (ob)
311 ob->close_container (); //TODO: client-specific
312
313 deactivate ();
251} 314}
252 315
253// the need for this function can be explained 316// the need for this function can be explained
254// by load_object not returning the object 317// by load_object not returning the object
255void 318void
256player::set_object (object *op) 319player::set_object (object *op)
257{ 320{
258 ob = op; 321 ob = op;
259 ob->contr = this; /* this aren't yet in archetype */ 322 ob->contr = this; /* this aren't yet in archetype */
260 323
261 ob->speed_left = 0.5; 324 ob->speed_left = 0.5f;
262 ob->speed = 1.0; 325 ob->speed = 1.0f;
263 ob->direction = 5; /* So player faces south */ 326 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} 327}
271 328
272player::player () 329player::player ()
273{ 330{
274 /* There are some elements we want initialized to non zero value - 331 /* There are some elements we want initialised to non zero value -
275 * we deal with that below this point. 332 * we deal with that below this point.
276 */ 333 */
277 outputs_sync = 16; /* Every 2 seconds */ 334 outputs_sync = 4;
278 outputs_count = 8; /* Keeps present behaviour */ 335 outputs_count = 4;
279 unapply = unapply_nochoice; 336 unapply = unapply_nochoice;
280 337
281 assign (savebed_map, first_map_path); /* Init. respawn position */ 338 savebed_map = first_map_path; /* Init. respawn position */
282 339
283 gen_sp_armour = 10; 340 gen_sp_armour = 10;
284 last_speed = -1;
285 shoottype = range_none;
286 bowtype = bow_normal; 341 bowtype = bow_normal;
287 petmode = pet_normal; 342 petmode = pet_normal;
288 listening = 10; 343 listening = 10;
289 usekeys = containers; 344 usekeys = containers;
290 last_weapon_sp = -1;
291 peaceful = 1; /* default peaceful */ 345 peaceful = 1; /* default peaceful */
292 do_los = 1; 346 do_los = 1;
347}
293 348
294 /* we need to clear these to -1 and not zero - otherwise, 349void
295 * if a player quits and starts a new character, we wont 350player::do_destroy ()
296 * send new values to the client, as things like exp start 351{
297 * at zero. 352 disconnect ();
298 */
299 for (int i = 0; i < NUM_SKILLS; i++)
300 last_skill_exp[i] = -1;
301 353
302 for (int i = 0; i < NROFATTACKS; i++) 354 attachable::do_destroy ();
303 last_resist[i] = -1;
304 355
305 last_stats.exp = -1; 356 if (ob)
306 last_weight = (uint32) - 1; 357 {
358 ob->destroy_inv (false);
359 ob->destroy ();
360 }
307} 361}
308 362
309player::~player () 363player::~player ()
310{ 364{
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 */ 365 /* Clear item stack */
346 free (stack_items); 366 free (stack_items);
347} 367}
348 368
349/* Tries to add player on the connection passed in ns. 369/* Tries to add player on the connection passed in ns.
… …
354player::create () 374player::create ()
355{ 375{
356 player *pl = new player; 376 player *pl = new player;
357 377
358 pl->set_object (arch_to_object (get_player_archetype (0))); 378 pl->set_object (arch_to_object (get_player_archetype (0)));
379
380 pl->ob->roll_stats ();
381 pl->ob->stats.wc = 2;
382 pl->ob->run_away = 25; /* Then we panick... */
383
384 set_first_map (pl->ob);
359 385
360 return pl; 386 return pl;
361} 387}
362 388
363/* 389/*
… …
390 416
391object * 417object *
392get_nearest_player (object *mon) 418get_nearest_player (object *mon)
393{ 419{
394 object *op = NULL; 420 object *op = NULL;
395 player *pl = NULL;
396 objectlink *ol; 421 objectlink *ol;
397 unsigned lastdist; 422 unsigned lastdist;
398 rv_vector rv; 423 rv_vector rv;
399 424
400 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
401 { 426 {
402 /* We should not find free objects on this friendly list, but it 427 /* We should not find free objects on this friendly list, but it
403 * does periodically happen. Given that, lets deal with it. 428 * does periodically happen. Given that, lets deal with it.
404 * While unlikely, it is possible the next object on the friendly 429 * While unlikely, it is possible the next object on the friendly
405 * list is also free, so encapsulate this in a while loop. 430 * list is also free, so encapsulate this in a while loop.
… …
409 object *tmp = ol->ob; 434 object *tmp = ol->ob;
410 435
411 /* Can't do much more other than log the fact, because the object 436 /* Can't do much more other than log the fact, because the object
412 * itself will have been cleared. 437 * itself will have been cleared.
413 */ 438 */
414 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 439 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440 tmp->debug_desc ());
415 ol = ol->next; 441 ol = ol->next;
416 remove_friendly_object (tmp); 442 remove_friendly_object (tmp);
417 if (!ol) 443 if (!ol)
418 return op; 444 return op;
419 } 445 }
… …
432 { 458 {
433 op = ol->ob; 459 op = ol->ob;
434 lastdist = rv.distance; 460 lastdist = rv.distance;
435 } 461 }
436 } 462 }
437 for (pl = first_player; pl != NULL; pl = pl->next) 463
438 { 464 for_all_players (pl)
439 if (can_detect_enemy (mon, pl->ob, &rv)) 465 if (can_detect_enemy (mon, pl->ob, &rv))
440 {
441
442 if (lastdist > rv.distance) 466 if (lastdist > rv.distance)
443 { 467 {
444 op = pl->ob; 468 op = pl->ob;
445 lastdist = rv.distance; 469 lastdist = rv.distance;
446 } 470 }
447 } 471
448 }
449#if 0 472#if 0
450 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 473 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
451#endif 474#endif
452 return op; 475 return op;
453} 476}
… …
511 x = mon->x; 534 x = mon->x;
512 y = mon->y; 535 y = mon->y;
513 m = mon->map; 536 m = mon->map;
514 dir = rv.direction; 537 dir = rv.direction;
515 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 538 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); 539 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
540
517 /* If we can't solve it within the search distance, return now. */ 541 /* If we can't solve it within the search distance, return now. */
518 if (diff > max) 542 if (diff > max)
519 return 0; 543 return 0;
544
520 while (diff > 1 && max > 0) 545 while (diff > 1 && max > 0)
521 { 546 {
522 lastx = x; 547 lastx = x;
523 lasty = y; 548 lasty = y;
524 lastmap = m; 549 lastmap = m;
… …
606 max--; 631 max--;
607 lastdir = dir; 632 lastdir = dir;
608 if (!firstdir) 633 if (!firstdir)
609 firstdir = dir; 634 firstdir = dir;
610 } 635 }
636
611 if (diff <= 1) 637 if (diff <= 1)
612 { 638 {
613 /* Recalculate diff (distance) because we may not have actually 639 /* Recalculate diff (distance) because we may not have actually
614 * headed toward player for entire distance. 640 * headed toward player for entire distance.
615 */ 641 */
616 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 642 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); 643 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
618 } 644 }
645
619 if (diff > max) 646 if (diff > max)
620 return 0; 647 return 0;
621 } 648 }
649
622 /* If we reached the max, didn't find a direction in time */ 650 /* If we reached the max, didn't find a direction in time */
623 if (!max) 651 if (!max)
624 return 0; 652 return 0;
625 653
626 return firstdir; 654 return firstdir;
… …
740roll_stat (void) 768roll_stat (void)
741{ 769{
742 int a[4], i, j, k; 770 int a[4], i, j, k;
743 771
744 for (i = 0; i < 4; i++) 772 for (i = 0; i < 4; i++)
745 a[i] = (int) RANDOM () % 6 + 1; 773 a[i] = (int) rndm (6) + 1;
746 774
747 for (i = 0, j = 0, k = 7; i < 4; i++) 775 for (i = 0, j = 0, k = 7; i < 4; i++)
748 if (a[i] < k) 776 if (a[i] < k)
749 k = a[i], j = i; 777 k = a[i], j = i;
750 778
… …
756} 784}
757 785
758void 786void
759object::roll_stats () 787object::roll_stats ()
760{ 788{
761 int statsort [7]; 789 int statsort [NUM_STATS];
762 790
763 for (;;) 791 for (;;)
764 { 792 {
765 int sum = 0; 793 int sum = 0;
766 for (int i = 7; i--; ) 794 for (int i = NUM_STATS; i--; )
767 sum += statsort [i] = roll_stat (); 795 sum += statsort [i] = roll_stat ();
768 796
769 if (sum >= 82 && sum <= 116) 797 if (sum >= 82 && sum <= 116)
770 break; 798 break;
771 } 799 }
772 800
773 // Sort the stats so that rerolling is easier... 801 // Sort the stats so that rerolling is easier...
774 std::sort (statsort, statsort + 7, std::greater<int>()); 802 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
775 803
804 for (int i = 0; i < NUM_STATS; ++i)
776 stats.Str = statsort[0]; 805 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 806
784 stats.exp = 0; 807 stats.exp = 0;
785 stats.ac = 0; 808 stats.ac = 0;
786 809
787 stats.hp = stats.maxhp; 810 stats.hp = stats.maxhp;
… …
799} 822}
800 823
801void 824void
802object::swap_stats (int a, int b) 825object::swap_stats (int a, int b)
803{ 826{
804 int tmp = get_attr_value (&contr->orig_stats, a); 827 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 828
829 for (int i = 0; i < NUM_STATS; ++i)
808 stats.Str = contr->orig_stats.Str; 830 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 831
816 //TODO: the following code looks so borked and should, at the very least, 832 //TODO: the following code looks so borked and should, at the very least,
817 // be merged with the similar code in roll_stats 833 // be merged with the similar code in roll_stats
818 stats.ac = 0; 834 stats.ac = 0;
819 835
… …
831 contr->levsp[1] = 6; 847 contr->levsp[1] = 6;
832 contr->levgrace[1] = 3; 848 contr->levgrace[1] = 3;
833 849
834 contr->orig_stats = stats; 850 contr->orig_stats = stats;
835 } 851 }
852}
853
854static void
855start_info (object *op)
856{
857 char buf[MAX_BUF];
858
859 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
860 new_draw_info (NDI_UNIQUE, 0, op, buf);
861 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
862 //new_draw_info (NDI_UNIQUE, 0, op, " ");
836} 863}
837 864
838/* This function takes the key that is passed, and does the 865/* This function takes the key that is passed, and does the
839 * appropriate action with it (change race, or other things). 866 * appropriate action with it (change race, or other things).
840 * The function name is for historical reasons - now we have 867 * The function name is for historical reasons - now we have
841 * separate race and class; this actually changes the RACE, 868 * separate race and class; this actually changes the RACE,
842 * not the class. 869 * not the class.
843 */ 870 */
844int 871void
845key_change_class (object *op, char key) 872player::chargen_race_done ()
846{ 873{
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 */ 874 /* this must before then initial items are given */
854 esrv_new_player (op->contr, op->weight + op->carrying); 875 esrv_new_player (ob->contr, ob->weight + ob->carrying);
855 876
856 treasurelist *tl = find_treasurelist ("starting_wealth"); 877 treasurelist *tl = treasurelist::find ("starting_wealth");
857 if (tl) 878 if (tl)
858 create_treasure (tl, op, 0, 0, 0); 879 create_treasure (tl, ob, 0, 0, 0);
859 880
860 INVOKE_PLAYER (BIRTH, op->contr); 881 INVOKE_PLAYER (BIRTH, ob->contr);
861 INVOKE_PLAYER (LOGIN, op->contr); 882 INVOKE_PLAYER (LOGIN, ob->contr);
862 883
863 op->contr->ns->state = ST_PLAYING; 884 ob->contr->ns->state = ST_PLAYING;
864 885
865 if (op->msg) 886 if (ob->msg)
866 op->msg = NULL; 887 ob->msg = 0;
867 888
868 /* We create this now because some of the unique maps will need it 889 /* We create this now because some of the unique maps will need it
869 * to save here. 890 * to save here.
870 */ 891 */
892 {
893 char buf[MAX_BUF];
871 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
872 make_path_to_file (buf); 895 make_path_to_file (buf);
896 }
873 897
874#ifdef AUTOSAVE
875 op->contr->last_save_tick = pticks;
876#endif
877 start_info (op); 898 start_info (ob);
878 CLEAR_FLAG (op, FLAG_WIZ); 899 CLEAR_FLAG (ob, FLAG_WIZ);
879 give_initial_items (op, op->randomitems); 900 give_initial_items (ob, ob->randomitems);
880 link_player_skills (op); 901 link_player_skills (ob);
881 esrv_send_inventory (op, op); 902 esrv_send_inventory (ob, ob);
882 op->update_stats (); 903 ob->update_stats ();
883 904
884 /* This moves the player to a different start map, if there 905 /* This moves the player to a different start map, if there
885 * is one for this race 906 * is one for this race
886 */ 907 */
887 if (*first_map_ext_path) 908 if (*first_map_ext_path)
888 { 909 {
889 object *tmp; 910 object *tmp;
890 char mapname[MAX_BUF]; 911 char mapname[MAX_BUF];
891 912
892 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
893 tmp = object::create (); 914 tmp = object::create ();
894 EXIT_PATH (tmp) = mapname; 915 EXIT_PATH (tmp) = mapname;
895 EXIT_X (tmp) = op->x; 916 EXIT_X (tmp) = ob->x;
896 EXIT_Y (tmp) = op->y; 917 EXIT_Y (tmp) = ob->y;
897 enter_exit (op, tmp); /* we don't really care if it succeeded; 918 ob->enter_exit (tmp); /* we don't really care if it succeeded;
898 * if the map isn't there, then stay on the 919 * if the map isn't there, then stay on the
899 * default initial map */ 920 * default initial map */
900 tmp->destroy (); 921 tmp->destroy ();
901 } 922 }
902 else 923 else
903 LOG (llevDebug, "first_map_ext_path not set\n"); 924 LOG (llevDebug, "first_map_ext_path not set\n");
925}
904 926
905 return 0; 927void
906 } 928player::chargen_race_next ()
907 929{
908 /* Following actually changes the race - this is the default command 930 /* Following actually changes the race - this is the default command
909 * if we don't match with one of the options above. 931 * if we don't match with one of the options above.
910 */ 932 */
911 933
912 tmp_loop = 0; 934 do
913 while (!tmp_loop)
914 { 935 {
915 shstr name = op->name; 936 shstr name = ob->name;
916 int x = op->x, y = op->y; 937 int x = ob->x, y = ob->y;
917 938
918 op->remove_statbonus (); 939 ob->remove_statbonus ();
919 op->remove (); 940 ob->remove ();
920 op->arch = get_player_archetype (op->arch); 941 ob->arch = get_player_archetype (ob->arch);
921 op->arch->clone.copy_to (op); 942 ob->arch->clone.copy_to (ob);
922 op->instantiate (); 943 ob->instantiate ();
923 op->stats = op->contr->orig_stats; 944 ob->stats = ob->contr->orig_stats;
924 op->name = op->name_pl = name; 945 ob->name = ob->name_pl = name;
925 op->x = x; 946 ob->x = x;
926 op->y = y; 947 ob->y = y;
927 SET_ANIMATION (op, 2); /* So player faces south */ 948 SET_ANIMATION (ob, 2); /* So player faces south */
928 insert_ob_in_map (op, op->map, op, 0); 949 insert_ob_in_map (ob, ob->map, ob, 0);
929 assign (op->contr->title, op->arch->clone.name); 950 assign (ob->contr->title, ob->arch->clone.name);
930 op->add_statbonus (); 951 ob->add_statbonus ();
931 tmp_loop = allowed_class (op);
932 } 952 }
953 while (!allowed_class (ob));
933 954
934 update_object (op, UP_OBJ_FACE); 955 update_object (ob, UP_OBJ_FACE);
935 esrv_update_item (UPD_FACE, op, op); 956 esrv_update_item (UPD_FACE, ob, ob);
936 op->update_stats (); 957 ob->update_stats ();
937 op->stats.hp = op->stats.maxhp; 958 ob->stats.hp = ob->stats.maxhp;
938 op->stats.sp = op->stats.maxsp; 959 ob->stats.sp = ob->stats.maxsp;
939 op->stats.grace = 0; 960 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} 961}
994 962
995void 963void
996flee_player (object *op) 964flee_player (object *op)
997{ 965{
… …
1044 /* Cornered, get rid of scared */ 1012 /* Cornered, get rid of scared */
1045 CLEAR_FLAG (op, FLAG_SCARED); 1013 CLEAR_FLAG (op, FLAG_SCARED);
1046 op->enemy = NULL; 1014 op->enemy = NULL;
1047} 1015}
1048 1016
1049
1050/* check_pick sees if there is stuff to be picked up/picks up stuff. 1017/* 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 1018 * It returns 1 if the player should keep on moving, 0 if he should
1052 * stop. 1019 * stop.
1053 */ 1020 */
1054int 1021int
1055check_pick (object *op) 1022check_pick (object *op)
1056{ 1023{
1057 object *tmp, *next; 1024 object *tmp, *next;
1058 int stop = 0; 1025 int stop = 0;
1059 int j, k, wvratio; 1026 int wvratio;
1060 char putstring[128], tmpstr[16]; 1027 char putstring[128];
1061 1028
1062 /* if you're flying, you cna't pick up anything */ 1029 /* if you're flying, you cna't pick up anything */
1063 if (op->move_type & MOVE_FLYING) 1030 if (op->move_type & MOVE_FLYING)
1064 return 1; 1031 return 1;
1065 1032
… …
1134 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1101 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1135 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1102 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1136 else 1103 else
1137 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1138 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1105 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106
1139 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1107 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1140
1141 sprintf (putstring, "...flags: ");
1142 for (k = 0; k < 4; k++)
1143 {
1144 for (j = 0; j < 32; j++)
1145 {
1146 if ((tmp->flags[k] >> j) & 0x01)
1147 {
1148 sprintf (tmpstr, "%d ", k * 32 + j);
1149 strcat (putstring, tmpstr);
1150 }
1151 }
1152 }
1153 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1154
1155#if 0
1156 /* print the flags too */
1157 for (k = 0; k < 4; k++)
1158 {
1159 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1160 for (j = 0; j < 32; j++)
1161 {
1162 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1163 if (!((j + 1) % 4))
1164 fprintf (stderr, " ");
1165 }
1166 fprintf (stderr, " [%d]\n", k * 32);
1167 }
1168#endif
1169 } 1108 }
1109
1170 /* philosophy: 1110 /* philosophy:
1171 * It's easy to grab an item type from a pile, as long as it's 1111 * It's easy to grab an item type from a pile, as long as it's
1172 * generic. This takes no game-time. For more detailed pickups 1112 * generic. This takes no game-time. For more detailed pickups
1173 * and selections, select-items shoul dbe used. This is a 1113 * and selections, select-items should be used. This is a
1174 * grab-as-you-run type mode that's really useful for arrows for 1114 * grab-as-you-run type mode that's really useful for arrows for
1175 * example. 1115 * example.
1176 * The drawback: right now it has no frontend, so you need to 1116 * The drawback: right now it has no frontend, so you need to
1177 * stick the bits you want into a calculator in hex mode and then 1117 * stick the bits you want into a calculator in hex mode and then
1178 * convert to decimal and then 'pickup <#> 1118 * convert to decimal and then 'pickup <#>
… …
1429 * found object is returned. 1369 * found object is returned.
1430 */ 1370 */
1431object * 1371object *
1432find_arrow (object *op, const char *type) 1372find_arrow (object *op, const char *type)
1433{ 1373{
1434 object *tmp = NULL; 1374 object *tmp = 0;
1435 1375
1436 for (op = op->inv; op; op = op->below) 1376 for (op = op->inv; op; op = op->below)
1437 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1438 tmp = find_arrow (op, type); 1378 tmp = find_arrow (op, type);
1439 else if (op->type == ARROW && op->race == type) 1379 else if (op->type == ARROW && op->race == type)
1440 return op; 1380 return op;
1381
1441 return tmp; 1382 return tmp;
1442} 1383}
1443 1384
1444/* 1385/*
1445 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1386 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1446 * against the target. A full test is not performed, simply a basic test 1387 * against the target. A full test is not performed, simply a basic test
1447 * of resistances. The archer is making a quick guess at what he sees down 1388 * of resistances. The archer is making a quick guess at what he sees down
1448 * the hall. Failing that it does it's best to pick the highest plus arrow. 1389 * the hall. Failing that it does it's best to pick the highest plus arrow.
1449 */ 1390 */
1450
1451object * 1391object *
1452find_better_arrow (object *op, object *target, const char *type, int *better) 1392find_better_arrow (object *op, object *target, const char *type, int *better)
1453{ 1393{
1454 object *tmp = NULL, *arrow, *ntmp; 1394 object *tmp = NULL, *arrow, *ntmp;
1455 int attacknum, attacktype, betterby = 0, i; 1395 int attacknum, attacktype, betterby = 0, i;
… …
1521 * find_better_arrow to find a decent arrow to use. 1461 * find_better_arrow to find a decent arrow to use.
1522 * op = the shooter 1462 * op = the shooter
1523 * type = bow->race 1463 * type = bow->race
1524 * dir = fire direction 1464 * dir = fire direction
1525 */ 1465 */
1526
1527object * 1466object *
1528pick_arrow_target (object *op, const char *type, int dir) 1467pick_arrow_target (object *op, const char *type, int dir)
1529{ 1468{
1530 object *tmp = NULL; 1469 object *tmp = NULL;
1531 maptile *m; 1470 maptile *m;
… …
1596 */ 1535 */
1597int 1536int
1598fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1537fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1599{ 1538{
1600 object *left, *bow; 1539 object *left, *bow;
1601 int bowspeed, mflags; 1540 int mflags;
1602 maptile *m; 1541 maptile *m;
1603 1542
1604 if (!dir) 1543 if (!dir)
1605 { 1544 {
1606 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1545 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1607 return 0; 1546 return 0;
1608 } 1547 }
1609 1548
1610 if (op->type == PLAYER) 1549 if (player *pl = op->contr)
1611 bow = op->contr->ranges[range_bow]; 1550 {
1551 bow = pl->ranged_ob;
1552 if (!op->change_weapon (bow))
1553 return 0;
1554 }
1612 else 1555 else
1613 { 1556 {
1614 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
1615 /* Don't check for applied - monsters don't apply bows - in that way, they 1558 /* Don't check for applied - monsters don't apply bows - in that way, they
1616 * don't need to switch back and forth between bows and weapons. 1559 * don't need to switch back and forth between bows and weapons.
… …
1621 if (!bow) 1564 if (!bow)
1622 { 1565 {
1623 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1624 return 0; 1567 return 0;
1625 } 1568 }
1569
1570 // optimisation: move object to top so we will find it quickly again
1571 if (bow->below)
1572 {
1573 bow->remove ();
1574 op->insert (bow);
1575 }
1576
1626 } 1577 }
1627 1578
1628 if (!bow->race || !bow->skill) 1579 if (!bow->race || !bow->skill)
1629 { 1580 {
1630 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1581 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1631 return 0; 1582 return 0;
1632 } 1583 }
1633
1634 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1635
1636 /* penalize ROF for bestarrow */
1637 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1638 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1639
1640 if (bowspeed < 1)
1641 bowspeed = 1;
1642 1584
1643 if (arrow == NULL) 1585 if (arrow == NULL)
1644 { 1586 {
1645 if ((arrow = find_arrow (op, bow->race)) == NULL) 1587 if ((arrow = find_arrow (op, bow->race)) == NULL)
1646 { 1588 {
1647 if (op->type == PLAYER) 1589 if (op->type == PLAYER)
1648 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1649 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1591 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1650 else 1592 else
1651 CLEAR_FLAG (op, FLAG_READY_BOW); 1593 CLEAR_FLAG (op, FLAG_READY_BOW);
1594
1652 return 0; 1595 return 0;
1653 } 1596 }
1654 } 1597 }
1655 1598
1656 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1599 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1678 return 0; 1621 return 0;
1679 } 1622 }
1680 1623
1681 arrow->set_owner (op); 1624 arrow->set_owner (op);
1682 arrow->skill = bow->skill; 1625 arrow->skill = bow->skill;
1683
1684 arrow->direction = dir; 1626 arrow->direction = dir;
1685 arrow->x = sx; 1627
1686 arrow->y = sy; 1628 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1629 arrow->stats.hp = arrow->stats.dam;
1630 arrow->stats.grace = arrow->attacktype;
1631
1632 if (arrow->slaying)
1633 arrow->spellarg = strdup (arrow->slaying);
1634
1635 if (player *pl = op->contr)
1636 {
1637 pl->has_hit = 1;
1638#if 0
1639 float speed = pl->weapon_sp;
1640
1641 /* penalize ROF for bestarrow */
1642 if (pl->bowtype == bow_bestarrow)
1643 speed *= .9f;
1644 else
1645 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1646
1647 op->speed_left += speed - op->speed;
1648#endif
1649 }
1650
1651 SET_ANIMATION (arrow, arrow->direction);
1652
1653 /* update the speed */
1654 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1655 + bow->stats.dam / 7.0;
1656
1657 arrow->set_speed (max (arrow->speed, 2.0));
1658 arrow->speed_left = 0;
1659
1660 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1687 1661
1688 if (op->type == PLAYER) 1662 if (op->type == PLAYER)
1689 { 1663 {
1690 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1691 op->update_stats ();
1692 }
1693
1694 SET_ANIMATION (arrow, arrow->direction);
1695 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1696 arrow->stats.hp = arrow->stats.dam;
1697 arrow->stats.grace = arrow->attacktype;
1698 if (arrow->slaying != NULL)
1699 arrow->spellarg = strdup (arrow->slaying);
1700
1701 /* Note that this was different for monsters - they got their level
1702 * added to the damage. I think the strength bonus is more proper.
1703 */
1704
1705 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1706
1707 /* update the speed */
1708 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1709 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1710
1711 if (arrow->speed < 1.0)
1712 arrow->speed = 1.0;
1713 update_ob_speed (arrow);
1714 arrow->speed_left = 0;
1715
1716 if (op->type == PLAYER)
1717 {
1718 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1719 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1720 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1721
1722 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1664 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1665 wc -= dex_bonus[op->stats.Dex];
1666
1667 if (!arrow->slaying)
1668 arrow->slaying = op->slaying;
1669
1670 arrow->attacktype |= op->attacktype;
1723 } 1671 }
1724 else 1672 else
1725 { 1673 {
1726 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1727 arrow->level = op->level; 1674 arrow->level = op->level;
1728 } 1675 arrow->stats.wc -= bow->magic;
1729 1676
1730 if (arrow->attacktype == AT_PHYSICAL) 1677 if (!arrow->slaying)
1678 arrow->slaying = bow->slaying;
1679
1731 arrow->attacktype |= bow->attacktype; 1680 arrow->attacktype |= bow->attacktype;
1681 }
1732 1682
1733 if (bow->slaying) 1683 wc -= arrow->level;
1734 arrow->slaying = bow->slaying; 1684 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1735 1685
1736 arrow->map = m; 1686 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1737 arrow->move_type = MOVE_FLY_LOW; 1687 arrow->move_type = MOVE_FLY_LOW;
1738 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1739 1689
1740 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1741 insert_ob_in_map (arrow, m, op, 0); 1691 m->insert (arrow, sx, sy, op);
1742 1692
1743 if (!arrow->destroyed ()) 1693 if (!arrow->destroyed ())
1744 move_arrow (arrow); 1694 move_arrow (arrow);
1745 1695
1746 if (op->type == PLAYER) 1696 if (op->type == PLAYER)
… …
1766{ 1716{
1767 int ret = 0, wcmod = 0; 1717 int ret = 0, wcmod = 0;
1768 1718
1769 if (op->contr->bowtype == bow_bestarrow) 1719 if (op->contr->bowtype == bow_bestarrow)
1770 { 1720 {
1771 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1721 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1772 } 1722 }
1773 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1723 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1774 { 1724 {
1775 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1725 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1776 wcmod = -1; 1726 wcmod = -1;
1727
1777 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1728 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1778 } 1729 }
1779 else if (op->contr->bowtype == bow_threewide) 1730 else if (op->contr->bowtype == bow_threewide)
1780 { 1731 {
1781 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1732 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1785 else if (op->contr->bowtype == bow_spreadshot) 1736 else if (op->contr->bowtype == bow_spreadshot)
1786 { 1737 {
1787 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);
1788 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1739 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1789 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1740 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1790
1791 } 1741 }
1792 else 1742 else
1793 { 1743 {
1794 /* Simple case */ 1744 /* Simple case */
1795 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1745 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1796 } 1746 }
1747
1797 return ret; 1748 return ret;
1798} 1749}
1799 1750
1800 1751
1801/* Fires a misc (wand/rod/horn) object in 'dir'. 1752/* Fires a misc (wand/rod/horn) object in 'dir'.
1802 * Broken apart from 'fire' to keep it more readable. 1753 * Broken apart from 'fire' to keep it more readable.
1803 */ 1754 */
1804void 1755void
1805fire_misc_object (object *op, int dir) 1756fire_misc_object (object *op, int dir)
1806{ 1757{
1807 object *item; 1758 object *item = op->contr->ranged_ob;
1808 1759
1809 if (!op->contr->ranges[range_misc]) 1760 if (!item)
1810 { 1761 {
1811 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1762 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1812 return; 1763 return;
1813 } 1764 }
1814 1765
1815 item = op->contr->ranges[range_misc];
1816 if (!item->inv) 1766 if (!item->inv)
1817 { 1767 {
1818 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1768 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1819 return; 1769 return;
1820 } 1770 }
1771
1772 if (!op->change_weapon (item))
1773 return;
1774
1821 if (item->type == WAND) 1775 if (item->type == WAND)
1822 { 1776 {
1823 if (item->stats.food <= 0) 1777 if (item->stats.food <= 0)
1824 { 1778 {
1825 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1826 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781
1827 return; 1782 return;
1828 } 1783 }
1829 } 1784 }
1830 else if (item->type == ROD || item->type == HORN) 1785 else if (item->type == ROD || item->type == HORN)
1831 { 1786 {
1832 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1833 { 1788 {
1834 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1790
1835 if (item->type == ROD) 1791 if (item->type == ROD)
1836 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1837 else 1793 else
1838 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1795
1839 return; 1796 return;
1840 } 1797 }
1841 } 1798 }
1842 1799
1843 if (cast_spell (op, item, dir, item->inv, NULL)) 1800 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1851 1808
1852 if (item->arch) 1809 if (item->arch)
1853 { 1810 {
1854 CLEAR_FLAG (item, FLAG_ANIMATE); 1811 CLEAR_FLAG (item, FLAG_ANIMATE);
1855 item->face = item->arch->clone.face; 1812 item->face = item->arch->clone.face;
1856 item->speed = 0; 1813 item->set_speed (0);
1857 update_ob_speed (item);
1858 } 1814 }
1815
1859 if ((tmp = item->in_player ())) 1816 if ((tmp = item->in_player ()))
1860 esrv_update_item (UPD_ANIM, tmp, item); 1817 esrv_update_item (UPD_ANIM, tmp, item);
1861 } 1818 }
1862 } 1819 }
1863 else if (item->type == ROD || item->type == HORN) 1820 else if (item->type == ROD || item->type == HORN)
1864 {
1865 drain_rod_charge (item); 1821 drain_rod_charge (item);
1866 }
1867 } 1822 }
1868} 1823}
1869 1824
1870/* Received a fire command for the player - go and do it. 1825/* Received a fire command for the player - go and do it.
1871 */ 1826 */
… …
1876 1831
1877 /* check for loss of invisiblity/hide */ 1832 /* check for loss of invisiblity/hide */
1878 if (action_makes_visible (op)) 1833 if (action_makes_visible (op))
1879 make_visible (op); 1834 make_visible (op);
1880 1835
1881 switch (op->contr->shoottype) 1836 player *pl = op->contr;
1837
1838 if (pl->golem)
1882 { 1839 {
1883 case range_none: 1840 control_golem (op->contr->golem, dir);
1884 return; 1841 return;
1842 }
1885 1843
1886 case range_bow: 1844 object *ob = pl->ranged_ob;
1845
1846 if (!ob)
1847 return;
1848
1849 switch (ob->type)
1850 {
1851 case BOW:
1887 player_fire_bow (op, dir); 1852 player_fire_bow (op, dir);
1888 return; 1853 break;
1889 1854
1890 case range_magic: /* Casting spells */ 1855 case SPELL:
1891 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1856 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1892 return; 1857 break;
1893 1858
1894 case range_misc: 1859 case BUILDER:
1860 apply_map_builder (op, dir);
1861 break;
1862
1863 case SKILL:
1864 case SKILL_TOOL:
1865 do_skill (op, op, ob, dir, 0);
1866 break;
1867
1868 default:
1895 fire_misc_object (op, dir); 1869 fire_misc_object (op, dir);
1896 return; 1870 break;
1897
1898 case range_golem: /* Control summoned monsters from scrolls */
1899 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1900 {
1901 op->contr->ranges[range_golem] = 0;
1902 op->contr->shoottype = range_none;
1903 }
1904 else
1905 control_golem (op->contr->ranges[range_golem], dir);
1906 return;
1907
1908 case range_skill:
1909 if (!op->chosen_skill)
1910 {
1911 if (op->type == PLAYER)
1912 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1913 return;
1914 }
1915 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1916 return;
1917 case range_builder:
1918 apply_map_builder (op, dir);
1919 return;
1920 default:
1921 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1922 return;
1923 } 1871 }
1924} 1872}
1925
1926
1927 1873
1928/* find_key 1874/* find_key
1929 * We try to find a key for the door as passed. If we find a key 1875 * We try to find a key for the door as passed. If we find a key
1930 * and successfully use it, we return the key, otherwise NULL 1876 * and successfully use it, we return the key, otherwise NULL
1931 * This function merges both normal and locked door, since the logic 1877 * This function merges both normal and locked door, since the logic
… …
1933 * pl is the player, 1879 * pl is the player,
1934 * inv is the objects inventory to searched 1880 * inv is the objects inventory to searched
1935 * door is the door we are trying to match against. 1881 * door is the door we are trying to match against.
1936 * This function can be called recursively to search containers. 1882 * This function can be called recursively to search containers.
1937 */ 1883 */
1938
1939object * 1884object *
1940find_key (object *pl, object *container, object *door) 1885find_key (object *pl, object *container, object *door)
1941{ 1886{
1942 object *tmp, *key; 1887 object *tmp, *key;
1943 1888
1944 /* Should not happen, but sanity checking is never bad */ 1889 /* Should not happen, but sanity checking is never bad */
1945 if (container->inv == NULL) 1890 if (!container->inv)
1946 return NULL; 1891 return 0;
1947 1892
1948 /* First, lets try to find a key in the top level inventory */ 1893 /* First, lets try to find a key in the top level inventory */
1949 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1894 for (tmp = container->inv; tmp; tmp = tmp->below)
1950 { 1895 {
1951 if (door->type == DOOR && tmp->type == KEY) 1896 if (door->type == DOOR && tmp->type == KEY)
1952 break; 1897 break;
1953 /* For sanity, we should really check door type, but other stuff 1898 /* For sanity, we should really check door type, but other stuff
1954 * (like containers) can be locked with special keys 1899 * (like containers) can be locked with special keys
1955 */ 1900 */
1956 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1901 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1957 break; 1902 break;
1958 } 1903 }
1904
1959 /* No key found - lets search inventories now */ 1905 /* No key found - lets search inventories now */
1960 /* If we find and use a key in an inventory, return at that time. 1906 /* If we find and use a key in an inventory, return at that time.
1961 * otherwise, if we search all the inventories and still don't find 1907 * otherwise, if we search all the inventories and still don't find
1962 * a key, return 1908 * a key, return
1963 */ 1909 */
1964 if (!tmp) 1910 if (!tmp)
1965 { 1911 {
1966 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1912 for (tmp = container->inv; tmp; tmp = tmp->below)
1967 { 1913 {
1968 /* No reason to search empty containers */ 1914 /* No reason to search empty containers */
1969 if (tmp->type == CONTAINER && tmp->inv) 1915 if (tmp->type == CONTAINER && tmp->inv)
1970 { 1916 {
1971 if ((key = find_key (pl, tmp, door)) != NULL) 1917 if ((key = find_key (pl, tmp, door)))
1972 return key; 1918 return key;
1973 } 1919 }
1974 } 1920 }
1921
1975 if (!tmp) 1922 if (!tmp)
1976 return NULL; 1923 return NULL;
1977 } 1924 }
1925
1978 /* We get down here if we have found a key. Now if its in a container, 1926 /* We get down here if we have found a key. Now if its in a container,
1979 * see if we actually want to use it 1927 * see if we actually want to use it
1980 */ 1928 */
1981 if (pl != container) 1929 if (pl != container)
1982 { 1930 {
… …
2003 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1951 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2004 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1952 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2005 return NULL; 1953 return NULL;
2006 } 1954 }
2007 } 1955 }
1956
2008 return tmp; 1957 return tmp;
2009} 1958}
2010 1959
2011/* moved door processing out of move_player_attack. 1960/* moved door processing out of move_player_attack.
2012 * returns 1 if player has opened the door with a key 1961 * returns 1 if player has opened the door with a key
… …
2026 if (key) 1975 if (key)
2027 { 1976 {
2028 object *container = key->env; 1977 object *container = key->env;
2029 1978
2030 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1979 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1980
2031 if (action_makes_visible (op)) 1981 if (action_makes_visible (op))
2032 make_visible (op); 1982 make_visible (op);
1983
2033 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1984 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2034 spring_trap (door->inv, op); 1985 spring_trap (door->inv, op);
1986
2035 if (door->type == DOOR) 1987 if (door->type == DOOR)
2036 {
2037 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1988 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2038 }
2039 else if (door->type == LOCKED_DOOR) 1989 else if (door->type == LOCKED_DOOR)
2040 { 1990 {
2041 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1991 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2042 remove_door2 (door); /* remove door without violence ;-) */ 1992 remove_door2 (door); /* remove door without violence ;-) */
2043 } 1993 }
1994
2044 /* Do this after we print the message */ 1995 /* Do this after we print the message */
2045 decrease_ob (key); /* Use up one of the keys */ 1996 decrease_ob (key); /* Use up one of the keys */
2046 /* Need to update the weight the container the key was in */ 1997 /* Need to update the weight the container the key was in */
2047 if (container != op) 1998 if (container != op)
2048 esrv_update_item (UPD_WEIGHT, op, container); 1999 esrv_update_item (UPD_WEIGHT, op, container);
2000
2049 return 1; /* Nothing more to do below */ 2001 return 1; /* Nothing more to do below */
2050 } 2002 }
2051 else if (door->type == LOCKED_DOOR) 2003 else if (door->type == LOCKED_DOOR)
2052 { 2004 {
2053 /* Might as well return now - no other way to open this */ 2005 /* Might as well return now - no other way to open this */
2054 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2006 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2055 return 1; 2007 return 1;
2056 } 2008 }
2009
2057 return 0; 2010 return 0;
2058} 2011}
2059 2012
2060/* This function is just part of a breakup from move_player. 2013/* This function is just part of a breakup from move_player.
2061 * It should keep the code cleaner. 2014 * It should keep the code cleaner.
… …
2065 */ 2018 */
2066void 2019void
2067move_player_attack (object *op, int dir) 2020move_player_attack (object *op, int dir)
2068{ 2021{
2069 object *tmp, *mon; 2022 object *tmp, *mon;
2070 sint16 nx, ny;
2071 int on_battleground; 2023 int on_battleground;
2072 maptile *m; 2024 maptile *m;
2073 2025
2074 nx = freearr_x[dir] + op->x; 2026 sint16 nx = freearr_x[dir] + op->x;
2075 ny = freearr_y[dir] + op->y; 2027 sint16 ny = freearr_y[dir] + op->y;
2076 2028
2077 on_battleground = op_on_battleground (op, 0, 0); 2029 on_battleground = op_on_battleground (op, 0, 0);
2078 2030
2079 /* If braced, or can't move to the square, and it is not out of the 2031 /* If braced, or can't move to the square, and it is not out of the
2080 * map, attack it. Note order of if statement is important - don't 2032 * map, attack it. Note order of if statement is important - don't
… …
2087 */ 2039 */
2088 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2040 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2089 { 2041 {
2090 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2042 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2091 { 2043 {
2092 m = get_map_from_coord (op->map, &nx, &ny); 2044 m = op->map->xy_find (nx, ny);
2093 if (!m) 2045 if (!m)
2094 return; /* Don't think this should happen */ 2046 return; /* Don't think this should happen */
2095 } 2047 }
2096 else 2048 else
2097 m = op->map; 2049 m = op->map;
2098 2050
2099 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL) 2051 if (!(tmp = m->at (nx, ny).bot))
2100 {
2101 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2102 return; 2052 return;
2103 }
2104 2053
2105 mon = 0; 2054 mon = 0;
2106 /* Go through all the objects, and find ones of interest. Only stop if 2055 /* Go through all the objects, and find ones of interest. Only stop if
2107 * we find a monster - that is something we know we want to attack. 2056 * we find a monster - that is something we know we want to attack.
2108 * if its a door or barrel (can roll) see if there may be monsters 2057 * if its a door or barrel (can roll) see if there may be monsters
… …
2161 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2110 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2162 { 2111 {
2163 /* If we're braced, we don't want to switch places with it */ 2112 /* If we're braced, we don't want to switch places with it */
2164 if (op->contr->braced) 2113 if (op->contr->braced)
2165 return; 2114 return;
2115
2166 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2116 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2167 (void) push_ob (mon, dir, op); 2117 push_ob (mon, dir, op);
2168 if (op->contr->tmp_invis || op->hide) 2118 if (op->contr->tmp_invis || op->hide)
2169 make_visible (op); 2119 make_visible (op);
2120
2170 return; 2121 return;
2171 } 2122 }
2172 2123
2173 /* in certain circumstances, you shouldn't attack friendly 2124 /* in certain circumstances, you shouldn't attack friendly
2174 * creatures. Note that if you are braced, you can't push 2125 * creatures. Note that if you are braced, you can't push
… …
2188 !on_battleground)) 2139 !on_battleground))
2189 { 2140 {
2190 if (!op->contr->braced) 2141 if (!op->contr->braced)
2191 { 2142 {
2192 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2143 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2193 (void) push_ob (mon, dir, op); 2144 push_ob (mon, dir, op);
2194 } 2145 }
2195 else 2146 else
2196 new_draw_info (0, 0, op, "You withhold your attack"); 2147 new_draw_info (0, 0, op, "You withhold your attack");
2197 2148
2198 if (op->contr->tmp_invis || op->hide) 2149 if (op->contr->tmp_invis || op->hide)
… …
2213 * Way it works is like this: First, it must have some hit points 2164 * Way it works is like this: First, it must have some hit points
2214 * and be living. Then, it must be one of the following: 2165 * and be living. Then, it must be one of the following:
2215 * 1) Not a player, 2) A player, but of a different party. Note 2166 * 1) Not a player, 2) A player, but of a different party. Note
2216 * that party_number -1 is no party, so attacks can still happen. 2167 * that party_number -1 is no party, so attacks can still happen.
2217 */ 2168 */
2218
2219 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2169 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2220 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2170 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2221 { 2171 {
2222
2223 /* If the player hasn't hit something this tick, and does
2224 * so, give them speed boost based on weapon speed. Doing
2225 * it here is better than process_players2, which basically
2226 * incurred a 1 tick offset.
2227 */
2228 if (!op->contr->has_hit) 2172 op->contr->has_hit = 1;
2229 {
2230 op->speed_left += op->speed / op->contr->weapon_sp;
2231
2232 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2233 }
2234 2173
2235 skill_attack (mon, op, 0, 0, 0); 2174 skill_attack (mon, op, 0, 0, 0);
2236 2175
2237 /* If attacking another player, that player gets automatic 2176 /* If attacking another player, that player gets automatic
2238 * hitback, and doesn't loose luck either. 2177 * hitback, and doesn't loose luck either.
… …
2257int 2196int
2258move_player (object *op, int dir) 2197move_player (object *op, int dir)
2259{ 2198{
2260 int pick; 2199 int pick;
2261 2200
2262 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2201 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2263 return 0; 2202 return 0;
2264 2203
2265 /* Sanity check: make sure dir is valid */ 2204 /* Sanity check: make sure dir is valid */
2266 if ((dir < 0) || (dir >= 9)) 2205 if ((dir < 0) || (dir >= 9))
2267 { 2206 {
2268 LOG (llevError, "move_player: invalid direction %d\n", dir); 2207 LOG (llevError, "move_player: invalid direction %d\n", dir);
2269 return 0; 2208 return 0;
2270 } 2209 }
2271 2210
2272 /* peterm: added following line */ 2211 /* peterm: added following line */
2273 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2212 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2274 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2213 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2275 2214
2276 op->facing = dir; 2215 op->facing = dir;
2277 2216
2278 if (op->hide) 2217 if (op->hide)
2279 do_hidden_move (op); 2218 do_hidden_move (op);
… …
2312 * Returns true if there are more actions we can do. 2251 * Returns true if there are more actions we can do.
2313 */ 2252 */
2314int 2253int
2315handle_newcs_player (object *op) 2254handle_newcs_player (object *op)
2316{ 2255{
2317 if (op->contr->hidden)
2318 {
2319 op->invisible = 1000;
2320 /* the socket code flashes the player visible/invisible
2321 * depending on the value of invisible, so we need to
2322 * alternate it here for it to work correctly.
2323 */
2324 if (pticks & 2)
2325 op->invisible--;
2326 }
2327 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2328 {
2329 op->invisible--;
2330 if (!op->invisible)
2331 {
2332 make_visible (op);
2333 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2334 }
2335 }
2336
2337 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2338 { 2257 {
2339 flee_player (op); 2258 flee_player (op);
2259
2340 /* If player is still scared, that is his action for this tick */ 2260 /* If player is still scared, that is his action for this tick */
2341 if (QUERY_FLAG (op, FLAG_SCARED)) 2261 if (op->flag [FLAG_SCARED])
2342 { 2262 {
2343 op->speed_left--; 2263 --op->speed_left;
2344 return 0; 2264 return 0;
2345 } 2265 }
2346 } 2266 }
2347
2348 /* I've been seeing crashes where the golem has been destroyed, but
2349 * the player object still points to the defunct golem. The code that
2350 * destroys the golem looks correct, and it doesn't always happen, so
2351 * put this in a a workaround to clean up the golem pointer.
2352 */
2353 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2354 op->contr->ranges[range_golem] = 0;
2355 2267
2356 /* call this here - we also will call this in do_ericserver, but 2268 /* call this here - we also will call this in do_ericserver, but
2357 * the players time has been increased when doericserver has been 2269 * the players time has been increased when doericserver has been
2358 * called, so we recheck it here. 2270 * called, so we recheck it here.
2359 */ 2271 */
2360 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2272 if (op->contr->ns->handle_command ())
2361 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2362 ;
2363
2364 if (op->speed_left < 0)
2365 return 0; 2273 return 1;
2366 2274
2275 if (op->speed_left > 0.f)
2276 {
2367 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2277 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2368 { 2278 {
2369 /* All move commands take 1 tick, at least for now */ 2279 /* All move commands take 1 tick, at least for now */
2370 op->speed_left--; 2280 --op->speed_left;
2371 2281
2372 /* Instead of all the stuff below, let move_player take care 2282 /* Instead of all the stuff below, let move_player take care
2373 * of it. Also, some of the skill stuff is only put in 2283 * of it. Also, some of the skill stuff is only put in
2374 * there, as well as the confusion stuff. 2284 * there, as well as the confusion stuff.
2375 */ 2285 */
2376 move_player (op, op->direction); 2286 move_player (op, op->direction);
2377 if (op->speed_left > 0) 2287
2378 return 1; 2288 return op->speed_left > 0.f;
2379 else 2289 }
2380 return 0;
2381 } 2290 }
2382 2291
2383 return 0; 2292 return 0;
2384} 2293}
2385 2294
… …
2423 * from. 2332 * from.
2424 */ 2333 */
2425void 2334void
2426remove_unpaid_objects (object *op, object *env) 2335remove_unpaid_objects (object *op, object *env)
2427{ 2336{
2428 object *next;
2429
2430 while (op) 2337 while (op)
2431 { 2338 {
2432 next = op->below; /* Make sure we have a good value, in case 2339 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2433 * we remove object 'op' 2340
2434 */
2435 if (QUERY_FLAG (op, FLAG_UNPAID)) 2341 if (QUERY_FLAG (op, FLAG_UNPAID))
2436 { 2342 {
2437 op->remove ();
2438 op->x = env->x;
2439 op->y = env->y;
2440 if (env->type == PLAYER) 2343 if (env->type == PLAYER)
2441 esrv_del_item (env->contr, op->count); 2344 esrv_del_item (env->contr, op->count);
2442 insert_ob_in_map (op, env->map, NULL, 0); 2345
2346 op->insert_at (env);
2443 } 2347 }
2444 else if (op->inv) 2348 else if (op->inv)
2445 remove_unpaid_objects (op->inv, env); 2349 remove_unpaid_objects (op->inv, env);
2446 2350
2447 op = next; 2351 op = next;
… …
2503 int rate_grace = 2000; 2407 int rate_grace = 2000;
2504 const int max_hp = 1; 2408 const int max_hp = 1;
2505 const int max_sp = 1; 2409 const int max_sp = 1;
2506 const int max_grace = 1; 2410 const int max_grace = 1;
2507 2411
2508 if (op->contr->outputs_sync) 2412 if (op->contr->hidden)
2413 {
2414 op->invisible = 1000;
2415 /* the socket code flashes the player visible/invisible
2416 * depending on the value of invisible, so we need to
2417 * alternate it here for it to work correctly.
2418 */
2419 if (pticks & 2)
2420 op->invisible--;
2509 { 2421 }
2510 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2422 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2511 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2423 {
2512 flush_output_element (op, &op->contr->outputs[i]); 2424 if (!op->invisible--)
2425 {
2426 make_visible (op);
2427 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2428 }
2513 } 2429 }
2514 2430
2515 if (op->contr->ns->state == ST_PLAYING) 2431 if (op->contr->ns->state == ST_PLAYING)
2516 { 2432 {
2517 /* these next three if clauses make it possible to SLOW DOWN 2433 /* these next three if clauses make it possible to SLOW DOWN
… …
2539 gen_grace = op->stats.maxgrace; 2455 gen_grace = op->stats.maxgrace;
2540 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2456 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2541 } 2457 }
2542 2458
2543 /* Regenerate Spell Points */ 2459 /* Regenerate Spell Points */
2544 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2460 if (!op->contr->golem && --op->last_sp < 0)
2545 { 2461 {
2546 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2462 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2547 if (op->stats.sp < op->stats.maxsp) 2463 if (op->stats.sp < op->stats.maxsp)
2548 { 2464 {
2549 op->stats.sp++; 2465 op->stats.sp++;
… …
2740 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2656 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2741 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2657 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2742 2658
2743 /* restore player */ 2659 /* restore player */
2744 at = archetype::find ("poisoning"); 2660 at = archetype::find ("poisoning");
2745 tmp = present_arch_in_ob (at, op); 2661 if (object *tmp = present_arch_in_ob (at, op))
2746 if (tmp)
2747 { 2662 {
2748 tmp->destroy (); 2663 tmp->destroy ();
2749 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2664 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2750 } 2665 }
2751 2666
2752 at = archetype::find ("confusion"); 2667 at = archetype::find ("confusion");
2753 tmp = present_arch_in_ob (at, op); 2668 if (object *tmp = present_arch_in_ob (at, op))
2754 if (tmp)
2755 { 2669 {
2756 tmp->destroy (); 2670 tmp->destroy ();
2757 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2671 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2758 } 2672 }
2759 2673
… …
2761 op->stats.hp = op->stats.maxhp; 2675 op->stats.hp = op->stats.maxhp;
2762 if (op->stats.food <= 0) 2676 if (op->stats.food <= 0)
2763 op->stats.food = 999; 2677 op->stats.food = 999;
2764 2678
2765 /* create a bodypart-trophy to make the winner happy */ 2679 /* create a bodypart-trophy to make the winner happy */
2766 tmp = arch_to_object (archetype::find ("finger")); 2680 if (object *tmp = arch_to_object (archetype::find ("finger")))
2767 if (tmp != NULL)
2768 { 2681 {
2769 sprintf (buf, "%s's finger", &op->name); 2682 sprintf (buf, "%s's finger", &op->name);
2770 tmp->name = buf; 2683 tmp->name = buf;
2771 sprintf (buf, " This finger has been cut off %s\n" 2684 sprintf (buf, " This finger has been cut off %s\n"
2772 " the %s, when he was defeated at\n level %d by %s.\n", 2685 " the %s, when he was defeated at\n level %d by %s.\n",
2773 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2686 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2774 tmp->msg = buf; 2687 tmp->msg = buf;
2775 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2688 tmp->value = 0, tmp->type = 0;
2776 tmp->materialname = NULL; 2689 tmp->materialname = "organics";
2777 tmp->x = op->x, tmp->y = op->y; 2690 tmp->insert_at (op, tmp);
2778 insert_ob_in_map (tmp, op->map, op, 0);
2779 } 2691 }
2780 2692
2781 /* teleport defeated player to new destination */ 2693 /* teleport defeated player to new destination */
2782 transfer_ob (op, x, y, 0, NULL); 2694 transfer_ob (op, x, y, 0, NULL);
2783 op->contr->braced = 0; 2695 op->contr->braced = 0;
… …
2788 2700
2789 command_kill_pets (op, 0); 2701 command_kill_pets (op, 0);
2790 2702
2791 if (op->stats.food < 0) 2703 if (op->stats.food < 0)
2792 { 2704 {
2793 if (op->contr->explore)
2794 {
2795 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2796 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2797 op->stats.food = 999;
2798 return;
2799 }
2800 sprintf (buf, "%s starved to death.", &op->name); 2705 sprintf (buf, "%s starved to death.", &op->name);
2801 strcpy (op->contr->killer, "starvation"); 2706 strcpy (op->contr->killer, "starvation");
2802 } 2707 }
2803 else 2708 else
2804 {
2805 if (op->contr->explore)
2806 {
2807 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2808 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2809 op->stats.hp = op->stats.maxhp;
2810 return;
2811 }
2812 sprintf (buf, "%s died.", &op->name); 2709 sprintf (buf, "%s died.", &op->name);
2813 } 2710
2814 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2711 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2815 2712
2816 /* save the map location for corpse, gravestone */ 2713 /* save the map location for corpse, gravestone */
2817 x = op->x; 2714 x = op->x;
2818 y = op->y; 2715 y = op->y;
2819 map = op->map; 2716 map = op->map;
2820
2821 2717
2822 /* NOT_PERMADEATH code. This basically brings the character back to 2718 /* NOT_PERMADEATH code. This basically brings the character back to
2823 * life if they are dead - it takes some exp and a random stat. 2719 * life if they are dead - it takes some exp and a random stat.
2824 * See the config.h file for a little more in depth detail about this. 2720 * See the config.h file for a little more in depth detail about this.
2825 */ 2721 */
… …
2842 num_stats_lose = 1; 2738 num_stats_lose = 1;
2843 else 2739 else
2844 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2740 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2845 } 2741 }
2846 else 2742 else
2847 {
2848 num_stats_lose = 1; 2743 num_stats_lose = 1;
2849 } 2744
2850 lost_a_stat = 0; 2745 lost_a_stat = 0;
2851 2746
2852 for (z = 0; z < num_stats_lose; z++) 2747 for (z = 0; z < num_stats_lose; z++)
2853 { 2748 {
2854 i = RANDOM () % NUM_STATS; 2749 i = RANDOM () % NUM_STATS;
… …
2995 op->stats.hp = op->stats.maxhp; 2890 op->stats.hp = op->stats.maxhp;
2996 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2891 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2997 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2892 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2998 2893
2999 /* 2894 /*
3000 * Check to see if the player is in a shop. IF so, then check to see if
3001 * the player has any unpaid items. If so, remove them and put them back 2895 * Check to see if the player has any unpaid items. If so, remove them
3002 * in the map. 2896 * and put them back in the map.
3003 */ 2897 */
3004
3005 if (is_in_shop (op))
3006 remove_unpaid_objects (op->inv, op); 2898 remove_unpaid_objects (op->inv, op);
3007 2899
3008 /****************************************/ 2900 /****************************************/
3009 /* */ 2901 /* */
3010 /* Move player to his current respawn- */ 2902 /* Move player to his current respawn- */
3011 /* position (usually last savebed) */ 2903 /* position (usually last savebed) */
3012 /* */ 2904 /* */
3013 /****************************************/ 2905 /****************************************/
3014 2906
3015 enter_player_savebed (op); 2907 enter_player_savebed (op);
3016 2908
3017 /* Save the player before inserting the force to reduce
3018 * chance of abuse.
3019 */
3020 op->contr->braced = 0; 2909 op->contr->braced = 0;
3021 op->contr->save ();
3022 2910
3023 /* it is possible that the player has blown something up 2911 /* it is possible that the player has blown something up
3024 * at his savebed location, and that can have long lasting 2912 * at his savebed location, and that can have long lasting
3025 * spell effects. So first see if there is a spell effect 2913 * spell effects. So first see if there is a spell effect
3026 * on the space that might harm the player. 2914 * on the space that might harm the player.
… …
3035 object *force; 2923 object *force;
3036 int at; 2924 int at;
3037 2925
3038 force = get_archetype (FORCE_NAME); 2926 force = get_archetype (FORCE_NAME);
3039 /* 50 ticks should be enough time for the spell to abate */ 2927 /* 50 ticks should be enough time for the spell to abate */
3040 force->speed = 0.1; 2928 force->speed = 0.1f;
3041 force->speed_left = -5.0; 2929 force->speed_left = -5.f;
3042 SET_FLAG (force, FLAG_APPLIED); 2930 SET_FLAG (force, FLAG_APPLIED);
3043 for (at = 0; at < NROFATTACKS; at++) 2931 for (at = 0; at < NROFATTACKS; at++)
3044 if (will_kill_again & (1 << at)) 2932 if (will_kill_again & (1 << at))
3045 force->resist[at] = 100; 2933 force->resist[at] = 100;
3046 2934
… …
3055void 2943void
3056loot_object (object *op) 2944loot_object (object *op)
3057{ /* Grab and destroy some treasure */ 2945{ /* Grab and destroy some treasure */
3058 object *tmp, *tmp2, *next; 2946 object *tmp, *tmp2, *next;
3059 2947
3060 if (op->container) 2948 op->close_container (); /* close open sack first */
3061 esrv_apply_container (op, op->container); /* close open sack first */
3062 2949
3063 for (tmp = op->inv; tmp; tmp = next) 2950 for (tmp = op->inv; tmp; tmp = next)
3064 { 2951 {
3065 next = tmp->below; 2952 next = tmp->below;
3066 2953
3067 if (tmp->invisible) 2954 if (tmp->invisible)
3068 continue; 2955 continue;
3069 2956
3070 tmp->remove (); 2957 tmp->remove ();
3071 tmp->x = op->x, tmp->y = op->y; 2958 tmp->x = op->x, tmp->y = op->y;
2959
3072 if (tmp->type == CONTAINER) 2960 if (tmp->type == CONTAINER)
3073 { /* empty container to ground */ 2961 loot_object (tmp); /* empty container to ground */
3074 loot_object (tmp); 2962
3075 }
3076 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2963 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3077 { 2964 {
3078 if (tmp->nrof > 1) 2965 if (tmp->nrof > 1)
3079 { 2966 {
3080 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2967 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3081 tmp2->destroy (); 2968 tmp2->destroy ();
… …
3092/* 2979/*
3093 * fix_weight(): Check recursively the weight of all players, and fix 2980 * fix_weight(): Check recursively the weight of all players, and fix
3094 * what needs to be fixed. Refresh windows and fix speed if anything 2981 * what needs to be fixed. Refresh windows and fix speed if anything
3095 * was changed. 2982 * was changed.
3096 */ 2983 */
3097
3098void 2984void
3099fix_weight (void) 2985fix_weight (void)
3100{ 2986{
3101 for (player *pl = first_player; pl; pl = pl->next) 2987 for_all_players (pl)
3102 { 2988 {
3103 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2989 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3104 2990
3105 if (old == sum) 2991 if (old == sum)
3106 continue; 2992 continue;
… …
3110} 2996}
3111 2997
3112void 2998void
3113fix_luck (void) 2999fix_luck (void)
3114{ 3000{
3115 for (player *pl = first_player; pl; pl = pl->next) 3001 for_all_players (pl)
3116 if (!pl->ob->contr->ns->state) 3002 if (!pl->ob->contr->ns->state)
3117 pl->ob->change_luck (0); 3003 pl->ob->change_luck (0);
3118} 3004}
3119 3005
3120/* cast_dust() - handles op throwing objects of type 'DUST'. 3006/* cast_dust() - handles op throwing objects of type 'DUST'.
… …
3162 if (op->type == PLAYER) 3048 if (op->type == PLAYER)
3163 { 3049 {
3164 op->contr->tmp_invis = 0; 3050 op->contr->tmp_invis = 0;
3165 op->contr->invis_race = 0; 3051 op->contr->invis_race = 0;
3166 } 3052 }
3053
3167 update_object (op, UP_OBJ_FACE); 3054 update_object (op, UP_OBJ_CHANGE);
3168} 3055}
3169 3056
3170int 3057int
3171is_true_undead (object *op) 3058is_true_undead (object *op)
3172{ 3059{
3173 object *tmp = NULL;
3174
3175 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3060 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3176 return 1; 3061 return 1;
3177 3062
3178 return 0; 3063 return 0;
3179} 3064}
… …
3238 3123
3239 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3124 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3240 3125
3241 /* its *extremely* hard to run and sneak/hide at the same time! */ 3126 /* its *extremely* hard to run and sneak/hide at the same time! */
3242 if (op->type == PLAYER && op->contr->run_on) 3127 if (op->type == PLAYER && op->contr->run_on)
3243 {
3244 if (!skop || num >= skop->level) 3128 if (!skop || num >= skop->level)
3245 { 3129 {
3246 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3130 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3247 make_visible (op); 3131 make_visible (op);
3248 return; 3132 return;
3249 } 3133 }
3250 else 3134 else
3251 num += 20; 3135 num += 20;
3252 } 3136
3253 num += op->map->difficulty; 3137 num += op->map->difficulty;
3254 hide = hideability (op); /* modify by terrain hidden level */ 3138 hide = hideability (op); /* modify by terrain hidden level */
3255 num -= hide; 3139 num -= hide;
3140
3256 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3141 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3257 { 3142 {
3258 make_visible (op); 3143 make_visible (op);
3259 if (op->type == PLAYER) 3144 if (op->type == PLAYER)
3260 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3145 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3261 } 3146 }
3262 else if (op->type == PLAYER && skop) 3147 else if (op->type == PLAYER && skop)
3263 {
3264 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3148 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3265 }
3266} 3149}
3267 3150
3268/* determine if who is standing near a hostile creature. */ 3151/* determine if who is standing near a hostile creature. */
3269 3152
3270int 3153int
… …
3337 if (pl->type != PLAYER) 3220 if (pl->type != PLAYER)
3338 { 3221 {
3339 LOG (llevError, "player_can_view() called for non-player object\n"); 3222 LOG (llevError, "player_can_view() called for non-player object\n");
3340 return -1; 3223 return -1;
3341 } 3224 }
3225
3342 if (!pl || !op) 3226 if (!pl || !op)
3343 return 0; 3227 return 0;
3344 3228
3345 if (op->head)
3346 {
3347 op = op->head; 3229 op = op->head_ ();
3348 } 3230
3349 get_rangevector (pl, op, &rv, 0x1); 3231 get_rangevector (pl, op, &rv, 0x1);
3350 3232
3351 /* starting with the 'head' part, lets loop 3233 /* starting with the 'head' part, lets loop
3352 * through the object and find if it has any 3234 * through the object and find if it has any
3353 * part that is in the los array but isnt on 3235 * part that is in the los array but isnt on
… …
3470 char buf[MAX_BUF]; /* tmp. string buffer */ 3352 char buf[MAX_BUF]; /* tmp. string buffer */
3471 int i = 0, j = 0; 3353 int i = 0, j = 0;
3472 3354
3473 /* get the appropriate treasurelist */ 3355 /* get the appropriate treasurelist */
3474 if (atnr == ATNR_FIRE) 3356 if (atnr == ATNR_FIRE)
3475 trlist = find_treasurelist ("dragon_ability_fire"); 3357 trlist = treasurelist::find ("dragon_ability_fire");
3476 else if (atnr == ATNR_COLD) 3358 else if (atnr == ATNR_COLD)
3477 trlist = find_treasurelist ("dragon_ability_cold"); 3359 trlist = treasurelist::find ("dragon_ability_cold");
3478 else if (atnr == ATNR_ELECTRICITY) 3360 else if (atnr == ATNR_ELECTRICITY)
3479 trlist = find_treasurelist ("dragon_ability_elec"); 3361 trlist = treasurelist::find ("dragon_ability_elec");
3480 else if (atnr == ATNR_POISON) 3362 else if (atnr == ATNR_POISON)
3481 trlist = find_treasurelist ("dragon_ability_poison"); 3363 trlist = treasurelist::find ("dragon_ability_poison");
3482 3364
3483 if (trlist == NULL || who->type != PLAYER) 3365 if (trlist == NULL || who->type != PLAYER)
3484 return; 3366 return;
3485 3367
3486 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3368 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3487 3369
3488 if (tr == NULL || tr->item == NULL) 3370 if (!tr || !tr->item)
3489 { 3371 {
3490 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3372 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3491 return; 3373 return;
3492 } 3374 }
3493 3375
… …
3618 * not readied. 3500 * not readied.
3619 */ 3501 */
3620void 3502void
3621player_unready_range_ob (player *pl, object *ob) 3503player_unready_range_ob (player *pl, object *ob)
3622{ 3504{
3623 rangetype i; 3505 if (pl->ob->current_weapon == ob)
3506 pl->ob->current_weapon = 0;
3624 3507
3625 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3508 if (pl->combat_ob == ob)
3626 { 3509 pl->combat_ob = 0;
3510
3627 if (pl->ranges[i] == ob) 3511 if (pl->ranged_ob == ob)
3628 { 3512 pl->ranged_ob = 0;
3629 pl->ranges[i] = NULL;
3630 if (pl->shoottype == i)
3631 {
3632 pl->shoottype = range_none;
3633 }
3634 }
3635 }
3636} 3513}
3514
3515sint8
3516player::visibility_at (maptile *map, int x, int y) const
3517{
3518 if (!ns)
3519 return 0;
3520
3521 int dx, dy;
3522 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3523 return 0;
3524
3525 x += dx - ns->current_x + ns->mapx / 2;
3526 y += dy - ns->current_y + ns->mapy / 2;
3527
3528 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3529 return 0;
3530
3531 return 100 - blocked_los [x][y];
3532}

Diff Legend

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