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.82 by elmex, Wed Jan 3 02:30:52 2007 UTC vs.
Revision 1.163 by root, Thu Aug 23 17:16:17 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 for_all_players (pl)
40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
41 return pl;
42
43 return 0;
44}
45 36
46void 37void
47display_motd (const object *op) 38display_motd (const object *op)
48{ 39{
49 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
123 114
124 news[0] = '\0'; 115 news[0] = '\0';
125 subject[0] = '\0'; 116 subject[0] = '\0';
126 size = 0; 117 size = 0;
127 118
128 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
129 { 120 {
130 if (*buf == '#') 121 if (*buf == '#')
131 continue; 122 continue;
132 123
133 if (*buf == '%') 124 if (*buf == '%')
134 { /* send one news */ 125 { /* send one news */
135 if (size > 0) 126 if (size > 0)
136 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
137 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
138 strip_endline (subject); 130 strip_endline (subject);
139 size = 0; 131 size = 0;
140 news[0] = '\0'; 132 news[0] = '\0';
141 } 133 }
… …
150 size += strlen (buf); 142 size += strlen (buf);
151 } 143 }
152 } 144 }
153 145
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155 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);
156 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
157} 149}
158 150
159/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
160static void 152static void
… …
164 op->x = -1; 156 op->x = -1;
165 op->y = -1; 157 op->y = -1;
166} 158}
167 159
168void 160void
169player::enter_map () 161player::activate ()
170{ 162{
171 object *tmp = object::create (); 163 if (active)
164 return;
172 165
173 EXIT_PATH (tmp) = maplevel; 166 players.insert (this);
174 EXIT_X (tmp) = ob->x; 167 ob->remove ();
175 EXIT_Y (tmp) = ob->y; 168 ob->map = 0;
176 ob->enter_exit (tmp); 169 ob->activate_recursive ();
170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
171 add_friendly_object (ob);
172}
177 173
178 tmp->destroy (); 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);
179} 194}
180 195
181// connect the player with a specific client 196// connect the player with a specific client
182// also changed, rationalises, and fixes some incorrect settings 197// also changes, rationalises, and fixes some incorrect settings
183void 198void
184player::connect (client *ns) 199player::connect (client *ns)
185{ 200{
186 this->ns = ns; 201 this->ns = ns;
187 ns->pl = this; 202 ns->pl = this;
188 203
189 next = first_player; 204 run_on = 0;
190 first_player = this; 205 fire_on = 0;
206 ob->close_container (); //TODO: client-specific
191 207
192 ns->update_look = 0; 208 ns->update_look = 0;
193 ns->look_position = 0; 209 ns->look_position = 0;
194 210
195 clear_los (ob); 211 clear_los (this);
212
213 ns->reset_stats ();
196 214
197 /* make sure he's a player -- needed because of class change. */ 215 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid 216 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race; 217 ob->race = ob->arch->race;
200
201 if (!legal_range (ob, shoottype))
202 shoottype = range_none;
203 218
204 ob->carrying = sum_weight (ob); 219 ob->carrying = sum_weight (ob);
205 link_player_skills (ob); 220 link_player_skills (ob);
206 221
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208 223
209 assign (title, ob->arch->clone.name); 224 assign (title, ob->arch->object::name);
210
211 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
212 * from the class, and not race. I don't see any way to get the class information
213 * to then update this. I don't think this will actually break anything - anyone
214 * that can use armour should be able to use a shield. What this may 'break'
215 * are features new characters get, eg, if someone starts up with a Q, they
216 * should be able to use a shield. However, old Q's won't get that advantage.
217 */
218 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219 SET_FLAG (ob, FLAG_USE_SHIELD);
220 225
221 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
223 { 228 {
224 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
225 230
226 shstr_cmp dragon_ability_force ("dragon_ability_force");
227 shstr_cmp dragon_skin_force ("dragon_skin_force");
228
229 for (tmp = ob->inv; tmp; tmp = tmp->below) 231 for (tmp = ob->inv; tmp; tmp = tmp->below)
230 if (tmp->type == FORCE) 232 if (tmp->type == FORCE)
231 if (tmp->arch->name == dragon_ability_force) 233 if (tmp->arch->archname == shstr_dragon_ability_force)
232 abil = tmp; 234 abil = tmp;
233 else if (tmp->arch->name == dragon_skin_force) 235 else if (tmp->arch->archname == shstr_dragon_skin_force)
234 skin = tmp; 236 skin = tmp;
235 237
236 set_dragon_name (ob, abil, skin); 238 set_dragon_name (ob, abil, skin);
237 } 239 }
238 240
239 CLEAR_FLAG (ob, FLAG_FRIENDLY);
240 add_friendly_object (ob);
241
242 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 241 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 242
246 esrv_new_player (this, ob->weight + ob->carrying); 243 esrv_new_player (this, ob->weight + ob->carrying);
247 244
245 ob->flag [FLAG_READY_WEAPON] = false;
246 ob->flag [FLAG_READY_SKILL] = false;
247 ob->flag [FLAG_READY_BOW] = false;
248
249 for (object *op = ob->inv; op; op = op->below)
250 if (op->flag [FLAG_APPLIED])
251 switch (op->type)
252 {
253 case SKILL:
254 ob->flag [FLAG_APPLIED] = false;
255 break;
256
257 case WAND:
258 case ROD:
259 case HORN:
260 case BOW:
261 ranged_ob = op;
262 break;
263
264 case WEAPON:
265 combat_ob = op;
266 break;
267 }
268
269 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
248 ob->update_stats (); 270 ob->update_stats ();
271
249 ns->floorbox_update (); 272 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob); 273 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0); 274 esrv_add_spells (this, 0);
253 275
254 ob->activate_recursive (); 276 activate ();
255 enter_map ();
256 277
257 send_rules (ob); 278 send_rules (ob);
258 send_news (ob); 279 send_news (ob);
259 display_motd (ob); 280 display_motd (ob);
260 281
… …
264 285
265void 286void
266player::disconnect () 287player::disconnect ()
267{ 288{
268 if (ob) 289 if (ob)
269 ob->deactivate_recursive (); 290 {
291 ob->close_container (); //TODO: client-specific
292 ob->drop_unpaid_items ();
293 }
270 294
271 //TODO: don't be so harsh and destroy :)
272 if (ns) 295 if (ns)
273 { 296 {
274 if (enable_save) 297 if (active)
275 {
276 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 298 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277 save (true);
278 }
279 299
280 INVOKE_PLAYER (DISCONNECT, this); 300 INVOKE_PLAYER (DISCONNECT, this);
281 301
282 client *ns = this->ns; 302 ns->reset_stats ();
283 ns->send_packet ("goodbye");
284 ns->flush ();
285 ns->pl = 0; 303 ns->pl = 0;
286 this->ns = 0; 304 ns = 0;
287
288 ns->destroy ();
289 destroy ();
290 } 305 }
306
307 observe = ob;
308
309 deactivate ();
291} 310}
292 311
293// the need for this function can be explained 312// the need for this function can be explained
294// by load_object not returning the object 313// by load_object not returning the object
295void 314void
296player::set_object (object *op) 315player::set_object (object *op)
297{ 316{
298 ob = op; 317 ob = observe = op;
299 ob->contr = this; /* this aren't yet in archetype */ 318 ob->contr = this; /* this aren't yet in archetype */
300 319
320 ob->speed = 1.0f;
301 ob->speed_left = 0.5; 321 ob->speed_left = 0.5f;
302 ob->speed = 1.0; 322
303 ob->direction = 5; /* So player faces south */ 323 ob->direction = 5; /* So player faces south */
304 ob->stats.wc = 2; 324}
305 ob->run_away = 25; /* Then we panick... */
306 325
307 ob->roll_stats (); 326void
327player::set_observe (object *op)
328{
329 observe = op ? op : ob;
330 do_los = 1;
308} 331}
309 332
310player::player () 333player::player ()
311{ 334{
312 /* There are some elements we want initialised to non zero value - 335 /* There are some elements we want initialised to non zero value -
313 * we deal with that below this point. 336 * we deal with that below this point.
314 */ 337 */
315 outputs_sync = 16; /* Every 2 seconds */ 338 outputs_sync = 4;
316 outputs_count = 8; /* Keeps present behaviour */ 339 outputs_count = 4;
317 unapply = unapply_nochoice; 340 unapply = unapply_nochoice;
318 341
319 savebed_map = first_map_path; /* Init. respawn position */ 342 savebed_map = first_map_path; /* Init. respawn position */
320 343
321 gen_sp_armour = 10; 344 gen_sp_armour = 10;
322 last_speed = -1;
323 shoottype = range_none;
324 bowtype = bow_normal; 345 bowtype = bow_normal;
325 petmode = pet_normal; 346 petmode = pet_normal;
326 listening = 10; 347 listening = 10;
327 usekeys = containers; 348 usekeys = containers;
328 last_weapon_sp = -1;
329 peaceful = 1; /* default peaceful */ 349 peaceful = 1; /* default peaceful */
330 do_los = 1; 350 do_los = 1;
331 351
332 /* we need to clear these to -1 and not zero - otherwise, 352 weapon_sp = 1.0f;
333 * if a player quits and starts a new character, we wont 353 weapon_sp_left = 0.5f;
334 * send new values to the client, as things like exp start
335 * at zero.
336 */
337 for (int i = 0; i < NUM_SKILLS; i++)
338 last_skill_exp[i] = -1;
339
340 for (int i = 0; i < NROFATTACKS; i++)
341 last_resist[i] = -1;
342
343 last_stats.exp = -1;
344 last_weight = (uint32) - 1;
345} 354}
346 355
347void 356void
348player::do_destroy () 357player::do_destroy ()
349{ 358{
350 disconnect (); 359 disconnect ();
351 360
352 save (false);
353 enable_save = false;
354
355 attachable::do_destroy (); 361 attachable::do_destroy ();
356
357 terminate_all_pets (ob);
358
359 if (first_player != this)
360 {
361 player *prev = first_player;
362
363 while (prev && prev->next && prev->next != this)
364 prev = prev->next;
365
366 if (prev->next != this)
367 {
368 LOG (llevError, "Free_player: Can't find previous player.\n");
369 abort ();
370 }
371
372 prev->next = next;
373 }
374 else
375 first_player = next;
376 362
377 if (ob) 363 if (ob)
378 { 364 {
379 ob->destroy_inv (false); 365 ob->destroy_inv (false);
380 ob->destroy (); 366 ob->destroy ();
381 } 367 }
368
369 ob = observe = 0;
382} 370}
383 371
384player::~player () 372player::~player ()
385{ 373{
386 /* Clear item stack */ 374 /* Clear item stack */
… …
395player::create () 383player::create ()
396{ 384{
397 player *pl = new player; 385 player *pl = new player;
398 386
399 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
400 set_first_map (pl->ob); 393 set_first_map (pl->ob);
401 394
402 return pl; 395 return pl;
403} 396}
404 397
… …
408 * Note: there MUST be at least one player archetype! 401 * Note: there MUST be at least one player archetype!
409 */ 402 */
410archetype * 403archetype *
411get_player_archetype (archetype *at) 404get_player_archetype (archetype *at)
412{ 405{
413 archetype *start = at; 406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
414 407
415 for (;;) 408 for (;;)
416 { 409 {
417 if (at == NULL || at->next == NULL) 410 if (++i == archetypes.end ())
418 at = first_archetype; 411 i = archetypes.begin ();
419 else 412 else if (*i == at)
420 at = at->next; 413 cleanup ("not a single player archetype found");
421 414
422 if (at->clone.type == PLAYER) 415 if ((*i)->type == PLAYER)
423 return at; 416 return *i;
424
425 if (at == start)
426 {
427 LOG (llevError, "No Player archetypes\n");
428 exit (-1);
429 }
430 } 417 }
431} 418}
432 419
433object * 420object *
434get_nearest_player (object *mon) 421get_nearest_player (object *mon)
… …
436 object *op = NULL; 423 object *op = NULL;
437 objectlink *ol; 424 objectlink *ol;
438 unsigned lastdist; 425 unsigned lastdist;
439 rv_vector rv; 426 rv_vector rv;
440 427
441 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 428 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
442 { 429 {
443 /* We should not find free objects on this friendly list, but it
444 * does periodically happen. Given that, lets deal with it.
445 * While unlikely, it is possible the next object on the friendly
446 * list is also free, so encapsulate this in a while loop.
447 */
448 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
449 {
450 object *tmp = ol->ob;
451
452 /* Can't do much more other than log the fact, because the object
453 * itself will have been cleared.
454 */
455 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
456 ol = ol->next;
457 remove_friendly_object (tmp);
458 if (!ol)
459 return op;
460 }
461
462 /* Remove special check for player from this. First, it looks to cause
463 * some crashes (ol->ob->contr not set properly?), but secondly, a more
464 * complicated method of state checking would be needed in any case -
465 * as it was, a clever player could type quit, and the function would
466 * skip them over while waiting for confirmation. Remove
467 * on_same_map check, as can_detect_enemy also does this
468 */
469 if (!can_detect_enemy (mon, ol->ob, &rv)) 430 if (!can_detect_enemy (mon, ol->ob, &rv))
470 continue; 431 continue;
471 432
472 if (lastdist > rv.distance) 433 if (lastdist > rv.distance)
473 { 434 {
… …
549 x = mon->x; 510 x = mon->x;
550 y = mon->y; 511 y = mon->y;
551 m = mon->map; 512 m = mon->map;
552 dir = rv.direction; 513 dir = rv.direction;
553 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 514 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
554 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 515 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
516
555 /* If we can't solve it within the search distance, return now. */ 517 /* If we can't solve it within the search distance, return now. */
556 if (diff > max) 518 if (diff > max)
557 return 0; 519 return 0;
520
558 while (diff > 1 && max > 0) 521 while (diff > 1 && max > 0)
559 { 522 {
560 lastx = x; 523 lastx = x;
561 lasty = y; 524 lasty = y;
562 lastmap = m; 525 lastmap = m;
… …
644 max--; 607 max--;
645 lastdir = dir; 608 lastdir = dir;
646 if (!firstdir) 609 if (!firstdir)
647 firstdir = dir; 610 firstdir = dir;
648 } 611 }
612
649 if (diff <= 1) 613 if (diff <= 1)
650 { 614 {
651 /* Recalculate diff (distance) because we may not have actually 615 /* Recalculate diff (distance) because we may not have actually
652 * headed toward player for entire distance. 616 * headed toward player for entire distance.
653 */ 617 */
654 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 618 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
655 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 619 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
656 } 620 }
621
657 if (diff > max) 622 if (diff > max)
658 return 0; 623 return 0;
659 } 624 }
625
660 /* If we reached the max, didn't find a direction in time */ 626 /* If we reached the max, didn't find a direction in time */
661 if (!max) 627 if (!max)
662 return 0; 628 return 0;
663 629
664 return firstdir; 630 return firstdir;
… …
778roll_stat (void) 744roll_stat (void)
779{ 745{
780 int a[4], i, j, k; 746 int a[4], i, j, k;
781 747
782 for (i = 0; i < 4; i++) 748 for (i = 0; i < 4; i++)
783 a[i] = (int) RANDOM () % 6 + 1; 749 a[i] = (int) rndm (6) + 1;
784 750
785 for (i = 0, j = 0, k = 7; i < 4; i++) 751 for (i = 0, j = 0, k = 7; i < 4; i++)
786 if (a[i] < k) 752 if (a[i] < k)
787 k = a[i], j = i; 753 k = a[i], j = i;
788 754
… …
794} 760}
795 761
796void 762void
797object::roll_stats () 763object::roll_stats ()
798{ 764{
799 int statsort [7]; 765 int statsort [NUM_STATS];
800 766
801 for (;;) 767 for (;;)
802 { 768 {
803 int sum = 0; 769 int sum = 0;
804 for (int i = 7; i--; ) 770 for (int i = NUM_STATS; i--; )
805 sum += statsort [i] = roll_stat (); 771 sum += statsort [i] = roll_stat ();
806 772
807 if (sum >= 82 && sum <= 116) 773 if (sum >= 82 && sum <= 116)
808 break; 774 break;
809 } 775 }
810 776
811 // Sort the stats so that rerolling is easier... 777 // Sort the stats so that rerolling is easier...
812 std::sort (statsort, statsort + 7, std::greater<int>()); 778 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
813 779
780 for (int i = 0; i < NUM_STATS; ++i)
814 stats.Str = statsort[0]; 781 stats.stat (i) = statsort [i];
815 stats.Dex = statsort[1];
816 stats.Con = statsort[2];
817 stats.Int = statsort[3];
818 stats.Wis = statsort[4];
819 stats.Pow = statsort[5];
820 stats.Cha = statsort[6];
821 782
822 stats.exp = 0; 783 stats.exp = 0;
823 stats.ac = 0; 784 stats.ac = 0;
824 785
825 stats.hp = stats.maxhp; 786 stats.hp = stats.maxhp;
… …
837} 798}
838 799
839void 800void
840object::swap_stats (int a, int b) 801object::swap_stats (int a, int b)
841{ 802{
842 int tmp = get_attr_value (&contr->orig_stats, a); 803 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
843 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
844 set_attr_value (&contr->orig_stats, b, tmp);
845 804
805 for (int i = 0; i < NUM_STATS; ++i)
846 stats.Str = contr->orig_stats.Str; 806 stats.stat (i) = contr->orig_stats.stat (i);
847 stats.Dex = contr->orig_stats.Dex;
848 stats.Con = contr->orig_stats.Con;
849 stats.Int = contr->orig_stats.Int;
850 stats.Wis = contr->orig_stats.Wis;
851 stats.Pow = contr->orig_stats.Pow;
852 stats.Cha = contr->orig_stats.Cha;
853 807
854 //TODO: the following code looks so borked and should, at the very least, 808 //TODO: the following code looks so borked and should, at the very least,
855 // be merged with the similar code in roll_stats 809 // be merged with the similar code in roll_stats
856 stats.ac = 0; 810 stats.ac = 0;
857 811
… …
888 * appropriate action with it (change race, or other things). 842 * appropriate action with it (change race, or other things).
889 * The function name is for historical reasons - now we have 843 * The function name is for historical reasons - now we have
890 * separate race and class; this actually changes the RACE, 844 * separate race and class; this actually changes the RACE,
891 * not the class. 845 * not the class.
892 */ 846 */
893int 847void
894key_change_class (object *op, char key) 848player::chargen_race_done ()
895{ 849{
896 int tmp_loop;
897
898 if (key == 'd' || key == 'D')
899 {
900 char buf[MAX_BUF];
901
902 /* this must before then initial items are given */ 850 /* this must before then initial items are given */
903 esrv_new_player (op->contr, op->weight + op->carrying); 851 esrv_new_player (ob->contr, ob->weight + ob->carrying);
904 852
905 treasurelist *tl = find_treasurelist ("starting_wealth"); 853 treasurelist *tl = treasurelist::find ("starting_wealth");
906 if (tl) 854 if (tl)
907 create_treasure (tl, op, 0, 0, 0); 855 create_treasure (tl, ob, 0, 0, 0);
908 856
909 INVOKE_PLAYER (BIRTH, op->contr); 857 INVOKE_PLAYER (BIRTH, ob->contr);
910 INVOKE_PLAYER (LOGIN, op->contr); 858 INVOKE_PLAYER (LOGIN, ob->contr);
911 859
912 op->contr->ns->state = ST_PLAYING; 860 ob->contr->ns->state = ST_PLAYING;
913 861
914 if (op->msg) 862 if (ob->msg)
915 op->msg = NULL; 863 ob->msg = 0;
916 864
917 /* We create this now because some of the unique maps will need it 865 /* We create this now because some of the unique maps will need it
918 * to save here. 866 * to save here.
919 */ 867 */
868 {
869 char buf[MAX_BUF];
920 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 870 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
921 make_path_to_file (buf); 871 make_path_to_file (buf);
872 }
922 873
923#ifdef AUTOSAVE
924 op->contr->last_save_tick = pticks;
925#endif
926 start_info (op); 874 start_info (ob);
927 CLEAR_FLAG (op, FLAG_WIZ); 875 CLEAR_FLAG (ob, FLAG_WIZ);
928 give_initial_items (op, op->randomitems); 876 give_initial_items (ob, ob->randomitems);
929 link_player_skills (op); 877 link_player_skills (ob);
930 esrv_send_inventory (op, op); 878 esrv_send_inventory (ob, ob);
931 op->update_stats (); 879 ob->update_stats ();
932 880
933 /* This moves the player to a different start map, if there 881 /* This moves the player to a different start map, if there
934 * is one for this race 882 * is one for this race
935 */ 883 */
936 if (*first_map_ext_path) 884 if (*first_map_ext_path)
937 { 885 {
938 object *tmp; 886 object *tmp;
939 char mapname[MAX_BUF]; 887 char mapname[MAX_BUF];
940 888
941 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 889 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
942 tmp = object::create (); 890 tmp = object::create ();
943 EXIT_PATH (tmp) = mapname; 891 EXIT_PATH (tmp) = mapname;
944 EXIT_X (tmp) = op->x; 892 EXIT_X (tmp) = ob->x;
945 EXIT_Y (tmp) = op->y; 893 EXIT_Y (tmp) = ob->y;
946 op->enter_exit (tmp); /* we don't really care if it succeeded; 894 ob->enter_exit (tmp); /* we don't really care if it succeeded;
947 * if the map isn't there, then stay on the 895 * if the map isn't there, then stay on the
948 * default initial map */ 896 * default initial map */
949 tmp->destroy (); 897 tmp->destroy ();
950 } 898 }
951 else 899 else
952 LOG (llevDebug, "first_map_ext_path not set\n"); 900 LOG (llevDebug, "first_map_ext_path not set\n");
901}
953 902
954 return 0; 903void
955 } 904player::chargen_race_next ()
956 905{
957 /* Following actually changes the race - this is the default command 906 /* Following actually changes the race - this is the default command
958 * if we don't match with one of the options above. 907 * if we don't match with one of the options above.
959 */ 908 */
960 909
961 tmp_loop = 0; 910 do
962 while (!tmp_loop)
963 { 911 {
964 shstr name = op->name; 912 shstr name = ob->name;
965 int x = op->x, y = op->y; 913 int x = ob->x, y = ob->y;
966 914
967 op->remove_statbonus (); 915 ob->remove_statbonus ();
968 op->remove (); 916 ob->remove ();
969 op->arch = get_player_archetype (op->arch); 917 ob->arch = get_player_archetype (ob->arch);
970 op->arch->clone.copy_to (op); 918 ob->arch->copy_to (ob);
971 op->instantiate (); 919 ob->instantiate ();
972 op->stats = op->contr->orig_stats; 920 ob->stats = ob->contr->orig_stats;
973 op->name = op->name_pl = name; 921 ob->name = ob->name_pl = name;
974 op->x = x; 922 ob->x = x;
975 op->y = y; 923 ob->y = y;
976 SET_ANIMATION (op, 2); /* So player faces south */ 924 SET_ANIMATION (ob, 2); /* So player faces south */
977 insert_ob_in_map (op, op->map, op, 0); 925 insert_ob_in_map (ob, ob->map, ob, 0);
978 assign (op->contr->title, op->arch->clone.name); 926 assign (ob->contr->title, ob->arch->object::name);
979 op->add_statbonus (); 927 ob->add_statbonus ();
980 tmp_loop = allowed_class (op);
981 } 928 }
929 while (!allowed_class (ob));
982 930
983 update_object (op, UP_OBJ_FACE); 931 update_object (ob, UP_OBJ_FACE);
984 esrv_update_item (UPD_FACE, op, op); 932 esrv_update_item (UPD_FACE, ob, ob);
985 op->update_stats (); 933 ob->update_stats ();
986 op->stats.hp = op->stats.maxhp; 934 ob->stats.hp = ob->stats.maxhp;
987 op->stats.sp = op->stats.maxsp; 935 ob->stats.sp = ob->stats.maxsp;
988 op->stats.grace = 0; 936 ob->stats.grace = 0;
989
990 if (op->msg)
991 new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994 return 0;
995}
996
997int
998key_confirm_quit (object *op, char key)
999{
1000 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001 {
1002 op->contr->ns->state = ST_PLAYING;
1003 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004 return 1;
1005 }
1006
1007 INVOKE_PLAYER (LOGOUT, op->contr);
1008 INVOKE_PLAYER (QUIT, op->contr);
1009
1010 op->contr->enable_save = false;
1011
1012 terminate_all_pets (op);
1013 op->remove ();
1014 op->direction = 0;
1015 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1016
1017 strcpy (op->contr->killer, "quit");
1018 check_score (op);
1019 op->contr->party = 0;
1020 op->contr->own_title[0] = '\0';
1021 op->contr->destroy ();
1022
1023 return 1;
1024} 937}
1025 938
1026void 939void
1027flee_player (object *op) 940flee_player (object *op)
1028{ 941{
… …
1075 /* Cornered, get rid of scared */ 988 /* Cornered, get rid of scared */
1076 CLEAR_FLAG (op, FLAG_SCARED); 989 CLEAR_FLAG (op, FLAG_SCARED);
1077 op->enemy = NULL; 990 op->enemy = NULL;
1078} 991}
1079 992
1080
1081/* check_pick sees if there is stuff to be picked up/picks up stuff. 993/* check_pick sees if there is stuff to be picked up/picks up stuff.
1082 * IT returns 1 if the player should keep on moving, 0 if he should 994 * It returns 1 if the player should keep on moving, 0 if he should
1083 * stop. 995 * stop.
1084 */ 996 */
1085int 997int
1086check_pick (object *op) 998check_pick (object *op)
1087{ 999{
1088 object *tmp, *next; 1000 object *tmp, *next;
1089 int stop = 0; 1001 int stop = 0;
1090 int j, k, wvratio; 1002 int wvratio;
1091 char putstring[128], tmpstr[16]; 1003 char putstring[128];
1092 1004
1093 /* if you're flying, you cna't pick up anything */ 1005 /* if you're flying, you cna't pick up anything */
1094 if (op->move_type & MOVE_FLYING) 1006 if (op->move_type & MOVE_FLYING)
1095 return 1; 1007 return 1;
1096 1008
… …
1164 if (tmp->name != NULL) 1076 if (tmp->name != NULL)
1165 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1077 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1166 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1078 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1167 else 1079 else
1168 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1080 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1169 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1081 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1170 1082
1171 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1083 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1172 } 1084 }
1173 1085
1174 /* philosophy: 1086 /* philosophy:
… …
1249 pick_up (op, tmp); 1161 pick_up (op, tmp);
1250 continue; 1162 continue;
1251 } 1163 }
1252 1164
1253 if (op->contr->mode & PU_READABLES) 1165 if (op->contr->mode & PU_READABLES)
1254 if (tmp->type == BOOK || tmp->type == SCROLL) 1166 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1255 { 1167 {
1256 pick_up (op, tmp); 1168 pick_up (op, tmp);
1257 continue; 1169 continue;
1258 } 1170 }
1259 1171
… …
1367 /* careful: chairs and tables are weapons! */ 1279 /* careful: chairs and tables are weapons! */
1368 if (op->contr->mode & PU_ALLWEAPON) 1280 if (op->contr->mode & PU_ALLWEAPON)
1369 { 1281 {
1370 if (tmp->type == WEAPON && tmp->name != NULL) 1282 if (tmp->type == WEAPON && tmp->name != NULL)
1371 { 1283 {
1372 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1284 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1373 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1285 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1374 { 1286 {
1375 pick_up (op, tmp); 1287 pick_up (op, tmp);
1376 continue; 1288 continue;
1377 } 1289 }
1378 } 1290 }
1379 1291
1380 if (tmp->type == WEAPON && tmp->name == NULL) 1292 if (tmp->type == WEAPON && tmp->name == NULL)
1381 { 1293 {
1382 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1294 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1383 { 1295 {
1384 pick_up (op, tmp); 1296 pick_up (op, tmp);
1385 continue; 1297 continue;
1386 } 1298 }
1387 } 1299 }
… …
1412 if (tmp->name != NULL) 1324 if (tmp->name != NULL)
1413 { 1325 {
1414 fprintf (stderr, "%s", tmp->name); 1326 fprintf (stderr, "%s", tmp->name);
1415 } 1327 }
1416 else 1328 else
1417 fprintf (stderr, "%s", tmp->arch->name); 1329 fprintf (stderr, "%s", tmp->arch->archname);
1418 fprintf (stderr, ",%d] = ", tmp->type); 1330 fprintf (stderr, ",%d] = ", tmp->type);
1419 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1331 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1420#endif 1332#endif
1421 continue; 1333 continue;
1422 } 1334 }
… …
1433 * found object is returned. 1345 * found object is returned.
1434 */ 1346 */
1435object * 1347object *
1436find_arrow (object *op, const char *type) 1348find_arrow (object *op, const char *type)
1437{ 1349{
1438 object *tmp = NULL; 1350 object *tmp = 0;
1439 1351
1440 for (op = op->inv; op; op = op->below) 1352 for (op = op->inv; op; op = op->below)
1441 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1353 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1442 tmp = find_arrow (op, type); 1354 tmp = find_arrow (op, type);
1443 else if (op->type == ARROW && op->race == type) 1355 else if (op->type == ARROW && op->race == type)
1444 return op; 1356 return op;
1357
1445 return tmp; 1358 return tmp;
1446} 1359}
1447 1360
1448/* 1361/*
1449 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1362 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1450 * against the target. A full test is not performed, simply a basic test 1363 * against the target. A full test is not performed, simply a basic test
1451 * of resistances. The archer is making a quick guess at what he sees down 1364 * of resistances. The archer is making a quick guess at what he sees down
1452 * the hall. Failing that it does it's best to pick the highest plus arrow. 1365 * the hall. Failing that it does it's best to pick the highest plus arrow.
1453 */ 1366 */
1454
1455object * 1367object *
1456find_better_arrow (object *op, object *target, const char *type, int *better) 1368find_better_arrow (object *op, object *target, const char *type, int *better)
1457{ 1369{
1458 object *tmp = NULL, *arrow, *ntmp; 1370 object *tmp = NULL, *arrow, *ntmp;
1459 int attacknum, attacktype, betterby = 0, i; 1371 int attacknum, attacktype, betterby = 0, i;
… …
1492 else 1404 else
1493 { 1405 {
1494 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1406 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1495 { 1407 {
1496 attacktype = 1 << attacknum; 1408 attacktype = 1 << attacknum;
1497 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1409 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1498 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1410 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1499 { 1411 {
1500 tmp = arrow; 1412 tmp = arrow;
1501 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1413 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1502 } 1414 }
1503 } 1415 }
1504 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1416 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1505 { 1417 {
1506 tmp = arrow; 1418 tmp = arrow;
… …
1525 * find_better_arrow to find a decent arrow to use. 1437 * find_better_arrow to find a decent arrow to use.
1526 * op = the shooter 1438 * op = the shooter
1527 * type = bow->race 1439 * type = bow->race
1528 * dir = fire direction 1440 * dir = fire direction
1529 */ 1441 */
1530
1531object * 1442object *
1532pick_arrow_target (object *op, const char *type, int dir) 1443pick_arrow_target (object *op, const char *type, int dir)
1533{ 1444{
1534 object *tmp = NULL; 1445 object *tmp = NULL;
1535 maptile *m; 1446 maptile *m;
… …
1600 */ 1511 */
1601int 1512int
1602fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1513fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1603{ 1514{
1604 object *left, *bow; 1515 object *left, *bow;
1605 int bowspeed, mflags; 1516 int mflags;
1606 maptile *m; 1517 maptile *m;
1607 1518
1608 if (!dir) 1519 if (!dir)
1609 { 1520 {
1610 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1521 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1611 return 0; 1522 return 0;
1612 } 1523 }
1613 1524
1614 if (op->type == PLAYER) 1525 if (op->contr)
1615 bow = op->contr->ranges[range_bow]; 1526 bow = op->current_weapon;
1616 else 1527 else
1617 { 1528 {
1618 for (bow = op->inv; bow; bow = bow->below) 1529 for (bow = op->inv; bow; bow = bow->below)
1619 /* Don't check for applied - monsters don't apply bows - in that way, they 1530 /* Don't check for applied - monsters don't apply bows - in that way, they
1620 * don't need to switch back and forth between bows and weapons. 1531 * don't need to switch back and forth between bows and weapons.
… …
1625 if (!bow) 1536 if (!bow)
1626 { 1537 {
1627 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1538 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1628 return 0; 1539 return 0;
1629 } 1540 }
1541
1542 // optimisation: move object to top so we will find it quickly again
1543 if (bow->below)
1544 {
1545 bow->remove ();
1546 op->insert (bow);
1547 }
1548
1630 } 1549 }
1631 1550
1632 if (!bow->race || !bow->skill) 1551 if (!bow->race || !bow->skill)
1633 { 1552 {
1634 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1553 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1635 return 0; 1554 return 0;
1636 } 1555 }
1637
1638 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1639
1640 /* penalize ROF for bestarrow */
1641 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1642 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1643
1644 if (bowspeed < 1)
1645 bowspeed = 1;
1646 1556
1647 if (arrow == NULL) 1557 if (arrow == NULL)
1648 { 1558 {
1649 if ((arrow = find_arrow (op, bow->race)) == NULL) 1559 if ((arrow = find_arrow (op, bow->race)) == NULL)
1650 { 1560 {
1651 if (op->type == PLAYER) 1561 if (op->type == PLAYER)
1652 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1562 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1653 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1563 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1654 else 1564 else
1655 CLEAR_FLAG (op, FLAG_READY_BOW); 1565 CLEAR_FLAG (op, FLAG_READY_BOW);
1566
1656 return 0; 1567 return 0;
1657 } 1568 }
1658 } 1569 }
1659 1570
1660 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1571 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1684 1595
1685 arrow->set_owner (op); 1596 arrow->set_owner (op);
1686 arrow->skill = bow->skill; 1597 arrow->skill = bow->skill;
1687 arrow->direction = dir; 1598 arrow->direction = dir;
1688 1599
1600 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1601 arrow->stats.hp = arrow->stats.dam;
1602 arrow->stats.grace = arrow->attacktype;
1603
1604 if (arrow->slaying)
1605 arrow->spellarg = strdup (arrow->slaying);
1606
1607#if 0
1608 if (player *pl = op->contr)
1609 {
1610 float speed = pl->weapon_sp;
1611
1612 /* penalize ROF for bestarrow */
1613 if (pl->bowtype == bow_bestarrow)
1614 speed *= .9f;
1615 else
1616 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1617
1618 op->speed_left += speed - op->speed;
1619 }
1620#endif
1621
1622 SET_ANIMATION (arrow, arrow->direction);
1623
1624 /* update the speed */
1625 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1626 + bow->stats.dam / 7.f;
1627
1628 arrow->set_speed (max (arrow->speed, 2.f));
1629 arrow->speed_left = 0;
1630
1631 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1632
1689 if (op->type == PLAYER) 1633 if (op->type == PLAYER)
1690 { 1634 {
1691 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1692 op->update_stats ();
1693 }
1694
1695 SET_ANIMATION (arrow, arrow->direction);
1696 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1697 arrow->stats.hp = arrow->stats.dam;
1698 arrow->stats.grace = arrow->attacktype;
1699 if (arrow->slaying != NULL)
1700 arrow->spellarg = strdup (arrow->slaying);
1701
1702 /* Note that this was different for monsters - they got their level
1703 * added to the damage. I think the strength bonus is more proper.
1704 */
1705
1706 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1707
1708 /* update the speed */
1709 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1710 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1711
1712 arrow->set_speed (max (arrow->speed, 1.0));
1713 arrow->speed_left = 0;
1714
1715 if (op->type == PLAYER)
1716 {
1717 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1719 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1635 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1636 wc -= dex_bonus[op->stats.Dex];
1637
1638 if (!arrow->slaying)
1639 arrow->slaying = op->slaying;
1640
1641 arrow->attacktype |= op->attacktype;
1722 } 1642 }
1723 else 1643 else
1724 { 1644 {
1725 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726 arrow->level = op->level; 1645 arrow->level = op->level;
1727 } 1646 arrow->stats.wc -= bow->magic;
1728 1647
1729 if (arrow->attacktype == AT_PHYSICAL) 1648 if (!arrow->slaying)
1649 arrow->slaying = bow->slaying;
1650
1730 arrow->attacktype |= bow->attacktype; 1651 arrow->attacktype |= bow->attacktype;
1652 }
1731 1653
1732 if (bow->slaying) 1654 wc -= arrow->level;
1733 arrow->slaying = bow->slaying; 1655 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1734 1656
1657 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1735 arrow->move_type = MOVE_FLY_LOW; 1658 arrow->move_type = MOVE_FLY_LOW;
1736 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1659 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1737 1660
1738 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1661 op->play_sound (sound_find ("fire_arrow"));
1739 m->insert (arrow, sx, sy, op); 1662 m->insert (arrow, sx, sy, op);
1740 1663
1741 if (!arrow->destroyed ()) 1664 if (!arrow->destroyed ())
1742 move_arrow (arrow); 1665 move_arrow (arrow);
1743 1666
… …
1764{ 1687{
1765 int ret = 0, wcmod = 0; 1688 int ret = 0, wcmod = 0;
1766 1689
1767 if (op->contr->bowtype == bow_bestarrow) 1690 if (op->contr->bowtype == bow_bestarrow)
1768 { 1691 {
1769 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1692 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1770 } 1693 }
1771 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1694 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1772 { 1695 {
1773 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1696 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1774 wcmod = -1; 1697 wcmod = -1;
… …
1784 else if (op->contr->bowtype == bow_spreadshot) 1707 else if (op->contr->bowtype == bow_spreadshot)
1785 { 1708 {
1786 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1709 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1787 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1710 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1788 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1711 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1789
1790 } 1712 }
1791 else 1713 else
1792 { 1714 {
1793 /* Simple case */ 1715 /* Simple case */
1794 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1716 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1795 } 1717 }
1718
1796 return ret; 1719 return ret;
1797} 1720}
1798
1799 1721
1800/* Fires a misc (wand/rod/horn) object in 'dir'. 1722/* Fires a misc (wand/rod/horn) object in 'dir'.
1801 * Broken apart from 'fire' to keep it more readable. 1723 * Broken apart from 'fire' to keep it more readable.
1802 */ 1724 */
1803void 1725void
1804fire_misc_object (object *op, int dir) 1726fire_misc_object (object *op, int dir)
1805{ 1727{
1806 object *item; 1728 object *item = op->contr->ranged_ob;
1807 1729
1808 if (!op->contr->ranges[range_misc]) 1730 if (!item)
1809 { 1731 {
1810 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1732 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1811 return; 1733 return;
1812 } 1734 }
1813 1735
1814 item = op->contr->ranges[range_misc];
1815 if (!item->inv) 1736 if (!item->inv)
1816 { 1737 {
1817 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1738 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1818 return; 1739 return;
1819 } 1740 }
1741
1742 if (!op->change_weapon (item))
1743 return;
1744
1820 if (item->type == WAND) 1745 if (item->type == WAND)
1821 { 1746 {
1822 if (item->stats.food <= 0) 1747 if (item->stats.food <= 0)
1823 { 1748 {
1824 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1749 op->contr->play_sound (sound_find ("wand_poof"));
1825 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1750 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1751
1826 return; 1752 return;
1827 } 1753 }
1828 } 1754 }
1829 else if (item->type == ROD || item->type == HORN) 1755 else if (item->type == ROD || item->type == HORN)
1830 { 1756 {
1831 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1757 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1832 { 1758 {
1833 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1759 op->contr->play_sound (sound_find ("wand_poof"));
1760
1834 if (item->type == ROD) 1761 if (item->type == ROD)
1835 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1762 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1836 else 1763 else
1837 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1764 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1765
1838 return; 1766 return;
1839 } 1767 }
1840 } 1768 }
1841 1769
1842 if (cast_spell (op, item, dir, item->inv, NULL)) 1770 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1849 object *tmp; 1777 object *tmp;
1850 1778
1851 if (item->arch) 1779 if (item->arch)
1852 { 1780 {
1853 CLEAR_FLAG (item, FLAG_ANIMATE); 1781 CLEAR_FLAG (item, FLAG_ANIMATE);
1854 item->face = item->arch->clone.face; 1782 item->face = item->arch->face;
1855 item->set_speed (0); 1783 item->set_speed (0);
1856 } 1784 }
1857 1785
1858 if ((tmp = item->in_player ())) 1786 if ((tmp = item->in_player ()))
1859 esrv_update_item (UPD_ANIM, tmp, item); 1787 esrv_update_item (UPD_ANIM, tmp, item);
… …
1864 } 1792 }
1865} 1793}
1866 1794
1867/* Received a fire command for the player - go and do it. 1795/* Received a fire command for the player - go and do it.
1868 */ 1796 */
1869void 1797bool
1870fire (object *op, int dir) 1798fire (object *op, int dir)
1871{ 1799{
1872 int spellcost = 0; 1800 int spellcost = 0;
1873 1801
1874 /* check for loss of invisiblity/hide */ 1802 /* check for loss of invisiblity/hide */
1875 if (action_makes_visible (op)) 1803 if (action_makes_visible (op))
1876 make_visible (op); 1804 make_visible (op);
1877 1805
1878 switch (op->contr->shoottype) 1806 player *pl = op->contr;
1807
1808 if (pl->golem)
1809 {
1810 control_golem (op->contr->golem, dir);
1811 return false;
1879 { 1812 }
1880 case range_none:
1881 return;
1882 1813
1883 case range_bow: 1814 object *ob = pl->ranged_ob;
1815
1816 if (!ob)
1817 return false;
1818
1819 if (!op->change_weapon (ob))
1820 return false;
1821
1822 if (op->speed_left > 0.f)
1823 --op->speed_left;
1824 else
1825 return false;
1826
1827 switch (ob->type)
1828 {
1829 case BOW:
1884 player_fire_bow (op, dir); 1830 player_fire_bow (op, dir);
1885 return; 1831 break;
1886 1832
1887 case range_magic: /* Casting spells */ 1833 case SPELL:
1888 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1834 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1889 return; 1835 break;
1890 1836
1891 case range_misc: 1837 case BUILDER:
1838 apply_map_builder (op, dir);
1839 break;
1840
1841 case SKILL:
1842 do_skill (op, op, ob, dir, 0);
1843 break;
1844
1845 default:
1892 fire_misc_object (op, dir); 1846 fire_misc_object (op, dir);
1893 return; 1847 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 } 1848 }
1921}
1922 1849
1923 1850 return true;
1851}
1924 1852
1925/* find_key 1853/* find_key
1926 * We try to find a key for the door as passed. If we find a key 1854 * 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 1855 * and successfully use it, we return the key, otherwise NULL
1928 * This function merges both normal and locked door, since the logic 1856 * This function merges both normal and locked door, since the logic
… …
1930 * pl is the player, 1858 * pl is the player,
1931 * inv is the objects inventory to searched 1859 * inv is the objects inventory to searched
1932 * door is the door we are trying to match against. 1860 * door is the door we are trying to match against.
1933 * This function can be called recursively to search containers. 1861 * This function can be called recursively to search containers.
1934 */ 1862 */
1935
1936object * 1863object *
1937find_key (object *pl, object *container, object *door) 1864find_key (object *pl, object *container, object *door)
1938{ 1865{
1939 object *tmp, *key; 1866 object *tmp, *key;
1940 1867
1941 /* Should not happen, but sanity checking is never bad */ 1868 /* Should not happen, but sanity checking is never bad */
1942 if (container->inv == NULL) 1869 if (!container->inv)
1943 return NULL; 1870 return 0;
1944 1871
1945 /* First, lets try to find a key in the top level inventory */ 1872 /* First, lets try to find a key in the top level inventory */
1946 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1873 for (tmp = container->inv; tmp; tmp = tmp->below)
1947 { 1874 {
1948 if (door->type == DOOR && tmp->type == KEY) 1875 if (door->type == DOOR && tmp->type == KEY)
1949 break; 1876 break;
1950 /* For sanity, we should really check door type, but other stuff 1877 /* For sanity, we should really check door type, but other stuff
1951 * (like containers) can be locked with special keys 1878 * (like containers) can be locked with special keys
1952 */ 1879 */
1953 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1880 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1954 break; 1881 break;
1955 } 1882 }
1883
1956 /* No key found - lets search inventories now */ 1884 /* No key found - lets search inventories now */
1957 /* If we find and use a key in an inventory, return at that time. 1885 /* 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 1886 * otherwise, if we search all the inventories and still don't find
1959 * a key, return 1887 * a key, return
1960 */ 1888 */
1961 if (!tmp) 1889 if (!tmp)
1962 { 1890 {
1963 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1891 for (tmp = container->inv; tmp; tmp = tmp->below)
1964 { 1892 {
1965 /* No reason to search empty containers */ 1893 /* No reason to search empty containers */
1966 if (tmp->type == CONTAINER && tmp->inv) 1894 if (tmp->type == CONTAINER && tmp->inv)
1967 { 1895 {
1968 if ((key = find_key (pl, tmp, door)) != NULL) 1896 if ((key = find_key (pl, tmp, door)))
1969 return key; 1897 return key;
1970 } 1898 }
1971 } 1899 }
1900
1972 if (!tmp) 1901 if (!tmp)
1973 return NULL; 1902 return NULL;
1974 } 1903 }
1904
1975 /* We get down here if we have found a key. Now if its in a container, 1905 /* 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 1906 * see if we actually want to use it
1977 */ 1907 */
1978 if (pl != container) 1908 if (pl != container)
1979 { 1909 {
… …
2000 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1930 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)); 1931 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2002 return NULL; 1932 return NULL;
2003 } 1933 }
2004 } 1934 }
1935
2005 return tmp; 1936 return tmp;
2006} 1937}
2007 1938
2008/* moved door processing out of move_player_attack. 1939/* moved door processing out of move_player_attack.
2009 * returns 1 if player has opened the door with a key 1940 * returns 1 if player has opened the door with a key
… …
2011 * 0 otherwise 1942 * 0 otherwise
2012 */ 1943 */
2013static int 1944static int
2014player_attack_door (object *op, object *door) 1945player_attack_door (object *op, object *door)
2015{ 1946{
2016 /* If its a door, try to find a use a key. If we do destroy the door, 1947 /* 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 - 1948 * might as well return immediately as there is nothing more to do -
2018 * otherwise, we fall through to the rest of the code. 1949 * otherwise, we fall through to the rest of the code.
2019 */ 1950 */
2020 object *key = find_key (op, op, door); 1951 object *key = find_key (op, op, door);
2021 1952
2022 /* IF we found a key, do some extra work */ 1953 /* If we found a key, do some extra work */
2023 if (key) 1954 if (key)
2024 { 1955 {
2025 object *container = key->env; 1956 object *container = key->env;
2026 1957
2027 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2028 if (action_makes_visible (op)) 1958 if (action_makes_visible (op))
2029 make_visible (op); 1959 make_visible (op);
1960
2030 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1961 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2031 spring_trap (door->inv, op); 1962 spring_trap (door->inv, op);
1963
2032 if (door->type == DOOR) 1964 if (door->type == DOOR)
2033 {
2034 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1965 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2035 }
2036 else if (door->type == LOCKED_DOOR) 1966 else if (door->type == LOCKED_DOOR)
2037 { 1967 {
2038 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1968 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 ;-) */ 1969 remove_door2 (door); /* remove door without violence ;-) */
2040 } 1970 }
1971
2041 /* Do this after we print the message */ 1972 /* Do this after we print the message */
2042 decrease_ob (key); /* Use up one of the keys */ 1973 decrease_ob (key); /* Use up one of the keys */
2043 /* Need to update the weight the container the key was in */ 1974 /* Need to update the weight the container the key was in */
2044 if (container != op) 1975 if (container != op)
2045 esrv_update_item (UPD_WEIGHT, op, container); 1976 esrv_update_item (UPD_WEIGHT, op, container);
1977
2046 return 1; /* Nothing more to do below */ 1978 return 1; /* Nothing more to do below */
2047 } 1979 }
2048 else if (door->type == LOCKED_DOOR) 1980 else if (door->type == LOCKED_DOOR)
2049 { 1981 {
2050 /* Might as well return now - no other way to open this */ 1982 /* Might as well return now - no other way to open this */
2051 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1983 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2052 return 1; 1984 return 1;
2053 } 1985 }
1986
2054 return 0; 1987 return 0;
2055} 1988}
2056 1989
2057/* This function is just part of a breakup from move_player. 1990/* This function is just part of a breakup from move_player.
2058 * It should keep the code cleaner. 1991 * It should keep the code cleaner.
2059 * When this is called, the players direction has been updated 1992 * When this is called, the players direction has been updated
2060 * (taking into account confusion.) The player is also actually 1993 * (taking into account confusion.) The player is also actually
2061 * going to try and move (not fire weapons). 1994 * going to try and move (not fire weapons).
2062 */ 1995 */
2063void 1996bool
2064move_player_attack (object *op, int dir) 1997move_player_attack (object *op, int dir)
2065{ 1998{
2066 object *tmp, *mon;
2067 sint16 nx, ny;
2068 int on_battleground; 1999 int on_battleground;
2069 maptile *m;
2070 2000
2071 nx = freearr_x[dir] + op->x; 2001 sint16 nx = freearr_x[dir] + op->x;
2072 ny = freearr_y[dir] + op->y; 2002 sint16 ny = freearr_y[dir] + op->y;
2073 2003
2074 on_battleground = op_on_battleground (op, 0, 0); 2004 on_battleground = op_on_battleground (op, 0, 0);
2005
2006 if (out_of_map (op->map, nx, ny))
2007 return false;
2008
2009 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2010 {
2011 --op->speed_left;
2012 return true;
2013 }
2075 2014
2076 /* If braced, or can't move to the square, and it is not out of the 2015 /* 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 2016 * 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 2017 * 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 2018 * 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 2019 * 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 2020 * 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 2021 * quite a bit of processing. However, it probably is less than what
2083 * move_ob uses. 2022 * move_ob uses.
2084 */ 2023 */
2085 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2024 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 2025
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 2026 /* 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. 2027 * 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 2028 * if its a door or barrel (can roll) see if there may be monsters
2106 * on the space 2029 * on the space
2107 */ 2030 */
2108 while (tmp) 2031 object *mon;
2109 { 2032 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2110 if (tmp == op) 2033 {
2111 { 2034 if ((mon->flag [FLAG_ALIVE]
2112 tmp = tmp->above; 2035 || mon->type == LOCKED_DOOR
2113 continue; 2036 || mon->flag [FLAG_CAN_ROLL])
2114 }
2115
2116 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2117 {
2118 mon = tmp; 2037 && mon != op)
2119 break; 2038 break;
2120 } 2039 }
2121 2040
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 */ 2041 if (!mon) /* This happens anytime the player tries to move */
2129 return; /* into a wall */ 2042 return false; /* into a wall */
2130 2043
2131 if (mon->head)
2132 mon = mon->head; 2044 mon = mon->head_ ();
2133 2045
2134 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2046 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2047 if (op->contr->weapon_sp_left > 0.f)
2135 if (player_attack_door (op, mon)) 2048 if (player_attack_door (op, mon))
2049 {
2050 --op->contr->weapon_sp_left;
2136 return; 2051 return true;
2052 }
2137 2053
2138 /* The following deals with possibly attacking peaceful 2054 /* The following deals with possibly attacking peaceful
2139 * or frienddly creatures. Basically, all players are considered 2055 * or friendly creatures. Basically, all players are considered
2140 * unaggressive. If the moving player has peaceful set, then the 2056 * unaggressive. If the moving player has peaceful set, then the
2141 * object should be pushed instead of attacked. It is assumed that 2057 * object should be pushed instead of attacked. It is assumed that
2142 * if you are braced, you will not attack friends accidently, 2058 * if you are braced, you will not attack friends accidently,
2143 * and thus will not push them. 2059 * and thus will not push them.
2144 */ 2060 */
2145 2061
2146 /* If the creature is a pet, push it even if the player is not 2062 /* 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 2063 * peaceful. Our assumption is the creature is a pet if the
2148 * player owns it and it is either friendly or unagressive. 2064 * player owns it and it is either friendly or unagressive.
2149 */ 2065 */
2150 if ((op->type == PLAYER) 2066 if (op->type == PLAYER
2151#if COZY_SERVER
2152 &&
2153 ((mon->owner && mon->owner->contr 2067 && ((mon->owner && mon->owner->contr
2154 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2068 && same_party (mon->owner->contr->party, op->contr->party))
2155#else
2156 && mon->owner == op 2069 || mon->owner == op)
2157#endif
2158 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2070 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2159 { 2071 {
2160 /* If we're braced, we don't want to switch places with it */ 2072 /* If we're braced, we don't want to switch places with it */
2161 if (op->contr->braced) 2073 if (op->contr->braced)
2162 return; 2074 return false;
2163 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2075
2076 if (op->speed_left > 0.f)
2077 {
2078 --op->speed_left;
2079
2080 op->play_sound (sound_find ("push_player"));
2164 (void) push_ob (mon, dir, op); 2081 push_ob (mon, dir, op);
2082
2165 if (op->contr->tmp_invis || op->hide) 2083 if (op->contr->tmp_invis || op->hide)
2166 make_visible (op); 2084 make_visible (op);
2085
2167 return; 2086 return true;
2168 } 2087 }
2088 else
2089 return false;
2090 }
2169 2091
2170 /* in certain circumstances, you shouldn't attack friendly 2092 /* in certain circumstances, you shouldn't attack friendly
2171 * creatures. Note that if you are braced, you can't push 2093 * creatures. Note that if you are braced, you can't push
2172 * someone, but put it inside this loop so that you won't 2094 * someone, but put it inside this loop so that you won't
2173 * attack them either. 2095 * attack them either.
2174 */ 2096 */
2175 if ((mon->type == PLAYER || mon->enemy != op) && 2097 if ((mon->type == PLAYER || mon->enemy != op)
2176 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2098 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2177#ifdef PROHIBIT_PLAYERKILL
2178 (op->contr->peaceful 2099 && ((op->contr->peaceful
2179 || (mon->type == PLAYER 2100 || (mon->type == PLAYER && mon->contr->peaceful))
2180 && mon->contr->
2181 peaceful)) &&
2182#else
2183 op->contr->peaceful &&
2184#endif
2185 !on_battleground)) 2101 && !on_battleground))
2102 {
2103 if (op->speed_left > 0.f)
2186 { 2104 {
2105 --op->speed_left;
2106
2187 if (!op->contr->braced) 2107 if (!op->contr->braced)
2188 { 2108 {
2189 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2109 op->play_sound (sound_find ("push_player"));
2190 (void) push_ob (mon, dir, op); 2110 push_ob (mon, dir, op);
2191 } 2111 }
2192 else 2112 else
2193 new_draw_info (0, 0, op, "You withhold your attack"); 2113 new_draw_info (0, 0, op, "You withhold your attack");
2194 2114
2195 if (op->contr->tmp_invis || op->hide) 2115 if (op->contr->tmp_invis || op->hide)
2196 make_visible (op); 2116 make_visible (op);
2197 }
2198 2117
2118 return true;
2119 }
2120 }
2199 /* If the object is a boulder or other rollable object, then 2121 /* 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. 2122 * roll it if not braced. You can't roll it if you are braced.
2201 */ 2123 */
2202 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2124 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2125 {
2126 if (op->speed_left > 0.f)
2203 { 2127 {
2128 --op->speed_left;
2129
2204 recursive_roll (mon, dir, op); 2130 recursive_roll (mon, dir, op);
2205 if (action_makes_visible (op)) 2131 if (action_makes_visible (op))
2206 make_visible (op); 2132 make_visible (op);
2207 }
2208 2133
2134 return true;
2135 }
2136 }
2209 /* Any generic living creature. Including things like doors. 2137 /* Any generic living creature. Including things like doors.
2210 * Way it works is like this: First, it must have some hit points 2138 * 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: 2139 * 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 2140 * 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. 2141 * that party_number -1 is no party, so attacks can still happen.
2214 */ 2142 */
2215
2216 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2143 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))) 2144 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2218 { 2145 {
2219 2146 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 { 2147 {
2227 op->speed_left += op->speed / op->contr->weapon_sp; 2148 --op->contr->weapon_sp_left;
2228
2229 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2230 }
2231 2149
2232 skill_attack (mon, op, 0, 0, 0); 2150 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 2151
2248 if (action_makes_visible (op)) 2152 if (action_makes_visible (op))
2249 make_visible (op); 2153 make_visible (op);
2250 }
2251 } /* if player should attack something */
2252}
2253 2154
2254int 2155 return true;
2156 }
2157 }
2158
2159 return false;
2160}
2161
2162bool
2255move_player (object *op, int dir) 2163move_player (object *op, int dir)
2256{ 2164{
2257 int pick; 2165 int pick;
2258 2166
2259 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2167 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2260 return 0; 2168 return 0;
2261 2169
2262 /* Sanity check: make sure dir is valid */ 2170 /* Sanity check: make sure dir is valid */
2263 if ((dir < 0) || (dir >= 9)) 2171 if ((dir < 0) || (dir >= 9))
2264 { 2172 {
2265 LOG (llevError, "move_player: invalid direction %d\n", dir); 2173 LOG (llevError, "move_player: invalid direction %d\n", dir);
2266 return 0; 2174 return 0;
2267 } 2175 }
2268 2176
2269 /* peterm: added following line */ 2177 /* peterm: added following line */
2270 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2178 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2271 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2179 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2272 2180
2273 op->facing = dir; 2181 op->facing = dir;
2274 2182
2275 if (op->hide) 2183 if (op->hide)
2276 do_hidden_move (op); 2184 do_hidden_move (op);
2277 2185
2186 bool retval;
2187
2278 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2188 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2279 /*nop */ ; 2189 retval = RESULT_INT (0);
2280 else if (op->contr->fire_on) 2190 else if (op->contr->fire_on)
2281 fire (op, dir); 2191 retval = fire (op, dir);
2282 else 2192 else
2283 { 2193 {
2284 move_player_attack (op, dir); 2194 retval = move_player_attack (op, dir);
2285 pick = check_pick (op); 2195 pick = check_pick (op);
2286 } 2196 }
2287 2197
2288 /* Add special check for newcs players and fire on - this way, the 2198 /* Add special check for newcs players and fire on - this way, the
2289 * server can handle repeat firing. 2199 * server can handle repeat firing.
… …
2296 /* Update how the player looks. Use the facing, so direction may 2206 /* Update how the player looks. Use the facing, so direction may
2297 * get reset to zero. This allows for full animation capabilities 2207 * get reset to zero. This allows for full animation capabilities
2298 * for players. 2208 * for players.
2299 */ 2209 */
2300 animate_object (op, op->facing); 2210 animate_object (op, op->facing);
2301 return 0; 2211
2212 return retval;
2302} 2213}
2303 2214
2304/* This is similar to handle_player, below, but is only used by the 2215/* This is similar to handle_player, below, but is only used by the
2305 * new client/server stuff. 2216 * new client/server stuff.
2306 * This is sort of special, in that the new client/server actually uses 2217 * This is sort of special, in that the new client/server actually uses
2307 * the new speed values for commands. 2218 * the new speed values for commands.
2308 * 2219 *
2309 * Returns true if there are more actions we can do. 2220 * Returns true if there are more actions we can do. Should not do
2221 * many actions in a row, as that would be too unfair to other
2222 * players.
2310 */ 2223 */
2311int 2224bool
2312handle_newcs_player (object *op) 2225handle_newcs_player (object *op)
2313{ 2226{
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)) 2227 if (QUERY_FLAG (op, FLAG_SCARED))
2335 { 2228 {
2336 flee_player (op); 2229 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 { 2230 {
2340 op->speed_left--; 2231 --op->speed_left;
2232 flee_player (op);
2233
2341 return 0; 2234 return true;
2342 } 2235 }
2236 else
2237 return false;
2343 } 2238 }
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 2239
2353 /* call this here - we also will call this in do_ericserver, but 2240 /* call this here - we also will call this in do_ericserver, but
2354 * the players time has been increased when doericserver has been 2241 * the players time has been increased when doericserver has been
2355 * called, so we recheck it here. 2242 * called, so we recheck it here.
2356 */ 2243 */
2357 op->contr->ns->handle_command (); 2244 if (op->contr->ns->handle_command ())
2358
2359 if (op->speed_left < 0)
2360 return 0; 2245 return true;
2361 2246
2362 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2247 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2363 {
2364 /* All move commands take 1 tick, at least for now */
2365 op->speed_left--;
2366
2367 /* Instead of all the stuff below, let move_player take care
2368 * of it. Also, some of the skill stuff is only put in
2369 * there, as well as the confusion stuff.
2370 */
2371 move_player (op, op->direction); 2248 return move_player (op, op->direction);
2372 if (op->speed_left > 0)
2373 return 1;
2374 else
2375 return 0;
2376 }
2377 2249
2378 return 0; 2250 return false;
2379} 2251}
2380 2252
2381int 2253int
2382save_life (object *op) 2254save_life (object *op)
2383{ 2255{
… …
2385 return 0; 2257 return 0;
2386 2258
2387 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2259 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2388 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2260 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2389 { 2261 {
2390 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2262 op->play_sound (sound_find ("ob_evaporate"));
2391 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2263 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2392 2264
2393 if (op->contr) 2265 if (op->contr)
2394 esrv_del_item (op->contr, tmp->count); 2266 esrv_del_item (op->contr, tmp->count);
2395 2267
… …
2415/* This goes throws the inventory and removes unpaid objects, and puts them 2287/* This goes throws the inventory and removes unpaid objects, and puts them
2416 * back in the map (location and map determined by values of env). This 2288 * back in the map (location and map determined by values of env). This
2417 * function will descend into containers. op is the object to start the search 2289 * function will descend into containers. op is the object to start the search
2418 * from. 2290 * from.
2419 */ 2291 */
2420void 2292static void
2421remove_unpaid_objects (object *op, object *env) 2293drop_unpaid_items (object *op, object *env)
2422{ 2294{
2423 object *next;
2424
2425 while (op) 2295 while (op)
2426 { 2296 {
2427 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2297 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2428 2298
2429 if (QUERY_FLAG (op, FLAG_UNPAID)) 2299 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2432 esrv_del_item (env->contr, op->count); 2302 esrv_del_item (env->contr, op->count);
2433 2303
2434 op->insert_at (env); 2304 op->insert_at (env);
2435 } 2305 }
2436 else if (op->inv) 2306 else if (op->inv)
2437 remove_unpaid_objects (op->inv, env); 2307 drop_unpaid_items (op->inv, env);
2438 2308
2439 op = next; 2309 op = next;
2440 } 2310 }
2311}
2312
2313void
2314object::drop_unpaid_items ()
2315{
2316 if (!flag [FLAG_REMOVED])
2317 ::drop_unpaid_items (inv, this);
2441} 2318}
2442 2319
2443/* 2320/*
2444 * Returns pointer a static string containing gravestone text 2321 * Returns pointer a static string containing gravestone text
2445 * Moved from apply.c to player.c - player.c is what 2322 * Moved from apply.c to player.c - player.c is what
… …
2495 int rate_grace = 2000; 2372 int rate_grace = 2000;
2496 const int max_hp = 1; 2373 const int max_hp = 1;
2497 const int max_sp = 1; 2374 const int max_sp = 1;
2498 const int max_grace = 1; 2375 const int max_grace = 1;
2499 2376
2500 if (op->contr->outputs_sync) 2377 if (op->contr->hidden)
2378 {
2379 op->invisible = 1000;
2380 /* the socket code flashes the player visible/invisible
2381 * depending on the value of invisible, so we need to
2382 * alternate it here for it to work correctly.
2383 */
2384 if (pticks & 2)
2385 op->invisible--;
2501 { 2386 }
2502 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2387 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2503 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2388 {
2504 flush_output_element (op, &op->contr->outputs[i]); 2389 if (!op->invisible--)
2390 {
2391 make_visible (op);
2392 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2393 }
2505 } 2394 }
2506 2395
2507 if (op->contr->ns->state == ST_PLAYING) 2396 if (op->contr->ns->state == ST_PLAYING)
2508 { 2397 {
2509 /* these next three if clauses make it possible to SLOW DOWN 2398 /* these next three if clauses make it possible to SLOW DOWN
… …
2528 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2417 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2529 else 2418 else
2530 { 2419 {
2531 gen_grace = op->stats.maxgrace; 2420 gen_grace = op->stats.maxgrace;
2532 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2421 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2533 }
2534
2535 /* Regenerate Spell Points */
2536 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2537 {
2538 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2539 if (op->stats.sp < op->stats.maxsp)
2540 {
2541 op->stats.sp++;
2542 /* dms do not consume food */
2543 if (!QUERY_FLAG (op, FLAG_WIZ))
2544 {
2545 op->stats.food--;
2546 if (op->contr->digestion < 0)
2547 op->stats.food += op->contr->digestion;
2548 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2549 op->stats.food = last_food;
2550 }
2551 }
2552
2553 if (max_sp > 1)
2554 {
2555 over_sp = (gen_sp + 10) / rate_sp;
2556 if (over_sp > 0)
2557 {
2558 if (op->stats.sp < op->stats.maxsp)
2559 {
2560 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2561
2562 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2563 op->stats.sp--;
2564
2565 if (op->stats.sp > op->stats.maxsp)
2566 op->stats.sp = op->stats.maxsp;
2567 }
2568 op->last_sp = 0;
2569 }
2570 else
2571 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2572 }
2573 else
2574 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2575 } 2422 }
2576 2423
2577 /* Regenerate Grace */ 2424 /* Regenerate Grace */
2578 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2425 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2579 if (--op->last_grace < 0) 2426 if (--op->last_grace < 0)
… …
2600 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2447 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2601 } 2448 }
2602 /* wearing stuff doesn't detract from grace generation. */ 2449 /* wearing stuff doesn't detract from grace generation. */
2603 } 2450 }
2604 2451
2452 if (op->stats.food > 0)
2453 {
2605 /* Regenerate Hit Points */ 2454 /* Regenerate Spell Points */
2606 if (--op->last_heal < 0) 2455 if (!op->contr->golem && --op->last_sp < 0)
2607 {
2608 if (op->stats.hp < op->stats.maxhp)
2609 { 2456 {
2610 op->stats.hp++; 2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2611 /* dms do not consume food */ 2458
2612 if (!QUERY_FLAG (op, FLAG_WIZ)) 2459 if (op->stats.sp < op->stats.maxsp)
2613 { 2460 {
2461 op->stats.sp++;
2462
2463 /* dms do not consume food */
2464 if (!QUERY_FLAG (op, FLAG_WIZ))
2465 {
2614 op->stats.food--; 2466 op->stats.food--;
2467
2615 if (op->contr->digestion < 0) 2468 if (op->contr->digestion < 0)
2616 op->stats.food += op->contr->digestion; 2469 op->stats.food += op->contr->digestion;
2617 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2470 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2618 op->stats.food = last_food; 2471 op->stats.food = last_food;
2472 }
2619 } 2473 }
2620 }
2621 2474
2622 if (max_hp > 1) 2475 if (max_sp > 1)
2623 {
2624 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2625 if (over_hp > 0)
2626 { 2476 {
2627 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2477 over_sp = (gen_sp + 10) / rate_sp;
2478 if (over_sp > 0)
2479 {
2480 if (op->stats.sp < op->stats.maxsp)
2481 {
2482 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2483
2484 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2485 op->stats.sp--;
2486
2487 if (op->stats.sp > op->stats.maxsp)
2488 op->stats.sp = op->stats.maxsp;
2489 }
2490
2628 op->last_heal = 0; 2491 op->last_sp = 0;
2492 }
2493 else
2494 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2629 } 2495 }
2630 else 2496 else
2497 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2498 }
2499
2500 /* Regenerate Hit Points */
2501 if (--op->last_heal < 0)
2502 {
2503 if (op->stats.hp < op->stats.maxhp)
2631 { 2504 {
2632 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2505 op->stats.hp++;
2506
2507 /* dms do not consume food */
2508 if (!QUERY_FLAG (op, FLAG_WIZ))
2509 {
2510 op->stats.food--;
2511
2512 if (op->contr->digestion < 0)
2513 op->stats.food += op->contr->digestion;
2514 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2515 op->stats.food = last_food;
2516 }
2633 } 2517 }
2518
2519 if (max_hp > 1)
2520 {
2521 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2522
2523 if (over_hp > 0)
2524 {
2525 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2526 op->last_heal = 0;
2527 }
2528 else
2529 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2634 } 2530 }
2635 else 2531 else
2636 {
2637 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2532 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2638 } 2533 }
2639 } 2534 }
2640 2535
2641 /* Digestion */ 2536 /* Digestion */
2642 if (--op->last_eat < 0) 2537 if (--op->last_eat < 0)
2643 { 2538 {
2644#ifdef COZY_SERVER 2539 int bonus = max (0, op->contr->digestion),
2645 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2540 penalty = max (0, -op->contr->digestion);
2646 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2647#else
2648 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2649#endif
2650 2541
2651 if (op->contr->gen_hp > 0)
2652 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2542 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2653 else
2654 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2655 2543
2656 /* dms do not consume food */ 2544 /* dms do not consume food */
2657 if (!QUERY_FLAG (op, FLAG_WIZ)) 2545 if (!QUERY_FLAG (op, FLAG_WIZ))
2658 op->stats.food--; 2546 op->stats.food--;
2659 } 2547 }
… …
2686 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2574 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2687 manual_apply (op, flesh, 0); 2575 manual_apply (op, flesh, 0);
2688 } 2576 }
2689 } 2577 }
2690 2578
2691 while (op->stats.food < 0 && op->stats.hp >= 0) 2579 if (op->stats.food < 0)
2692 op->stats.food++, op->stats.hp--; 2580 {
2581 op->stats.hp += op->stats.food;
2582 op->stats.food = 0;
2583 }
2693 2584
2694 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2585 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2695 kill_player (op); 2586 kill_player (op);
2696 } 2587 }
2697} 2588}
… …
2720 object *tmp; 2611 object *tmp;
2721 2612
2722 if (save_life (op)) 2613 if (save_life (op))
2723 return; 2614 return;
2724 2615
2725
2726 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2616 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2727 * in cities ONLY!!! It is very important that this doesn't get abused. 2617 * in cities ONLY!!! It is very important that this doesn't get abused.
2728 * Look at op_on_battleground() for more info --AndreasV 2618 * Look at op_on_battleground() for more info --AndreasV
2729 */ 2619 */
2730 if (op_on_battleground (op, &x, &y)) 2620 if (op_on_battleground (op, &x, &y))
… …
2759 tmp->name = buf; 2649 tmp->name = buf;
2760 sprintf (buf, " This finger has been cut off %s\n" 2650 sprintf (buf, " This finger has been cut off %s\n"
2761 " the %s, when he was defeated at\n level %d by %s.\n", 2651 " the %s, when he was defeated at\n level %d by %s.\n",
2762 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2652 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2763 tmp->msg = buf; 2653 tmp->msg = buf;
2764 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2654 tmp->value = 0, tmp->type = 0;
2765 tmp->materialname = NULL; 2655 tmp->materialname = "organics";
2766 op->insert_at (tmp, op); 2656 tmp->insert_at (op, tmp);
2767 } 2657 }
2768 2658
2769 /* teleport defeated player to new destination */ 2659 /* teleport defeated player to new destination */
2770 transfer_ob (op, x, y, 0, NULL); 2660 transfer_ob (op, x, y, 0, NULL);
2771 op->contr->braced = 0; 2661 op->contr->braced = 0;
… …
2776 2666
2777 command_kill_pets (op, 0); 2667 command_kill_pets (op, 0);
2778 2668
2779 if (op->stats.food < 0) 2669 if (op->stats.food < 0)
2780 { 2670 {
2781 if (op->contr->explore)
2782 {
2783 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2784 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2785 op->stats.food = 999;
2786 return;
2787 }
2788 sprintf (buf, "%s starved to death.", &op->name); 2671 sprintf (buf, "%s starved to death.", &op->name);
2789 strcpy (op->contr->killer, "starvation"); 2672 strcpy (op->contr->killer, "starvation");
2790 } 2673 }
2791 else 2674 else
2792 {
2793 if (op->contr->explore)
2794 {
2795 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2796 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2797 op->stats.hp = op->stats.maxhp;
2798 return;
2799 }
2800 sprintf (buf, "%s died.", &op->name); 2675 sprintf (buf, "%s died.", &op->name);
2801 }
2802 2676
2803 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2677 op->contr->play_sound (sound_find ("player_dies"));
2804 2678
2805 /* save the map location for corpse, gravestone */ 2679 /* save the map location for corpse, gravestone */
2806 x = op->x; 2680 x = op->x;
2807 y = op->y; 2681 y = op->y;
2808 map = op->map; 2682 map = op->map;
… …
2982 op->stats.hp = op->stats.maxhp; 2856 op->stats.hp = op->stats.maxhp;
2983 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2857 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2984 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2858 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2985 2859
2986 /* 2860 /*
2987 * Check to see if the player is in a shop. IF so, then check to see if
2988 * the player has any unpaid items. If so, remove them and put them back 2861 * Check to see if the player has any unpaid items. If so, remove them
2989 * in the map. 2862 * and put them back in the map.
2990 */ 2863 */
2991 2864 op->drop_unpaid_items ();
2992 if (is_in_shop (op))
2993 remove_unpaid_objects (op->inv, op);
2994 2865
2995 /****************************************/ 2866 /****************************************/
2996 /* */ 2867 /* */
2997 /* Move player to his current respawn- */ 2868 /* Move player to his current respawn- */
2998 /* position (usually last savebed) */ 2869 /* position (usually last savebed) */
2999 /* */ 2870 /* */
3000 /****************************************/ 2871 /****************************************/
3001 2872
3002 enter_player_savebed (op); 2873 enter_player_savebed (op);
3003 2874
3004 /* Save the player before inserting the force to reduce
3005 * chance of abuse.
3006 */
3007 op->contr->braced = 0; 2875 op->contr->braced = 0;
3008 op->contr->save ();
3009 2876
3010 /* it is possible that the player has blown something up 2877 /* it is possible that the player has blown something up
3011 * at his savebed location, and that can have long lasting 2878 * at his savebed location, and that can have long lasting
3012 * spell effects. So first see if there is a spell effect 2879 * spell effects. So first see if there is a spell effect
3013 * on the space that might harm the player. 2880 * on the space that might harm the player.
… …
3022 object *force; 2889 object *force;
3023 int at; 2890 int at;
3024 2891
3025 force = get_archetype (FORCE_NAME); 2892 force = get_archetype (FORCE_NAME);
3026 /* 50 ticks should be enough time for the spell to abate */ 2893 /* 50 ticks should be enough time for the spell to abate */
3027 force->speed = 0.1; 2894 force->speed = 0.1f;
3028 force->speed_left = -5.0; 2895 force->speed_left = -5.f;
3029 SET_FLAG (force, FLAG_APPLIED); 2896 SET_FLAG (force, FLAG_APPLIED);
3030 for (at = 0; at < NROFATTACKS; at++) 2897 for (at = 0; at < NROFATTACKS; at++)
3031 if (will_kill_again & (1 << at)) 2898 if (will_kill_again & (1 << at))
3032 force->resist[at] = 100; 2899 force->resist[at] = 100;
3033 2900
… …
3042void 2909void
3043loot_object (object *op) 2910loot_object (object *op)
3044{ /* Grab and destroy some treasure */ 2911{ /* Grab and destroy some treasure */
3045 object *tmp, *tmp2, *next; 2912 object *tmp, *tmp2, *next;
3046 2913
3047 if (op->container) 2914 op->close_container (); /* close open sack first */
3048 esrv_apply_container (op, op->container); /* close open sack first */
3049 2915
3050 for (tmp = op->inv; tmp; tmp = next) 2916 for (tmp = op->inv; tmp; tmp = next)
3051 { 2917 {
3052 next = tmp->below; 2918 next = tmp->below;
3053 2919
3054 if (tmp->invisible) 2920 if (tmp->invisible)
3055 continue; 2921 continue;
3056 2922
3057 tmp->remove (); 2923 tmp->remove ();
3058 tmp->x = op->x, tmp->y = op->y; 2924 tmp->x = op->x, tmp->y = op->y;
2925
3059 if (tmp->type == CONTAINER) 2926 if (tmp->type == CONTAINER)
3060 { /* empty container to ground */ 2927 loot_object (tmp); /* empty container to ground */
3061 loot_object (tmp); 2928
3062 }
3063 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2929 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3064 { 2930 {
3065 if (tmp->nrof > 1) 2931 if (tmp->nrof > 1)
3066 { 2932 {
3067 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2933 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3068 tmp2->destroy (); 2934 tmp2->destroy ();
… …
3079/* 2945/*
3080 * fix_weight(): Check recursively the weight of all players, and fix 2946 * fix_weight(): Check recursively the weight of all players, and fix
3081 * what needs to be fixed. Refresh windows and fix speed if anything 2947 * what needs to be fixed. Refresh windows and fix speed if anything
3082 * was changed. 2948 * was changed.
3083 */ 2949 */
3084
3085void 2950void
3086fix_weight (void) 2951fix_weight (void)
3087{ 2952{
3088 for_all_players (pl) 2953 for_all_players (pl)
3089 { 2954 {
… …
3149 if (op->type == PLAYER) 3014 if (op->type == PLAYER)
3150 { 3015 {
3151 op->contr->tmp_invis = 0; 3016 op->contr->tmp_invis = 0;
3152 op->contr->invis_race = 0; 3017 op->contr->invis_race = 0;
3153 } 3018 }
3019
3154 update_object (op, UP_OBJ_FACE); 3020 update_object (op, UP_OBJ_CHANGE);
3155} 3021}
3156 3022
3157int 3023int
3158is_true_undead (object *op) 3024is_true_undead (object *op)
3159{ 3025{
3160 object *tmp = NULL;
3161
3162 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3026 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3163 return 1; 3027 return 1;
3164 3028
3165 return 0; 3029 return 0;
3166} 3030}
3167 3031
… …
3211/* For Hidden creatures - a chance of becoming 'unhidden' 3075/* For Hidden creatures - a chance of becoming 'unhidden'
3212 * every time they move - as we subtract off 'invisibility' 3076 * every time they move - as we subtract off 'invisibility'
3213 * AND, for players, if they move into a ridiculously unhideable 3077 * AND, for players, if they move into a ridiculously unhideable
3214 * spot (surrounded by clear terrain in broad daylight). -b.t. 3078 * spot (surrounded by clear terrain in broad daylight). -b.t.
3215 */ 3079 */
3216
3217void 3080void
3218do_hidden_move (object *op) 3081do_hidden_move (object *op)
3219{ 3082{
3220 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3083 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3221 object *skop; 3084 object *skop;
… …
3225 3088
3226 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3089 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3227 3090
3228 /* its *extremely* hard to run and sneak/hide at the same time! */ 3091 /* its *extremely* hard to run and sneak/hide at the same time! */
3229 if (op->type == PLAYER && op->contr->run_on) 3092 if (op->type == PLAYER && op->contr->run_on)
3230 {
3231 if (!skop || num >= skop->level) 3093 if (!skop || num >= skop->level)
3232 { 3094 {
3233 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3095 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3234 make_visible (op); 3096 make_visible (op);
3235 return; 3097 return;
3236 } 3098 }
3237 else 3099 else
3238 num += 20; 3100 num += 20;
3239 } 3101
3240 num += op->map->difficulty; 3102 num += op->map->difficulty;
3241 hide = hideability (op); /* modify by terrain hidden level */ 3103 hide = hideability (op); /* modify by terrain hidden level */
3242 num -= hide; 3104 num -= hide;
3105
3243 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3106 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3244 { 3107 {
3245 make_visible (op); 3108 make_visible (op);
3246 if (op->type == PLAYER) 3109 if (op->type == PLAYER)
3247 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3110 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3248 } 3111 }
3249 else if (op->type == PLAYER && skop) 3112 else if (op->type == PLAYER && skop)
3250 {
3251 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3113 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3252 }
3253} 3114}
3254 3115
3255/* determine if who is standing near a hostile creature. */ 3116/* determine if who is standing near a hostile creature. */
3256 3117
3257int 3118int
… …
3305 * object op. This function works fine for monsters, 3166 * object op. This function works fine for monsters,
3306 * but we dont worry if the object isnt the top one in 3167 * but we dont worry if the object isnt the top one in
3307 * a pile (say a coin under a table would return "viewable" 3168 * a pile (say a coin under a table would return "viewable"
3308 * by this routine). Another question, should we be 3169 * by this routine). Another question, should we be
3309 * concerned with the direction the player is looking 3170 * concerned with the direction the player is looking
3310 * in? Realistically, most of use cant see stuff behind 3171 * in? Realistically, most of us can't see stuff behind
3311 * our backs...on the other hand, does the "facing" direction 3172 * our backs...on the other hand, does the "facing" direction
3312 * imply the way your head, or body is facing? Its possible 3173 * imply the way your head, or body is facing? It's possible
3313 * for them to differ. Sigh, this fctn could get a bit more complex. 3174 * for them to differ. Sigh, this fctn could get a bit more complex.
3314 * -b.t. 3175 * -b.t.
3315 * This function is now map tiling safe. 3176 * This function is now map tiling safe.
3316 */ 3177 */
3317
3318int 3178int
3319player_can_view (object *pl, object *op) 3179player_can_view (object *pl, object *op)
3320{ 3180{
3321 rv_vector rv; 3181 rv_vector rv;
3322 int dx, dy; 3182 int dx, dy;
… …
3334 3194
3335 get_rangevector (pl, op, &rv, 0x1); 3195 get_rangevector (pl, op, &rv, 0x1);
3336 3196
3337 /* starting with the 'head' part, lets loop 3197 /* starting with the 'head' part, lets loop
3338 * through the object and find if it has any 3198 * through the object and find if it has any
3339 * part that is in the los array but isnt on 3199 * part that is in the los array but isn't on
3340 * a blocked los square. 3200 * a blocked los square.
3341 * we use the archetype to figure out offsets. 3201 * we use the archetype to figure out offsets.
3342 */ 3202 */
3343 while (op) 3203 while (op)
3344 { 3204 {
3345 dx = rv.distance_x + op->arch->clone.x; 3205 dx = rv.distance_x + op->arch->x;
3346 dy = rv.distance_y + op->arch->clone.y; 3206 dy = rv.distance_y + op->arch->y;
3347 3207
3348 /* only the viewable area the player sees is updated by LOS 3208 /* only the viewable area the player sees is updated by LOS
3349 * code, so we need to restrict ourselves to that range of values 3209 * code, so we need to restrict ourselves to that range of values
3350 * for any meaningful values. 3210 * for any meaningful values.
3351 */ 3211 */
3352 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3212 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3353 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3213 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3354 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3214 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3355 return 1; 3215 return 1;
3216
3356 op = op->more; 3217 op = op->more;
3357 } 3218 }
3219
3358 return 0; 3220 return 0;
3359} 3221}
3360 3222
3361/* routine for both players and monsters. We call this when 3223/* routine for both players and monsters. We call this when
3362 * there is a possibility for our action distrubing our hiding 3224 * there is a possibility for our action distrubing our hiding
… …
3365 * return 0. 3227 * return 0.
3366 */ 3228 */
3367int 3229int
3368action_makes_visible (object *op) 3230action_makes_visible (object *op)
3369{ 3231{
3370
3371 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3232 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3372 { 3233 {
3373 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3234 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3374 return 0; 3235 return 0;
3375 3236
… …
3381 { 3242 {
3382 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3243 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3383 return 1; 3244 return 1;
3384 } 3245 }
3385 } 3246 }
3247
3386 return 0; 3248 return 0;
3387} 3249}
3388 3250
3389/* op_on_battleground - checks if the given object op (usually 3251/* op_on_battleground - checks if the given object op (usually
3390 * a player) is standing on a valid battleground-tile, 3252 * a player) is standing on a valid battleground-tile,
… …
3395 * Default is to do the same as before, so only people wanting to have different points need worry about this 3257 * Default is to do the same as before, so only people wanting to have different points need worry about this
3396 */ 3258 */
3397int 3259int
3398op_on_battleground (object *op, int *x, int *y) 3260op_on_battleground (object *op, int *x, int *y)
3399{ 3261{
3400 object *tmp;
3401
3402 /* A battleground-tile needs the following attributes to be valid: 3262 /* A battleground-tile needs the following attributes to be valid:
3403 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3263 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3404 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3264 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3405 * and the exit-coordinates sp/hp must both be > 0. 3265 * and the exit-coordinates sp/hp must both be > 0.
3406 * => The intention here is to prevent abuse of the battleground- 3266 * => The intention here is to prevent abuse of the battleground-
3407 * feature (like pickable or hidden battleground tiles). */ 3267 * feature (like pickable or hidden battleground tiles). */
3408 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3268 for (object *tmp = op->below; tmp; tmp = tmp->below)
3409 { 3269 {
3410 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3270 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3411 { 3271 {
3412 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3272 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3413 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3273 && tmp->type == BATTLEGROUND
3274 && tmp->name == shstr_battleground
3275 && EXIT_X (tmp) && EXIT_Y (tmp))
3414 { 3276 {
3415 /*before we assign the exit, check if this is a teambattle */ 3277 /* before we assign the exit, check if this is a teambattle */
3416 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3278 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3417 { 3279 {
3418 object *invtmp;
3419
3420 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3280 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3421 { 3281 {
3422 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3282 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3423 { 3283 {
3424 if (x != NULL && y != NULL) 3284 if (x && y)
3425 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3285 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3286
3426 return 1; 3287 return 1;
3427 } 3288 }
3428 } 3289 }
3429 } 3290 }
3291
3430 if (x != NULL && y != NULL) 3292 if (x && y)
3431 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3293 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3294
3432 return 1; 3295 return 1;
3433 } 3296 }
3434 } 3297 }
3435 } 3298 }
3299
3436 /* If we got here, did not find a battleground */ 3300 /* If we got here, did not find a battleground */
3437 return 0; 3301 return 0;
3438} 3302}
3439 3303
3440/* 3304/*
… …
3456 char buf[MAX_BUF]; /* tmp. string buffer */ 3320 char buf[MAX_BUF]; /* tmp. string buffer */
3457 int i = 0, j = 0; 3321 int i = 0, j = 0;
3458 3322
3459 /* get the appropriate treasurelist */ 3323 /* get the appropriate treasurelist */
3460 if (atnr == ATNR_FIRE) 3324 if (atnr == ATNR_FIRE)
3461 trlist = find_treasurelist ("dragon_ability_fire"); 3325 trlist = treasurelist::find (shstr_dragon_ability_fire);
3462 else if (atnr == ATNR_COLD) 3326 else if (atnr == ATNR_COLD)
3463 trlist = find_treasurelist ("dragon_ability_cold"); 3327 trlist = treasurelist::find (shstr_dragon_ability_cold);
3464 else if (atnr == ATNR_ELECTRICITY) 3328 else if (atnr == ATNR_ELECTRICITY)
3465 trlist = find_treasurelist ("dragon_ability_elec"); 3329 trlist = treasurelist::find (shstr_dragon_ability_elec);
3466 else if (atnr == ATNR_POISON) 3330 else if (atnr == ATNR_POISON)
3467 trlist = find_treasurelist ("dragon_ability_poison"); 3331 trlist = treasurelist::find (shstr_dragon_ability_poison);
3468 3332
3469 if (trlist == NULL || who->type != PLAYER) 3333 if (trlist == NULL || who->type != PLAYER)
3470 return; 3334 return;
3471 3335
3472 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3336 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3476 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3340 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3477 return; 3341 return;
3478 } 3342 }
3479 3343
3480 /* everything seems okay - now bring on the gift: */ 3344 /* everything seems okay - now bring on the gift: */
3481 item = &(tr->item->clone); 3345 item = tr->item;
3482 3346
3483 if (item->type == SPELL) 3347 if (item->type == SPELL)
3484 { 3348 {
3485 if (check_spell_known (who, item->name)) 3349 if (check_spell_known (who, item->name))
3486 return; 3350 return;
… …
3545 { 3409 {
3546 /* forces in the treasurelist can alter the player's stats */ 3410 /* forces in the treasurelist can alter the player's stats */
3547 object *skin; 3411 object *skin;
3548 3412
3549 /* first get the dragon skin force */ 3413 /* first get the dragon skin force */
3550 shstr_cmp dragon_skin_force ("dragon_skin_force");
3551 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3414 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3552 ; 3415 ;
3553 3416
3554 if (!skin) 3417 if (!skin)
3555 return; 3418 return;
3556 3419
… …
3604 * not readied. 3467 * not readied.
3605 */ 3468 */
3606void 3469void
3607player_unready_range_ob (player *pl, object *ob) 3470player_unready_range_ob (player *pl, object *ob)
3608{ 3471{
3609 rangetype i; 3472 if (pl->ob->current_weapon == ob)
3473 pl->ob->current_weapon = 0;
3610 3474
3611 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3475 if (pl->combat_ob == ob)
3612 { 3476 pl->combat_ob = 0;
3477
3613 if (pl->ranges[i] == ob) 3478 if (pl->ranged_ob == ob)
3614 { 3479 pl->ranged_ob = 0;
3615 pl->ranges[i] = NULL;
3616 if (pl->shoottype == i)
3617 {
3618 pl->shoottype = range_none;
3619 }
3620 }
3621 }
3622} 3480}
3481
3482sint8
3483player::visibility_at (maptile *map, int x, int y) const
3484{
3485 if (!ns)
3486 return 0;
3487
3488 int dx, dy;
3489 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3490 return 0;
3491
3492 x += dx - ns->current_x + ns->mapx / 2;
3493 y += dy - ns->current_y + ns->mapy / 2;
3494
3495 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3496 return 0;
3497
3498 return 100 - blocked_los [x][y];
3499}

Diff Legend

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