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

Diff Legend

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