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

Diff Legend

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