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