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