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.89 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 2008 UTC

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