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.75 by root, Sat Dec 30 21:15:59 2006 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 authors can be reached via e-mail to <support@deliantra.net>
21 The author 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
161set_first_map (object *op) 153set_first_map (object *op)
162{ 154{
163 strcpy (op->contr->maplevel, first_map_path); 155 op->contr->maplevel = first_map_path;
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->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0;
190 party = 0;
191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193
194 players.erase (this);
179} 195}
180 196
181// connect the player with a specific client 197// connect the player with a specific client
182// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
183void 199void
184player::connect (client *ns) 200player::connect (client *ns)
185{ 201{
186 this->ns = ns; 202 this->ns = ns;
187 ns->pl = this; 203 ns->pl = this;
188 204
189 next = first_player; 205 run_on = 0;
190 first_player = this; 206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
191 208
192 ns->update_look = 0; 209 ns->update_look = 0;
193 ns->look_position = 0; 210 ns->look_position = 0;
194 211
195 clear_los (ob); 212 clear_los (this);
213
214 ns->reset_stats ();
196 215
197 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
200 219
201 if (!legal_range (ob, shoottype)) 220 ob->update_weight ();
202 shoottype = range_none;
203
204 ob->carrying = sum_weight (ob);
205 link_player_skills (ob); 221 link_player_skills (ob);
206 222
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208 224
209 assign (title, ob->arch->clone.name); 225 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 226
221 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
223 { 229 {
224 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
225 231
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) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
230 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
231 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
232 abil = tmp; 235 abil = tmp;
233 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
234 skin = tmp; 237 skin = tmp;
235 238
236 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
237 } 240 }
238 241
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!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 243
246 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
247 245
248 ob->update_stats (); 246 ob->update_stats ();
247
249 ns->floorbox_update (); 248 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob); 249 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0); 250 esrv_add_spells (this, 0);
253 251
254 ob->activate (1); 252 activate ();
255 enter_map ();
256 253
257 send_rules (ob); 254 send_rules (ob);
258 send_news (ob); 255 send_news (ob);
259 display_motd (ob); 256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
260 INVOKE_PLAYER (LOGIN, this); 259 INVOKE_PLAYER (LOGIN, this);
261} 260}
262 261
263void 262void
264player::disconnect () 263player::disconnect ()
265{ 264{
266 if (ob) 265 if (ob)
267 ob->deactivate (1); 266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
268 270
269 //TODO: don't be so harsh and destroy :)
270 if (ns) 271 if (ns)
271 { 272 {
272 if (enable_save) 273 if (active)
273 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
274 275
275 client *ns = this->ns; 276 INVOKE_PLAYER (DISCONNECT, this);
276 ns->send_packet ("goodbye"); 277
277 ns->flush (); 278 ns->reset_stats ();
278 ns->pl = 0; 279 ns->pl = 0;
279 this->ns = 0; 280 ns = 0;
280
281 ns->destroy ();
282 destroy ();
283 } 281 }
282
283 observe = ob;
284
285 deactivate ();
284} 286}
285 287
286// the need for this function can be explained 288// the need for this function can be explained
287// by load_object not returning the object 289// by load_object not returning the object
288void 290void
289player::set_object (object *op) 291player::set_object (object *op)
290{ 292{
291 ob = op; 293 ob = observe = op;
292 ob->contr = this; /* this aren't yet in archetype */ 294 ob->contr = this; /* this aren't yet in archetype */
293 295
296 ob->speed = 1.0f;
294 ob->speed_left = 0.5; 297 ob->speed_left = 0.5f;
295 ob->speed = 1.0; 298
296 ob->direction = 5; /* So player faces south */ 299 ob->direction = 5; /* So player faces south */
297 ob->stats.wc = 2;
298 ob->run_away = 25; /* Then we panick... */
299 300
300 set_first_map (ob); 301 ob->flag [FLAG_READY_WEAPON] = false;
301 enter_map (); 302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false;
302 304
303 ob->roll_stats (); 305 for (object *op = ob->inv; op; op = op->below)
306 if (op->flag [FLAG_APPLIED])
307 switch (op->type)
308 {
309 case SKILL:
310 ob->flag [FLAG_APPLIED] = false;
311 break;
312
313 case WAND:
314 case ROD:
315 case HORN:
316 case BOW:
317 ranged_ob = op;
318 break;
319
320 case WEAPON:
321 combat_ob = op;
322 break;
323 }
324
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326 ob->deactivate (); // change_Weapon activates, fix this better
327}
328
329void
330player::set_observe (object *op)
331{
332 observe = op ? op : ob;
333 do_los = 1;
304} 334}
305 335
306player::player () 336player::player ()
307{ 337{
308 /* There are some elements we want initialized to non zero value - 338 /* There are some elements we want initialised to non zero value -
309 * we deal with that below this point. 339 * we deal with that below this point.
310 */ 340 */
311 outputs_sync = 16; /* Every 2 seconds */ 341 outputs_sync = 4;
312 outputs_count = 8; /* Keeps present behaviour */ 342 outputs_count = 4;
313 unapply = unapply_nochoice; 343 unapply = unapply_nochoice;
314 344
315 assign (savebed_map, first_map_path); /* Init. respawn position */ 345 savebed_map = first_map_path; /* Init. respawn position */
316 346
317 gen_sp_armour = 10; 347 gen_sp_armour = 10;
318 last_speed = -1;
319 shoottype = range_none;
320 bowtype = bow_normal; 348 bowtype = bow_normal;
321 petmode = pet_normal; 349 petmode = pet_normal;
322 listening = 10; 350 listening = 10;
323 usekeys = containers; 351 usekeys = containers;
324 last_weapon_sp = -1;
325 peaceful = 1; /* default peaceful */ 352 peaceful = 1; /* default peaceful */
326 do_los = 1; 353 do_los = 1;
327 354
328 /* we need to clear these to -1 and not zero - otherwise, 355 weapon_sp = 1.0f;
329 * if a player quits and starts a new character, we wont 356 weapon_sp_left = 0.5f;
330 * send new values to the client, as things like exp start
331 * at zero.
332 */
333 for (int i = 0; i < NUM_SKILLS; i++)
334 last_skill_exp[i] = -1;
335
336 for (int i = 0; i < NROFATTACKS; i++)
337 last_resist[i] = -1;
338
339 last_stats.exp = -1;
340 last_weight = (uint32) - 1;
341} 357}
342 358
343void 359void
344player::do_destroy () 360player::do_destroy ()
345{ 361{
346 disconnect (); 362 disconnect ();
347 363
348 save (false);
349 enable_save = false;
350
351 attachable::do_destroy (); 364 attachable::do_destroy ();
352
353 terminate_all_pets (ob);
354
355 if (first_player != this)
356 {
357 player *prev = first_player;
358
359 while (prev && prev->next && prev->next != this)
360 prev = prev->next;
361
362 if (prev->next != this)
363 {
364 LOG (llevError, "Free_player: Can't find previous player.\n");
365 abort ();
366 }
367
368 prev->next = next;
369 }
370 else
371 first_player = next;
372 365
373 if (ob) 366 if (ob)
374 { 367 {
375 ob->destroy_inv (false); 368 ob->destroy_inv (false);
376 ob->destroy (); 369 ob->destroy ();
377 } 370 }
371
372 ob = observe = 0;
378} 373}
379 374
380player::~player () 375player::~player ()
381{ 376{
382 /* Clear item stack */ 377 /* Clear item stack */
… …
391player::create () 386player::create ()
392{ 387{
393 player *pl = new player; 388 player *pl = new player;
394 389
395 pl->set_object (arch_to_object (get_player_archetype (0))); 390 pl->set_object (arch_to_object (get_player_archetype (0)));
391
392 pl->ob->roll_stats ();
393 pl->ob->stats.wc = 2;
394 pl->ob->run_away = 25; /* Then we panick... */
395
396 set_first_map (pl->ob);
396 397
397 return pl; 398 return pl;
398} 399}
399 400
400/* 401/*
… …
403 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
404 */ 405 */
405archetype * 406archetype *
406get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
407{ 408{
408 archetype *start = at; 409 // archetypes could have been reloaded
410 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412 if (!nat)
413 return at;
414
415 archvec::iterator i = archetypes.find (nat);
409 416
410 for (;;) 417 for (;;)
411 { 418 {
412 if (at == NULL || at->next == NULL) 419 if (++i == archetypes.end ())
413 at = first_archetype; 420 i = archetypes.begin ();
414 else 421 else if (*i == at)
415 at = at->next; 422 cleanup ("not a single player archetype found");
416 423
417 if (at->clone.type == PLAYER) 424 if ((*i)->type == PLAYER)
418 return at; 425 return *i;
419
420 if (at == start)
421 {
422 LOG (llevError, "No Player archetypes\n");
423 exit (-1);
424 }
425 } 426 }
426} 427}
427 428
428object * 429object *
429get_nearest_player (object *mon) 430get_nearest_player (object *mon)
… …
431 object *op = NULL; 432 object *op = NULL;
432 objectlink *ol; 433 objectlink *ol;
433 unsigned lastdist; 434 unsigned lastdist;
434 rv_vector rv; 435 rv_vector rv;
435 436
436 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 437 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
437 { 438 {
438 /* We should not find free objects on this friendly list, but it
439 * does periodically happen. Given that, lets deal with it.
440 * While unlikely, it is possible the next object on the friendly
441 * list is also free, so encapsulate this in a while loop.
442 */
443 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
444 {
445 object *tmp = ol->ob;
446
447 /* Can't do much more other than log the fact, because the object
448 * itself will have been cleared.
449 */
450 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
451 ol = ol->next;
452 remove_friendly_object (tmp);
453 if (!ol)
454 return op;
455 }
456
457 /* Remove special check for player from this. First, it looks to cause
458 * some crashes (ol->ob->contr not set properly?), but secondly, a more
459 * complicated method of state checking would be needed in any case -
460 * as it was, a clever player could type quit, and the function would
461 * skip them over while waiting for confirmation. Remove
462 * on_same_map check, as can_detect_enemy also does this
463 */
464 if (!can_detect_enemy (mon, ol->ob, &rv)) 439 if (!can_detect_enemy (mon, ol->ob, &rv))
465 continue; 440 continue;
466 441
467 if (lastdist > rv.distance) 442 if (lastdist > rv.distance)
468 { 443 {
… …
544 x = mon->x; 519 x = mon->x;
545 y = mon->y; 520 y = mon->y;
546 m = mon->map; 521 m = mon->map;
547 dir = rv.direction; 522 dir = rv.direction;
548 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 523 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
549 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 524 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
525
550 /* If we can't solve it within the search distance, return now. */ 526 /* If we can't solve it within the search distance, return now. */
551 if (diff > max) 527 if (diff > max)
552 return 0; 528 return 0;
529
553 while (diff > 1 && max > 0) 530 while (diff > 1 && max > 0)
554 { 531 {
555 lastx = x; 532 lastx = x;
556 lasty = y; 533 lasty = y;
557 lastmap = m; 534 lastmap = m;
… …
639 max--; 616 max--;
640 lastdir = dir; 617 lastdir = dir;
641 if (!firstdir) 618 if (!firstdir)
642 firstdir = dir; 619 firstdir = dir;
643 } 620 }
621
644 if (diff <= 1) 622 if (diff <= 1)
645 { 623 {
646 /* Recalculate diff (distance) because we may not have actually 624 /* Recalculate diff (distance) because we may not have actually
647 * headed toward player for entire distance. 625 * headed toward player for entire distance.
648 */ 626 */
649 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 627 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
650 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 628 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
651 } 629 }
630
652 if (diff > max) 631 if (diff > max)
653 return 0; 632 return 0;
654 } 633 }
634
655 /* If we reached the max, didn't find a direction in time */ 635 /* If we reached the max, didn't find a direction in time */
656 if (!max) 636 if (!max)
657 return 0; 637 return 0;
658 638
659 return firstdir; 639 return firstdir;
660} 640}
661 641
662void 642void
663give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
664{ 644{
665 object *op, *next = NULL;
666
667 if (pl->randomitems != NULL) 645 if (pl->randomitems)
668 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
669 647
670 for (op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
671 { 649 {
672 next = op->below; 650 next = op->below;
673 651
674 /* Forces get applied per default, unless they have the 652 /* Forces get applied per default, unless they have the
675 * flag "neutral" set. Sorry but I can't think of a better way 653 * flag "neutral" set. Sorry but I can't think of a better way
… …
680 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
681 * by this player due to race restrictions 659 * by this player due to race restrictions
682 */ 660 */
683 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
684 { 662 {
685 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
686 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
687 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
688 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
689 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 669 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
690 { 670 {
691 op->destroy (); 671 op->destroy ();
692 continue; 672 continue;
693 } 673 }
694 } 674 }
… …
717 if (op->nrof > 1) 697 if (op->nrof > 1)
718 op->nrof = 1; 698 op->nrof = 1;
719 } 699 }
720 700
721 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
722 {
723 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
724 }
725 703
726 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
727 * items. Just don't identify gold or silver, or it won't be 705 * items. Just don't identify gold or silver, or it won't be
728 * merged properly. 706 * merged properly.
729 */ 707 */
730 if (need_identify (op)) 708 if (need_identify (op))
731 { 709 {
732 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
733 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
734 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
735 } 713 }
714
736 if (op->type == SPELL) 715 if (op->type == SPELL)
737 { 716 {
738 op->destroy (); 717 op->destroy ();
739 continue; 718 continue;
740 } 719 }
… …
742 { 721 {
743 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
744 op->stats.exp = 0; 723 op->stats.exp = 0;
745 op->level = 1; 724 op->level = 1;
746 } 725 }
747 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
748 else
749 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
750 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
751 729
752 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
753 link_player_skills (pl); 731 link_player_skills (pl);
… …
773roll_stat (void) 751roll_stat (void)
774{ 752{
775 int a[4], i, j, k; 753 int a[4], i, j, k;
776 754
777 for (i = 0; i < 4; i++) 755 for (i = 0; i < 4; i++)
778 a[i] = (int) RANDOM () % 6 + 1; 756 a[i] = (int) rndm (6) + 1;
779 757
780 for (i = 0, j = 0, k = 7; i < 4; i++) 758 for (i = 0, j = 0, k = 7; i < 4; i++)
781 if (a[i] < k) 759 if (a[i] < k)
782 k = a[i], j = i; 760 k = a[i], j = i;
783 761
… …
789} 767}
790 768
791void 769void
792object::roll_stats () 770object::roll_stats ()
793{ 771{
794 int statsort [7]; 772 int statsort [NUM_STATS];
795 773
796 for (;;) 774 for (;;)
797 { 775 {
798 int sum = 0; 776 int sum = 0;
799 for (int i = 7; i--; ) 777 for (int i = NUM_STATS; i--; )
800 sum += statsort [i] = roll_stat (); 778 sum += statsort [i] = roll_stat ();
801 779
802 if (sum >= 82 && sum <= 116) 780 if (sum >= 82 && sum <= 116)
803 break; 781 break;
804 } 782 }
805 783
806 // Sort the stats so that rerolling is easier... 784 // Sort the stats so that rerolling is easier...
807 std::sort (statsort, statsort + 7, std::greater<int>()); 785 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
808 786
787 for (int i = 0; i < NUM_STATS; ++i)
809 stats.Str = statsort[0]; 788 stats.stat (i) = statsort [i];
810 stats.Dex = statsort[1];
811 stats.Con = statsort[2];
812 stats.Int = statsort[3];
813 stats.Wis = statsort[4];
814 stats.Pow = statsort[5];
815 stats.Cha = statsort[6];
816 789
817 stats.exp = 0; 790 stats.exp = 0;
818 stats.ac = 0; 791 stats.ac = 0;
819 792
820 stats.hp = stats.maxhp; 793 stats.hp = stats.maxhp;
… …
832} 805}
833 806
834void 807void
835object::swap_stats (int a, int b) 808object::swap_stats (int a, int b)
836{ 809{
837 int tmp = get_attr_value (&contr->orig_stats, a); 810 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
838 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
839 set_attr_value (&contr->orig_stats, b, tmp);
840 811
812 for (int i = 0; i < NUM_STATS; ++i)
841 stats.Str = contr->orig_stats.Str; 813 stats.stat (i) = contr->orig_stats.stat (i);
842 stats.Dex = contr->orig_stats.Dex;
843 stats.Con = contr->orig_stats.Con;
844 stats.Int = contr->orig_stats.Int;
845 stats.Wis = contr->orig_stats.Wis;
846 stats.Pow = contr->orig_stats.Pow;
847 stats.Cha = contr->orig_stats.Cha;
848 814
849 //TODO: the following code looks so borked and should, at the very least, 815 //TODO: the following code looks so borked and should, at the very least,
850 // be merged with the similar code in roll_stats 816 // be merged with the similar code in roll_stats
851 stats.ac = 0; 817 stats.ac = 0;
852 818
… …
871static void 837static void
872start_info (object *op) 838start_info (object *op)
873{ 839{
874 char buf[MAX_BUF]; 840 char buf[MAX_BUF];
875 841
876 sprintf (buf, "Welcome to Crossfire v%s!", VERSION); 842 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
877 new_draw_info (NDI_UNIQUE, 0, op, buf); 843 new_draw_info (NDI_UNIQUE, 0, op, buf);
878 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
879 //new_draw_info (NDI_UNIQUE, 0, op, " ");
880} 844}
881 845
882/* This function takes the key that is passed, and does the 846/* This function takes the key that is passed, and does the
883 * appropriate action with it (change race, or other things). 847 * appropriate action with it (change race, or other things).
884 * The function name is for historical reasons - now we have 848 * The function name is for historical reasons - now we have
885 * separate race and class; this actually changes the RACE, 849 * separate race and class; this actually changes the RACE,
886 * not the class. 850 * not the class.
887 */ 851 */
888int 852void
889key_change_class (object *op, char key) 853player::chargen_race_done ()
890{ 854{
891 int tmp_loop;
892
893 if (key == 'd' || key == 'D')
894 {
895 char buf[MAX_BUF];
896
897 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
898 esrv_new_player (op->contr, op->weight + op->carrying); 856 esrv_new_player (ob->contr, ob->weight + ob->carrying);
899 857
900 treasurelist *tl = find_treasurelist ("starting_wealth"); 858 treasurelist *tl = treasurelist::find ("starting_wealth");
901 if (tl) 859 if (tl)
902 create_treasure (tl, op, 0, 0, 0); 860 create_treasure (tl, ob, 0, 0, 0);
903 861
904 INVOKE_PLAYER (BIRTH, op->contr); 862 INVOKE_PLAYER (BIRTH, ob->contr);
905 INVOKE_PLAYER (LOGIN, op->contr); 863 INVOKE_PLAYER (LOGIN, ob->contr);
906 864
907 op->contr->ns->state = ST_PLAYING; 865 ob->contr->ns->state = ST_PLAYING;
908 866
909 if (op->msg) 867 if (ob->msg)
910 op->msg = NULL; 868 ob->msg = 0;
911 869
912 /* We create this now because some of the unique maps will need it 870 /* We create this now because some of the unique maps will need it
913 * to save here. 871 * to save here.
914 */ 872 */
873 {
874 char buf[MAX_BUF];
915 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 875 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
916 make_path_to_file (buf); 876 make_path_to_file (buf);
877 }
917 878
918#ifdef AUTOSAVE
919 op->contr->last_save_tick = pticks;
920#endif
921 start_info (op); 879 start_info (ob);
922 CLEAR_FLAG (op, FLAG_WIZ); 880 CLEAR_FLAG (ob, FLAG_WIZ);
923 give_initial_items (op, op->randomitems); 881 give_initial_items (ob, ob->randomitems);
924 link_player_skills (op); 882 link_player_skills (ob);
925 esrv_send_inventory (op, op); 883 esrv_send_inventory (ob, ob);
926 op->update_stats (); 884 ob->update_stats ();
927 885
928 /* This moves the player to a different start map, if there 886 /* This moves the player to a different start map, if there
929 * is one for this race 887 * is one for this race
930 */ 888 */
931 if (*first_map_ext_path) 889 if (*first_map_ext_path)
932 { 890 {
933 object *tmp; 891 object *tmp;
934 char mapname[MAX_BUF]; 892 char mapname[MAX_BUF];
935 893
936 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 894 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
937 tmp = object::create (); 895 tmp = object::create ();
938 EXIT_PATH (tmp) = mapname; 896 EXIT_PATH (tmp) = mapname;
939 EXIT_X (tmp) = op->x; 897 EXIT_X (tmp) = ob->x;
940 EXIT_Y (tmp) = op->y; 898 EXIT_Y (tmp) = ob->y;
941 op->enter_exit (tmp); /* we don't really care if it succeeded; 899 ob->enter_exit (tmp); /* we don't really care if it succeeded;
942 * if the map isn't there, then stay on the 900 * if the map isn't there, then stay on the
943 * default initial map */ 901 * default initial map */
944 tmp->destroy (); 902 tmp->destroy ();
945 } 903 }
946 else 904 else
947 LOG (llevDebug, "first_map_ext_path not set\n"); 905 LOG (llevDebug, "first_map_ext_path not set\n");
906}
948 907
949 return 0; 908void
950 } 909player::chargen_race_next ()
951 910{
952 /* Following actually changes the race - this is the default command 911 /* Following actually changes the race - this is the default command
953 * if we don't match with one of the options above. 912 * if we don't match with one of the options above.
954 */ 913 */
955 914
956 tmp_loop = 0; 915 do
957 while (!tmp_loop)
958 { 916 {
959 shstr name = op->name; 917 shstr name = ob->name;
960 int x = op->x, y = op->y; 918 int x = ob->x, y = ob->y;
961 919
962 op->remove_statbonus (); 920 ob->remove_statbonus ();
963 op->remove (); 921 ob->remove ();
964 op->arch = get_player_archetype (op->arch); 922 ob->arch = get_player_archetype (ob->arch);
965 op->arch->clone.copy_to (op); 923 ob->arch->copy_to (ob);
966 op->instantiate (); 924 ob->instantiate ();
967 op->stats = op->contr->orig_stats; 925 ob->stats = ob->contr->orig_stats;
968 op->name = op->name_pl = name; 926 ob->name = ob->name_pl = name;
969 op->x = x; 927 ob->x = x;
970 op->y = y; 928 ob->y = y;
971 SET_ANIMATION (op, 2); /* So player faces south */ 929 SET_ANIMATION (ob, 2); /* So player faces south */
972 insert_ob_in_map (op, op->map, op, 0); 930 insert_ob_in_map (ob, ob->map, ob, 0);
973 assign (op->contr->title, op->arch->clone.name); 931 assign (ob->contr->title, ob->arch->object::name);
974 op->add_statbonus (); 932 ob->add_statbonus ();
975 tmp_loop = allowed_class (op);
976 } 933 }
934 while (!allowed_class (ob));
977 935
978 update_object (op, UP_OBJ_FACE); 936 update_object (ob, UP_OBJ_FACE);
979 esrv_update_item (UPD_FACE, op, op); 937 esrv_update_item (UPD_FACE, ob, ob);
980 op->update_stats (); 938 ob->update_stats ();
981 op->stats.hp = op->stats.maxhp; 939 ob->stats.hp = ob->stats.maxhp;
982 op->stats.sp = op->stats.maxsp; 940 ob->stats.sp = ob->stats.maxsp;
983 op->stats.grace = 0; 941 ob->stats.grace = 0;
984
985 if (op->msg)
986 new_draw_info (NDI_BLUE, 0, op, op->msg);
987
988 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
989 return 0;
990}
991
992int
993key_confirm_quit (object *op, char key)
994{
995 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
996 {
997 op->contr->ns->state = ST_PLAYING;
998 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
999 return 1;
1000 }
1001
1002 INVOKE_PLAYER (LOGOUT, op->contr);
1003 INVOKE_PLAYER (QUIT, op->contr);
1004
1005 op->contr->enable_save = false;
1006
1007 terminate_all_pets (op);
1008 op->remove ();
1009 op->direction = 0;
1010 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1011
1012 strcpy (op->contr->killer, "quit");
1013 check_score (op);
1014 op->contr->party = 0;
1015 op->contr->own_title[0] = '\0';
1016 op->contr->destroy ();
1017
1018 return 1;
1019} 942}
1020 943
1021void 944void
1022flee_player (object *op) 945flee_player (object *op)
1023{ 946{
… …
1070 /* Cornered, get rid of scared */ 993 /* Cornered, get rid of scared */
1071 CLEAR_FLAG (op, FLAG_SCARED); 994 CLEAR_FLAG (op, FLAG_SCARED);
1072 op->enemy = NULL; 995 op->enemy = NULL;
1073} 996}
1074 997
1075
1076/* check_pick sees if there is stuff to be picked up/picks up stuff. 998/* check_pick sees if there is stuff to be picked up/picks up stuff.
1077 * IT returns 1 if the player should keep on moving, 0 if he should 999 * It returns 1 if the player should keep on moving, 0 if he should
1078 * stop. 1000 * stop.
1079 */ 1001 */
1080int 1002int
1081check_pick (object *op) 1003check_pick (object *op)
1082{ 1004{
1083 object *tmp, *next; 1005 object *tmp, *next;
1084 int stop = 0; 1006 int stop = 0;
1085 int j, k, wvratio; 1007 int wvratio;
1086 char putstring[128], tmpstr[16]; 1008 char putstring[128];
1087 1009
1088 /* if you're flying, you cna't pick up anything */ 1010 /* if you're flying, you cna't pick up anything */
1089 if (op->move_type & MOVE_FLYING) 1011 if (op->move_type & MOVE_FLYING)
1090 return 1; 1012 return 1;
1091 1013
1092 next = op->below; 1014 next = op->below;
1093 1015
1016 int cnt = MAX_ITEM_PER_DROP;
1017#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1018
1094 /* loop while there are items on the floor that are not marked as 1019 /* loop while there are items on the floor that are not marked as
1095 * destroyed */ 1020 * destroyed */
1096 while (next && !next->destroyed ()) 1021 while (next && !next->destroyed ())
1097 { 1022 {
1098 tmp = next; 1023 tmp = next;
1099 next = tmp->below; 1024 next = tmp->below;
1100 1025
1026 if (cnt <= 0)
1027 {
1028 op->failmsg ("Couldn't pickup all items at once.");
1029 return 0;
1030 }
1031
1101 if (op->destroyed ()) 1032 if (op->destroyed ())
1102 return 0; 1033 return 0;
1103 1034
1104 if (!can_pick (op, tmp)) 1035 if (!can_pick (op, tmp))
1105 continue; 1036 continue;
1106 1037
1107 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1038 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1108 { 1039 {
1109 if (item_matched_string (op, tmp, op->contr->search_str)) 1040 if (item_matched_string (op, tmp, op->contr->search_str))
1110 pick_up (op, tmp); 1041 CHK_PICK_PICKUP;
1111 continue; 1042 continue;
1112 } 1043 }
1113 1044
1114 /* high not bit set? We're using the old autopickup model */ 1045 /* high not bit set? We're using the old autopickup model */
1115 if (!(op->contr->mode & PU_NEWMODE)) 1046 if (!(op->contr->mode & PU_NEWMODE))
… …
1117 switch (op->contr->mode) 1048 switch (op->contr->mode)
1118 { 1049 {
1119 case 0: 1050 case 0:
1120 return 1; /* don't pick up */ 1051 return 1; /* don't pick up */
1121 case 1: 1052 case 1:
1122 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1123 return 1; 1054 return 1;
1124 case 2: 1055 case 2:
1125 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1126 return 0; 1057 return 0;
1127 case 3: 1058 case 3:
1128 return 0; /* stop before pickup */ 1059 return 0; /* stop before pickup */
1129 case 4: 1060 case 4:
1130 pick_up (op, tmp); 1061 CHK_PICK_PICKUP;
1131 break; 1062 break;
1132 case 5: 1063 case 5:
1133 pick_up (op, tmp); 1064 CHK_PICK_PICKUP;
1134 stop = 1; 1065 stop = 1;
1135 break; 1066 break;
1136 case 6: 1067 case 6:
1137 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1068 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1138 pick_up (op, tmp); 1069 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1070 CHK_PICK_PICKUP;
1139 break; 1071 break;
1140 1072
1141 case 7: 1073 case 7:
1142 if (tmp->type == MONEY || tmp->type == GEM) 1074 if (tmp->type == MONEY || tmp->type == GEM)
1143 pick_up (op, tmp); 1075 CHK_PICK_PICKUP;
1144 break; 1076 break;
1145 1077
1146 default: 1078 default:
1147 /* use value density */ 1079 /* use value density */
1148 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1080 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1149 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1081 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1150 pick_up (op, tmp); 1082 CHK_PICK_PICKUP;
1151 } 1083 }
1152 } 1084 }
1153 else 1085 else
1154 { /* old model */ 1086 { /* old model */
1155 /* NEW pickup handling */ 1087 /* NEW pickup handling */
… …
1159 if (tmp->name != NULL) 1091 if (tmp->name != NULL)
1160 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1092 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1161 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1093 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1162 else 1094 else
1163 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1095 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1164 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1096 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1165 1097
1166 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1098 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1167 } 1099 }
1168 1100
1169 /* philosophy: 1101 /* philosophy:
… …
1210 /* all food and drink if desired */ 1142 /* all food and drink if desired */
1211 /* question: don't pick up known-poisonous stuff? */ 1143 /* question: don't pick up known-poisonous stuff? */
1212 if (op->contr->mode & PU_FOOD) 1144 if (op->contr->mode & PU_FOOD)
1213 if (tmp->type == FOOD) 1145 if (tmp->type == FOOD)
1214 { 1146 {
1215 pick_up (op, tmp); 1147 CHK_PICK_PICKUP;
1216 continue; 1148 continue;
1217 } 1149 }
1218 1150
1219 if (op->contr->mode & PU_DRINK) 1151 if (op->contr->mode & PU_DRINK)
1220 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1152 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1221 { 1153 {
1222 pick_up (op, tmp); 1154 CHK_PICK_PICKUP;
1223 continue; 1155 continue;
1224 } 1156 }
1225 1157
1226 if (op->contr->mode & PU_POTION) 1158 if (op->contr->mode & PU_POTION)
1227 if (tmp->type == POTION) 1159 if (tmp->type == POTION)
1228 { 1160 {
1229 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1230 continue; 1162 continue;
1231 } 1163 }
1232 1164
1233 /* spellbooks, skillscrolls and normal books/scrolls */ 1165 /* spellbooks, skillscrolls and normal books/scrolls */
1234 if (op->contr->mode & PU_SPELLBOOK) 1166 if (op->contr->mode & PU_SPELLBOOK)
1235 if (tmp->type == SPELLBOOK) 1167 if (tmp->type == SPELLBOOK)
1236 { 1168 {
1237 pick_up (op, tmp); 1169 CHK_PICK_PICKUP;
1238 continue; 1170 continue;
1239 } 1171 }
1240 1172
1241 if (op->contr->mode & PU_SKILLSCROLL) 1173 if (op->contr->mode & PU_SKILLSCROLL)
1242 if (tmp->type == SKILLSCROLL) 1174 if (tmp->type == SKILLSCROLL)
1243 { 1175 {
1244 pick_up (op, tmp); 1176 CHK_PICK_PICKUP;
1245 continue; 1177 continue;
1246 } 1178 }
1247 1179
1248 if (op->contr->mode & PU_READABLES) 1180 if (op->contr->mode & PU_READABLES)
1249 if (tmp->type == BOOK || tmp->type == SCROLL) 1181 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1250 { 1182 {
1251 pick_up (op, tmp); 1183 CHK_PICK_PICKUP;
1252 continue; 1184 continue;
1253 } 1185 }
1254 1186
1255 /* wands/staves/rods/horns */ 1187 /* wands/staves/rods/horns */
1256 if (op->contr->mode & PU_MAGIC_DEVICE) 1188 if (op->contr->mode & PU_MAGIC_DEVICE)
1257 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1189 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1258 { 1190 {
1259 pick_up (op, tmp); 1191 CHK_PICK_PICKUP;
1260 continue; 1192 continue;
1261 } 1193 }
1262 1194
1263 /* pick up all magical items */ 1195 /* pick up all magical items */
1264 if (op->contr->mode & PU_MAGICAL) 1196 if (op->contr->mode & PU_MAGICAL)
1265 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1197 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1266 { 1198 {
1267 pick_up (op, tmp); 1199 CHK_PICK_PICKUP;
1268 continue; 1200 continue;
1269 } 1201 }
1270 1202
1271 if (op->contr->mode & PU_VALUABLES) 1203 if (op->contr->mode & PU_VALUABLES)
1272 { 1204 {
1273 if (tmp->type == MONEY || tmp->type == GEM) 1205 if (tmp->type == MONEY || tmp->type == GEM)
1274 { 1206 {
1275 pick_up (op, tmp); 1207 CHK_PICK_PICKUP;
1276 continue; 1208 continue;
1277 } 1209 }
1278 } 1210 }
1279 1211
1280 /* rings & amulets - talismans seems to be typed AMULET */ 1212 /* rings & amulets - talismans seems to be typed AMULET */
1281 if (op->contr->mode & PU_JEWELS) 1213 if (op->contr->mode & PU_JEWELS)
1282 if (tmp->type == RING || tmp->type == AMULET) 1214 if (tmp->type == RING || tmp->type == AMULET)
1283 { 1215 {
1284 pick_up (op, tmp); 1216 CHK_PICK_PICKUP;
1285 continue; 1217 continue;
1286 } 1218 }
1287 1219
1288 /* we don't forget dragon food */ 1220 /* we don't forget dragon food */
1289 if (op->contr->mode & PU_FLESH) 1221 if (op->contr->mode & PU_FLESH)
1290 if (tmp->type == FLESH) 1222 if (tmp->type == FLESH)
1291 { 1223 {
1292 pick_up (op, tmp); 1224 CHK_PICK_PICKUP;
1293 continue; 1225 continue;
1294 } 1226 }
1295 1227
1296 /* bows and arrows. Bows are good for selling! */ 1228 /* bows and arrows. Bows are good for selling! */
1297 if (op->contr->mode & PU_BOW) 1229 if (op->contr->mode & PU_BOW)
1298 if (tmp->type == BOW) 1230 if (tmp->type == BOW)
1299 { 1231 {
1300 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1301 continue; 1233 continue;
1302 } 1234 }
1303 1235
1304 if (op->contr->mode & PU_ARROW) 1236 if (op->contr->mode & PU_ARROW)
1305 if (tmp->type == ARROW) 1237 if (tmp->type == ARROW)
1306 { 1238 {
1307 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1308 continue; 1240 continue;
1309 } 1241 }
1310 1242
1311 /* all kinds of armor etc. */ 1243 /* all kinds of armor etc. */
1312 if (op->contr->mode & PU_ARMOUR) 1244 if (op->contr->mode & PU_ARMOUR)
1313 if (tmp->type == ARMOUR) 1245 if (tmp->type == ARMOUR)
1314 { 1246 {
1315 pick_up (op, tmp); 1247 CHK_PICK_PICKUP;
1316 continue; 1248 continue;
1317 } 1249 }
1318 1250
1319 if (op->contr->mode & PU_HELMET) 1251 if (op->contr->mode & PU_HELMET)
1320 if (tmp->type == HELMET) 1252 if (tmp->type == HELMET)
1321 { 1253 {
1322 pick_up (op, tmp); 1254 CHK_PICK_PICKUP;
1323 continue; 1255 continue;
1324 } 1256 }
1325 1257
1326 if (op->contr->mode & PU_SHIELD) 1258 if (op->contr->mode & PU_SHIELD)
1327 if (tmp->type == SHIELD) 1259 if (tmp->type == SHIELD)
1328 { 1260 {
1329 pick_up (op, tmp); 1261 CHK_PICK_PICKUP;
1330 continue; 1262 continue;
1331 } 1263 }
1332 1264
1333 if (op->contr->mode & PU_BOOTS) 1265 if (op->contr->mode & PU_BOOTS)
1334 if (tmp->type == BOOTS) 1266 if (tmp->type == BOOTS)
1335 { 1267 {
1336 pick_up (op, tmp); 1268 CHK_PICK_PICKUP;
1337 continue; 1269 continue;
1338 } 1270 }
1339 1271
1340 if (op->contr->mode & PU_GLOVES) 1272 if (op->contr->mode & PU_GLOVES)
1341 if (tmp->type == GLOVES) 1273 if (tmp->type == GLOVES)
1342 { 1274 {
1343 pick_up (op, tmp); 1275 CHK_PICK_PICKUP;
1344 continue; 1276 continue;
1345 } 1277 }
1346 1278
1347 if (op->contr->mode & PU_CLOAK) 1279 if (op->contr->mode & PU_CLOAK)
1348 if (tmp->type == CLOAK) 1280 if (tmp->type == CLOAK)
1349 { 1281 {
1350 pick_up (op, tmp); 1282 CHK_PICK_PICKUP;
1351 continue; 1283 continue;
1352 } 1284 }
1353 1285
1354 /* hoping to catch throwing daggers here */ 1286 /* hoping to catch throwing daggers here */
1355 if (op->contr->mode & PU_MISSILEWEAPON) 1287 if (op->contr->mode & PU_MISSILEWEAPON)
1356 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1288 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1357 { 1289 {
1358 pick_up (op, tmp); 1290 CHK_PICK_PICKUP;
1359 continue; 1291 continue;
1360 } 1292 }
1361 1293
1362 /* careful: chairs and tables are weapons! */ 1294 /* careful: chairs and tables are weapons! */
1363 if (op->contr->mode & PU_ALLWEAPON) 1295 if (op->contr->mode & PU_ALLWEAPON)
1364 { 1296 {
1365 if (tmp->type == WEAPON && tmp->name != NULL) 1297 if (tmp->type == WEAPON && tmp->name != NULL)
1366 { 1298 {
1367 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1299 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1368 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1300 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1369 { 1301 {
1370 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1371 continue; 1303 continue;
1372 } 1304 }
1373 } 1305 }
1374 1306
1375 if (tmp->type == WEAPON && tmp->name == NULL) 1307 if (tmp->type == WEAPON && tmp->name == NULL)
1376 { 1308 {
1377 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1309 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1378 { 1310 {
1379 pick_up (op, tmp); 1311 CHK_PICK_PICKUP;
1380 continue; 1312 continue;
1381 } 1313 }
1382 } 1314 }
1383 } 1315 }
1384 1316
1385 /* misc stuff that's useful */ 1317 /* misc stuff that's useful */
1386 if (op->contr->mode & PU_KEY) 1318 if (op->contr->mode & PU_KEY)
1387 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1319 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1388 { 1320 {
1389 pick_up (op, tmp); 1321 CHK_PICK_PICKUP;
1390 continue; 1322 continue;
1391 } 1323 }
1392 1324
1393 /* any of the last 4 bits set means we use the ratio for value 1325 /* any of the last 4 bits set means we use the ratio for value
1394 * pickups */ 1326 * pickups */
… …
1399 /* >=7 is the old standard setting. Now we take the last 4 bits 1331 /* >=7 is the old standard setting. Now we take the last 4 bits
1400 * and multiply them by 5, giving 0..15*5== 5..75 */ 1332 * and multiply them by 5, giving 0..15*5== 5..75 */
1401 wvratio = (op->contr->mode & PU_RATIO) * 5; 1333 wvratio = (op->contr->mode & PU_RATIO) * 5;
1402 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1334 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1403 { 1335 {
1404 pick_up (op, tmp); 1336 CHK_PICK_PICKUP;
1405#if 0 1337#if 0
1406 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1338 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1407 if (tmp->name != NULL) 1339 if (tmp->name != NULL)
1408 { 1340 {
1409 fprintf (stderr, "%s", tmp->name); 1341 fprintf (stderr, "%s", tmp->name);
1410 } 1342 }
1411 else 1343 else
1412 fprintf (stderr, "%s", tmp->arch->name); 1344 fprintf (stderr, "%s", tmp->arch->archname);
1413 fprintf (stderr, ",%d] = ", tmp->type); 1345 fprintf (stderr, ",%d] = ", tmp->type);
1414 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1346 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1415#endif 1347#endif
1416 continue; 1348 continue;
1417 } 1349 }
… …
1428 * found object is returned. 1360 * found object is returned.
1429 */ 1361 */
1430object * 1362object *
1431find_arrow (object *op, const char *type) 1363find_arrow (object *op, const char *type)
1432{ 1364{
1433 object *tmp = NULL;
1434
1435 for (op = op->inv; op; op = op->below) 1365 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1436 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1437 tmp = find_arrow (op, type);
1438 else if (op->type == ARROW && op->race == type) 1366 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1367 return splay (tmp);
1368
1369 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1370 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1371 if (object *arrow = find_arrow (tmp, type))
1372 {
1373 splay (tmp);
1439 return op; 1374 return arrow;
1375 }
1376
1440 return tmp; 1377 return 0;
1441} 1378}
1442 1379
1443/* 1380/*
1444 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1381 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1445 * against the target. A full test is not performed, simply a basic test 1382 * against the target. A full test is not performed, simply a basic test
1446 * of resistances. The archer is making a quick guess at what he sees down 1383 * of resistances. The archer is making a quick guess at what he sees down
1447 * the hall. Failing that it does it's best to pick the highest plus arrow. 1384 * the hall. Failing that it does it's best to pick the highest plus arrow.
1448 */ 1385 */
1449
1450object * 1386object *
1451find_better_arrow (object *op, object *target, const char *type, int *better) 1387find_better_arrow (object *op, object *target, const char *type, int *better)
1452{ 1388{
1453 object *tmp = NULL, *arrow, *ntmp; 1389 object *tmp = NULL, *arrow, *ntmp;
1454 int attacknum, attacktype, betterby = 0, i; 1390 int attacknum, attacktype, betterby = 0, i;
… …
1487 else 1423 else
1488 { 1424 {
1489 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1425 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1490 { 1426 {
1491 attacktype = 1 << attacknum; 1427 attacktype = 1 << attacknum;
1492 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1428 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1493 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1429 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1494 { 1430 {
1495 tmp = arrow; 1431 tmp = arrow;
1496 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1432 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1497 } 1433 }
1498 } 1434 }
1499 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1435 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1500 { 1436 {
1501 tmp = arrow; 1437 tmp = arrow;
… …
1520 * find_better_arrow to find a decent arrow to use. 1456 * find_better_arrow to find a decent arrow to use.
1521 * op = the shooter 1457 * op = the shooter
1522 * type = bow->race 1458 * type = bow->race
1523 * dir = fire direction 1459 * dir = fire direction
1524 */ 1460 */
1525
1526object * 1461object *
1527pick_arrow_target (object *op, const char *type, int dir) 1462pick_arrow_target (object *op, const char *type, int dir)
1528{ 1463{
1529 object *tmp = NULL; 1464 object *tmp = NULL;
1530 maptile *m; 1465 maptile *m;
… …
1595 */ 1530 */
1596int 1531int
1597fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1532fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1598{ 1533{
1599 object *left, *bow; 1534 object *left, *bow;
1600 int bowspeed, mflags; 1535 int mflags;
1601 maptile *m; 1536 maptile *m;
1602 1537
1603 if (!dir) 1538 if (!dir)
1604 { 1539 {
1605 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1540 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606 return 0; 1541 return 0;
1607 } 1542 }
1608 1543
1609 if (op->type == PLAYER) 1544 if (op->contr)
1610 bow = op->contr->ranges[range_bow]; 1545 bow = op->current_weapon;
1611 else 1546 else
1612 { 1547 {
1613 for (bow = op->inv; bow; bow = bow->below) 1548 for (bow = op->inv; bow; bow = bow->below)
1614 /* Don't check for applied - monsters don't apply bows - in that way, they 1549 /* Don't check for applied - monsters don't apply bows - in that way, they
1615 * don't need to switch back and forth between bows and weapons. 1550 * don't need to switch back and forth between bows and weapons.
… …
1620 if (!bow) 1555 if (!bow)
1621 { 1556 {
1622 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1557 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1623 return 0; 1558 return 0;
1624 } 1559 }
1560
1561 // optimisation: move object to top so we will find it quickly again
1562 if (bow->below)
1563 {
1564 bow->remove ();
1565 op->insert (bow);
1566 }
1567
1625 } 1568 }
1626 1569
1627 if (!bow->race || !bow->skill) 1570 if (!bow->race || !bow->skill)
1628 { 1571 {
1629 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1572 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1630 return 0; 1573 return 0;
1631 } 1574 }
1632
1633 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1634
1635 /* penalize ROF for bestarrow */
1636 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1637 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1639 if (bowspeed < 1)
1640 bowspeed = 1;
1641 1575
1642 if (arrow == NULL) 1576 if (arrow == NULL)
1643 { 1577 {
1644 if ((arrow = find_arrow (op, bow->race)) == NULL) 1578 if ((arrow = find_arrow (op, bow->race)) == NULL)
1645 { 1579 {
1646 if (op->type == PLAYER) 1580 if (op->type == PLAYER)
1647 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1581 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1648 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1582 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1649 else 1583 else
1650 CLEAR_FLAG (op, FLAG_READY_BOW); 1584 CLEAR_FLAG (op, FLAG_READY_BOW);
1585
1651 return 0; 1586 return 0;
1652 } 1587 }
1653 } 1588 }
1654 1589
1655 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1590 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1668 arrow->destroy (); 1603 arrow->destroy ();
1669 return 0; 1604 return 0;
1670 } 1605 }
1671 1606
1672 left = arrow; /* these are arrows left to the player */ 1607 left = arrow; /* these are arrows left to the player */
1673 arrow = get_split_ob (arrow, 1); 1608 arrow = arrow->split ();
1674 if (!arrow) 1609 if (!arrow)
1675 { 1610 {
1676 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1611 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1677 return 0; 1612 return 0;
1678 } 1613 }
1679 1614
1680 arrow->set_owner (op); 1615 arrow->set_owner (op);
1681 arrow->skill = bow->skill; 1616 arrow->skill = bow->skill;
1682 arrow->direction = dir; 1617 arrow->direction = dir;
1683 1618
1619 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1620 arrow->stats.hp = arrow->stats.dam;
1621 arrow->stats.grace = arrow->attacktype;
1622
1623 if (arrow->slaying)
1624 arrow->spellarg = strdup (arrow->slaying);
1625
1626#if 0
1627 if (player *pl = op->contr)
1628 {
1629 float speed = pl->weapon_sp;
1630
1631 /* penalize ROF for bestarrow */
1632 if (pl->bowtype == bow_bestarrow)
1633 speed *= .9f;
1634 else
1635 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1636
1637 op->speed_left += speed - op->speed;
1638 }
1639#endif
1640
1641 SET_ANIMATION (arrow, arrow->direction);
1642
1643 /* update the speed */
1644 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1645 + bow->stats.dam / 7.f;
1646
1647 arrow->set_speed (max (arrow->speed, 2.f));
1648 arrow->speed_left = 0;
1649
1650 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1651
1684 if (op->type == PLAYER) 1652 if (op->type == PLAYER)
1685 { 1653 {
1686 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1687 op->update_stats ();
1688 }
1689
1690 SET_ANIMATION (arrow, arrow->direction);
1691 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1692 arrow->stats.hp = arrow->stats.dam;
1693 arrow->stats.grace = arrow->attacktype;
1694 if (arrow->slaying != NULL)
1695 arrow->spellarg = strdup (arrow->slaying);
1696
1697 /* Note that this was different for monsters - they got their level
1698 * added to the damage. I think the strength bonus is more proper.
1699 */
1700
1701 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1702
1703 /* update the speed */
1704 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1705 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1706
1707 arrow->set_speed (max (arrow->speed, 1.0));
1708 arrow->speed_left = 0;
1709
1710 if (op->type == PLAYER)
1711 {
1712 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1713 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1714 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1715
1716 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1654 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1655 wc -= dex_bonus[op->stats.Dex];
1656
1657 if (!arrow->slaying)
1658 arrow->slaying = op->slaying;
1659
1660 arrow->attacktype |= op->attacktype;
1717 } 1661 }
1718 else 1662 else
1719 { 1663 {
1720 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1721 arrow->level = op->level; 1664 arrow->level = op->level;
1722 } 1665 arrow->stats.wc -= bow->magic;
1723 1666
1724 if (arrow->attacktype == AT_PHYSICAL) 1667 if (!arrow->slaying)
1668 arrow->slaying = bow->slaying;
1669
1725 arrow->attacktype |= bow->attacktype; 1670 arrow->attacktype |= bow->attacktype;
1671 }
1726 1672
1727 if (bow->slaying) 1673 wc -= arrow->level;
1728 arrow->slaying = bow->slaying; 1674 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1729 1675
1676 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1730 arrow->move_type = MOVE_FLY_LOW; 1677 arrow->move_type = MOVE_FLY_LOW;
1731 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1678 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1732 1679
1733 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1680 op->play_sound (sound_find ("fire_arrow"));
1734 m->insert (arrow, sx, sy, op); 1681 m->insert (arrow, sx, sy, op);
1735 1682
1736 if (!arrow->destroyed ()) 1683 if (!arrow->destroyed ())
1737 move_arrow (arrow); 1684 move_arrow (arrow);
1738
1739 if (op->type == PLAYER)
1740 {
1741 if (left->destroyed ())
1742 esrv_del_item (op->contr, left->count);
1743 else
1744 esrv_send_item (op, left);
1745 }
1746 1685
1747 return 1; 1686 return 1;
1748} 1687}
1749 1688
1750/* Special fire code for players - this takes into 1689/* Special fire code for players - this takes into
… …
1759{ 1698{
1760 int ret = 0, wcmod = 0; 1699 int ret = 0, wcmod = 0;
1761 1700
1762 if (op->contr->bowtype == bow_bestarrow) 1701 if (op->contr->bowtype == bow_bestarrow)
1763 { 1702 {
1764 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1703 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1765 } 1704 }
1766 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1705 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1767 { 1706 {
1768 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1707 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1769 wcmod = -1; 1708 wcmod = -1;
… …
1779 else if (op->contr->bowtype == bow_spreadshot) 1718 else if (op->contr->bowtype == bow_spreadshot)
1780 { 1719 {
1781 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1720 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1782 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1721 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1783 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1722 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1784
1785 } 1723 }
1786 else 1724 else
1787 { 1725 {
1788 /* Simple case */ 1726 /* Simple case */
1789 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1727 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1790 } 1728 }
1729
1791 return ret; 1730 return ret;
1792} 1731}
1793
1794 1732
1795/* Fires a misc (wand/rod/horn) object in 'dir'. 1733/* Fires a misc (wand/rod/horn) object in 'dir'.
1796 * Broken apart from 'fire' to keep it more readable. 1734 * Broken apart from 'fire' to keep it more readable.
1797 */ 1735 */
1798void 1736void
1799fire_misc_object (object *op, int dir) 1737fire_misc_object (object *op, int dir)
1800{ 1738{
1801 object *item; 1739 object *item = op->contr->ranged_ob;
1802 1740
1803 if (!op->contr->ranges[range_misc]) 1741 if (!item)
1804 { 1742 {
1805 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1743 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1806 return; 1744 return;
1807 } 1745 }
1808 1746
1809 item = op->contr->ranges[range_misc];
1810 if (!item->inv) 1747 if (!item->inv)
1811 { 1748 {
1812 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1749 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1813 return; 1750 return;
1814 } 1751 }
1752
1753 if (!op->change_weapon (item))
1754 return;
1755
1815 if (item->type == WAND) 1756 if (item->type == WAND)
1816 { 1757 {
1817 if (item->stats.food <= 0) 1758 if (item->stats.food <= 0)
1818 { 1759 {
1819 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1760 op->contr->play_sound (sound_find ("wand_poof"));
1820 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1761 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1762
1821 return; 1763 return;
1822 } 1764 }
1823 } 1765 }
1824 else if (item->type == ROD || item->type == HORN) 1766 else if (item->type == ROD || item->type == HORN)
1825 { 1767 {
1826 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1768 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1827 { 1769 {
1828 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1770 op->contr->play_sound (sound_find ("wand_poof"));
1771
1829 if (item->type == ROD) 1772 if (item->type == ROD)
1830 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1773 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1831 else 1774 else
1832 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1775 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1776
1833 return; 1777 return;
1834 } 1778 }
1835 } 1779 }
1836 1780
1837 if (cast_spell (op, item, dir, item->inv, NULL)) 1781 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1844 object *tmp; 1788 object *tmp;
1845 1789
1846 if (item->arch) 1790 if (item->arch)
1847 { 1791 {
1848 CLEAR_FLAG (item, FLAG_ANIMATE); 1792 CLEAR_FLAG (item, FLAG_ANIMATE);
1849 item->face = item->arch->clone.face; 1793 item->face = item->arch->face;
1850 item->set_speed (0); 1794 item->set_speed (0);
1851 } 1795 }
1852 1796
1853 if ((tmp = item->in_player ())) 1797 if ((tmp = item->in_player ()))
1854 esrv_update_item (UPD_ANIM, tmp, item); 1798 esrv_update_item (UPD_ANIM, tmp, item);
… …
1859 } 1803 }
1860} 1804}
1861 1805
1862/* Received a fire command for the player - go and do it. 1806/* Received a fire command for the player - go and do it.
1863 */ 1807 */
1864void 1808bool
1865fire (object *op, int dir) 1809fire (object *op, int dir)
1866{ 1810{
1867 int spellcost = 0; 1811 int spellcost = 0;
1868 1812
1869 /* check for loss of invisiblity/hide */ 1813 /* check for loss of invisiblity/hide */
1870 if (action_makes_visible (op)) 1814 if (action_makes_visible (op))
1871 make_visible (op); 1815 make_visible (op);
1872 1816
1873 switch (op->contr->shoottype) 1817 player *pl = op->contr;
1818
1819 if (pl->golem)
1820 {
1821 control_golem (op->contr->golem, dir);
1822 return false;
1874 { 1823 }
1875 case range_none:
1876 return;
1877 1824
1878 case range_bow: 1825 object *ob = pl->ranged_ob;
1826
1827 if (!ob)
1828 return false;
1829
1830 if (!op->change_weapon (ob))
1831 return false;
1832
1833 if (op->speed_left > 0.f)
1834 --op->speed_left;
1835 else
1836 return false;
1837
1838 switch (ob->type)
1839 {
1840 case BOW:
1879 player_fire_bow (op, dir); 1841 player_fire_bow (op, dir);
1880 return; 1842 break;
1881 1843
1882 case range_magic: /* Casting spells */ 1844 case SPELL:
1883 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1845 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1884 return; 1846 break;
1885 1847
1886 case range_misc: 1848 case BUILDER:
1849 apply_map_builder (op, dir);
1850 break;
1851
1852 case SKILL:
1853 do_skill (op, op, ob, dir, 0);
1854 break;
1855
1856 default:
1887 fire_misc_object (op, dir); 1857 fire_misc_object (op, dir);
1888 return; 1858 break;
1889
1890 case range_golem: /* Control summoned monsters from scrolls */
1891 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1892 {
1893 op->contr->ranges[range_golem] = 0;
1894 op->contr->shoottype = range_none;
1895 }
1896 else
1897 control_golem (op->contr->ranges[range_golem], dir);
1898 return;
1899
1900 case range_skill:
1901 if (!op->chosen_skill)
1902 {
1903 if (op->type == PLAYER)
1904 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1905 return;
1906 }
1907 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1908 return;
1909 case range_builder:
1910 apply_map_builder (op, dir);
1911 return;
1912 default:
1913 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1914 return;
1915 } 1859 }
1916}
1917 1860
1918 1861 return true;
1862}
1919 1863
1920/* find_key 1864/* find_key
1921 * We try to find a key for the door as passed. If we find a key 1865 * We try to find a key for the door as passed. If we find a key
1922 * and successfully use it, we return the key, otherwise NULL 1866 * and successfully use it, we return the key, otherwise NULL
1923 * This function merges both normal and locked door, since the logic 1867 * This function merges both normal and locked door, since the logic
… …
1925 * pl is the player, 1869 * pl is the player,
1926 * inv is the objects inventory to searched 1870 * inv is the objects inventory to searched
1927 * door is the door we are trying to match against. 1871 * door is the door we are trying to match against.
1928 * This function can be called recursively to search containers. 1872 * This function can be called recursively to search containers.
1929 */ 1873 */
1930
1931object * 1874object *
1932find_key (object *pl, object *container, object *door) 1875find_key (object *pl, object *container, object *door)
1933{ 1876{
1934 object *tmp, *key; 1877 object *tmp, *key;
1935 1878
1936 /* Should not happen, but sanity checking is never bad */ 1879 /* Should not happen, but sanity checking is never bad */
1937 if (container->inv == NULL) 1880 if (!container->inv)
1938 return NULL; 1881 return 0;
1939 1882
1940 /* First, lets try to find a key in the top level inventory */ 1883 /* First, lets try to find a key in the top level inventory */
1941 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1884 for (tmp = container->inv; tmp; tmp = tmp->below)
1942 { 1885 {
1943 if (door->type == DOOR && tmp->type == KEY) 1886 if (door->type == DOOR && tmp->type == KEY)
1944 break; 1887 break;
1945 /* For sanity, we should really check door type, but other stuff 1888 /* For sanity, we should really check door type, but other stuff
1946 * (like containers) can be locked with special keys 1889 * (like containers) can be locked with special keys
1947 */ 1890 */
1948 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1891 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1949 break; 1892 break;
1950 } 1893 }
1894
1951 /* No key found - lets search inventories now */ 1895 /* No key found - lets search inventories now */
1952 /* If we find and use a key in an inventory, return at that time. 1896 /* If we find and use a key in an inventory, return at that time.
1953 * otherwise, if we search all the inventories and still don't find 1897 * otherwise, if we search all the inventories and still don't find
1954 * a key, return 1898 * a key, return
1955 */ 1899 */
1956 if (!tmp) 1900 if (!tmp)
1957 { 1901 {
1958 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1902 for (tmp = container->inv; tmp; tmp = tmp->below)
1959 { 1903 {
1960 /* No reason to search empty containers */ 1904 /* No reason to search empty containers */
1961 if (tmp->type == CONTAINER && tmp->inv) 1905 if (tmp->type == CONTAINER && tmp->inv)
1962 { 1906 {
1963 if ((key = find_key (pl, tmp, door)) != NULL) 1907 if ((key = find_key (pl, tmp, door)))
1964 return key; 1908 return key;
1965 } 1909 }
1966 } 1910 }
1911
1967 if (!tmp) 1912 if (!tmp)
1968 return NULL; 1913 return NULL;
1969 } 1914 }
1915
1970 /* We get down here if we have found a key. Now if its in a container, 1916 /* We get down here if we have found a key. Now if its in a container,
1971 * see if we actually want to use it 1917 * see if we actually want to use it
1972 */ 1918 */
1973 if (pl != container) 1919 if (pl != container)
1974 { 1920 {
… …
1995 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1941 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1996 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1942 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1997 return NULL; 1943 return NULL;
1998 } 1944 }
1999 } 1945 }
1946
2000 return tmp; 1947 return tmp;
2001} 1948}
2002 1949
2003/* moved door processing out of move_player_attack. 1950/* moved door processing out of move_player_attack.
2004 * returns 1 if player has opened the door with a key 1951 * returns 1 if player has opened the door with a key
… …
2006 * 0 otherwise 1953 * 0 otherwise
2007 */ 1954 */
2008static int 1955static int
2009player_attack_door (object *op, object *door) 1956player_attack_door (object *op, object *door)
2010{ 1957{
2011 /* If its a door, try to find a use a key. If we do destroy the door, 1958 /* If its a door, try to find a key. If we do destroy the door,
2012 * might as well return immediately as there is nothing more to do - 1959 * might as well return immediately as there is nothing more to do -
2013 * otherwise, we fall through to the rest of the code. 1960 * otherwise, we fall through to the rest of the code.
2014 */ 1961 */
2015 object *key = find_key (op, op, door); 1962 object *key = find_key (op, op, door);
2016 1963
2017 /* IF we found a key, do some extra work */ 1964 /* If we found a key, do some extra work */
2018 if (key) 1965 if (key)
2019 { 1966 {
2020 object *container = key->env; 1967 object *container = key->env;
2021 1968
2022 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2023 if (action_makes_visible (op)) 1969 if (action_makes_visible (op))
2024 make_visible (op); 1970 make_visible (op);
1971
2025 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1972 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2026 spring_trap (door->inv, op); 1973 spring_trap (door->inv, op);
1974
2027 if (door->type == DOOR) 1975 if (door->type == DOOR)
2028 {
2029 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1976 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2030 }
2031 else if (door->type == LOCKED_DOOR) 1977 else if (door->type == LOCKED_DOOR)
2032 { 1978 {
2033 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1979 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2034 remove_door2 (door); /* remove door without violence ;-) */ 1980 remove_door2 (door); /* remove door without violence ;-) */
2035 } 1981 }
1982
2036 /* Do this after we print the message */ 1983 /* Do this after we print the message */
2037 decrease_ob (key); /* Use up one of the keys */ 1984 key->decrease (); /* Use up one of the keys */
2038 /* Need to update the weight the container the key was in */ 1985 /* Need to update the weight the container the key was in */
2039 if (container != op) 1986 if (container != op)
2040 esrv_update_item (UPD_WEIGHT, op, container); 1987 esrv_update_item (UPD_WEIGHT, op, container);
1988
2041 return 1; /* Nothing more to do below */ 1989 return 1; /* Nothing more to do below */
2042 } 1990 }
2043 else if (door->type == LOCKED_DOOR) 1991 else if (door->type == LOCKED_DOOR)
2044 { 1992 {
2045 /* Might as well return now - no other way to open this */ 1993 /* Might as well return now - no other way to open this */
2046 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1994 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2047 return 1; 1995 return 1;
2048 } 1996 }
1997
2049 return 0; 1998 return 0;
2050} 1999}
2051 2000
2052/* This function is just part of a breakup from move_player. 2001/* This function is just part of a breakup from move_player.
2053 * It should keep the code cleaner. 2002 * It should keep the code cleaner.
2054 * When this is called, the players direction has been updated 2003 * When this is called, the players direction has been updated
2055 * (taking into account confusion.) The player is also actually 2004 * (taking into account confusion.) The player is also actually
2056 * going to try and move (not fire weapons). 2005 * going to try and move (not fire weapons).
2057 */ 2006 */
2058void 2007bool
2059move_player_attack (object *op, int dir) 2008move_player_attack (object *op, int dir)
2060{ 2009{
2061 object *tmp, *mon;
2062 sint16 nx, ny;
2063 int on_battleground; 2010 int on_battleground;
2064 maptile *m;
2065 2011
2066 nx = freearr_x[dir] + op->x; 2012 sint16 nx = freearr_x[dir] + op->x;
2067 ny = freearr_y[dir] + op->y; 2013 sint16 ny = freearr_y[dir] + op->y;
2068 2014
2069 on_battleground = op_on_battleground (op, 0, 0); 2015 on_battleground = op_on_battleground (op, 0, 0);
2016
2017 if (out_of_map (op->map, nx, ny))
2018 return false;
2019
2020 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2021 {
2022 --op->speed_left;
2023 return true;
2024 }
2070 2025
2071 /* If braced, or can't move to the square, and it is not out of the 2026 /* If braced, or can't move to the square, and it is not out of the
2072 * map, attack it. Note order of if statement is important - don't 2027 * map, attack it. Note order of if statement is important - don't
2073 * want to be calling move_ob if braced, because move_ob will move the 2028 * want to be calling move_ob if braced, because move_ob will move the
2074 * player. This is a pretty nasty hack, because if we could 2029 * player. This is a pretty nasty hack, because if we could
2075 * move to some space, it then means that if we are braced, we should 2030 * move to some space, it then means that if we are braced, we should
2076 * do nothing at all. As it is, if we are braced, we go through 2031 * do nothing at all. As it is, if we are braced, we go through
2077 * quite a bit of processing. However, it probably is less than what 2032 * quite a bit of processing. However, it probably is less than what
2078 * move_ob uses. 2033 * move_ob uses.
2079 */ 2034 */
2080 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2035 maptile *m = op->map->xy_find (nx, ny);
2081 {
2082 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2083 {
2084 m = get_map_from_coord (op->map, &nx, &ny);
2085 if (!m)
2086 return; /* Don't think this should happen */
2087 }
2088 else
2089 m = op->map;
2090 2036
2091 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2092 {
2093 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2094 return;
2095 }
2096
2097 mon = 0;
2098 /* Go through all the objects, and find ones of interest. Only stop if 2037 /* Go through all the objects, and find ones of interest. Only stop if
2099 * we find a monster - that is something we know we want to attack. 2038 * we find a monster - that is something we know we want to attack.
2100 * if its a door or barrel (can roll) see if there may be monsters 2039 * if its a door or barrel (can roll) see if there may be monsters
2101 * on the space 2040 * on the space
2102 */ 2041 */
2103 while (tmp) 2042 object *mon;
2104 { 2043 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2105 if (tmp == op) 2044 {
2106 { 2045 if ((mon->flag [FLAG_ALIVE]
2107 tmp = tmp->above; 2046 || mon->type == LOCKED_DOOR
2108 continue; 2047 || mon->flag [FLAG_CAN_ROLL])
2109 }
2110
2111 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2112 {
2113 mon = tmp; 2048 && mon != op)
2114 break; 2049 break;
2115 } 2050 }
2116 2051
2117 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2118 mon = tmp;
2119
2120 tmp = tmp->above;
2121 }
2122
2123 if (!mon) /* This happens anytime the player tries to move */ 2052 if (!mon) /* This happens anytime the player tries to move */
2124 return; /* into a wall */ 2053 return false; /* into a wall */
2125 2054
2126 if (mon->head)
2127 mon = mon->head; 2055 mon = mon->head_ ();
2128 2056
2129 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2057 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2058 if (op->contr->weapon_sp_left > 0.f)
2130 if (player_attack_door (op, mon)) 2059 if (player_attack_door (op, mon))
2060 {
2061 --op->contr->weapon_sp_left;
2131 return; 2062 return true;
2063 }
2132 2064
2133 /* The following deals with possibly attacking peaceful 2065 /* The following deals with possibly attacking peaceful
2134 * or frienddly creatures. Basically, all players are considered 2066 * or friendly creatures. Basically, all players are considered
2135 * unaggressive. If the moving player has peaceful set, then the 2067 * unaggressive. If the moving player has peaceful set, then the
2136 * object should be pushed instead of attacked. It is assumed that 2068 * object should be pushed instead of attacked. It is assumed that
2137 * if you are braced, you will not attack friends accidently, 2069 * if you are braced, you will not attack friends accidently,
2138 * and thus will not push them. 2070 * and thus will not push them.
2139 */ 2071 */
2140 2072
2141 /* If the creature is a pet, push it even if the player is not 2073 /* If the creature is a pet, push it even if the player is not
2142 * peaceful. Our assumption is the creature is a pet if the 2074 * peaceful. Our assumption is the creature is a pet if the
2143 * player owns it and it is either friendly or unagressive. 2075 * player owns it and it is either friendly or unagressive.
2144 */ 2076 */
2145 if ((op->type == PLAYER) 2077 if (op->type == PLAYER
2146#if COZY_SERVER
2147 &&
2148 ((mon->owner && mon->owner->contr 2078 && ((mon->owner && mon->owner->contr
2149 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2079 && same_party (mon->owner->contr->party, op->contr->party))
2150#else
2151 && mon->owner == op 2080 || mon->owner == op)
2152#endif
2153 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2081 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2154 { 2082 {
2155 /* If we're braced, we don't want to switch places with it */ 2083 /* If we're braced, we don't want to switch places with it */
2156 if (op->contr->braced) 2084 if (op->contr->braced)
2157 return; 2085 return false;
2158 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2086
2087 if (op->speed_left > 0.f)
2088 {
2089 --op->speed_left;
2090
2091 op->play_sound (sound_find ("push_player"));
2159 (void) push_ob (mon, dir, op); 2092 push_ob (mon, dir, op);
2093
2160 if (op->contr->tmp_invis || op->hide) 2094 if (op->contr->tmp_invis || op->hide)
2161 make_visible (op); 2095 make_visible (op);
2096
2162 return; 2097 return true;
2163 } 2098 }
2099 else
2100 return false;
2101 }
2164 2102
2165 /* in certain circumstances, you shouldn't attack friendly 2103 /* in certain circumstances, you shouldn't attack friendly
2166 * creatures. Note that if you are braced, you can't push 2104 * creatures. Note that if you are braced, you can't push
2167 * someone, but put it inside this loop so that you won't 2105 * someone, but put it inside this loop so that you won't
2168 * attack them either. 2106 * attack them either.
2169 */ 2107 */
2170 if ((mon->type == PLAYER || mon->enemy != op) && 2108 if ((mon->type == PLAYER || mon->enemy != op)
2171 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2109 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2172#ifdef PROHIBIT_PLAYERKILL
2173 (op->contr->peaceful 2110 && ((op->contr->peaceful
2174 || (mon->type == PLAYER 2111 || (mon->type == PLAYER && mon->contr->peaceful))
2175 && mon->contr->
2176 peaceful)) &&
2177#else
2178 op->contr->peaceful &&
2179#endif
2180 !on_battleground)) 2112 && !on_battleground))
2113 {
2114 if (op->speed_left > 0.f)
2181 { 2115 {
2116 --op->speed_left;
2117
2182 if (!op->contr->braced) 2118 if (!op->contr->braced)
2183 { 2119 {
2184 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2120 op->play_sound (sound_find ("push_player"));
2185 (void) push_ob (mon, dir, op); 2121 push_ob (mon, dir, op);
2186 } 2122 }
2187 else 2123 else
2188 new_draw_info (0, 0, op, "You withhold your attack"); 2124 op->statusmsg ("You withhold your attack");
2189 2125
2190 if (op->contr->tmp_invis || op->hide) 2126 if (op->contr->tmp_invis || op->hide)
2191 make_visible (op); 2127 make_visible (op);
2192 }
2193 2128
2129 return true;
2130 }
2131 }
2194 /* If the object is a boulder or other rollable object, then 2132 /* If the object is a boulder or other rollable object, then
2195 * roll it if not braced. You can't roll it if you are braced. 2133 * roll it if not braced. You can't roll it if you are braced.
2196 */ 2134 */
2197 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2135 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2136 {
2137 if (op->speed_left > 0.f)
2198 { 2138 {
2139 --op->speed_left;
2140
2199 recursive_roll (mon, dir, op); 2141 recursive_roll (mon, dir, op);
2200 if (action_makes_visible (op)) 2142 if (action_makes_visible (op))
2201 make_visible (op); 2143 make_visible (op);
2202 }
2203 2144
2145 return true;
2146 }
2147 }
2204 /* Any generic living creature. Including things like doors. 2148 /* Any generic living creature. Including things like doors.
2205 * Way it works is like this: First, it must have some hit points 2149 * Way it works is like this: First, it must have some hit points
2206 * and be living. Then, it must be one of the following: 2150 * and be living. Then, it must be one of the following:
2207 * 1) Not a player, 2) A player, but of a different party. Note 2151 * 1) Not a player, 2) A player, but of a different party. Note
2208 * that party_number -1 is no party, so attacks can still happen. 2152 * that party_number -1 is no party, so attacks can still happen.
2209 */ 2153 */
2210
2211 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2154 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2212 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2155 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2213 { 2156 {
2214 2157 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2215 /* If the player hasn't hit something this tick, and does
2216 * so, give them speed boost based on weapon speed. Doing
2217 * it here is better than process_players2, which basically
2218 * incurred a 1 tick offset.
2219 */
2220 if (!op->contr->has_hit)
2221 { 2158 {
2222 op->speed_left += op->speed / op->contr->weapon_sp; 2159 --op->contr->weapon_sp_left;
2223
2224 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2225 }
2226 2160
2227 skill_attack (mon, op, 0, 0, 0); 2161 skill_attack (mon, op, 0, 0, 0);
2228
2229 /* If attacking another player, that player gets automatic
2230 * hitback, and doesn't loose luck either.
2231 * Disable hitback on the battleground or if the target is
2232 * the wiz.
2233 */
2234 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2235 {
2236 short luck = mon->stats.luck;
2237
2238 mon->contr->has_hit = 1;
2239 skill_attack (op, mon, 0, 0, 0);
2240 mon->stats.luck = luck;
2241 }
2242 2162
2243 if (action_makes_visible (op)) 2163 if (action_makes_visible (op))
2244 make_visible (op); 2164 make_visible (op);
2245 }
2246 } /* if player should attack something */
2247}
2248 2165
2249int 2166 return true;
2167 }
2168 }
2169
2170 return false;
2171}
2172
2173bool
2250move_player (object *op, int dir) 2174move_player (object *op, int dir)
2251{ 2175{
2252 int pick; 2176 int pick;
2253 2177
2254 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2178 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2255 return 0; 2179 return 0;
2256 2180
2257 /* Sanity check: make sure dir is valid */ 2181 /* Sanity check: make sure dir is valid */
2258 if ((dir < 0) || (dir >= 9)) 2182 if ((dir < 0) || (dir >= 9))
2259 { 2183 {
2260 LOG (llevError, "move_player: invalid direction %d\n", dir); 2184 LOG (llevError, "move_player: invalid direction %d\n", dir);
2261 return 0; 2185 return 0;
2262 } 2186 }
2263 2187
2264 /* peterm: added following line */ 2188 /* peterm: added following line */
2265 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2189 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2266 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2190 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2267 2191
2268 op->facing = dir; 2192 op->facing = dir;
2269 2193
2270 if (op->hide) 2194 if (op->hide)
2271 do_hidden_move (op); 2195 do_hidden_move (op);
2272 2196
2197 bool retval;
2198
2273 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2199 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2274 /*nop */ ; 2200 retval = RESULT_INT (0);
2275 else if (op->contr->fire_on) 2201 else if (op->contr->fire_on)
2276 fire (op, dir); 2202 retval = fire (op, dir);
2277 else 2203 else
2278 { 2204 {
2279 move_player_attack (op, dir); 2205 retval = move_player_attack (op, dir);
2280 pick = check_pick (op); 2206 pick = check_pick (op);
2281 } 2207 }
2282 2208
2283 /* Add special check for newcs players and fire on - this way, the 2209 /* Add special check for newcs players and fire on - this way, the
2284 * server can handle repeat firing. 2210 * server can handle repeat firing.
… …
2291 /* Update how the player looks. Use the facing, so direction may 2217 /* Update how the player looks. Use the facing, so direction may
2292 * get reset to zero. This allows for full animation capabilities 2218 * get reset to zero. This allows for full animation capabilities
2293 * for players. 2219 * for players.
2294 */ 2220 */
2295 animate_object (op, op->facing); 2221 animate_object (op, op->facing);
2296 return 0; 2222
2223 return retval;
2297} 2224}
2298 2225
2299/* This is similar to handle_player, below, but is only used by the 2226/* This is similar to handle_player, below, but is only used by the
2300 * new client/server stuff. 2227 * new client/server stuff.
2301 * This is sort of special, in that the new client/server actually uses 2228 * This is sort of special, in that the new client/server actually uses
2302 * the new speed values for commands. 2229 * the new speed values for commands.
2303 * 2230 *
2304 * Returns true if there are more actions we can do. 2231 * Returns true if there are more actions we can do. Should not do
2232 * many actions in a row, as that would be too unfair to other
2233 * players.
2305 */ 2234 */
2306int 2235bool
2307handle_newcs_player (object *op) 2236handle_newcs_player (object *op)
2308{ 2237{
2309 if (op->contr->hidden)
2310 {
2311 op->invisible = 1000;
2312 /* the socket code flashes the player visible/invisible
2313 * depending on the value of invisible, so we need to
2314 * alternate it here for it to work correctly.
2315 */
2316 if (pticks & 2)
2317 op->invisible--;
2318 }
2319 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2320 {
2321 op->invisible--;
2322 if (!op->invisible)
2323 {
2324 make_visible (op);
2325 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2326 }
2327 }
2328
2329 if (QUERY_FLAG (op, FLAG_SCARED)) 2238 if (QUERY_FLAG (op, FLAG_SCARED))
2330 { 2239 {
2331 flee_player (op); 2240 if (op->speed_left > 0.f)
2332 /* If player is still scared, that is his action for this tick */
2333 if (QUERY_FLAG (op, FLAG_SCARED))
2334 { 2241 {
2335 op->speed_left--; 2242 --op->speed_left;
2243 flee_player (op);
2244
2336 return 0; 2245 return true;
2337 } 2246 }
2247 else
2248 return false;
2338 } 2249 }
2339
2340 /* I've been seeing crashes where the golem has been destroyed, but
2341 * the player object still points to the defunct golem. The code that
2342 * destroys the golem looks correct, and it doesn't always happen, so
2343 * put this in a a workaround to clean up the golem pointer.
2344 */
2345 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2346 op->contr->ranges[range_golem] = 0;
2347 2250
2348 /* call this here - we also will call this in do_ericserver, but 2251 /* call this here - we also will call this in do_ericserver, but
2349 * the players time has been increased when doericserver has been 2252 * the players time has been increased when doericserver has been
2350 * called, so we recheck it here. 2253 * called, so we recheck it here.
2351 */ 2254 */
2352 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2255 if (op->contr->ns->handle_command ())
2353 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2354 ;
2355
2356 if (op->speed_left < 0)
2357 return 0; 2256 return true;
2358 2257
2359 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2258 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2360 {
2361 /* All move commands take 1 tick, at least for now */
2362 op->speed_left--;
2363
2364 /* Instead of all the stuff below, let move_player take care
2365 * of it. Also, some of the skill stuff is only put in
2366 * there, as well as the confusion stuff.
2367 */
2368 move_player (op, op->direction); 2259 return move_player (op, op->direction);
2369 if (op->speed_left > 0)
2370 return 1;
2371 else
2372 return 0;
2373 }
2374 2260
2375 return 0; 2261 return false;
2376} 2262}
2377 2263
2378int 2264int
2379save_life (object *op) 2265save_life (object *op)
2380{ 2266{
… …
2382 return 0; 2268 return 0;
2383 2269
2384 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2270 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2385 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2271 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2386 { 2272 {
2387 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2273 op->play_sound (sound_find ("ob_evaporate"));
2388 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2274 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2389 2275
2390 if (op->contr) 2276 if (op->contr)
2391 esrv_del_item (op->contr, tmp->count); 2277 esrv_del_item (op->contr, tmp->count);
2392 2278
… …
2412/* This goes throws the inventory and removes unpaid objects, and puts them 2298/* This goes throws the inventory and removes unpaid objects, and puts them
2413 * back in the map (location and map determined by values of env). This 2299 * back in the map (location and map determined by values of env). This
2414 * function will descend into containers. op is the object to start the search 2300 * function will descend into containers. op is the object to start the search
2415 * from. 2301 * from.
2416 */ 2302 */
2417void 2303static void
2418remove_unpaid_objects (object *op, object *env) 2304drop_unpaid_items (object *op, object *env)
2419{ 2305{
2420 object *next;
2421
2422 while (op) 2306 while (op)
2423 { 2307 {
2424 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2308 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2425 2309
2426 if (QUERY_FLAG (op, FLAG_UNPAID)) 2310 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2429 esrv_del_item (env->contr, op->count); 2313 esrv_del_item (env->contr, op->count);
2430 2314
2431 op->insert_at (env); 2315 op->insert_at (env);
2432 } 2316 }
2433 else if (op->inv) 2317 else if (op->inv)
2434 remove_unpaid_objects (op->inv, env); 2318 drop_unpaid_items (op->inv, env);
2435 2319
2436 op = next; 2320 op = next;
2437 } 2321 }
2322}
2323
2324void
2325object::drop_unpaid_items ()
2326{
2327 if (!flag [FLAG_REMOVED])
2328 ::drop_unpaid_items (inv, this);
2438} 2329}
2439 2330
2440/* 2331/*
2441 * Returns pointer a static string containing gravestone text 2332 * Returns pointer a static string containing gravestone text
2442 * Moved from apply.c to player.c - player.c is what 2333 * Moved from apply.c to player.c - player.c is what
… …
2492 int rate_grace = 2000; 2383 int rate_grace = 2000;
2493 const int max_hp = 1; 2384 const int max_hp = 1;
2494 const int max_sp = 1; 2385 const int max_sp = 1;
2495 const int max_grace = 1; 2386 const int max_grace = 1;
2496 2387
2497 if (op->contr->outputs_sync) 2388 if (op->contr->hidden)
2389 {
2390 op->invisible = 1000;
2391 /* the socket code flashes the player visible/invisible
2392 * depending on the value of invisible, so we need to
2393 * alternate it here for it to work correctly.
2394 */
2395 if (pticks & 2)
2396 op->invisible--;
2498 { 2397 }
2499 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2398 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2500 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2399 {
2501 flush_output_element (op, &op->contr->outputs[i]); 2400 if (!op->invisible--)
2401 {
2402 make_visible (op);
2403 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2404 }
2502 } 2405 }
2503 2406
2504 if (op->contr->ns->state == ST_PLAYING) 2407 if (op->contr->ns->state == ST_PLAYING)
2505 { 2408 {
2506 /* these next three if clauses make it possible to SLOW DOWN 2409 /* these next three if clauses make it possible to SLOW DOWN
… …
2525 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2428 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2526 else 2429 else
2527 { 2430 {
2528 gen_grace = op->stats.maxgrace; 2431 gen_grace = op->stats.maxgrace;
2529 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2432 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2530 }
2531
2532 /* Regenerate Spell Points */
2533 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2534 {
2535 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2536 if (op->stats.sp < op->stats.maxsp)
2537 {
2538 op->stats.sp++;
2539 /* dms do not consume food */
2540 if (!QUERY_FLAG (op, FLAG_WIZ))
2541 {
2542 op->stats.food--;
2543 if (op->contr->digestion < 0)
2544 op->stats.food += op->contr->digestion;
2545 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2546 op->stats.food = last_food;
2547 }
2548 }
2549
2550 if (max_sp > 1)
2551 {
2552 over_sp = (gen_sp + 10) / rate_sp;
2553 if (over_sp > 0)
2554 {
2555 if (op->stats.sp < op->stats.maxsp)
2556 {
2557 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2558
2559 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2560 op->stats.sp--;
2561
2562 if (op->stats.sp > op->stats.maxsp)
2563 op->stats.sp = op->stats.maxsp;
2564 }
2565 op->last_sp = 0;
2566 }
2567 else
2568 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2569 }
2570 else
2571 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2572 } 2433 }
2573 2434
2574 /* Regenerate Grace */ 2435 /* Regenerate Grace */
2575 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2436 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2576 if (--op->last_grace < 0) 2437 if (--op->last_grace < 0)
… …
2597 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2458 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2598 } 2459 }
2599 /* wearing stuff doesn't detract from grace generation. */ 2460 /* wearing stuff doesn't detract from grace generation. */
2600 } 2461 }
2601 2462
2463 if (op->stats.food > 0)
2464 {
2602 /* Regenerate Hit Points */ 2465 /* Regenerate Spell Points */
2603 if (--op->last_heal < 0) 2466 if (!op->contr->golem && --op->last_sp < 0)
2604 {
2605 if (op->stats.hp < op->stats.maxhp)
2606 { 2467 {
2607 op->stats.hp++; 2468 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2608 /* dms do not consume food */ 2469
2609 if (!QUERY_FLAG (op, FLAG_WIZ)) 2470 if (op->stats.sp < op->stats.maxsp)
2610 { 2471 {
2472 op->stats.sp++;
2473
2474 /* dms do not consume food */
2475 if (!QUERY_FLAG (op, FLAG_WIZ))
2476 {
2611 op->stats.food--; 2477 op->stats.food--;
2478
2612 if (op->contr->digestion < 0) 2479 if (op->contr->digestion < 0)
2613 op->stats.food += op->contr->digestion; 2480 op->stats.food += op->contr->digestion;
2614 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2481 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2615 op->stats.food = last_food; 2482 op->stats.food = last_food;
2483 }
2616 } 2484 }
2617 }
2618 2485
2619 if (max_hp > 1) 2486 if (max_sp > 1)
2620 {
2621 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2622 if (over_hp > 0)
2623 { 2487 {
2624 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2488 over_sp = (gen_sp + 10) / rate_sp;
2489 if (over_sp > 0)
2490 {
2491 if (op->stats.sp < op->stats.maxsp)
2492 {
2493 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2494
2495 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2496 op->stats.sp--;
2497
2498 if (op->stats.sp > op->stats.maxsp)
2499 op->stats.sp = op->stats.maxsp;
2500 }
2501
2625 op->last_heal = 0; 2502 op->last_sp = 0;
2503 }
2504 else
2505 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2626 } 2506 }
2627 else 2507 else
2508 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2509 }
2510
2511 /* Regenerate Hit Points */
2512 if (--op->last_heal < 0)
2513 {
2514 if (op->stats.hp < op->stats.maxhp)
2628 { 2515 {
2629 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2516 op->stats.hp++;
2517
2518 /* dms do not consume food */
2519 if (!QUERY_FLAG (op, FLAG_WIZ))
2520 {
2521 op->stats.food--;
2522
2523 if (op->contr->digestion < 0)
2524 op->stats.food += op->contr->digestion;
2525 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526 op->stats.food = last_food;
2527 }
2630 } 2528 }
2529
2530 if (max_hp > 1)
2531 {
2532 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533
2534 if (over_hp > 0)
2535 {
2536 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2537 op->last_heal = 0;
2538 }
2539 else
2540 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2631 } 2541 }
2632 else 2542 else
2633 {
2634 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2543 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2635 } 2544 }
2636 } 2545 }
2637 2546
2638 /* Digestion */ 2547 /* Digestion */
2639 if (--op->last_eat < 0) 2548 if (--op->last_eat < 0)
2640 { 2549 {
2641#ifdef COZY_SERVER 2550 int bonus = max (0, op->contr->digestion),
2642 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2551 penalty = max (0, -op->contr->digestion);
2643 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2644#else
2645 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2646#endif
2647 2552
2648 if (op->contr->gen_hp > 0)
2649 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2553 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2650 else
2651 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2652 2554
2653 /* dms do not consume food */ 2555 /* dms do not consume food */
2654 if (!QUERY_FLAG (op, FLAG_WIZ)) 2556 if (!QUERY_FLAG (op, FLAG_WIZ))
2655 op->stats.food--; 2557 op->stats.food--;
2656 } 2558 }
… …
2683 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2585 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2684 manual_apply (op, flesh, 0); 2586 manual_apply (op, flesh, 0);
2685 } 2587 }
2686 } 2588 }
2687 2589
2688 while (op->stats.food < 0 && op->stats.hp >= 0) 2590 if (op->stats.food < 0)
2689 op->stats.food++, op->stats.hp--; 2591 {
2592 op->stats.hp += op->stats.food;
2593 op->stats.food = 0;
2594 }
2690 2595
2691 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2596 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2692 kill_player (op); 2597 kill_player (op);
2693 } 2598 }
2694} 2599}
… …
2699 * file. 2604 * file.
2700 */ 2605 */
2701void 2606void
2702kill_player (object *op) 2607kill_player (object *op)
2703{ 2608{
2609 int x, y;
2704 char buf[MAX_BUF]; 2610 char buf[MAX_BUF];
2705 int x, y;
2706
2707 //int i;
2708 maptile *map; /* this is for resurrection */ 2611 maptile *map; /* this is for resurrection */
2709
2710 /* int z;
2711 int num_stats_lose;
2712 int lost_a_stat;
2713 int lose_this_stat;
2714 int this_stat; */
2715 int will_kill_again; 2612 int will_kill_again;
2716 archetype *at; 2613 archetype *at;
2717 object *tmp; 2614 object *tmp;
2718 2615
2719 if (save_life (op)) 2616 if (save_life (op))
2720 return; 2617 return;
2721
2722 2618
2723 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2619 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2724 * in cities ONLY!!! It is very important that this doesn't get abused. 2620 * in cities ONLY!!! It is very important that this doesn't get abused.
2725 * Look at op_on_battleground() for more info --AndreasV 2621 * Look at op_on_battleground() for more info --AndreasV
2726 */ 2622 */
… …
2742 { 2638 {
2743 tmp->destroy (); 2639 tmp->destroy ();
2744 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2640 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2745 } 2641 }
2746 2642
2747 cure_disease (op, 0); /* remove any disease */ 2643 cure_disease (op, 0, 0); /* remove any disease */
2748 op->stats.hp = op->stats.maxhp; 2644 op->stats.hp = op->stats.maxhp;
2749 if (op->stats.food <= 0) 2645 if (op->stats.food <= 0)
2750 op->stats.food = 999; 2646 op->stats.food = 999;
2751 2647
2752 /* create a bodypart-trophy to make the winner happy */ 2648 /* create a bodypart-trophy to make the winner happy */
2753 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2649 if (object *tmp = arch_to_object (archetype::find ("finger")))
2754 { 2650 {
2755 sprintf (buf, "%s's finger", &op->name); 2651 tmp->name = format ("%s's finger" , &op->name);
2756 tmp->name = buf; 2652 tmp->name_pl = format ("%s's fingers", &op->name);
2757 sprintf (buf, " This finger has been cut off %s\n" 2653 tmp->msg = format (
2758 " the %s, when he was defeated at\n level %d by %s.\n", 2654 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2759 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2655 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2760 tmp->msg = buf; 2656 );
2761 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2657 tmp->value = 0, tmp->type = 0;
2762 tmp->materialname = NULL; 2658 tmp->materialname = "organics";
2763 op->insert_at (tmp, op); 2659 tmp->insert_at (op, tmp);
2764 } 2660 }
2765 2661
2766 /* teleport defeated player to new destination */ 2662 /* teleport defeated player to new destination */
2767 transfer_ob (op, x, y, 0, NULL); 2663 transfer_ob (op, x, y, 0, NULL);
2768 op->contr->braced = 0; 2664 op->contr->braced = 0;
… …
2772 INVOKE_PLAYER (DEATH, op->contr); 2668 INVOKE_PLAYER (DEATH, op->contr);
2773 2669
2774 command_kill_pets (op, 0); 2670 command_kill_pets (op, 0);
2775 2671
2776 if (op->stats.food < 0) 2672 if (op->stats.food < 0)
2777 {
2778 if (op->contr->explore)
2779 {
2780 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2781 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2782 op->stats.food = 999;
2783 return;
2784 }
2785 sprintf (buf, "%s starved to death.", &op->name);
2786 strcpy (op->contr->killer, "starvation"); 2673 strcpy (op->contr->killer, "starvation");
2787 }
2788 else
2789 {
2790 if (op->contr->explore)
2791 {
2792 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2793 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2794 op->stats.hp = op->stats.maxhp;
2795 return;
2796 }
2797 sprintf (buf, "%s died.", &op->name);
2798 }
2799 2674
2800 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2675 op->contr->play_sound (sound_find ("player_dies"));
2801 2676
2802 /* save the map location for corpse, gravestone */ 2677 /* save the map location for corpse, gravestone */
2803 x = op->x; 2678 x = op->x;
2804 y = op->y; 2679 y = op->y;
2805 map = op->map; 2680 map = op->map;
… …
2968 { 2843 {
2969 tmp->destroy (); 2844 tmp->destroy ();
2970 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2845 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2971 } 2846 }
2972 2847
2973 cure_disease (op, 0); /* remove any disease */ 2848 cure_disease (op, 0, 0); /* remove any disease */
2974 2849
2975 /*add_exp(op, (op->stats.exp * -0.20)); */ 2850 /*add_exp(op, (op->stats.exp * -0.20)); */
2976 apply_death_exp_penalty (op); 2851 apply_death_exp_penalty (op);
2977 if (op->stats.food < 100) 2852 if (op->stats.food < 100)
2978 op->stats.food = 900; 2853 op->stats.food = 900;
2979 op->stats.hp = op->stats.maxhp; 2854 op->stats.hp = op->stats.maxhp;
2980 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2855 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2981 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2856 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2982 2857
2983 /* 2858 /*
2984 * Check to see if the player is in a shop. IF so, then check to see if
2985 * the player has any unpaid items. If so, remove them and put them back 2859 * Check to see if the player has any unpaid items. If so, remove them
2986 * in the map. 2860 * and put them back in the map.
2987 */ 2861 */
2988 2862 op->drop_unpaid_items ();
2989 if (is_in_shop (op))
2990 remove_unpaid_objects (op->inv, op);
2991 2863
2992 /****************************************/ 2864 /****************************************/
2993 /* */ 2865 /* */
2994 /* Move player to his current respawn- */ 2866 /* Move player to his current respawn- */
2995 /* position (usually last savebed) */ 2867 /* position (usually last savebed) */
2996 /* */ 2868 /* */
2997 /****************************************/ 2869 /****************************************/
2998 2870
2999 enter_player_savebed (op); 2871 enter_player_savebed (op);
3000 2872
3001 /* Save the player before inserting the force to reduce
3002 * chance of abuse.
3003 */
3004 op->contr->braced = 0; 2873 op->contr->braced = 0;
3005 op->contr->save ();
3006 2874
3007 /* it is possible that the player has blown something up 2875 /* it is possible that the player has blown something up
3008 * at his savebed location, and that can have long lasting 2876 * at his savebed location, and that can have long lasting
3009 * spell effects. So first see if there is a spell effect 2877 * spell effects. So first see if there is a spell effect
3010 * on the space that might harm the player. 2878 * on the space that might harm the player.
… …
3019 object *force; 2887 object *force;
3020 int at; 2888 int at;
3021 2889
3022 force = get_archetype (FORCE_NAME); 2890 force = get_archetype (FORCE_NAME);
3023 /* 50 ticks should be enough time for the spell to abate */ 2891 /* 50 ticks should be enough time for the spell to abate */
3024 force->speed = 0.1; 2892 force->speed = 0.1f;
3025 force->speed_left = -5.0; 2893 force->speed_left = -5.f;
3026 SET_FLAG (force, FLAG_APPLIED); 2894 SET_FLAG (force, FLAG_APPLIED);
3027 for (at = 0; at < NROFATTACKS; at++) 2895 for (at = 0; at < NROFATTACKS; at++)
3028 if (will_kill_again & (1 << at)) 2896 if (will_kill_again & (1 << at))
3029 force->resist[at] = 100; 2897 force->resist[at] = 100;
3030 2898
… …
3039void 2907void
3040loot_object (object *op) 2908loot_object (object *op)
3041{ /* Grab and destroy some treasure */ 2909{ /* Grab and destroy some treasure */
3042 object *tmp, *tmp2, *next; 2910 object *tmp, *tmp2, *next;
3043 2911
3044 if (op->container) 2912 op->close_container (); /* close open sack first */
3045 esrv_apply_container (op, op->container); /* close open sack first */
3046 2913
3047 for (tmp = op->inv; tmp; tmp = next) 2914 for (tmp = op->inv; tmp; tmp = next)
3048 { 2915 {
3049 next = tmp->below; 2916 next = tmp->below;
3050 2917
3051 if (tmp->invisible) 2918 if (tmp->invisible)
3052 continue; 2919 continue;
3053 2920
3054 tmp->remove (); 2921 tmp->remove ();
3055 tmp->x = op->x, tmp->y = op->y; 2922 tmp->x = op->x, tmp->y = op->y;
2923
3056 if (tmp->type == CONTAINER) 2924 if (tmp->type == CONTAINER)
3057 { /* empty container to ground */ 2925 loot_object (tmp); /* empty container to ground */
3058 loot_object (tmp); 2926
3059 }
3060 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2927 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3061 { 2928 {
3062 if (tmp->nrof > 1) 2929 if (tmp->nrof > 1)
3063 { 2930 {
3064 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2931 tmp->decrease (rndm (1, tmp->nrof - 1));
3065 tmp2->destroy ();
3066 insert_ob_in_map (tmp, op->map, NULL, 0); 2932 insert_ob_in_map (tmp, op->map, NULL, 0);
3067 } 2933 }
3068 else 2934 else
3069 tmp->destroy (); 2935 tmp->destroy ();
3070 } 2936 }
… …
3076/* 2942/*
3077 * fix_weight(): Check recursively the weight of all players, and fix 2943 * fix_weight(): Check recursively the weight of all players, and fix
3078 * what needs to be fixed. Refresh windows and fix speed if anything 2944 * what needs to be fixed. Refresh windows and fix speed if anything
3079 * was changed. 2945 * was changed.
3080 */ 2946 */
3081
3082void 2947void
3083fix_weight (void) 2948fix_weight (void)
3084{ 2949{
3085 for_all_players (pl) 2950 for_all_players (pl)
3086 { 2951 {
3087 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2952 sint32 old = pl->ob->carrying;
3088 2953
3089 if (old == sum) 2954 pl->ob->update_weight ();
3090 continue; 2955
2956 if (old != pl->ob->carrying)
2957 {
3091 pl->ob->update_stats (); 2958 pl->ob->update_stats ();
3092 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2959 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2960 }
3093 } 2961 }
3094} 2962}
3095 2963
3096void 2964void
3097fix_luck (void) 2965fix_luck (void)
… …
3141void 3009void
3142make_visible (object *op) 3010make_visible (object *op)
3143{ 3011{
3144 op->hide = 0; 3012 op->hide = 0;
3145 op->invisible = 0; 3013 op->invisible = 0;
3014
3146 if (op->type == PLAYER) 3015 if (op->type == PLAYER)
3147 { 3016 {
3148 op->contr->tmp_invis = 0; 3017 op->contr->tmp_invis = 0;
3149 op->contr->invis_race = 0; 3018 op->contr->invis_race = 0;
3150 } 3019 }
3020
3151 update_object (op, UP_OBJ_FACE); 3021 update_object (op, UP_OBJ_CHANGE);
3152} 3022}
3153 3023
3154int 3024int
3155is_true_undead (object *op) 3025is_true_undead (object *op)
3156{ 3026{
3157 object *tmp = NULL;
3158
3159 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3027 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3160 return 1; 3028 return 1;
3161 3029
3162 return 0; 3030 return 0;
3163} 3031}
3164 3032
3165/* look at the surrounding terrain to determine 3033/* look at the surrounding terrain to determine
3166 * the hideability of this object. Positive levels 3034 * the hideability of this object. Positive levels
3167 * indicate greater hideability. 3035 * indicate greater hideability.
3168 */ 3036 */
3169
3170int 3037int
3171hideability (object *ob) 3038hideability (object *ob)
3172{ 3039{
3173 int i, level = 0, mflag; 3040 int i, level = 0, mflag;
3174 sint16 x, y; 3041 sint16 x, y;
… …
3184 * as bad as carrying a light on a pitch dark map */ 3051 * as bad as carrying a light on a pitch dark map */
3185 if (has_carried_lights (ob)) 3052 if (has_carried_lights (ob))
3186 level = -(10 + (2 * ob->map->darkness)); 3053 level = -(10 + (2 * ob->map->darkness));
3187 3054
3188 /* scan through all nearby squares for terrain to hide in */ 3055 /* scan through all nearby squares for terrain to hide in */
3189 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3056 for (i = 0, x = ob->x, y = ob->y;
3057 i <= SIZEOFFREE1;
3058 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3190 { 3059 {
3191 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3060 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3192 if (mflag & P_OUT_OF_MAP) 3061 if (mflag & P_OUT_OF_MAP)
3193 {
3194 continue; 3062 continue;
3195 } 3063
3196 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3064 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3197 level += 2; 3065 level += 2;
3198 else /* open terrain! */ 3066 else /* open terrain! */
3199 level -= 1; 3067 level -= 1;
3200 } 3068 }
… …
3208/* For Hidden creatures - a chance of becoming 'unhidden' 3076/* For Hidden creatures - a chance of becoming 'unhidden'
3209 * every time they move - as we subtract off 'invisibility' 3077 * every time they move - as we subtract off 'invisibility'
3210 * AND, for players, if they move into a ridiculously unhideable 3078 * AND, for players, if they move into a ridiculously unhideable
3211 * spot (surrounded by clear terrain in broad daylight). -b.t. 3079 * spot (surrounded by clear terrain in broad daylight). -b.t.
3212 */ 3080 */
3213
3214void 3081void
3215do_hidden_move (object *op) 3082do_hidden_move (object *op)
3216{ 3083{
3217 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3084 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3218 object *skop; 3085 object *skop;
… …
3222 3089
3223 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3090 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3224 3091
3225 /* its *extremely* hard to run and sneak/hide at the same time! */ 3092 /* its *extremely* hard to run and sneak/hide at the same time! */
3226 if (op->type == PLAYER && op->contr->run_on) 3093 if (op->type == PLAYER && op->contr->run_on)
3227 {
3228 if (!skop || num >= skop->level) 3094 if (!skop || num >= skop->level)
3229 { 3095 {
3230 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3096 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3231 make_visible (op); 3097 make_visible (op);
3232 return; 3098 return;
3233 } 3099 }
3234 else 3100 else
3235 num += 20; 3101 num += 20;
3236 } 3102
3237 num += op->map->difficulty; 3103 num += op->map->difficulty;
3238 hide = hideability (op); /* modify by terrain hidden level */ 3104 hide = hideability (op); /* modify by terrain hidden level */
3239 num -= hide; 3105 num -= hide;
3106
3240 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3107 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3241 { 3108 {
3242 make_visible (op); 3109 make_visible (op);
3243 if (op->type == PLAYER) 3110 if (op->type == PLAYER)
3244 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3111 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3245 } 3112 }
3246 else if (op->type == PLAYER && skop) 3113 else if (op->type == PLAYER && skop)
3247 {
3248 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3114 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3249 }
3250} 3115}
3251 3116
3252/* determine if who is standing near a hostile creature. */ 3117/* determine if who is standing near a hostile creature. */
3253 3118
3254int 3119int
… …
3302 * object op. This function works fine for monsters, 3167 * object op. This function works fine for monsters,
3303 * but we dont worry if the object isnt the top one in 3168 * but we dont worry if the object isnt the top one in
3304 * a pile (say a coin under a table would return "viewable" 3169 * a pile (say a coin under a table would return "viewable"
3305 * by this routine). Another question, should we be 3170 * by this routine). Another question, should we be
3306 * concerned with the direction the player is looking 3171 * concerned with the direction the player is looking
3307 * in? Realistically, most of use cant see stuff behind 3172 * in? Realistically, most of us can't see stuff behind
3308 * our backs...on the other hand, does the "facing" direction 3173 * our backs...on the other hand, does the "facing" direction
3309 * imply the way your head, or body is facing? Its possible 3174 * imply the way your head, or body is facing? It's possible
3310 * for them to differ. Sigh, this fctn could get a bit more complex. 3175 * for them to differ. Sigh, this fctn could get a bit more complex.
3311 * -b.t. 3176 * -b.t.
3312 * This function is now map tiling safe. 3177 * This function is now map tiling safe.
3313 */ 3178 */
3314
3315int 3179int
3316player_can_view (object *pl, object *op) 3180player_can_view (object *pl, object *op)
3317{ 3181{
3318 rv_vector rv; 3182 rv_vector rv;
3319 int dx, dy; 3183 int dx, dy;
… …
3331 3195
3332 get_rangevector (pl, op, &rv, 0x1); 3196 get_rangevector (pl, op, &rv, 0x1);
3333 3197
3334 /* starting with the 'head' part, lets loop 3198 /* starting with the 'head' part, lets loop
3335 * through the object and find if it has any 3199 * through the object and find if it has any
3336 * part that is in the los array but isnt on 3200 * part that is in the los array but isn't on
3337 * a blocked los square. 3201 * a blocked los square.
3338 * we use the archetype to figure out offsets. 3202 * we use the archetype to figure out offsets.
3339 */ 3203 */
3340 while (op) 3204 while (op)
3341 { 3205 {
3342 dx = rv.distance_x + op->arch->clone.x; 3206 dx = rv.distance_x + op->arch->x;
3343 dy = rv.distance_y + op->arch->clone.y; 3207 dy = rv.distance_y + op->arch->y;
3344 3208
3345 /* only the viewable area the player sees is updated by LOS 3209 /* only the viewable area the player sees is updated by LOS
3346 * code, so we need to restrict ourselves to that range of values 3210 * code, so we need to restrict ourselves to that range of values
3347 * for any meaningful values. 3211 * for any meaningful values.
3348 */ 3212 */
3349 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3213 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3350 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3214 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3351 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3215 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3352 return 1; 3216 return 1;
3217
3353 op = op->more; 3218 op = op->more;
3354 } 3219 }
3220
3355 return 0; 3221 return 0;
3356} 3222}
3357 3223
3358/* routine for both players and monsters. We call this when 3224/* routine for both players and monsters. We call this when
3359 * there is a possibility for our action distrubing our hiding 3225 * there is a possibility for our action distrubing our hiding
… …
3362 * return 0. 3228 * return 0.
3363 */ 3229 */
3364int 3230int
3365action_makes_visible (object *op) 3231action_makes_visible (object *op)
3366{ 3232{
3367
3368 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3233 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3369 { 3234 {
3370 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3235 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3371 return 0; 3236 return 0;
3372 3237
… …
3378 { 3243 {
3379 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3244 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3380 return 1; 3245 return 1;
3381 } 3246 }
3382 } 3247 }
3248
3383 return 0; 3249 return 0;
3384} 3250}
3385 3251
3386/* op_on_battleground - checks if the given object op (usually 3252/* op_on_battleground - checks if the given object op (usually
3387 * a player) is standing on a valid battleground-tile, 3253 * a player) is standing on a valid battleground-tile,
… …
3392 * Default is to do the same as before, so only people wanting to have different points need worry about this 3258 * Default is to do the same as before, so only people wanting to have different points need worry about this
3393 */ 3259 */
3394int 3260int
3395op_on_battleground (object *op, int *x, int *y) 3261op_on_battleground (object *op, int *x, int *y)
3396{ 3262{
3397 object *tmp;
3398
3399 /* A battleground-tile needs the following attributes to be valid: 3263 /* A battleground-tile needs the following attributes to be valid:
3400 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3264 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3401 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3265 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3402 * and the exit-coordinates sp/hp must both be > 0. 3266 * and the exit-coordinates sp/hp must both be > 0.
3403 * => The intention here is to prevent abuse of the battleground- 3267 * => The intention here is to prevent abuse of the battleground-
3404 * feature (like pickable or hidden battleground tiles). */ 3268 * feature (like pickable or hidden battleground tiles). */
3405 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3269 for (object *tmp = op->below; tmp; tmp = tmp->below)
3406 { 3270 {
3407 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3271 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3408 { 3272 {
3409 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3273 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3410 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3274 && tmp->type == BATTLEGROUND
3275 && tmp->name == shstr_battleground
3276 && EXIT_X (tmp) && EXIT_Y (tmp))
3411 { 3277 {
3412 /*before we assign the exit, check if this is a teambattle */ 3278 /* before we assign the exit, check if this is a teambattle */
3413 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3279 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3414 { 3280 {
3415 object *invtmp;
3416
3417 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3281 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3418 { 3282 {
3419 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3283 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3420 { 3284 {
3421 if (x != NULL && y != NULL) 3285 if (x && y)
3422 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3286 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3287
3423 return 1; 3288 return 1;
3424 } 3289 }
3425 } 3290 }
3426 } 3291 }
3292
3427 if (x != NULL && y != NULL) 3293 if (x && y)
3428 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3294 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3295
3429 return 1; 3296 return 1;
3430 } 3297 }
3431 } 3298 }
3432 } 3299 }
3300
3433 /* If we got here, did not find a battleground */ 3301 /* If we got here, did not find a battleground */
3434 return 0; 3302 return 0;
3435} 3303}
3436 3304
3437/* 3305/*
… …
3453 char buf[MAX_BUF]; /* tmp. string buffer */ 3321 char buf[MAX_BUF]; /* tmp. string buffer */
3454 int i = 0, j = 0; 3322 int i = 0, j = 0;
3455 3323
3456 /* get the appropriate treasurelist */ 3324 /* get the appropriate treasurelist */
3457 if (atnr == ATNR_FIRE) 3325 if (atnr == ATNR_FIRE)
3458 trlist = find_treasurelist ("dragon_ability_fire"); 3326 trlist = treasurelist::find (shstr_dragon_ability_fire);
3459 else if (atnr == ATNR_COLD) 3327 else if (atnr == ATNR_COLD)
3460 trlist = find_treasurelist ("dragon_ability_cold"); 3328 trlist = treasurelist::find (shstr_dragon_ability_cold);
3461 else if (atnr == ATNR_ELECTRICITY) 3329 else if (atnr == ATNR_ELECTRICITY)
3462 trlist = find_treasurelist ("dragon_ability_elec"); 3330 trlist = treasurelist::find (shstr_dragon_ability_elec);
3463 else if (atnr == ATNR_POISON) 3331 else if (atnr == ATNR_POISON)
3464 trlist = find_treasurelist ("dragon_ability_poison"); 3332 trlist = treasurelist::find (shstr_dragon_ability_poison);
3465 3333
3466 if (trlist == NULL || who->type != PLAYER) 3334 if (trlist == NULL || who->type != PLAYER)
3467 return; 3335 return;
3468 3336
3469 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3337 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3470 3338
3471 if (tr == NULL || tr->item == NULL) 3339 if (!tr || !tr->item)
3472 { 3340 {
3473 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3341 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3474 return; 3342 return;
3475 } 3343 }
3476 3344
3477 /* everything seems okay - now bring on the gift: */ 3345 /* everything seems okay - now bring on the gift: */
3478 item = &(tr->item->clone); 3346 item = tr->item;
3479 3347
3480 if (item->type == SPELL) 3348 if (item->type == SPELL)
3481 { 3349 {
3482 if (check_spell_known (who, item->name)) 3350 if (check_spell_known (who, item->name))
3483 return; 3351 return;
… …
3542 { 3410 {
3543 /* forces in the treasurelist can alter the player's stats */ 3411 /* forces in the treasurelist can alter the player's stats */
3544 object *skin; 3412 object *skin;
3545 3413
3546 /* first get the dragon skin force */ 3414 /* first get the dragon skin force */
3547 shstr_cmp dragon_skin_force ("dragon_skin_force");
3548 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3415 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3549 ; 3416 ;
3550 3417
3551 if (!skin) 3418 if (!skin)
3552 return; 3419 return;
3553 3420
… …
3601 * not readied. 3468 * not readied.
3602 */ 3469 */
3603void 3470void
3604player_unready_range_ob (player *pl, object *ob) 3471player_unready_range_ob (player *pl, object *ob)
3605{ 3472{
3606 rangetype i; 3473 if (pl->ob->current_weapon == ob)
3474 pl->ob->current_weapon = 0;
3607 3475
3608 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3476 if (pl->combat_ob == ob)
3609 { 3477 pl->combat_ob = 0;
3478
3610 if (pl->ranges[i] == ob) 3479 if (pl->ranged_ob == ob)
3611 { 3480 pl->ranged_ob = 0;
3612 pl->ranges[i] = NULL;
3613 if (pl->shoottype == i)
3614 {
3615 pl->shoottype = range_none;
3616 }
3617 }
3618 }
3619} 3481}
3482
3483sint8
3484player::visibility_at (maptile *map, int x, int y) const
3485{
3486 if (!ns)
3487 return 0;
3488
3489 int dx, dy;
3490 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3491 return 0;
3492
3493 x += dx - ns->current_x + ns->mapx / 2;
3494 y += dy - ns->current_y + ns->mapy / 2;
3495
3496 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3497 return 0;
3498
3499 return 100 - blocked_los [x][y];
3500}
3501
3502void
3503player::infobox (const char *title, const char *msg, int color)
3504{
3505 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3506}
3507
3508void
3509player::statusmsg (const char *msg, int color)
3510{
3511 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3512}
3513
3514void
3515player::failmsg (const char *msg, int color)
3516{
3517 play_sound (sound_find ("generic_failure"));
3518 statusmsg (msg, color);
3519}
3520

Diff Legend

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