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.54 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.152 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#include <algorithm> 32#include <algorithm>
34#include <functional> 33#include <functional>
35 34
36player * 35playervec 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 36
48void 37void
49display_motd (const object *op) 38display_motd (const object *op)
50{ 39{
51 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
125 114
126 news[0] = '\0'; 115 news[0] = '\0';
127 subject[0] = '\0'; 116 subject[0] = '\0';
128 size = 0; 117 size = 0;
129 118
130 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
131 { 120 {
132 if (*buf == '#') 121 if (*buf == '#')
133 continue; 122 continue;
134 123
135 if (*buf == '%') 124 if (*buf == '%')
136 { /* send one news */ 125 { /* send one news */
137 if (size > 0) 126 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 */ 127 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 */
128
139 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
140 strip_endline (subject); 130 strip_endline (subject);
141 size = 0; 131 size = 0;
142 news[0] = '\0'; 132 news[0] = '\0';
143 } 133 }
… …
152 size += strlen (buf); 142 size += strlen (buf);
153 } 143 }
154 } 144 }
155 145
156 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 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); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
158 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
159} 149}
160 150
161/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
162static void 152static void
163set_first_map (object *op) 153set_first_map (object *op)
164{ 154{
165 strcpy (op->contr->maplevel, first_map_path); 155 op->contr->maplevel = first_map_path;
166 op->x = -1; 156 op->x = -1;
167 op->y = -1; 157 op->y = -1;
168 enter_exit (op, 0);
169} 158}
170 159
160void
161player::activate ()
162{
163 if (active)
164 return;
165
166 players.insert (this);
167 ob->remove ();
168 ob->map = 0;
169 ob->activate_recursive ();
170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
171 add_friendly_object (ob);
172}
173
174void
175player::deactivate ()
176{
177 if (!active)
178 return;
179
180 terminate_all_pets (ob);
181 remove_friendly_object (ob);
182 ob->deactivate_recursive ();
183
184 if (ob->map)
185 maplevel = ob->map->path;
186
187 ob->remove ();
188 ob->map = 0;
189 party = 0;
190
191 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
192
193 players.erase (this);
194}
195
196// connect the player with a specific client
197// also changes, rationalises, and fixes some incorrect settings
171void 198void
172player::connect (client *ns) 199player::connect (client *ns)
173{ 200{
174 this->ns = ns; 201 this->ns = ns;
175 ns->pl = this; 202 ns->pl = this;
176 203
177 next = first_player; 204 run_on = 0;
178 first_player = this; 205 fire_on = 0;
206 ob->close_container (); //TODO: client-specific
179 207
180 ns->update_look = 0; 208 ns->update_look = 0;
181 ns->look_position = 0; 209 ns->look_position = 0;
182 210
183 clear_los (ob); 211 clear_los (this);
184 212
213 ns->reset_stats ();
214
215 /* make sure he's a player -- needed because of class change. */
185 ob->type = PLAYER; // we are paranoid 216 ob->type = PLAYER; // we are paranoid
186 ob->race = ob->arch->clone.race; 217 ob->race = ob->arch->race;
187
188 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
189 ob->update_stats ();
190 update_ob_speed (ob);
191 218
192 ob->carrying = sum_weight (ob); 219 ob->carrying = sum_weight (ob);
193 link_player_skills (ob); 220 link_player_skills (ob);
194 221
195 if (!legal_range (ob, shoottype)) 222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196 shoottype = range_none;
197 223
198 assign (title, ob->arch->clone.name); 224 assign (title, ob->arch->object::name);
199
200 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
201 * from the class, and not race. I don't see any way to get the class information
202 * to then update this. I don't think this will actually break anything - anyone
203 * that can use armour should be able to use a shield. What this may 'break'
204 * are features new characters get, eg, if someone starts up with a Q, they
205 * should be able to use a shield. However, old Q's won't get that advantage.
206 */
207 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208 SET_FLAG (ob, FLAG_USE_SHIELD);
209 225
210 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
211 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
212 { 228 {
213 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
… …
215 shstr_cmp dragon_ability_force ("dragon_ability_force"); 231 shstr_cmp dragon_ability_force ("dragon_ability_force");
216 shstr_cmp dragon_skin_force ("dragon_skin_force"); 232 shstr_cmp dragon_skin_force ("dragon_skin_force");
217 233
218 for (tmp = ob->inv; tmp; tmp = tmp->below) 234 for (tmp = ob->inv; tmp; tmp = tmp->below)
219 if (tmp->type == FORCE) 235 if (tmp->type == FORCE)
220 if (tmp->arch->name == dragon_ability_force) 236 if (tmp->arch->archname == dragon_ability_force)
221 abil = tmp; 237 abil = tmp;
222 else if (tmp->arch->name == dragon_skin_force) 238 else if (tmp->arch->archname == dragon_skin_force)
223 skin = tmp; 239 skin = tmp;
224 240
225 set_dragon_name (ob, abil, skin); 241 set_dragon_name (ob, abil, skin);
226 } 242 }
227 243
228 CLEAR_FLAG (ob, FLAG_FRIENDLY);
229 add_friendly_object (ob);
230
231 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name); 245
246 esrv_new_player (this, ob->weight + ob->carrying);
247
248 ob->flag [FLAG_READY_WEAPON] = false;
249 ob->flag [FLAG_READY_SKILL] = false;
250 ob->flag [FLAG_READY_BOW] = false;
251
252 for (object *op = ob->inv; op; op = op->below)
253 if (op->flag [FLAG_APPLIED])
254 switch (op->type)
255 {
256 case SKILL:
257 ob->flag [FLAG_APPLIED] = false;
258 break;
259
260 case WAND:
261 case ROD:
262 case HORN:
263 case BOW:
264 ranged_ob = op;
265 break;
266
267 case WEAPON:
268 combat_ob = op;
269 break;
270 }
271
272 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
273 ob->update_stats ();
235 274
236 ns->floorbox_update (); 275 ns->floorbox_update ();
237
238 esrv_new_player (this, ob->weight + ob->carrying);
239 esrv_send_inventory (ob, ob); 276 esrv_send_inventory (ob, ob);
240 esrv_add_spells (this, 0); 277 esrv_add_spells (this, 0);
241 278
242 enter_exit (ob, 0); 279 activate ();
243 280
244// send_rules (ob);//TODO 281 send_rules (ob);
245// send_news (ob);//TODO 282 send_news (ob);
246// display_motd (ob);//TODO 283 display_motd (ob);
284
285 INVOKE_PLAYER (CONNECT, this);
247 INVOKE_PLAYER (LOGIN, this); 286 INVOKE_PLAYER (LOGIN, this);
287}
288
289void
290player::disconnect ()
291{
292 if (ns)
293 {
294 if (active)
295 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
296
297 INVOKE_PLAYER (DISCONNECT, this);
298
299 ns->reset_stats ();
300 ns->pl = 0;
301 ns = 0;
302 }
303
304 if (ob)
305 ob->close_container (); //TODO: client-specific
306
307 observe = ob;
308
309 deactivate ();
248} 310}
249 311
250// the need for this function can be explained 312// the need for this function can be explained
251// by load_object not returning the object 313// by load_object not returning the object
252void 314void
253player::set_object (object *op) 315player::set_object (object *op)
254{ 316{
255 ob = op; 317 ob = observe = op;
256 ob->contr = this; /* this aren't yet in archetype */ 318 ob->contr = this; /* this aren't yet in archetype */
257 319
320 ob->speed = 1.0f;
258 ob->speed_left = 0.5; 321 ob->speed_left = 0.5f;
259 ob->speed = 1.0; 322
260 ob->direction = 5; /* So player faces south */ 323 ob->direction = 5; /* So player faces south */
261 ob->stats.wc = 2; 324}
262 ob->run_away = 25; /* Then we panick... */
263 325
264 set_first_map (ob); 326void
265 327player::set_observe (object *op)
266 ob->roll_stats (); 328{
329 observe = op ? op : ob;
330 do_los = 1;
267} 331}
268 332
269player::player () 333player::player ()
270{ 334{
271 /* There are some elements we want initialized to non zero value - 335 /* There are some elements we want initialised to non zero value -
272 * we deal with that below this point. 336 * we deal with that below this point.
273 */ 337 */
274 outputs_sync = 16; /* Every 2 seconds */ 338 outputs_sync = 4;
275 outputs_count = 8; /* Keeps present behaviour */ 339 outputs_count = 4;
276 unapply = unapply_nochoice; 340 unapply = unapply_nochoice;
277 341
278 assign (savebed_map, first_map_path); /* Init. respawn position */ 342 savebed_map = first_map_path; /* Init. respawn position */
279 343
280 gen_sp_armour = 10; 344 gen_sp_armour = 10;
281 last_speed = -1;
282 shoottype = range_none;
283 bowtype = bow_normal; 345 bowtype = bow_normal;
284 petmode = pet_normal; 346 petmode = pet_normal;
285 listening = 10; 347 listening = 10;
286 usekeys = containers; 348 usekeys = containers;
287 last_weapon_sp = -1;
288 peaceful = 1; /* default peaceful */ 349 peaceful = 1; /* default peaceful */
289 do_los = 1; 350 do_los = 1;
290 351
291 /* we need to clear these to -1 and not zero - otherwise, 352 weapon_sp = 1.0f;
292 * if a player quits and starts a new character, we wont 353 weapon_sp_left = 0.5f;
293 * send new values to the client, as things like exp start 354}
294 * at zero.
295 */
296 for (int i = 0; i < NUM_SKILLS; i++)
297 last_skill_exp[i] = -1;
298 355
299 for (int i = 0; i < NROFATTACKS; i++) 356void
300 last_resist[i] = -1; 357player::do_destroy ()
358{
359 disconnect ();
301 360
302 last_stats.exp = -1; 361 attachable::do_destroy ();
303 last_weight = (uint32) - 1; 362
363 if (ob)
364 {
365 ob->destroy_inv (false);
366 ob->destroy ();
367 }
368
369 ob = observe = 0;
304} 370}
305 371
306player::~player () 372player::~player ()
307{ 373{
308 terminate_all_pets (ob);
309
310 if (first_player != this)
311 {
312 player *prev = first_player;
313
314 while (prev && prev->next && prev->next != this)
315 prev = prev->next;
316
317 if (prev->next != this)
318 {
319 LOG (llevError, "Free_player: Can't find previous player.\n");
320 abort ();
321 }
322
323 prev->next = next;
324 }
325 else
326 first_player = next;
327
328 if (ob)
329 {
330 ob->contr = 0;
331 ob->destroy (1);
332 }
333
334 if (ns)
335 {
336 ns->send_packet ("goodbye");
337 ns->flush ();
338 ns->pl = 0;
339 ns->destroy ();
340 }
341
342 /* Clear item stack */ 374 /* Clear item stack */
343 free (stack_items); 375 free (stack_items);
344} 376}
345 377
346/* Tries to add player on the connection passed in ns. 378/* Tries to add player on the connection passed in ns.
… …
351player::create () 383player::create ()
352{ 384{
353 player *pl = new player; 385 player *pl = new player;
354 386
355 pl->set_object (arch_to_object (get_player_archetype (0))); 387 pl->set_object (arch_to_object (get_player_archetype (0)));
388
389 pl->ob->roll_stats ();
390 pl->ob->stats.wc = 2;
391 pl->ob->run_away = 25; /* Then we panick... */
392
393 set_first_map (pl->ob);
356 394
357 return pl; 395 return pl;
358} 396}
359 397
360/* 398/*
… …
363 * Note: there MUST be at least one player archetype! 401 * Note: there MUST be at least one player archetype!
364 */ 402 */
365archetype * 403archetype *
366get_player_archetype (archetype *at) 404get_player_archetype (archetype *at)
367{ 405{
368 archetype *start = at; 406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
369 407
370 for (;;) 408 for (;;)
371 { 409 {
372 if (at == NULL || at->next == NULL) 410 if (++i == archetypes.end ())
373 at = first_archetype; 411 i = archetypes.begin ();
374 else 412 else if (*i == at)
375 at = at->next; 413 cleanup ("not a single player archetype found");
376 414
377 if (at->clone.type == PLAYER) 415 if ((*i)->type == PLAYER)
378 return at; 416 return *i;
379
380 if (at == start)
381 {
382 LOG (llevError, "No Player archetypes\n");
383 exit (-1);
384 }
385 } 417 }
386} 418}
387 419
388object * 420object *
389get_nearest_player (object *mon) 421get_nearest_player (object *mon)
390{ 422{
391 object *op = NULL; 423 object *op = NULL;
392 player *pl = NULL;
393 objectlink *ol; 424 objectlink *ol;
394 unsigned lastdist; 425 unsigned lastdist;
395 rv_vector rv; 426 rv_vector rv;
396 427
397 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 428 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
398 { 429 {
399 /* We should not find free objects on this friendly list, but it 430 /* We should not find free objects on this friendly list, but it
400 * does periodically happen. Given that, lets deal with it. 431 * does periodically happen. Given that, lets deal with it.
401 * While unlikely, it is possible the next object on the friendly 432 * While unlikely, it is possible the next object on the friendly
402 * list is also free, so encapsulate this in a while loop. 433 * list is also free, so encapsulate this in a while loop.
… …
406 object *tmp = ol->ob; 437 object *tmp = ol->ob;
407 438
408 /* Can't do much more other than log the fact, because the object 439 /* Can't do much more other than log the fact, because the object
409 * itself will have been cleared. 440 * itself will have been cleared.
410 */ 441 */
411 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 442 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
443 tmp->debug_desc ());
412 ol = ol->next; 444 ol = ol->next;
413 remove_friendly_object (tmp); 445 remove_friendly_object (tmp);
414 if (!ol) 446 if (!ol)
415 return op; 447 return op;
416 } 448 }
… …
429 { 461 {
430 op = ol->ob; 462 op = ol->ob;
431 lastdist = rv.distance; 463 lastdist = rv.distance;
432 } 464 }
433 } 465 }
434 for (pl = first_player; pl != NULL; pl = pl->next) 466
435 { 467 for_all_players (pl)
436 if (can_detect_enemy (mon, pl->ob, &rv)) 468 if (can_detect_enemy (mon, pl->ob, &rv))
437 {
438
439 if (lastdist > rv.distance) 469 if (lastdist > rv.distance)
440 { 470 {
441 op = pl->ob; 471 op = pl->ob;
442 lastdist = rv.distance; 472 lastdist = rv.distance;
443 } 473 }
444 } 474
445 }
446#if 0 475#if 0
447 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 476 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
448#endif 477#endif
449 return op; 478 return op;
450} 479}
… …
508 x = mon->x; 537 x = mon->x;
509 y = mon->y; 538 y = mon->y;
510 m = mon->map; 539 m = mon->map;
511 dir = rv.direction; 540 dir = rv.direction;
512 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 541 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
513 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 542 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
543
514 /* If we can't solve it within the search distance, return now. */ 544 /* If we can't solve it within the search distance, return now. */
515 if (diff > max) 545 if (diff > max)
516 return 0; 546 return 0;
547
517 while (diff > 1 && max > 0) 548 while (diff > 1 && max > 0)
518 { 549 {
519 lastx = x; 550 lastx = x;
520 lasty = y; 551 lasty = y;
521 lastmap = m; 552 lastmap = m;
… …
603 max--; 634 max--;
604 lastdir = dir; 635 lastdir = dir;
605 if (!firstdir) 636 if (!firstdir)
606 firstdir = dir; 637 firstdir = dir;
607 } 638 }
639
608 if (diff <= 1) 640 if (diff <= 1)
609 { 641 {
610 /* Recalculate diff (distance) because we may not have actually 642 /* Recalculate diff (distance) because we may not have actually
611 * headed toward player for entire distance. 643 * headed toward player for entire distance.
612 */ 644 */
613 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 645 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
614 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 646 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
615 } 647 }
648
616 if (diff > max) 649 if (diff > max)
617 return 0; 650 return 0;
618 } 651 }
652
619 /* If we reached the max, didn't find a direction in time */ 653 /* If we reached the max, didn't find a direction in time */
620 if (!max) 654 if (!max)
621 return 0; 655 return 0;
622 656
623 return firstdir; 657 return firstdir;
… …
737roll_stat (void) 771roll_stat (void)
738{ 772{
739 int a[4], i, j, k; 773 int a[4], i, j, k;
740 774
741 for (i = 0; i < 4; i++) 775 for (i = 0; i < 4; i++)
742 a[i] = (int) RANDOM () % 6 + 1; 776 a[i] = (int) rndm (6) + 1;
743 777
744 for (i = 0, j = 0, k = 7; i < 4; i++) 778 for (i = 0, j = 0, k = 7; i < 4; i++)
745 if (a[i] < k) 779 if (a[i] < k)
746 k = a[i], j = i; 780 k = a[i], j = i;
747 781
… …
753} 787}
754 788
755void 789void
756object::roll_stats () 790object::roll_stats ()
757{ 791{
758 int statsort [7]; 792 int statsort [NUM_STATS];
759 793
760 for (;;) 794 for (;;)
761 { 795 {
762 int sum = 0; 796 int sum = 0;
763 for (int i = 7; i--; ) 797 for (int i = NUM_STATS; i--; )
764 sum += statsort [i] = roll_stat (); 798 sum += statsort [i] = roll_stat ();
765 799
766 if (sum >= 82 && sum <= 116) 800 if (sum >= 82 && sum <= 116)
767 break; 801 break;
768 } 802 }
769 803
770 // Sort the stats so that rerolling is easier... 804 // Sort the stats so that rerolling is easier...
771 std::sort (statsort, statsort + 7, std::greater<int>()); 805 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
772 806
807 for (int i = 0; i < NUM_STATS; ++i)
773 stats.Str = statsort[0]; 808 stats.stat (i) = statsort [i];
774 stats.Dex = statsort[1];
775 stats.Con = statsort[2];
776 stats.Int = statsort[3];
777 stats.Wis = statsort[4];
778 stats.Pow = statsort[5];
779 stats.Cha = statsort[6];
780 809
781 stats.exp = 0; 810 stats.exp = 0;
782 stats.ac = 0; 811 stats.ac = 0;
783 812
784 stats.hp = stats.maxhp; 813 stats.hp = stats.maxhp;
… …
796} 825}
797 826
798void 827void
799object::swap_stats (int a, int b) 828object::swap_stats (int a, int b)
800{ 829{
801 int tmp = get_attr_value (&contr->orig_stats, a); 830 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
802 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
803 set_attr_value (&contr->orig_stats, b, tmp);
804 831
832 for (int i = 0; i < NUM_STATS; ++i)
805 stats.Str = contr->orig_stats.Str; 833 stats.stat (i) = contr->orig_stats.stat (i);
806 stats.Dex = contr->orig_stats.Dex;
807 stats.Con = contr->orig_stats.Con;
808 stats.Int = contr->orig_stats.Int;
809 stats.Wis = contr->orig_stats.Wis;
810 stats.Pow = contr->orig_stats.Pow;
811 stats.Cha = contr->orig_stats.Cha;
812 834
813 //TODO: the following code looks so borked and should, at the very least, 835 //TODO: the following code looks so borked and should, at the very least,
814 // be merged with the similar code in roll_stats 836 // be merged with the similar code in roll_stats
815 stats.ac = 0; 837 stats.ac = 0;
816 838
… …
828 contr->levsp[1] = 6; 850 contr->levsp[1] = 6;
829 contr->levgrace[1] = 3; 851 contr->levgrace[1] = 3;
830 852
831 contr->orig_stats = stats; 853 contr->orig_stats = stats;
832 } 854 }
855}
856
857static void
858start_info (object *op)
859{
860 char buf[MAX_BUF];
861
862 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
863 new_draw_info (NDI_UNIQUE, 0, op, buf);
864 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865 //new_draw_info (NDI_UNIQUE, 0, op, " ");
833} 866}
834 867
835/* This function takes the key that is passed, and does the 868/* This function takes the key that is passed, and does the
836 * appropriate action with it (change race, or other things). 869 * appropriate action with it (change race, or other things).
837 * The function name is for historical reasons - now we have 870 * The function name is for historical reasons - now we have
838 * separate race and class; this actually changes the RACE, 871 * separate race and class; this actually changes the RACE,
839 * not the class. 872 * not the class.
840 */ 873 */
841int 874void
842key_change_class (object *op, char key) 875player::chargen_race_done ()
843{ 876{
844 int tmp_loop;
845
846 if (key == 'd' || key == 'D')
847 {
848 char buf[MAX_BUF];
849
850 /* this must before then initial items are given */ 877 /* this must before then initial items are given */
851 esrv_new_player (op->contr, op->weight + op->carrying); 878 esrv_new_player (ob->contr, ob->weight + ob->carrying);
852 879
853 treasurelist *tl = find_treasurelist ("starting_wealth"); 880 treasurelist *tl = treasurelist::find ("starting_wealth");
854 if (tl) 881 if (tl)
855 create_treasure (tl, op, 0, 0, 0); 882 create_treasure (tl, ob, 0, 0, 0);
856 883
857 INVOKE_PLAYER (BIRTH, op->contr); 884 INVOKE_PLAYER (BIRTH, ob->contr);
858 INVOKE_PLAYER (LOGIN, op->contr); 885 INVOKE_PLAYER (LOGIN, ob->contr);
859 886
860 op->contr->ns->state = ST_PLAYING; 887 ob->contr->ns->state = ST_PLAYING;
861 888
862 if (op->msg) 889 if (ob->msg)
863 op->msg = NULL; 890 ob->msg = 0;
864 891
865 /* We create this now because some of the unique maps will need it 892 /* We create this now because some of the unique maps will need it
866 * to save here. 893 * to save here.
867 */ 894 */
895 {
896 char buf[MAX_BUF];
868 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
869 make_path_to_file (buf); 898 make_path_to_file (buf);
899 }
870 900
871#ifdef AUTOSAVE
872 op->contr->last_save_tick = pticks;
873#endif
874 start_info (op); 901 start_info (ob);
875 CLEAR_FLAG (op, FLAG_WIZ); 902 CLEAR_FLAG (ob, FLAG_WIZ);
876 give_initial_items (op, op->randomitems); 903 give_initial_items (ob, ob->randomitems);
877 link_player_skills (op); 904 link_player_skills (ob);
878 esrv_send_inventory (op, op); 905 esrv_send_inventory (ob, ob);
879 op->update_stats (); 906 ob->update_stats ();
880 907
881 /* This moves the player to a different start map, if there 908 /* This moves the player to a different start map, if there
882 * is one for this race 909 * is one for this race
883 */ 910 */
884 if (*first_map_ext_path) 911 if (*first_map_ext_path)
885 { 912 {
886 object *tmp; 913 object *tmp;
887 char mapname[MAX_BUF]; 914 char mapname[MAX_BUF];
888 915
889 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 916 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
890 tmp = object::create (); 917 tmp = object::create ();
891 EXIT_PATH (tmp) = mapname; 918 EXIT_PATH (tmp) = mapname;
892 EXIT_X (tmp) = op->x; 919 EXIT_X (tmp) = ob->x;
893 EXIT_Y (tmp) = op->y; 920 EXIT_Y (tmp) = ob->y;
894 enter_exit (op, tmp); /* we don't really care if it succeeded; 921 ob->enter_exit (tmp); /* we don't really care if it succeeded;
895 * if the map isn't there, then stay on the 922 * if the map isn't there, then stay on the
896 * default initial map */ 923 * default initial map */
897 tmp->destroy (); 924 tmp->destroy ();
898 } 925 }
899 else 926 else
900 LOG (llevDebug, "first_map_ext_path not set\n"); 927 LOG (llevDebug, "first_map_ext_path not set\n");
928}
901 929
902 return 0; 930void
903 } 931player::chargen_race_next ()
904 932{
905 /* Following actually changes the race - this is the default command 933 /* Following actually changes the race - this is the default command
906 * if we don't match with one of the options above. 934 * if we don't match with one of the options above.
907 */ 935 */
908 936
909 tmp_loop = 0; 937 do
910 while (!tmp_loop)
911 { 938 {
912 shstr name = op->name; 939 shstr name = ob->name;
913 int x = op->x, y = op->y; 940 int x = ob->x, y = ob->y;
914 941
915 op->remove_statbonus (); 942 ob->remove_statbonus ();
916 op->remove (); 943 ob->remove ();
917 op->arch = get_player_archetype (op->arch); 944 ob->arch = get_player_archetype (ob->arch);
918 op->arch->clone.copy_to (op); 945 ob->arch->copy_to (ob);
919 op->instantiate (); 946 ob->instantiate ();
920 op->stats = op->contr->orig_stats; 947 ob->stats = ob->contr->orig_stats;
921 op->name = op->name_pl = name; 948 ob->name = ob->name_pl = name;
922 op->x = x; 949 ob->x = x;
923 op->y = y; 950 ob->y = y;
924 SET_ANIMATION (op, 2); /* So player faces south */ 951 SET_ANIMATION (ob, 2); /* So player faces south */
925 insert_ob_in_map (op, op->map, op, 0); 952 insert_ob_in_map (ob, ob->map, ob, 0);
926 assign (op->contr->title, op->arch->clone.name); 953 assign (ob->contr->title, ob->arch->object::name);
927 op->add_statbonus (); 954 ob->add_statbonus ();
928 tmp_loop = allowed_class (op);
929 } 955 }
956 while (!allowed_class (ob));
930 957
931 update_object (op, UP_OBJ_FACE); 958 update_object (ob, UP_OBJ_FACE);
932 esrv_update_item (UPD_FACE, op, op); 959 esrv_update_item (UPD_FACE, ob, ob);
933 op->update_stats (); 960 ob->update_stats ();
934 op->stats.hp = op->stats.maxhp; 961 ob->stats.hp = ob->stats.maxhp;
935 op->stats.sp = op->stats.maxsp; 962 ob->stats.sp = ob->stats.maxsp;
936 op->stats.grace = 0; 963 ob->stats.grace = 0;
937
938 if (op->msg)
939 new_draw_info (NDI_BLUE, 0, op, op->msg);
940
941 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
942 return 0;
943}
944
945int
946key_confirm_quit (object *op, char key)
947{
948 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
949 {
950 op->contr->ns->state = ST_PLAYING;
951 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
952 return 1;
953 }
954
955 INVOKE_PLAYER (LOGOUT, op->contr);
956 INVOKE_PLAYER (QUIT, op->contr);
957
958 terminate_all_pets (op);
959 leave_map (op);
960 op->direction = 0;
961 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
962
963 strcpy (op->contr->killer, "quit");
964 check_score (op);
965 op->contr->party = 0;
966 op->contr->own_title[0] = '\0';
967
968 object_ptr ob = op;
969
970 delete ob->contr;
971
972 /* We need to hunt for any per player unique maps in memory and
973 * get rid of them. The trailing slash in the path is intentional,
974 * so that players named 'Ab' won't match against players 'Abe' pathname
975 */
976 char buf[MAX_BUF];
977 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
978
979 for (maptile *next, *mp = first_map; mp; mp = next)
980 {
981 next = mp->next;
982
983 if (!strncmp (mp->path, buf, strlen (buf)))
984 delete_map (mp);
985 }
986
987 delete_character (ob->name, 1);
988
989 return 1;
990} 964}
991 965
992void 966void
993flee_player (object *op) 967flee_player (object *op)
994{ 968{
… …
1041 /* Cornered, get rid of scared */ 1015 /* Cornered, get rid of scared */
1042 CLEAR_FLAG (op, FLAG_SCARED); 1016 CLEAR_FLAG (op, FLAG_SCARED);
1043 op->enemy = NULL; 1017 op->enemy = NULL;
1044} 1018}
1045 1019
1046
1047/* check_pick sees if there is stuff to be picked up/picks up stuff. 1020/* check_pick sees if there is stuff to be picked up/picks up stuff.
1048 * IT returns 1 if the player should keep on moving, 0 if he should 1021 * It returns 1 if the player should keep on moving, 0 if he should
1049 * stop. 1022 * stop.
1050 */ 1023 */
1051int 1024int
1052check_pick (object *op) 1025check_pick (object *op)
1053{ 1026{
1054 object *tmp, *next; 1027 object *tmp, *next;
1055 int stop = 0; 1028 int stop = 0;
1056 int j, k, wvratio; 1029 int wvratio;
1057 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1058 1031
1059 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1060 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1061 return 1; 1034 return 1;
1062 1035
… …
1130 if (tmp->name != NULL) 1103 if (tmp->name != NULL)
1131 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1132 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1105 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1133 else 1106 else
1134 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1135 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1108 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109
1136 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1110 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1137
1138 sprintf (putstring, "...flags: ");
1139 for (k = 0; k < 4; k++)
1140 {
1141 for (j = 0; j < 32; j++)
1142 {
1143 if ((tmp->flags[k] >> j) & 0x01)
1144 {
1145 sprintf (tmpstr, "%d ", k * 32 + j);
1146 strcat (putstring, tmpstr);
1147 }
1148 }
1149 }
1150 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1151
1152#if 0
1153 /* print the flags too */
1154 for (k = 0; k < 4; k++)
1155 {
1156 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1157 for (j = 0; j < 32; j++)
1158 {
1159 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1160 if (!((j + 1) % 4))
1161 fprintf (stderr, " ");
1162 }
1163 fprintf (stderr, " [%d]\n", k * 32);
1164 }
1165#endif
1166 } 1111 }
1112
1167 /* philosophy: 1113 /* philosophy:
1168 * It's easy to grab an item type from a pile, as long as it's 1114 * It's easy to grab an item type from a pile, as long as it's
1169 * generic. This takes no game-time. For more detailed pickups 1115 * generic. This takes no game-time. For more detailed pickups
1170 * and selections, select-items shoul dbe used. This is a 1116 * and selections, select-items should be used. This is a
1171 * grab-as-you-run type mode that's really useful for arrows for 1117 * grab-as-you-run type mode that's really useful for arrows for
1172 * example. 1118 * example.
1173 * The drawback: right now it has no frontend, so you need to 1119 * The drawback: right now it has no frontend, so you need to
1174 * stick the bits you want into a calculator in hex mode and then 1120 * stick the bits you want into a calculator in hex mode and then
1175 * convert to decimal and then 'pickup <#> 1121 * convert to decimal and then 'pickup <#>
… …
1360 /* careful: chairs and tables are weapons! */ 1306 /* careful: chairs and tables are weapons! */
1361 if (op->contr->mode & PU_ALLWEAPON) 1307 if (op->contr->mode & PU_ALLWEAPON)
1362 { 1308 {
1363 if (tmp->type == WEAPON && tmp->name != NULL) 1309 if (tmp->type == WEAPON && tmp->name != NULL)
1364 { 1310 {
1365 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1311 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1366 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1312 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1367 { 1313 {
1368 pick_up (op, tmp); 1314 pick_up (op, tmp);
1369 continue; 1315 continue;
1370 } 1316 }
1371 } 1317 }
1372 1318
1373 if (tmp->type == WEAPON && tmp->name == NULL) 1319 if (tmp->type == WEAPON && tmp->name == NULL)
1374 { 1320 {
1375 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1321 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1376 { 1322 {
1377 pick_up (op, tmp); 1323 pick_up (op, tmp);
1378 continue; 1324 continue;
1379 } 1325 }
1380 } 1326 }
… …
1405 if (tmp->name != NULL) 1351 if (tmp->name != NULL)
1406 { 1352 {
1407 fprintf (stderr, "%s", tmp->name); 1353 fprintf (stderr, "%s", tmp->name);
1408 } 1354 }
1409 else 1355 else
1410 fprintf (stderr, "%s", tmp->arch->name); 1356 fprintf (stderr, "%s", tmp->arch->archname);
1411 fprintf (stderr, ",%d] = ", tmp->type); 1357 fprintf (stderr, ",%d] = ", tmp->type);
1412 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1358 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1413#endif 1359#endif
1414 continue; 1360 continue;
1415 } 1361 }
… …
1426 * found object is returned. 1372 * found object is returned.
1427 */ 1373 */
1428object * 1374object *
1429find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1430{ 1376{
1431 object *tmp = NULL; 1377 object *tmp = 0;
1432 1378
1433 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1434 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1435 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1436 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1437 return op; 1383 return op;
1384
1438 return tmp; 1385 return tmp;
1439} 1386}
1440 1387
1441/* 1388/*
1442 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1389 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1443 * against the target. A full test is not performed, simply a basic test 1390 * against the target. A full test is not performed, simply a basic test
1444 * of resistances. The archer is making a quick guess at what he sees down 1391 * of resistances. The archer is making a quick guess at what he sees down
1445 * the hall. Failing that it does it's best to pick the highest plus arrow. 1392 * the hall. Failing that it does it's best to pick the highest plus arrow.
1446 */ 1393 */
1447
1448object * 1394object *
1449find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1450{ 1396{
1451 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1452 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1485 else 1431 else
1486 { 1432 {
1487 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1433 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1488 { 1434 {
1489 attacktype = 1 << attacknum; 1435 attacktype = 1 << attacknum;
1490 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1436 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1491 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1437 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1492 { 1438 {
1493 tmp = arrow; 1439 tmp = arrow;
1494 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1440 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1495 } 1441 }
1496 } 1442 }
1497 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1443 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1498 { 1444 {
1499 tmp = arrow; 1445 tmp = arrow;
… …
1518 * find_better_arrow to find a decent arrow to use. 1464 * find_better_arrow to find a decent arrow to use.
1519 * op = the shooter 1465 * op = the shooter
1520 * type = bow->race 1466 * type = bow->race
1521 * dir = fire direction 1467 * dir = fire direction
1522 */ 1468 */
1523
1524object * 1469object *
1525pick_arrow_target (object *op, const char *type, int dir) 1470pick_arrow_target (object *op, const char *type, int dir)
1526{ 1471{
1527 object *tmp = NULL; 1472 object *tmp = NULL;
1528 maptile *m; 1473 maptile *m;
… …
1593 */ 1538 */
1594int 1539int
1595fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1540fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1596{ 1541{
1597 object *left, *bow; 1542 object *left, *bow;
1598 int bowspeed, mflags; 1543 int mflags;
1599 maptile *m; 1544 maptile *m;
1600 1545
1601 if (!dir) 1546 if (!dir)
1602 { 1547 {
1603 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1548 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1604 return 0; 1549 return 0;
1605 } 1550 }
1606 1551
1607 if (op->type == PLAYER) 1552 if (op->contr)
1608 bow = op->contr->ranges[range_bow]; 1553 bow = op->current_weapon;
1609 else 1554 else
1610 { 1555 {
1611 for (bow = op->inv; bow; bow = bow->below) 1556 for (bow = op->inv; bow; bow = bow->below)
1612 /* Don't check for applied - monsters don't apply bows - in that way, they 1557 /* Don't check for applied - monsters don't apply bows - in that way, they
1613 * don't need to switch back and forth between bows and weapons. 1558 * don't need to switch back and forth between bows and weapons.
… …
1618 if (!bow) 1563 if (!bow)
1619 { 1564 {
1620 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1565 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1621 return 0; 1566 return 0;
1622 } 1567 }
1568
1569 // optimisation: move object to top so we will find it quickly again
1570 if (bow->below)
1571 {
1572 bow->remove ();
1573 op->insert (bow);
1574 }
1575
1623 } 1576 }
1624 1577
1625 if (!bow->race || !bow->skill) 1578 if (!bow->race || !bow->skill)
1626 { 1579 {
1627 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1580 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1628 return 0; 1581 return 0;
1629 } 1582 }
1630
1631 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1632
1633 /* penalize ROF for bestarrow */
1634 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1635 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1636
1637 if (bowspeed < 1)
1638 bowspeed = 1;
1639 1583
1640 if (arrow == NULL) 1584 if (arrow == NULL)
1641 { 1585 {
1642 if ((arrow = find_arrow (op, bow->race)) == NULL) 1586 if ((arrow = find_arrow (op, bow->race)) == NULL)
1643 { 1587 {
1644 if (op->type == PLAYER) 1588 if (op->type == PLAYER)
1645 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1589 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1646 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1590 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1647 else 1591 else
1648 CLEAR_FLAG (op, FLAG_READY_BOW); 1592 CLEAR_FLAG (op, FLAG_READY_BOW);
1593
1649 return 0; 1594 return 0;
1650 } 1595 }
1651 } 1596 }
1652 1597
1653 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1598 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1675 return 0; 1620 return 0;
1676 } 1621 }
1677 1622
1678 arrow->set_owner (op); 1623 arrow->set_owner (op);
1679 arrow->skill = bow->skill; 1624 arrow->skill = bow->skill;
1680
1681 arrow->direction = dir; 1625 arrow->direction = dir;
1682 arrow->x = sx; 1626
1683 arrow->y = sy; 1627 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1628 arrow->stats.hp = arrow->stats.dam;
1629 arrow->stats.grace = arrow->attacktype;
1630
1631 if (arrow->slaying)
1632 arrow->spellarg = strdup (arrow->slaying);
1633
1634#if 0
1635 if (player *pl = op->contr)
1636 {
1637 float speed = pl->weapon_sp;
1638
1639 /* penalize ROF for bestarrow */
1640 if (pl->bowtype == bow_bestarrow)
1641 speed *= .9f;
1642 else
1643 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1644
1645 op->speed_left += speed - op->speed;
1646 }
1647#endif
1648
1649 SET_ANIMATION (arrow, arrow->direction);
1650
1651 /* update the speed */
1652 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1653 + bow->stats.dam / 7.f;
1654
1655 arrow->set_speed (max (arrow->speed, 2.f));
1656 arrow->speed_left = 0;
1657
1658 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1684 1659
1685 if (op->type == PLAYER) 1660 if (op->type == PLAYER)
1686 { 1661 {
1687 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1688 op->update_stats ();
1689 }
1690
1691 SET_ANIMATION (arrow, arrow->direction);
1692 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1693 arrow->stats.hp = arrow->stats.dam;
1694 arrow->stats.grace = arrow->attacktype;
1695 if (arrow->slaying != NULL)
1696 arrow->spellarg = strdup (arrow->slaying);
1697
1698 /* Note that this was different for monsters - they got their level
1699 * added to the damage. I think the strength bonus is more proper.
1700 */
1701
1702 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1703
1704 /* update the speed */
1705 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1706 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1707
1708 if (arrow->speed < 1.0)
1709 arrow->speed = 1.0;
1710 update_ob_speed (arrow);
1711 arrow->speed_left = 0;
1712
1713 if (op->type == PLAYER)
1714 {
1715 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1716 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1717 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1718
1719 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1662 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1663 wc -= dex_bonus[op->stats.Dex];
1664
1665 if (!arrow->slaying)
1666 arrow->slaying = op->slaying;
1667
1668 arrow->attacktype |= op->attacktype;
1720 } 1669 }
1721 else 1670 else
1722 { 1671 {
1723 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1724 arrow->level = op->level; 1672 arrow->level = op->level;
1725 } 1673 arrow->stats.wc -= bow->magic;
1726 1674
1727 if (arrow->attacktype == AT_PHYSICAL) 1675 if (!arrow->slaying)
1676 arrow->slaying = bow->slaying;
1677
1728 arrow->attacktype |= bow->attacktype; 1678 arrow->attacktype |= bow->attacktype;
1679 }
1729 1680
1730 if (bow->slaying) 1681 wc -= arrow->level;
1731 arrow->slaying = bow->slaying; 1682 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1732 1683
1733 arrow->map = m; 1684 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1734 arrow->move_type = MOVE_FLY_LOW; 1685 arrow->move_type = MOVE_FLY_LOW;
1735 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1686 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1736 1687
1737 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1688 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1738 insert_ob_in_map (arrow, m, op, 0); 1689 m->insert (arrow, sx, sy, op);
1739 1690
1740 if (!arrow->destroyed ()) 1691 if (!arrow->destroyed ())
1741 move_arrow (arrow); 1692 move_arrow (arrow);
1742 1693
1743 if (op->type == PLAYER) 1694 if (op->type == PLAYER)
… …
1763{ 1714{
1764 int ret = 0, wcmod = 0; 1715 int ret = 0, wcmod = 0;
1765 1716
1766 if (op->contr->bowtype == bow_bestarrow) 1717 if (op->contr->bowtype == bow_bestarrow)
1767 { 1718 {
1768 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1719 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1769 } 1720 }
1770 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1721 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1771 { 1722 {
1772 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1723 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1773 wcmod = -1; 1724 wcmod = -1;
1725
1774 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1726 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1775 } 1727 }
1776 else if (op->contr->bowtype == bow_threewide) 1728 else if (op->contr->bowtype == bow_threewide)
1777 { 1729 {
1778 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1730 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1782 else if (op->contr->bowtype == bow_spreadshot) 1734 else if (op->contr->bowtype == bow_spreadshot)
1783 { 1735 {
1784 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1736 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1785 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1737 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1786 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1738 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1787
1788 } 1739 }
1789 else 1740 else
1790 { 1741 {
1791 /* Simple case */ 1742 /* Simple case */
1792 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1743 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1793 } 1744 }
1745
1794 return ret; 1746 return ret;
1795} 1747}
1796
1797 1748
1798/* Fires a misc (wand/rod/horn) object in 'dir'. 1749/* Fires a misc (wand/rod/horn) object in 'dir'.
1799 * Broken apart from 'fire' to keep it more readable. 1750 * Broken apart from 'fire' to keep it more readable.
1800 */ 1751 */
1801void 1752void
1802fire_misc_object (object *op, int dir) 1753fire_misc_object (object *op, int dir)
1803{ 1754{
1804 object *item; 1755 object *item = op->contr->ranged_ob;
1805 1756
1806 if (!op->contr->ranges[range_misc]) 1757 if (!item)
1807 { 1758 {
1808 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1759 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1809 return; 1760 return;
1810 } 1761 }
1811 1762
1812 item = op->contr->ranges[range_misc];
1813 if (!item->inv) 1763 if (!item->inv)
1814 { 1764 {
1815 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1765 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1816 return; 1766 return;
1817 } 1767 }
1768
1769 if (!op->change_weapon (item))
1770 return;
1771
1818 if (item->type == WAND) 1772 if (item->type == WAND)
1819 { 1773 {
1820 if (item->stats.food <= 0) 1774 if (item->stats.food <= 0)
1821 { 1775 {
1822 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1776 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1823 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1778
1824 return; 1779 return;
1825 } 1780 }
1826 } 1781 }
1827 else if (item->type == ROD || item->type == HORN) 1782 else if (item->type == ROD || item->type == HORN)
1828 { 1783 {
1829 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1784 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1830 { 1785 {
1831 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1786 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1787
1832 if (item->type == ROD) 1788 if (item->type == ROD)
1833 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1789 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1834 else 1790 else
1835 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1792
1836 return; 1793 return;
1837 } 1794 }
1838 } 1795 }
1839 1796
1840 if (cast_spell (op, item, dir, item->inv, NULL)) 1797 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1847 object *tmp; 1804 object *tmp;
1848 1805
1849 if (item->arch) 1806 if (item->arch)
1850 { 1807 {
1851 CLEAR_FLAG (item, FLAG_ANIMATE); 1808 CLEAR_FLAG (item, FLAG_ANIMATE);
1852 item->face = item->arch->clone.face; 1809 item->face = item->arch->face;
1853 item->speed = 0; 1810 item->set_speed (0);
1854 update_ob_speed (item);
1855 } 1811 }
1812
1856 if ((tmp = item->in_player ())) 1813 if ((tmp = item->in_player ()))
1857 esrv_update_item (UPD_ANIM, tmp, item); 1814 esrv_update_item (UPD_ANIM, tmp, item);
1858 } 1815 }
1859 } 1816 }
1860 else if (item->type == ROD || item->type == HORN) 1817 else if (item->type == ROD || item->type == HORN)
1861 {
1862 drain_rod_charge (item); 1818 drain_rod_charge (item);
1863 }
1864 } 1819 }
1865} 1820}
1866 1821
1867/* Received a fire command for the player - go and do it. 1822/* Received a fire command for the player - go and do it.
1868 */ 1823 */
1869void 1824bool
1870fire (object *op, int dir) 1825fire (object *op, int dir)
1871{ 1826{
1872 int spellcost = 0; 1827 int spellcost = 0;
1873 1828
1874 /* check for loss of invisiblity/hide */ 1829 /* check for loss of invisiblity/hide */
1875 if (action_makes_visible (op)) 1830 if (action_makes_visible (op))
1876 make_visible (op); 1831 make_visible (op);
1877 1832
1878 switch (op->contr->shoottype) 1833 player *pl = op->contr;
1834
1835 if (pl->golem)
1836 {
1837 control_golem (op->contr->golem, dir);
1838 return false;
1879 { 1839 }
1880 case range_none:
1881 return;
1882 1840
1883 case range_bow: 1841 object *ob = pl->ranged_ob;
1842
1843 if (!ob)
1844 return false;
1845
1846 if (!op->change_weapon (ob))
1847 return false;
1848
1849 if (op->speed_left > 0.f)
1850 --op->speed_left;
1851 else
1852 return false;
1853
1854 switch (ob->type)
1855 {
1856 case BOW:
1884 player_fire_bow (op, dir); 1857 player_fire_bow (op, dir);
1885 return; 1858 break;
1886 1859
1887 case range_magic: /* Casting spells */ 1860 case SPELL:
1888 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1861 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1889 return; 1862 break;
1890 1863
1891 case range_misc: 1864 case BUILDER:
1865 apply_map_builder (op, dir);
1866 break;
1867
1868 case SKILL:
1869 do_skill (op, op, ob, dir, 0);
1870 break;
1871
1872 default:
1892 fire_misc_object (op, dir); 1873 fire_misc_object (op, dir);
1893 return; 1874 break;
1894
1895 case range_golem: /* Control summoned monsters from scrolls */
1896 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1897 {
1898 op->contr->ranges[range_golem] = 0;
1899 op->contr->shoottype = range_none;
1900 }
1901 else
1902 control_golem (op->contr->ranges[range_golem], dir);
1903 return;
1904
1905 case range_skill:
1906 if (!op->chosen_skill)
1907 {
1908 if (op->type == PLAYER)
1909 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1910 return;
1911 }
1912 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1913 return;
1914 case range_builder:
1915 apply_map_builder (op, dir);
1916 return;
1917 default:
1918 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1919 return;
1920 } 1875 }
1921}
1922 1876
1923 1877 return true;
1878}
1924 1879
1925/* find_key 1880/* find_key
1926 * We try to find a key for the door as passed. If we find a key 1881 * We try to find a key for the door as passed. If we find a key
1927 * and successfully use it, we return the key, otherwise NULL 1882 * and successfully use it, we return the key, otherwise NULL
1928 * This function merges both normal and locked door, since the logic 1883 * This function merges both normal and locked door, since the logic
… …
1930 * pl is the player, 1885 * pl is the player,
1931 * inv is the objects inventory to searched 1886 * inv is the objects inventory to searched
1932 * door is the door we are trying to match against. 1887 * door is the door we are trying to match against.
1933 * This function can be called recursively to search containers. 1888 * This function can be called recursively to search containers.
1934 */ 1889 */
1935
1936object * 1890object *
1937find_key (object *pl, object *container, object *door) 1891find_key (object *pl, object *container, object *door)
1938{ 1892{
1939 object *tmp, *key; 1893 object *tmp, *key;
1940 1894
1941 /* Should not happen, but sanity checking is never bad */ 1895 /* Should not happen, but sanity checking is never bad */
1942 if (container->inv == NULL) 1896 if (!container->inv)
1943 return NULL; 1897 return 0;
1944 1898
1945 /* First, lets try to find a key in the top level inventory */ 1899 /* First, lets try to find a key in the top level inventory */
1946 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1900 for (tmp = container->inv; tmp; tmp = tmp->below)
1947 { 1901 {
1948 if (door->type == DOOR && tmp->type == KEY) 1902 if (door->type == DOOR && tmp->type == KEY)
1949 break; 1903 break;
1950 /* For sanity, we should really check door type, but other stuff 1904 /* For sanity, we should really check door type, but other stuff
1951 * (like containers) can be locked with special keys 1905 * (like containers) can be locked with special keys
1952 */ 1906 */
1953 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1907 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1954 break; 1908 break;
1955 } 1909 }
1910
1956 /* No key found - lets search inventories now */ 1911 /* No key found - lets search inventories now */
1957 /* If we find and use a key in an inventory, return at that time. 1912 /* If we find and use a key in an inventory, return at that time.
1958 * otherwise, if we search all the inventories and still don't find 1913 * otherwise, if we search all the inventories and still don't find
1959 * a key, return 1914 * a key, return
1960 */ 1915 */
1961 if (!tmp) 1916 if (!tmp)
1962 { 1917 {
1963 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1918 for (tmp = container->inv; tmp; tmp = tmp->below)
1964 { 1919 {
1965 /* No reason to search empty containers */ 1920 /* No reason to search empty containers */
1966 if (tmp->type == CONTAINER && tmp->inv) 1921 if (tmp->type == CONTAINER && tmp->inv)
1967 { 1922 {
1968 if ((key = find_key (pl, tmp, door)) != NULL) 1923 if ((key = find_key (pl, tmp, door)))
1969 return key; 1924 return key;
1970 } 1925 }
1971 } 1926 }
1927
1972 if (!tmp) 1928 if (!tmp)
1973 return NULL; 1929 return NULL;
1974 } 1930 }
1931
1975 /* We get down here if we have found a key. Now if its in a container, 1932 /* We get down here if we have found a key. Now if its in a container,
1976 * see if we actually want to use it 1933 * see if we actually want to use it
1977 */ 1934 */
1978 if (pl != container) 1935 if (pl != container)
1979 { 1936 {
… …
2000 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1957 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2001 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1958 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2002 return NULL; 1959 return NULL;
2003 } 1960 }
2004 } 1961 }
1962
2005 return tmp; 1963 return tmp;
2006} 1964}
2007 1965
2008/* moved door processing out of move_player_attack. 1966/* moved door processing out of move_player_attack.
2009 * returns 1 if player has opened the door with a key 1967 * returns 1 if player has opened the door with a key
… …
2011 * 0 otherwise 1969 * 0 otherwise
2012 */ 1970 */
2013static int 1971static int
2014player_attack_door (object *op, object *door) 1972player_attack_door (object *op, object *door)
2015{ 1973{
2016 /* If its a door, try to find a use a key. If we do destroy the door, 1974 /* If its a door, try to find a key. If we do destroy the door,
2017 * might as well return immediately as there is nothing more to do - 1975 * might as well return immediately as there is nothing more to do -
2018 * otherwise, we fall through to the rest of the code. 1976 * otherwise, we fall through to the rest of the code.
2019 */ 1977 */
2020 object *key = find_key (op, op, door); 1978 object *key = find_key (op, op, door);
2021 1979
2022 /* IF we found a key, do some extra work */ 1980 /* If we found a key, do some extra work */
2023 if (key) 1981 if (key)
2024 { 1982 {
2025 object *container = key->env; 1983 object *container = key->env;
2026 1984
2027 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1985 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1986
2028 if (action_makes_visible (op)) 1987 if (action_makes_visible (op))
2029 make_visible (op); 1988 make_visible (op);
1989
2030 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1990 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2031 spring_trap (door->inv, op); 1991 spring_trap (door->inv, op);
1992
2032 if (door->type == DOOR) 1993 if (door->type == DOOR)
2033 {
2034 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1994 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2035 }
2036 else if (door->type == LOCKED_DOOR) 1995 else if (door->type == LOCKED_DOOR)
2037 { 1996 {
2038 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1997 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2039 remove_door2 (door); /* remove door without violence ;-) */ 1998 remove_door2 (door); /* remove door without violence ;-) */
2040 } 1999 }
2000
2041 /* Do this after we print the message */ 2001 /* Do this after we print the message */
2042 decrease_ob (key); /* Use up one of the keys */ 2002 decrease_ob (key); /* Use up one of the keys */
2043 /* Need to update the weight the container the key was in */ 2003 /* Need to update the weight the container the key was in */
2044 if (container != op) 2004 if (container != op)
2045 esrv_update_item (UPD_WEIGHT, op, container); 2005 esrv_update_item (UPD_WEIGHT, op, container);
2006
2046 return 1; /* Nothing more to do below */ 2007 return 1; /* Nothing more to do below */
2047 } 2008 }
2048 else if (door->type == LOCKED_DOOR) 2009 else if (door->type == LOCKED_DOOR)
2049 { 2010 {
2050 /* Might as well return now - no other way to open this */ 2011 /* Might as well return now - no other way to open this */
2051 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2012 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2052 return 1; 2013 return 1;
2053 } 2014 }
2015
2054 return 0; 2016 return 0;
2055} 2017}
2056 2018
2057/* This function is just part of a breakup from move_player. 2019/* This function is just part of a breakup from move_player.
2058 * It should keep the code cleaner. 2020 * It should keep the code cleaner.
2059 * When this is called, the players direction has been updated 2021 * When this is called, the players direction has been updated
2060 * (taking into account confusion.) The player is also actually 2022 * (taking into account confusion.) The player is also actually
2061 * going to try and move (not fire weapons). 2023 * going to try and move (not fire weapons).
2062 */ 2024 */
2063void 2025bool
2064move_player_attack (object *op, int dir) 2026move_player_attack (object *op, int dir)
2065{ 2027{
2066 object *tmp, *mon;
2067 sint16 nx, ny;
2068 int on_battleground; 2028 int on_battleground;
2069 maptile *m;
2070 2029
2071 nx = freearr_x[dir] + op->x; 2030 sint16 nx = freearr_x[dir] + op->x;
2072 ny = freearr_y[dir] + op->y; 2031 sint16 ny = freearr_y[dir] + op->y;
2073 2032
2074 on_battleground = op_on_battleground (op, 0, 0); 2033 on_battleground = op_on_battleground (op, 0, 0);
2034
2035 if (out_of_map (op->map, nx, ny))
2036 return false;
2037
2038 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2039 {
2040 --op->speed_left;
2041 return true;
2042 }
2075 2043
2076 /* If braced, or can't move to the square, and it is not out of the 2044 /* If braced, or can't move to the square, and it is not out of the
2077 * map, attack it. Note order of if statement is important - don't 2045 * map, attack it. Note order of if statement is important - don't
2078 * want to be calling move_ob if braced, because move_ob will move the 2046 * want to be calling move_ob if braced, because move_ob will move the
2079 * player. This is a pretty nasty hack, because if we could 2047 * player. This is a pretty nasty hack, because if we could
2080 * move to some space, it then means that if we are braced, we should 2048 * move to some space, it then means that if we are braced, we should
2081 * do nothing at all. As it is, if we are braced, we go through 2049 * do nothing at all. As it is, if we are braced, we go through
2082 * quite a bit of processing. However, it probably is less than what 2050 * quite a bit of processing. However, it probably is less than what
2083 * move_ob uses. 2051 * move_ob uses.
2084 */ 2052 */
2085 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2053 maptile *m = op->map->xy_find (nx, ny);
2086 {
2087 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2088 {
2089 m = get_map_from_coord (op->map, &nx, &ny);
2090 if (!m)
2091 return; /* Don't think this should happen */
2092 }
2093 else
2094 m = op->map;
2095 2054
2096 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2097 {
2098 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2099 return;
2100 }
2101
2102 mon = 0;
2103 /* 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
2104 * 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.
2105 * 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
2106 * on the space 2058 * on the space
2107 */ 2059 */
2108 while (tmp) 2060 object *mon;
2109 { 2061 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2110 if (tmp == op) 2062 {
2111 { 2063 if ((mon->flag [FLAG_ALIVE]
2112 tmp = tmp->above; 2064 || mon->type == LOCKED_DOOR
2113 continue; 2065 || mon->flag [FLAG_CAN_ROLL])
2114 }
2115
2116 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2117 {
2118 mon = tmp; 2066 && mon != op)
2119 break; 2067 break;
2120 } 2068 }
2121 2069
2122 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2123 mon = tmp;
2124
2125 tmp = tmp->above;
2126 }
2127
2128 if (!mon) /* This happens anytime the player tries to move */ 2070 if (!mon) /* This happens anytime the player tries to move */
2129 return; /* into a wall */ 2071 return false; /* into a wall */
2130 2072
2131 if (mon->head)
2132 mon = mon->head; 2073 mon = mon->head_ ();
2133 2074
2134 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2075 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2076 if (op->contr->weapon_sp_left > 0.f)
2135 if (player_attack_door (op, mon)) 2077 if (player_attack_door (op, mon))
2078 {
2079 --op->contr->weapon_sp_left;
2136 return; 2080 return true;
2081 }
2137 2082
2138 /* The following deals with possibly attacking peaceful 2083 /* The following deals with possibly attacking peaceful
2139 * or frienddly creatures. Basically, all players are considered 2084 * or friendly creatures. Basically, all players are considered
2140 * unaggressive. If the moving player has peaceful set, then the 2085 * unaggressive. If the moving player has peaceful set, then the
2141 * object should be pushed instead of attacked. It is assumed that 2086 * object should be pushed instead of attacked. It is assumed that
2142 * if you are braced, you will not attack friends accidently, 2087 * if you are braced, you will not attack friends accidently,
2143 * and thus will not push them. 2088 * and thus will not push them.
2144 */ 2089 */
2145 2090
2146 /* If the creature is a pet, push it even if the player is not 2091 /* If the creature is a pet, push it even if the player is not
2147 * peaceful. Our assumption is the creature is a pet if the 2092 * peaceful. Our assumption is the creature is a pet if the
2148 * player owns it and it is either friendly or unagressive. 2093 * player owns it and it is either friendly or unagressive.
2149 */ 2094 */
2150 if ((op->type == PLAYER) 2095 if (op->type == PLAYER
2151#if COZY_SERVER
2152 &&
2153 ((mon->owner && mon->owner->contr 2096 && ((mon->owner && mon->owner->contr
2154 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2097 && same_party (mon->owner->contr->party, op->contr->party))
2155#else
2156 && mon->owner == op 2098 || mon->owner == op)
2157#endif
2158 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2099 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2159 { 2100 {
2160 /* If we're braced, we don't want to switch places with it */ 2101 /* If we're braced, we don't want to switch places with it */
2161 if (op->contr->braced) 2102 if (op->contr->braced)
2162 return; 2103 return false;
2104
2105 if (op->speed_left > 0.f)
2106 {
2107 --op->speed_left;
2108
2163 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2109 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2164 (void) push_ob (mon, dir, op); 2110 push_ob (mon, dir, op);
2111
2165 if (op->contr->tmp_invis || op->hide) 2112 if (op->contr->tmp_invis || op->hide)
2166 make_visible (op); 2113 make_visible (op);
2114
2167 return; 2115 return true;
2168 } 2116 }
2117 else
2118 return false;
2119 }
2169 2120
2170 /* in certain circumstances, you shouldn't attack friendly 2121 /* in certain circumstances, you shouldn't attack friendly
2171 * creatures. Note that if you are braced, you can't push 2122 * creatures. Note that if you are braced, you can't push
2172 * someone, but put it inside this loop so that you won't 2123 * someone, but put it inside this loop so that you won't
2173 * attack them either. 2124 * attack them either.
2174 */ 2125 */
2175 if ((mon->type == PLAYER || mon->enemy != op) && 2126 if ((mon->type == PLAYER || mon->enemy != op)
2176 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2127 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2177#ifdef PROHIBIT_PLAYERKILL
2178 (op->contr->peaceful 2128 && ((op->contr->peaceful
2179 || (mon->type == PLAYER 2129 || (mon->type == PLAYER && mon->contr->peaceful))
2180 && mon->contr->
2181 peaceful)) &&
2182#else
2183 op->contr->peaceful &&
2184#endif
2185 !on_battleground)) 2130 && !on_battleground))
2131 {
2132 if (op->speed_left > 0.f)
2186 { 2133 {
2134 --op->speed_left;
2135
2187 if (!op->contr->braced) 2136 if (!op->contr->braced)
2188 { 2137 {
2189 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2138 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2190 (void) push_ob (mon, dir, op); 2139 push_ob (mon, dir, op);
2191 } 2140 }
2192 else 2141 else
2193 new_draw_info (0, 0, op, "You withhold your attack"); 2142 new_draw_info (0, 0, op, "You withhold your attack");
2194 2143
2195 if (op->contr->tmp_invis || op->hide) 2144 if (op->contr->tmp_invis || op->hide)
2196 make_visible (op); 2145 make_visible (op);
2197 }
2198 2146
2147 return true;
2148 }
2149 }
2199 /* If the object is a boulder or other rollable object, then 2150 /* If the object is a boulder or other rollable object, then
2200 * roll it if not braced. You can't roll it if you are braced. 2151 * roll it if not braced. You can't roll it if you are braced.
2201 */ 2152 */
2202 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2153 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2154 {
2155 if (op->speed_left > 0.f)
2203 { 2156 {
2157 --op->speed_left;
2158
2204 recursive_roll (mon, dir, op); 2159 recursive_roll (mon, dir, op);
2205 if (action_makes_visible (op)) 2160 if (action_makes_visible (op))
2206 make_visible (op); 2161 make_visible (op);
2207 }
2208 2162
2163 return true;
2164 }
2165 }
2209 /* Any generic living creature. Including things like doors. 2166 /* Any generic living creature. Including things like doors.
2210 * Way it works is like this: First, it must have some hit points 2167 * Way it works is like this: First, it must have some hit points
2211 * and be living. Then, it must be one of the following: 2168 * and be living. Then, it must be one of the following:
2212 * 1) Not a player, 2) A player, but of a different party. Note 2169 * 1) Not a player, 2) A player, but of a different party. Note
2213 * that party_number -1 is no party, so attacks can still happen. 2170 * that party_number -1 is no party, so attacks can still happen.
2214 */ 2171 */
2215
2216 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2172 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2217 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2173 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2218 { 2174 {
2219 2175 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2220 /* If the player hasn't hit something this tick, and does
2221 * so, give them speed boost based on weapon speed. Doing
2222 * it here is better than process_players2, which basically
2223 * incurred a 1 tick offset.
2224 */
2225 if (!op->contr->has_hit)
2226 { 2176 {
2227 op->speed_left += op->speed / op->contr->weapon_sp; 2177 --op->contr->weapon_sp_left;
2228
2229 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2230 }
2231 2178
2232 skill_attack (mon, op, 0, 0, 0); 2179 skill_attack (mon, op, 0, 0, 0);
2233
2234 /* If attacking another player, that player gets automatic
2235 * hitback, and doesn't loose luck either.
2236 * Disable hitback on the battleground or if the target is
2237 * the wiz.
2238 */
2239 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2240 {
2241 short luck = mon->stats.luck;
2242
2243 mon->contr->has_hit = 1;
2244 skill_attack (op, mon, 0, 0, 0);
2245 mon->stats.luck = luck;
2246 }
2247 2180
2248 if (action_makes_visible (op)) 2181 if (action_makes_visible (op))
2249 make_visible (op); 2182 make_visible (op);
2250 }
2251 } /* if player should attack something */
2252}
2253 2183
2254int 2184 return true;
2185 }
2186 }
2187
2188 return false;
2189}
2190
2191bool
2255move_player (object *op, int dir) 2192move_player (object *op, int dir)
2256{ 2193{
2257 int pick; 2194 int pick;
2258 2195
2259 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2196 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2260 return 0; 2197 return 0;
2261 2198
2262 /* Sanity check: make sure dir is valid */ 2199 /* Sanity check: make sure dir is valid */
2263 if ((dir < 0) || (dir >= 9)) 2200 if ((dir < 0) || (dir >= 9))
2264 { 2201 {
2265 LOG (llevError, "move_player: invalid direction %d\n", dir); 2202 LOG (llevError, "move_player: invalid direction %d\n", dir);
2266 return 0; 2203 return 0;
2267 } 2204 }
2268 2205
2269 /* peterm: added following line */ 2206 /* peterm: added following line */
2270 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2207 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2271 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2208 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2272 2209
2273 op->facing = dir; 2210 op->facing = dir;
2274 2211
2275 if (op->hide) 2212 if (op->hide)
2276 do_hidden_move (op); 2213 do_hidden_move (op);
2277 2214
2215 bool retval;
2216
2278 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2217 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2279 /*nop */ ; 2218 retval = RESULT_INT (0);
2280 else if (op->contr->fire_on) 2219 else if (op->contr->fire_on)
2281 fire (op, dir); 2220 retval = fire (op, dir);
2282 else 2221 else
2283 { 2222 {
2284 move_player_attack (op, dir); 2223 retval = move_player_attack (op, dir);
2285 pick = check_pick (op); 2224 pick = check_pick (op);
2286 } 2225 }
2287 2226
2288 /* Add special check for newcs players and fire on - this way, the 2227 /* Add special check for newcs players and fire on - this way, the
2289 * server can handle repeat firing. 2228 * server can handle repeat firing.
… …
2296 /* Update how the player looks. Use the facing, so direction may 2235 /* Update how the player looks. Use the facing, so direction may
2297 * get reset to zero. This allows for full animation capabilities 2236 * get reset to zero. This allows for full animation capabilities
2298 * for players. 2237 * for players.
2299 */ 2238 */
2300 animate_object (op, op->facing); 2239 animate_object (op, op->facing);
2301 return 0; 2240
2241 return retval;
2302} 2242}
2303 2243
2304/* This is similar to handle_player, below, but is only used by the 2244/* This is similar to handle_player, below, but is only used by the
2305 * new client/server stuff. 2245 * new client/server stuff.
2306 * This is sort of special, in that the new client/server actually uses 2246 * This is sort of special, in that the new client/server actually uses
2307 * the new speed values for commands. 2247 * the new speed values for commands.
2308 * 2248 *
2309 * Returns true if there are more actions we can do. 2249 * Returns true if there are more actions we can do. Should not do
2250 * many actions in a row, as that would be too unfair to other
2251 * players.
2310 */ 2252 */
2311int 2253bool
2312handle_newcs_player (object *op) 2254handle_newcs_player (object *op)
2313{ 2255{
2314 if (op->contr->hidden)
2315 {
2316 op->invisible = 1000;
2317 /* the socket code flashes the player visible/invisible
2318 * depending on the value of invisible, so we need to
2319 * alternate it here for it to work correctly.
2320 */
2321 if (pticks & 2)
2322 op->invisible--;
2323 }
2324 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2325 {
2326 op->invisible--;
2327 if (!op->invisible)
2328 {
2329 make_visible (op);
2330 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2331 }
2332 }
2333
2334 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2335 { 2257 {
2336 flee_player (op); 2258 if (op->speed_left > 0.f)
2337 /* If player is still scared, that is his action for this tick */
2338 if (QUERY_FLAG (op, FLAG_SCARED))
2339 { 2259 {
2340 op->speed_left--; 2260 --op->speed_left;
2261 flee_player (op);
2262
2341 return 0; 2263 return true;
2342 } 2264 }
2265 else
2266 return false;
2343 } 2267 }
2344
2345 /* I've been seeing crashes where the golem has been destroyed, but
2346 * the player object still points to the defunct golem. The code that
2347 * destroys the golem looks correct, and it doesn't always happen, so
2348 * put this in a a workaround to clean up the golem pointer.
2349 */
2350 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2351 op->contr->ranges[range_golem] = 0;
2352 2268
2353 /* call this here - we also will call this in do_ericserver, but 2269 /* call this here - we also will call this in do_ericserver, but
2354 * the players time has been increased when doericserver has been 2270 * the players time has been increased when doericserver has been
2355 * called, so we recheck it here. 2271 * called, so we recheck it here.
2356 */ 2272 */
2357 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2273 if (op->contr->ns->handle_command ())
2358 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2359 ;
2360
2361 if (op->speed_left < 0)
2362 return 0; 2274 return true;
2363 2275
2364 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2276 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2365 {
2366 /* All move commands take 1 tick, at least for now */
2367 op->speed_left--;
2368
2369 /* Instead of all the stuff below, let move_player take care
2370 * of it. Also, some of the skill stuff is only put in
2371 * there, as well as the confusion stuff.
2372 */
2373 move_player (op, op->direction); 2277 return move_player (op, op->direction);
2374 if (op->speed_left > 0)
2375 return 1;
2376 else
2377 return 0;
2378 }
2379 2278
2380 return 0; 2279 return false;
2381} 2280}
2382 2281
2383int 2282int
2384save_life (object *op) 2283save_life (object *op)
2385{ 2284{
… …
2420 * from. 2319 * from.
2421 */ 2320 */
2422void 2321void
2423remove_unpaid_objects (object *op, object *env) 2322remove_unpaid_objects (object *op, object *env)
2424{ 2323{
2425 object *next;
2426
2427 while (op) 2324 while (op)
2428 { 2325 {
2429 next = op->below; /* Make sure we have a good value, in case 2326 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2430 * we remove object 'op' 2327
2431 */
2432 if (QUERY_FLAG (op, FLAG_UNPAID)) 2328 if (QUERY_FLAG (op, FLAG_UNPAID))
2433 { 2329 {
2434 op->remove ();
2435 op->x = env->x;
2436 op->y = env->y;
2437 if (env->type == PLAYER) 2330 if (env->type == PLAYER)
2438 esrv_del_item (env->contr, op->count); 2331 esrv_del_item (env->contr, op->count);
2439 insert_ob_in_map (op, env->map, NULL, 0); 2332
2333 op->insert_at (env);
2440 } 2334 }
2441 else if (op->inv) 2335 else if (op->inv)
2442 remove_unpaid_objects (op->inv, env); 2336 remove_unpaid_objects (op->inv, env);
2443 2337
2444 op = next; 2338 op = next;
2445 } 2339 }
2446} 2340}
2447
2448 2341
2449/* 2342/*
2450 * Returns pointer a static string containing gravestone text 2343 * Returns pointer a static string containing gravestone text
2451 * Moved from apply.c to player.c - player.c is what 2344 * Moved from apply.c to player.c - player.c is what
2452 * actually uses this function. player.c may not be quite the 2345 * actually uses this function. player.c may not be quite the
… …
2486 strncat (buf2, " ", 20 - strlen (buf) / 2); 2379 strncat (buf2, " ", 20 - strlen (buf) / 2);
2487 strcat (buf2, buf); 2380 strcat (buf2, buf);
2488 2381
2489 return buf2; 2382 return buf2;
2490} 2383}
2491
2492
2493 2384
2494void 2385void
2495do_some_living (object *op) 2386do_some_living (object *op)
2496{ 2387{
2497 int last_food = op->stats.food; 2388 int last_food = op->stats.food;
… …
2503 int rate_grace = 2000; 2394 int rate_grace = 2000;
2504 const int max_hp = 1; 2395 const int max_hp = 1;
2505 const int max_sp = 1; 2396 const int max_sp = 1;
2506 const int max_grace = 1; 2397 const int max_grace = 1;
2507 2398
2508 if (op->contr->outputs_sync) 2399 if (op->contr->hidden)
2400 {
2401 op->invisible = 1000;
2402 /* the socket code flashes the player visible/invisible
2403 * depending on the value of invisible, so we need to
2404 * alternate it here for it to work correctly.
2405 */
2406 if (pticks & 2)
2407 op->invisible--;
2509 { 2408 }
2510 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2409 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2511 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2410 {
2512 flush_output_element (op, &op->contr->outputs[i]); 2411 if (!op->invisible--)
2412 {
2413 make_visible (op);
2414 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2415 }
2513 } 2416 }
2514 2417
2515 if (op->contr->ns->state == ST_PLAYING) 2418 if (op->contr->ns->state == ST_PLAYING)
2516 { 2419 {
2517
2518 /* these next three if clauses make it possible to SLOW DOWN 2420 /* these next three if clauses make it possible to SLOW DOWN
2519 hp/grace/spellpoint regeneration. */ 2421 hp/grace/spellpoint regeneration. */
2520 if (op->contr->gen_hp >= 0) 2422 if (op->contr->gen_hp >= 0)
2521 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2423 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2522 else 2424 else
2523 { 2425 {
2524 gen_hp = op->stats.maxhp; 2426 gen_hp = op->stats.maxhp;
2525 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2427 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2526 } 2428 }
2429
2527 if (op->contr->gen_sp >= 0) 2430 if (op->contr->gen_sp >= 0)
2528 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2431 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2529 else 2432 else
2530 { 2433 {
2531 gen_sp = op->stats.maxsp; 2434 gen_sp = op->stats.maxsp;
2532 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2435 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2533 } 2436 }
2437
2534 if (op->contr->gen_grace >= 0) 2438 if (op->contr->gen_grace >= 0)
2535 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2439 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2536 else 2440 else
2537 { 2441 {
2538 gen_grace = op->stats.maxgrace; 2442 gen_grace = op->stats.maxgrace;
2539 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2443 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2540 } 2444 }
2541 2445
2542 /* Regenerate Spell Points */ 2446 /* Regenerate Spell Points */
2543 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2447 if (!op->contr->golem && --op->last_sp < 0)
2544 { 2448 {
2545 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2449 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2546 if (op->stats.sp < op->stats.maxsp) 2450 if (op->stats.sp < op->stats.maxsp)
2547 { 2451 {
2548 op->stats.sp++; 2452 op->stats.sp++;
… …
2554 op->stats.food += op->contr->digestion; 2458 op->stats.food += op->contr->digestion;
2555 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2459 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2556 op->stats.food = last_food; 2460 op->stats.food = last_food;
2557 } 2461 }
2558 } 2462 }
2463
2559 if (max_sp > 1) 2464 if (max_sp > 1)
2560 { 2465 {
2561 over_sp = (gen_sp + 10) / rate_sp; 2466 over_sp = (gen_sp + 10) / rate_sp;
2562 if (over_sp > 0) 2467 if (over_sp > 0)
2563 { 2468 {
2564 if (op->stats.sp < op->stats.maxsp) 2469 if (op->stats.sp < op->stats.maxsp)
2565 { 2470 {
2566 op->stats.sp += over_sp > max_sp ? max_sp : over_sp; 2471 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2472
2567 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp)) 2473 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2568 op->stats.sp--; 2474 op->stats.sp--;
2475
2569 if (op->stats.sp > op->stats.maxsp) 2476 if (op->stats.sp > op->stats.maxsp)
2570 op->stats.sp = op->stats.maxsp; 2477 op->stats.sp = op->stats.maxsp;
2571 } 2478 }
2572 op->last_sp = 0; 2479 op->last_sp = 0;
2573 } 2480 }
2574 else 2481 else
2575 {
2576 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2482 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2577 }
2578 } 2483 }
2579 else 2484 else
2580 {
2581 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10); 2485 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2582 }
2583 } 2486 }
2584 2487
2585 /* Regenerate Grace */ 2488 /* Regenerate Grace */
2586 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2489 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2587 if (--op->last_grace < 0) 2490 if (--op->last_grace < 0)
2588 { 2491 {
2589 if (op->stats.grace < op->stats.maxgrace / 2) 2492 if (op->stats.grace < op->stats.maxgrace / 2)
2590 op->stats.grace++; /* no penalty in food for regaining grace */ 2493 op->stats.grace++; /* no penalty in food for regaining grace */
2494
2591 if (max_grace > 1) 2495 if (max_grace > 1)
2592 { 2496 {
2593 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2497 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2594 if (over_grace > 0) 2498 if (over_grace > 0)
2595 { 2499 {
… …
2623 op->stats.food += op->contr->digestion; 2527 op->stats.food += op->contr->digestion;
2624 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2528 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2625 op->stats.food = last_food; 2529 op->stats.food = last_food;
2626 } 2530 }
2627 } 2531 }
2532
2628 if (max_hp > 1) 2533 if (max_hp > 1)
2629 { 2534 {
2630 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; 2535 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2631 if (over_hp > 0) 2536 if (over_hp > 0)
2632 { 2537 {
… …
2645 } 2550 }
2646 2551
2647 /* Digestion */ 2552 /* Digestion */
2648 if (--op->last_eat < 0) 2553 if (--op->last_eat < 0)
2649 { 2554 {
2650#ifdef COZY_SERVER
2651 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2652 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2653#else
2654 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2555 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2655#endif
2656 2556
2657 if (op->contr->gen_hp > 0) 2557 if (op->contr->gen_hp > 0)
2658 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2558 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2659 else 2559 else
2660 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2560 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2561
2661 /* dms do not consume food */ 2562 /* dms do not consume food */
2662 if (!QUERY_FLAG (op, FLAG_WIZ)) 2563 if (!QUERY_FLAG (op, FLAG_WIZ))
2663 op->stats.food--; 2564 op->stats.food--;
2664 } 2565 }
2665 }
2666 2566
2667 if (op->contr->ns->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2567 if (op->stats.food < 0 && op->stats.hp >= 0)
2668 { 2568 {
2669 object *tmp, *flesh = NULL; 2569 object *tmp, *flesh = 0;
2670 2570
2671 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2571 for (tmp = op->inv; tmp; tmp = tmp->below)
2672 {
2673 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2674 { 2572 {
2675 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2573 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2676 { 2574 {
2575 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2576 {
2677 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2577 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2678 manual_apply (op, tmp, 0); 2578 manual_apply (op, tmp, 0);
2679 if (op->stats.food >= 0 || op->stats.hp < 0) 2579 if (op->stats.food >= 0 || op->stats.hp < 0)
2680 break; 2580 break;
2681 } 2581 }
2682 else if (tmp->type == FLESH) 2582 else if (tmp->type == FLESH)
2683 flesh = tmp; 2583 flesh = tmp;
2684 } /* End if paid for object */ 2584 } /* End if paid for object */
2685 } /* end of for loop */ 2585 } /* end of for loop */
2586
2686 /* If player is still starving, it means they don't have any food, so 2587 /* If player is still starving, it means they don't have any food, so
2687 * eat flesh instead. 2588 * eat flesh instead.
2688 */ 2589 */
2689 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2590 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2690 { 2591 {
2691 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2592 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2692 manual_apply (op, flesh, 0); 2593 manual_apply (op, flesh, 0);
2693 } 2594 }
2694 } /* end if player is starving */ 2595 }
2695 2596
2696 while (op->stats.food < 0 && op->stats.hp > 0) 2597 while (op->stats.food < 0 && op->stats.hp >= 0)
2697 op->stats.food++, op->stats.hp--; 2598 op->stats.food++, op->stats.hp--;
2698 2599
2699 if (!op->contr->ns->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2600 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2700 kill_player (op); 2601 kill_player (op);
2602 }
2701} 2603}
2702
2703
2704 2604
2705/* If the player should die (lack of hp, food, etc), we call this. 2605/* If the player should die (lack of hp, food, etc), we call this.
2706 * op is the player in jeopardy. If the player can not be saved (not 2606 * op is the player in jeopardy. If the player can not be saved (not
2707 * permadeath, no lifesave), this will take care of removing the player 2607 * permadeath, no lifesave), this will take care of removing the player
2708 * file. 2608 * file.
… …
2738 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2638 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2739 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2639 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2740 2640
2741 /* restore player */ 2641 /* restore player */
2742 at = archetype::find ("poisoning"); 2642 at = archetype::find ("poisoning");
2743 tmp = present_arch_in_ob (at, op); 2643 if (object *tmp = present_arch_in_ob (at, op))
2744 if (tmp)
2745 { 2644 {
2746 tmp->destroy (); 2645 tmp->destroy ();
2747 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2646 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2748 } 2647 }
2749 2648
2750 at = archetype::find ("confusion"); 2649 at = archetype::find ("confusion");
2751 tmp = present_arch_in_ob (at, op); 2650 if (object *tmp = present_arch_in_ob (at, op))
2752 if (tmp)
2753 { 2651 {
2754 tmp->destroy (); 2652 tmp->destroy ();
2755 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2653 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2756 } 2654 }
2757 2655
… …
2759 op->stats.hp = op->stats.maxhp; 2657 op->stats.hp = op->stats.maxhp;
2760 if (op->stats.food <= 0) 2658 if (op->stats.food <= 0)
2761 op->stats.food = 999; 2659 op->stats.food = 999;
2762 2660
2763 /* create a bodypart-trophy to make the winner happy */ 2661 /* create a bodypart-trophy to make the winner happy */
2764 tmp = arch_to_object (archetype::find ("finger")); 2662 if (object *tmp = arch_to_object (archetype::find ("finger")))
2765 if (tmp != NULL)
2766 { 2663 {
2767 sprintf (buf, "%s's finger", &op->name); 2664 sprintf (buf, "%s's finger", &op->name);
2768 tmp->name = buf; 2665 tmp->name = buf;
2769 sprintf (buf, " This finger has been cut off %s\n" 2666 sprintf (buf, " This finger has been cut off %s\n"
2770 " the %s, when he was defeated at\n level %d by %s.\n", 2667 " the %s, when he was defeated at\n level %d by %s.\n",
2771 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2668 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2772 tmp->msg = buf; 2669 tmp->msg = buf;
2773 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2670 tmp->value = 0, tmp->type = 0;
2774 tmp->materialname = NULL; 2671 tmp->materialname = "organics";
2775 tmp->x = op->x, tmp->y = op->y; 2672 tmp->insert_at (op, tmp);
2776 insert_ob_in_map (tmp, op->map, op, 0);
2777 } 2673 }
2778 2674
2779 /* teleport defeated player to new destination */ 2675 /* teleport defeated player to new destination */
2780 transfer_ob (op, x, y, 0, NULL); 2676 transfer_ob (op, x, y, 0, NULL);
2781 op->contr->braced = 0; 2677 op->contr->braced = 0;
… …
2786 2682
2787 command_kill_pets (op, 0); 2683 command_kill_pets (op, 0);
2788 2684
2789 if (op->stats.food < 0) 2685 if (op->stats.food < 0)
2790 { 2686 {
2791 if (op->contr->explore)
2792 {
2793 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2794 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2795 op->stats.food = 999;
2796 return;
2797 }
2798 sprintf (buf, "%s starved to death.", &op->name); 2687 sprintf (buf, "%s starved to death.", &op->name);
2799 strcpy (op->contr->killer, "starvation"); 2688 strcpy (op->contr->killer, "starvation");
2800 } 2689 }
2801 else 2690 else
2802 {
2803 if (op->contr->explore)
2804 {
2805 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2806 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2807 op->stats.hp = op->stats.maxhp;
2808 return;
2809 }
2810 sprintf (buf, "%s died.", &op->name); 2691 sprintf (buf, "%s died.", &op->name);
2811 } 2692
2812 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2693 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2813 2694
2814 /* save the map location for corpse, gravestone */ 2695 /* save the map location for corpse, gravestone */
2815 x = op->x; 2696 x = op->x;
2816 y = op->y; 2697 y = op->y;
2817 map = op->map; 2698 map = op->map;
2818
2819 2699
2820 /* NOT_PERMADEATH code. This basically brings the character back to 2700 /* NOT_PERMADEATH code. This basically brings the character back to
2821 * life if they are dead - it takes some exp and a random stat. 2701 * life if they are dead - it takes some exp and a random stat.
2822 * See the config.h file for a little more in depth detail about this. 2702 * See the config.h file for a little more in depth detail about this.
2823 */ 2703 */
… …
2840 num_stats_lose = 1; 2720 num_stats_lose = 1;
2841 else 2721 else
2842 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2722 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2843 } 2723 }
2844 else 2724 else
2845 {
2846 num_stats_lose = 1; 2725 num_stats_lose = 1;
2847 } 2726
2848 lost_a_stat = 0; 2727 lost_a_stat = 0;
2849 2728
2850 for (z = 0; z < num_stats_lose; z++) 2729 for (z = 0; z < num_stats_lose; z++)
2851 { 2730 {
2852 i = RANDOM () % NUM_STATS; 2731 i = RANDOM () % NUM_STATS;
… …
2993 op->stats.hp = op->stats.maxhp; 2872 op->stats.hp = op->stats.maxhp;
2994 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2873 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2995 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2874 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2996 2875
2997 /* 2876 /*
2998 * Check to see if the player is in a shop. IF so, then check to see if
2999 * the player has any unpaid items. If so, remove them and put them back 2877 * Check to see if the player has any unpaid items. If so, remove them
3000 * in the map. 2878 * and put them back in the map.
3001 */ 2879 */
3002
3003 if (is_in_shop (op))
3004 remove_unpaid_objects (op->inv, op); 2880 remove_unpaid_objects (op->inv, op);
3005 2881
3006 /****************************************/ 2882 /****************************************/
3007 /* */ 2883 /* */
3008 /* Move player to his current respawn- */ 2884 /* Move player to his current respawn- */
3009 /* position (usually last savebed) */ 2885 /* position (usually last savebed) */
3010 /* */ 2886 /* */
3011 /****************************************/ 2887 /****************************************/
3012 2888
3013 enter_player_savebed (op); 2889 enter_player_savebed (op);
3014 2890
3015 /* Save the player before inserting the force to reduce
3016 * chance of abuse.
3017 */
3018 op->contr->braced = 0; 2891 op->contr->braced = 0;
3019 op->contr->save ();
3020 2892
3021 /* it is possible that the player has blown something up 2893 /* it is possible that the player has blown something up
3022 * at his savebed location, and that can have long lasting 2894 * at his savebed location, and that can have long lasting
3023 * spell effects. So first see if there is a spell effect 2895 * spell effects. So first see if there is a spell effect
3024 * on the space that might harm the player. 2896 * on the space that might harm the player.
… …
3033 object *force; 2905 object *force;
3034 int at; 2906 int at;
3035 2907
3036 force = get_archetype (FORCE_NAME); 2908 force = get_archetype (FORCE_NAME);
3037 /* 50 ticks should be enough time for the spell to abate */ 2909 /* 50 ticks should be enough time for the spell to abate */
3038 force->speed = 0.1; 2910 force->speed = 0.1f;
3039 force->speed_left = -5.0; 2911 force->speed_left = -5.f;
3040 SET_FLAG (force, FLAG_APPLIED); 2912 SET_FLAG (force, FLAG_APPLIED);
3041 for (at = 0; at < NROFATTACKS; at++) 2913 for (at = 0; at < NROFATTACKS; at++)
3042 if (will_kill_again & (1 << at)) 2914 if (will_kill_again & (1 << at))
3043 force->resist[at] = 100; 2915 force->resist[at] = 100;
3044 2916
… …
3053void 2925void
3054loot_object (object *op) 2926loot_object (object *op)
3055{ /* Grab and destroy some treasure */ 2927{ /* Grab and destroy some treasure */
3056 object *tmp, *tmp2, *next; 2928 object *tmp, *tmp2, *next;
3057 2929
3058 if (op->container) 2930 op->close_container (); /* close open sack first */
3059 esrv_apply_container (op, op->container); /* close open sack first */
3060 2931
3061 for (tmp = op->inv; tmp; tmp = next) 2932 for (tmp = op->inv; tmp; tmp = next)
3062 { 2933 {
3063 next = tmp->below; 2934 next = tmp->below;
3064 2935
3065 if (tmp->invisible) 2936 if (tmp->invisible)
3066 continue; 2937 continue;
3067 2938
3068 tmp->remove (); 2939 tmp->remove ();
3069 tmp->x = op->x, tmp->y = op->y; 2940 tmp->x = op->x, tmp->y = op->y;
2941
3070 if (tmp->type == CONTAINER) 2942 if (tmp->type == CONTAINER)
3071 { /* empty container to ground */ 2943 loot_object (tmp); /* empty container to ground */
3072 loot_object (tmp); 2944
3073 }
3074 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2945 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3075 { 2946 {
3076 if (tmp->nrof > 1) 2947 if (tmp->nrof > 1)
3077 { 2948 {
3078 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2949 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3079 tmp2->destroy (); 2950 tmp2->destroy ();
… …
3090/* 2961/*
3091 * fix_weight(): Check recursively the weight of all players, and fix 2962 * fix_weight(): Check recursively the weight of all players, and fix
3092 * what needs to be fixed. Refresh windows and fix speed if anything 2963 * what needs to be fixed. Refresh windows and fix speed if anything
3093 * was changed. 2964 * was changed.
3094 */ 2965 */
3095
3096void 2966void
3097fix_weight (void) 2967fix_weight (void)
3098{ 2968{
3099 for (player *pl = first_player; pl; pl = pl->next) 2969 for_all_players (pl)
3100 { 2970 {
3101 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2971 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3102 2972
3103 if (old == sum) 2973 if (old == sum)
3104 continue; 2974 continue;
… …
3108} 2978}
3109 2979
3110void 2980void
3111fix_luck (void) 2981fix_luck (void)
3112{ 2982{
3113 for (player *pl = first_player; pl; pl = pl->next) 2983 for_all_players (pl)
3114 if (!pl->ob->contr->ns->state) 2984 if (!pl->ob->contr->ns->state)
3115 pl->ob->change_luck (0); 2985 pl->ob->change_luck (0);
3116} 2986}
3117 2987
3118/* cast_dust() - handles op throwing objects of type 'DUST'. 2988/* cast_dust() - handles op throwing objects of type 'DUST'.
… …
3160 if (op->type == PLAYER) 3030 if (op->type == PLAYER)
3161 { 3031 {
3162 op->contr->tmp_invis = 0; 3032 op->contr->tmp_invis = 0;
3163 op->contr->invis_race = 0; 3033 op->contr->invis_race = 0;
3164 } 3034 }
3035
3165 update_object (op, UP_OBJ_FACE); 3036 update_object (op, UP_OBJ_CHANGE);
3166} 3037}
3167 3038
3168int 3039int
3169is_true_undead (object *op) 3040is_true_undead (object *op)
3170{ 3041{
3171 object *tmp = NULL;
3172
3173 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3042 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3174 return 1; 3043 return 1;
3175 3044
3176 return 0; 3045 return 0;
3177} 3046}
3178 3047
… …
3222/* For Hidden creatures - a chance of becoming 'unhidden' 3091/* For Hidden creatures - a chance of becoming 'unhidden'
3223 * every time they move - as we subtract off 'invisibility' 3092 * every time they move - as we subtract off 'invisibility'
3224 * AND, for players, if they move into a ridiculously unhideable 3093 * AND, for players, if they move into a ridiculously unhideable
3225 * spot (surrounded by clear terrain in broad daylight). -b.t. 3094 * spot (surrounded by clear terrain in broad daylight). -b.t.
3226 */ 3095 */
3227
3228void 3096void
3229do_hidden_move (object *op) 3097do_hidden_move (object *op)
3230{ 3098{
3231 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3099 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3232 object *skop; 3100 object *skop;
… …
3236 3104
3237 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3105 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3238 3106
3239 /* its *extremely* hard to run and sneak/hide at the same time! */ 3107 /* its *extremely* hard to run and sneak/hide at the same time! */
3240 if (op->type == PLAYER && op->contr->run_on) 3108 if (op->type == PLAYER && op->contr->run_on)
3241 {
3242 if (!skop || num >= skop->level) 3109 if (!skop || num >= skop->level)
3243 { 3110 {
3244 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3111 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3245 make_visible (op); 3112 make_visible (op);
3246 return; 3113 return;
3247 } 3114 }
3248 else 3115 else
3249 num += 20; 3116 num += 20;
3250 } 3117
3251 num += op->map->difficulty; 3118 num += op->map->difficulty;
3252 hide = hideability (op); /* modify by terrain hidden level */ 3119 hide = hideability (op); /* modify by terrain hidden level */
3253 num -= hide; 3120 num -= hide;
3121
3254 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3122 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3255 { 3123 {
3256 make_visible (op); 3124 make_visible (op);
3257 if (op->type == PLAYER) 3125 if (op->type == PLAYER)
3258 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3126 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3259 } 3127 }
3260 else if (op->type == PLAYER && skop) 3128 else if (op->type == PLAYER && skop)
3261 {
3262 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3129 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3263 }
3264} 3130}
3265 3131
3266/* determine if who is standing near a hostile creature. */ 3132/* determine if who is standing near a hostile creature. */
3267 3133
3268int 3134int
… …
3335 if (pl->type != PLAYER) 3201 if (pl->type != PLAYER)
3336 { 3202 {
3337 LOG (llevError, "player_can_view() called for non-player object\n"); 3203 LOG (llevError, "player_can_view() called for non-player object\n");
3338 return -1; 3204 return -1;
3339 } 3205 }
3206
3340 if (!pl || !op) 3207 if (!pl || !op)
3341 return 0; 3208 return 0;
3342 3209
3343 if (op->head)
3344 {
3345 op = op->head; 3210 op = op->head_ ();
3346 } 3211
3347 get_rangevector (pl, op, &rv, 0x1); 3212 get_rangevector (pl, op, &rv, 0x1);
3348 3213
3349 /* starting with the 'head' part, lets loop 3214 /* starting with the 'head' part, lets loop
3350 * through the object and find if it has any 3215 * through the object and find if it has any
3351 * part that is in the los array but isnt on 3216 * part that is in the los array but isnt on
3352 * a blocked los square. 3217 * a blocked los square.
3353 * we use the archetype to figure out offsets. 3218 * we use the archetype to figure out offsets.
3354 */ 3219 */
3355 while (op) 3220 while (op)
3356 { 3221 {
3357 dx = rv.distance_x + op->arch->clone.x; 3222 dx = rv.distance_x + op->arch->x;
3358 dy = rv.distance_y + op->arch->clone.y; 3223 dy = rv.distance_y + op->arch->y;
3359 3224
3360 /* only the viewable area the player sees is updated by LOS 3225 /* only the viewable area the player sees is updated by LOS
3361 * code, so we need to restrict ourselves to that range of values 3226 * code, so we need to restrict ourselves to that range of values
3362 * for any meaningful values. 3227 * for any meaningful values.
3363 */ 3228 */
… …
3468 char buf[MAX_BUF]; /* tmp. string buffer */ 3333 char buf[MAX_BUF]; /* tmp. string buffer */
3469 int i = 0, j = 0; 3334 int i = 0, j = 0;
3470 3335
3471 /* get the appropriate treasurelist */ 3336 /* get the appropriate treasurelist */
3472 if (atnr == ATNR_FIRE) 3337 if (atnr == ATNR_FIRE)
3473 trlist = find_treasurelist ("dragon_ability_fire"); 3338 trlist = treasurelist::find ("dragon_ability_fire");
3474 else if (atnr == ATNR_COLD) 3339 else if (atnr == ATNR_COLD)
3475 trlist = find_treasurelist ("dragon_ability_cold"); 3340 trlist = treasurelist::find ("dragon_ability_cold");
3476 else if (atnr == ATNR_ELECTRICITY) 3341 else if (atnr == ATNR_ELECTRICITY)
3477 trlist = find_treasurelist ("dragon_ability_elec"); 3342 trlist = treasurelist::find ("dragon_ability_elec");
3478 else if (atnr == ATNR_POISON) 3343 else if (atnr == ATNR_POISON)
3479 trlist = find_treasurelist ("dragon_ability_poison"); 3344 trlist = treasurelist::find ("dragon_ability_poison");
3480 3345
3481 if (trlist == NULL || who->type != PLAYER) 3346 if (trlist == NULL || who->type != PLAYER)
3482 return; 3347 return;
3483 3348
3484 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3349 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3485 3350
3486 if (tr == NULL || tr->item == NULL) 3351 if (!tr || !tr->item)
3487 { 3352 {
3488 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3353 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3489 return; 3354 return;
3490 } 3355 }
3491 3356
3492 /* everything seems okay - now bring on the gift: */ 3357 /* everything seems okay - now bring on the gift: */
3493 item = &(tr->item->clone); 3358 item = tr->item;
3494 3359
3495 if (item->type == SPELL) 3360 if (item->type == SPELL)
3496 { 3361 {
3497 if (check_spell_known (who, item->name)) 3362 if (check_spell_known (who, item->name))
3498 return; 3363 return;
… …
3558 /* forces in the treasurelist can alter the player's stats */ 3423 /* forces in the treasurelist can alter the player's stats */
3559 object *skin; 3424 object *skin;
3560 3425
3561 /* first get the dragon skin force */ 3426 /* first get the dragon skin force */
3562 shstr_cmp dragon_skin_force ("dragon_skin_force"); 3427 shstr_cmp dragon_skin_force ("dragon_skin_force");
3563 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3428 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3564 ; 3429 ;
3565 3430
3566 if (!skin) 3431 if (!skin)
3567 return; 3432 return;
3568 3433
… …
3616 * not readied. 3481 * not readied.
3617 */ 3482 */
3618void 3483void
3619player_unready_range_ob (player *pl, object *ob) 3484player_unready_range_ob (player *pl, object *ob)
3620{ 3485{
3621 rangetype i; 3486 if (pl->ob->current_weapon == ob)
3487 pl->ob->current_weapon = 0;
3622 3488
3623 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3489 if (pl->combat_ob == ob)
3624 { 3490 pl->combat_ob = 0;
3491
3625 if (pl->ranges[i] == ob) 3492 if (pl->ranged_ob == ob)
3626 { 3493 pl->ranged_ob = 0;
3627 pl->ranges[i] = NULL;
3628 if (pl->shoottype == i)
3629 {
3630 pl->shoottype = range_none;
3631 }
3632 }
3633 }
3634} 3494}
3495
3496sint8
3497player::visibility_at (maptile *map, int x, int y) const
3498{
3499 if (!ns)
3500 return 0;
3501
3502 int dx, dy;
3503 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3504 return 0;
3505
3506 x += dx - ns->current_x + ns->mapx / 2;
3507 y += dy - ns->current_y + ns->mapy / 2;
3508
3509 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3510 return 0;
3511
3512 return 100 - blocked_los [x][y];
3513}

Diff Legend

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