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.82 by elmex, Wed Jan 3 02:30:52 2007 UTC vs.
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#include <algorithm> 32#include <algorithm>
34#include <functional> 33#include <functional>
35 34
36player * 35playervec players;
37find_player (const char *plname)
38{
39 for_all_players (pl)
40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
41 return pl;
42
43 return 0;
44}
45 36
46void 37void
47display_motd (const object *op) 38display_motd (const object *op)
48{ 39{
49 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
123 114
124 news[0] = '\0'; 115 news[0] = '\0';
125 subject[0] = '\0'; 116 subject[0] = '\0';
126 size = 0; 117 size = 0;
127 118
128 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
129 { 120 {
130 if (*buf == '#') 121 if (*buf == '#')
131 continue; 122 continue;
132 123
133 if (*buf == '%') 124 if (*buf == '%')
134 { /* send one news */ 125 { /* send one news */
135 if (size > 0) 126 if (size > 0)
136 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
128
137 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
138 strip_endline (subject); 130 strip_endline (subject);
139 size = 0; 131 size = 0;
140 news[0] = '\0'; 132 news[0] = '\0';
141 } 133 }
… …
150 size += strlen (buf); 142 size += strlen (buf);
151 } 143 }
152 } 144 }
153 145
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
157} 149}
158 150
159/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
160static void 152static void
… …
164 op->x = -1; 156 op->x = -1;
165 op->y = -1; 157 op->y = -1;
166} 158}
167 159
168void 160void
169player::enter_map () 161player::activate ()
170{ 162{
171 object *tmp = object::create (); 163 if (active)
164 return;
172 165
173 EXIT_PATH (tmp) = maplevel; 166 players.insert (this);
174 EXIT_X (tmp) = ob->x; 167 ob->remove ();
175 EXIT_Y (tmp) = ob->y; 168 ob->map = 0;
176 ob->enter_exit (tmp); 169 ob->activate_recursive ();
170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
171 add_friendly_object (ob);
172}
177 173
178 tmp->destroy (); 174void
175player::deactivate ()
176{
177 if (!active)
178 return;
179
180 terminate_all_pets (ob);
181 remove_friendly_object (ob);
182 ob->deactivate_recursive ();
183
184 if (ob->map)
185 maplevel = ob->map->path;
186
187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0;
190 party = 0;
191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193
194 players.erase (this);
179} 195}
180 196
181// connect the player with a specific client 197// connect the player with a specific client
182// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
183void 199void
184player::connect (client *ns) 200player::connect (client *ns)
185{ 201{
186 this->ns = ns; 202 this->ns = ns;
187 ns->pl = this; 203 ns->pl = this;
188 204
189 next = first_player; 205 run_on = 0;
190 first_player = this; 206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
191 208
192 ns->update_look = 0; 209 ns->update_look = 0;
193 ns->look_position = 0; 210 ns->look_position = 0;
194 211
195 clear_los (ob); 212 clear_los (this);
213
214 ns->reset_stats ();
196 215
197 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
200
201 if (!legal_range (ob, shoottype))
202 shoottype = range_none;
203 219
204 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
205 link_player_skills (ob); 221 link_player_skills (ob);
206 222
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208 224
209 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
210
211 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
212 * from the class, and not race. I don't see any way to get the class information
213 * to then update this. I don't think this will actually break anything - anyone
214 * that can use armour should be able to use a shield. What this may 'break'
215 * are features new characters get, eg, if someone starts up with a Q, they
216 * should be able to use a shield. However, old Q's won't get that advantage.
217 */
218 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219 SET_FLAG (ob, FLAG_USE_SHIELD);
220 226
221 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
223 { 229 {
224 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
225 231
226 shstr_cmp dragon_ability_force ("dragon_ability_force");
227 shstr_cmp dragon_skin_force ("dragon_skin_force");
228
229 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
230 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
231 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
232 abil = tmp; 235 abil = tmp;
233 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
234 skin = tmp; 237 skin = tmp;
235 238
236 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
237 } 240 }
238 241
239 CLEAR_FLAG (ob, FLAG_FRIENDLY);
240 add_friendly_object (ob);
241
242 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 243
246 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
247 245
248 ob->update_stats (); 246 ob->update_stats ();
247
249 ns->floorbox_update (); 248 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob); 249 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0); 250 esrv_add_spells (this, 0);
253 251
254 ob->activate_recursive (); 252 activate ();
255 enter_map ();
256 253
257 send_rules (ob); 254 send_rules (ob);
258 send_news (ob); 255 send_news (ob);
259 display_motd (ob); 256 display_motd (ob);
260 257
… …
264 261
265void 262void
266player::disconnect () 263player::disconnect ()
267{ 264{
268 if (ob) 265 if (ob)
269 ob->deactivate_recursive (); 266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270 270
271 //TODO: don't be so harsh and destroy :)
272 if (ns) 271 if (ns)
273 { 272 {
274 if (enable_save) 273 if (active)
275 {
276 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277 save (true);
278 }
279 275
280 INVOKE_PLAYER (DISCONNECT, this); 276 INVOKE_PLAYER (DISCONNECT, this);
281 277
282 client *ns = this->ns; 278 ns->reset_stats ();
283 ns->send_packet ("goodbye");
284 ns->flush ();
285 ns->pl = 0; 279 ns->pl = 0;
286 this->ns = 0; 280 ns = 0;
287
288 ns->destroy ();
289 destroy ();
290 } 281 }
282
283 observe = ob;
284
285 deactivate ();
291} 286}
292 287
293// the need for this function can be explained 288// the need for this function can be explained
294// by load_object not returning the object 289// by load_object not returning the object
295void 290void
296player::set_object (object *op) 291player::set_object (object *op)
297{ 292{
298 ob = op; 293 ob = observe = op;
299 ob->contr = this; /* this aren't yet in archetype */ 294 ob->contr = this; /* this aren't yet in archetype */
300 295
296 ob->speed = 1.0f;
301 ob->speed_left = 0.5; 297 ob->speed_left = 0.5f;
302 ob->speed = 1.0; 298
303 ob->direction = 5; /* So player faces south */ 299 ob->direction = 5; /* So player faces south */
304 ob->stats.wc = 2;
305 ob->run_away = 25; /* Then we panick... */
306 300
307 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;
308} 333}
309 334
310player::player () 335player::player ()
311{ 336{
312 /* There are some elements we want initialised to non zero value - 337 /* There are some elements we want initialised to non zero value -
313 * we deal with that below this point. 338 * we deal with that below this point.
314 */ 339 */
315 outputs_sync = 16; /* Every 2 seconds */ 340 outputs_sync = 4;
316 outputs_count = 8; /* Keeps present behaviour */ 341 outputs_count = 4;
317 unapply = unapply_nochoice; 342 unapply = unapply_nochoice;
318 343
319 savebed_map = first_map_path; /* Init. respawn position */ 344 savebed_map = first_map_path; /* Init. respawn position */
320 345
321 gen_sp_armour = 10; 346 gen_sp_armour = 10;
322 last_speed = -1;
323 shoottype = range_none;
324 bowtype = bow_normal; 347 bowtype = bow_normal;
325 petmode = pet_normal; 348 petmode = pet_normal;
326 listening = 10; 349 listening = 10;
327 usekeys = containers; 350 usekeys = containers;
328 last_weapon_sp = -1;
329 peaceful = 1; /* default peaceful */ 351 peaceful = 1; /* default peaceful */
330 do_los = 1; 352 do_los = 1;
331 353
332 /* we need to clear these to -1 and not zero - otherwise, 354 weapon_sp = 1.0f;
333 * if a player quits and starts a new character, we wont 355 weapon_sp_left = 0.5f;
334 * send new values to the client, as things like exp start
335 * at zero.
336 */
337 for (int i = 0; i < NUM_SKILLS; i++)
338 last_skill_exp[i] = -1;
339
340 for (int i = 0; i < NROFATTACKS; i++)
341 last_resist[i] = -1;
342
343 last_stats.exp = -1;
344 last_weight = (uint32) - 1;
345} 356}
346 357
347void 358void
348player::do_destroy () 359player::do_destroy ()
349{ 360{
350 disconnect (); 361 disconnect ();
351 362
352 save (false);
353 enable_save = false;
354
355 attachable::do_destroy (); 363 attachable::do_destroy ();
356
357 terminate_all_pets (ob);
358
359 if (first_player != this)
360 {
361 player *prev = first_player;
362
363 while (prev && prev->next && prev->next != this)
364 prev = prev->next;
365
366 if (prev->next != this)
367 {
368 LOG (llevError, "Free_player: Can't find previous player.\n");
369 abort ();
370 }
371
372 prev->next = next;
373 }
374 else
375 first_player = next;
376 364
377 if (ob) 365 if (ob)
378 { 366 {
379 ob->destroy_inv (false); 367 ob->destroy_inv (false);
380 ob->destroy (); 368 ob->destroy ();
381 } 369 }
370
371 ob = observe = 0;
382} 372}
383 373
384player::~player () 374player::~player ()
385{ 375{
386 /* Clear item stack */ 376 /* Clear item stack */
… …
395player::create () 385player::create ()
396{ 386{
397 player *pl = new player; 387 player *pl = new player;
398 388
399 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
400 set_first_map (pl->ob); 395 set_first_map (pl->ob);
401 396
402 return pl; 397 return pl;
403} 398}
404 399
… …
408 * Note: there MUST be at least one player archetype! 403 * Note: there MUST be at least one player archetype!
409 */ 404 */
410archetype * 405archetype *
411get_player_archetype (archetype *at) 406get_player_archetype (archetype *at)
412{ 407{
413 archetype *start = at; 408 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
414 409
415 for (;;) 410 for (;;)
416 { 411 {
417 if (at == NULL || at->next == NULL) 412 if (++i == archetypes.end ())
418 at = first_archetype; 413 i = archetypes.begin ();
419 else 414 else if (*i == at)
420 at = at->next; 415 cleanup ("not a single player archetype found");
421 416
422 if (at->clone.type == PLAYER) 417 if ((*i)->type == PLAYER)
423 return at; 418 return *i;
424
425 if (at == start)
426 {
427 LOG (llevError, "No Player archetypes\n");
428 exit (-1);
429 }
430 } 419 }
431} 420}
432 421
433object * 422object *
434get_nearest_player (object *mon) 423get_nearest_player (object *mon)
… …
436 object *op = NULL; 425 object *op = NULL;
437 objectlink *ol; 426 objectlink *ol;
438 unsigned lastdist; 427 unsigned lastdist;
439 rv_vector rv; 428 rv_vector rv;
440 429
441 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 430 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
442 { 431 {
443 /* We should not find free objects on this friendly list, but it
444 * does periodically happen. Given that, lets deal with it.
445 * While unlikely, it is possible the next object on the friendly
446 * list is also free, so encapsulate this in a while loop.
447 */
448 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
449 {
450 object *tmp = ol->ob;
451
452 /* Can't do much more other than log the fact, because the object
453 * itself will have been cleared.
454 */
455 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
456 ol = ol->next;
457 remove_friendly_object (tmp);
458 if (!ol)
459 return op;
460 }
461
462 /* Remove special check for player from this. First, it looks to cause
463 * some crashes (ol->ob->contr not set properly?), but secondly, a more
464 * complicated method of state checking would be needed in any case -
465 * as it was, a clever player could type quit, and the function would
466 * skip them over while waiting for confirmation. Remove
467 * on_same_map check, as can_detect_enemy also does this
468 */
469 if (!can_detect_enemy (mon, ol->ob, &rv)) 432 if (!can_detect_enemy (mon, ol->ob, &rv))
470 continue; 433 continue;
471 434
472 if (lastdist > rv.distance) 435 if (lastdist > rv.distance)
473 { 436 {
… …
549 x = mon->x; 512 x = mon->x;
550 y = mon->y; 513 y = mon->y;
551 m = mon->map; 514 m = mon->map;
552 dir = rv.direction; 515 dir = rv.direction;
553 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 */
554 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
555 /* 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. */
556 if (diff > max) 520 if (diff > max)
557 return 0; 521 return 0;
522
558 while (diff > 1 && max > 0) 523 while (diff > 1 && max > 0)
559 { 524 {
560 lastx = x; 525 lastx = x;
561 lasty = y; 526 lasty = y;
562 lastmap = m; 527 lastmap = m;
… …
644 max--; 609 max--;
645 lastdir = dir; 610 lastdir = dir;
646 if (!firstdir) 611 if (!firstdir)
647 firstdir = dir; 612 firstdir = dir;
648 } 613 }
614
649 if (diff <= 1) 615 if (diff <= 1)
650 { 616 {
651 /* Recalculate diff (distance) because we may not have actually 617 /* Recalculate diff (distance) because we may not have actually
652 * headed toward player for entire distance. 618 * headed toward player for entire distance.
653 */ 619 */
654 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 620 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
655 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));
656 } 622 }
623
657 if (diff > max) 624 if (diff > max)
658 return 0; 625 return 0;
659 } 626 }
627
660 /* 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 */
661 if (!max) 629 if (!max)
662 return 0; 630 return 0;
663 631
664 return firstdir; 632 return firstdir;
… …
778roll_stat (void) 746roll_stat (void)
779{ 747{
780 int a[4], i, j, k; 748 int a[4], i, j, k;
781 749
782 for (i = 0; i < 4; i++) 750 for (i = 0; i < 4; i++)
783 a[i] = (int) RANDOM () % 6 + 1; 751 a[i] = (int) rndm (6) + 1;
784 752
785 for (i = 0, j = 0, k = 7; i < 4; i++) 753 for (i = 0, j = 0, k = 7; i < 4; i++)
786 if (a[i] < k) 754 if (a[i] < k)
787 k = a[i], j = i; 755 k = a[i], j = i;
788 756
… …
794} 762}
795 763
796void 764void
797object::roll_stats () 765object::roll_stats ()
798{ 766{
799 int statsort [7]; 767 int statsort [NUM_STATS];
800 768
801 for (;;) 769 for (;;)
802 { 770 {
803 int sum = 0; 771 int sum = 0;
804 for (int i = 7; i--; ) 772 for (int i = NUM_STATS; i--; )
805 sum += statsort [i] = roll_stat (); 773 sum += statsort [i] = roll_stat ();
806 774
807 if (sum >= 82 && sum <= 116) 775 if (sum >= 82 && sum <= 116)
808 break; 776 break;
809 } 777 }
810 778
811 // Sort the stats so that rerolling is easier... 779 // Sort the stats so that rerolling is easier...
812 std::sort (statsort, statsort + 7, std::greater<int>()); 780 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
813 781
782 for (int i = 0; i < NUM_STATS; ++i)
814 stats.Str = statsort[0]; 783 stats.stat (i) = statsort [i];
815 stats.Dex = statsort[1];
816 stats.Con = statsort[2];
817 stats.Int = statsort[3];
818 stats.Wis = statsort[4];
819 stats.Pow = statsort[5];
820 stats.Cha = statsort[6];
821 784
822 stats.exp = 0; 785 stats.exp = 0;
823 stats.ac = 0; 786 stats.ac = 0;
824 787
825 stats.hp = stats.maxhp; 788 stats.hp = stats.maxhp;
… …
837} 800}
838 801
839void 802void
840object::swap_stats (int a, int b) 803object::swap_stats (int a, int b)
841{ 804{
842 int tmp = get_attr_value (&contr->orig_stats, a); 805 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
843 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
844 set_attr_value (&contr->orig_stats, b, tmp);
845 806
807 for (int i = 0; i < NUM_STATS; ++i)
846 stats.Str = contr->orig_stats.Str; 808 stats.stat (i) = contr->orig_stats.stat (i);
847 stats.Dex = contr->orig_stats.Dex;
848 stats.Con = contr->orig_stats.Con;
849 stats.Int = contr->orig_stats.Int;
850 stats.Wis = contr->orig_stats.Wis;
851 stats.Pow = contr->orig_stats.Pow;
852 stats.Cha = contr->orig_stats.Cha;
853 809
854 //TODO: the following code looks so borked and should, at the very least, 810 //TODO: the following code looks so borked and should, at the very least,
855 // be merged with the similar code in roll_stats 811 // be merged with the similar code in roll_stats
856 stats.ac = 0; 812 stats.ac = 0;
857 813
… …
888 * appropriate action with it (change race, or other things). 844 * appropriate action with it (change race, or other things).
889 * The function name is for historical reasons - now we have 845 * The function name is for historical reasons - now we have
890 * separate race and class; this actually changes the RACE, 846 * separate race and class; this actually changes the RACE,
891 * not the class. 847 * not the class.
892 */ 848 */
893int 849void
894key_change_class (object *op, char key) 850player::chargen_race_done ()
895{ 851{
896 int tmp_loop;
897
898 if (key == 'd' || key == 'D')
899 {
900 char buf[MAX_BUF];
901
902 /* this must before then initial items are given */ 852 /* this must before then initial items are given */
903 esrv_new_player (op->contr, op->weight + op->carrying); 853 esrv_new_player (ob->contr, ob->weight + ob->carrying);
904 854
905 treasurelist *tl = find_treasurelist ("starting_wealth"); 855 treasurelist *tl = treasurelist::find ("starting_wealth");
906 if (tl) 856 if (tl)
907 create_treasure (tl, op, 0, 0, 0); 857 create_treasure (tl, ob, 0, 0, 0);
908 858
909 INVOKE_PLAYER (BIRTH, op->contr); 859 INVOKE_PLAYER (BIRTH, ob->contr);
910 INVOKE_PLAYER (LOGIN, op->contr); 860 INVOKE_PLAYER (LOGIN, ob->contr);
911 861
912 op->contr->ns->state = ST_PLAYING; 862 ob->contr->ns->state = ST_PLAYING;
913 863
914 if (op->msg) 864 if (ob->msg)
915 op->msg = NULL; 865 ob->msg = 0;
916 866
917 /* We create this now because some of the unique maps will need it 867 /* We create this now because some of the unique maps will need it
918 * to save here. 868 * to save here.
919 */ 869 */
870 {
871 char buf[MAX_BUF];
920 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 872 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
921 make_path_to_file (buf); 873 make_path_to_file (buf);
874 }
922 875
923#ifdef AUTOSAVE
924 op->contr->last_save_tick = pticks;
925#endif
926 start_info (op); 876 start_info (ob);
927 CLEAR_FLAG (op, FLAG_WIZ); 877 CLEAR_FLAG (ob, FLAG_WIZ);
928 give_initial_items (op, op->randomitems); 878 give_initial_items (ob, ob->randomitems);
929 link_player_skills (op); 879 link_player_skills (ob);
930 esrv_send_inventory (op, op); 880 esrv_send_inventory (ob, ob);
931 op->update_stats (); 881 ob->update_stats ();
932 882
933 /* This moves the player to a different start map, if there 883 /* This moves the player to a different start map, if there
934 * is one for this race 884 * is one for this race
935 */ 885 */
936 if (*first_map_ext_path) 886 if (*first_map_ext_path)
937 { 887 {
938 object *tmp; 888 object *tmp;
939 char mapname[MAX_BUF]; 889 char mapname[MAX_BUF];
940 890
941 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 891 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
942 tmp = object::create (); 892 tmp = object::create ();
943 EXIT_PATH (tmp) = mapname; 893 EXIT_PATH (tmp) = mapname;
944 EXIT_X (tmp) = op->x; 894 EXIT_X (tmp) = ob->x;
945 EXIT_Y (tmp) = op->y; 895 EXIT_Y (tmp) = ob->y;
946 op->enter_exit (tmp); /* we don't really care if it succeeded; 896 ob->enter_exit (tmp); /* we don't really care if it succeeded;
947 * if the map isn't there, then stay on the 897 * if the map isn't there, then stay on the
948 * default initial map */ 898 * default initial map */
949 tmp->destroy (); 899 tmp->destroy ();
950 } 900 }
951 else 901 else
952 LOG (llevDebug, "first_map_ext_path not set\n"); 902 LOG (llevDebug, "first_map_ext_path not set\n");
903}
953 904
954 return 0; 905void
955 } 906player::chargen_race_next ()
956 907{
957 /* Following actually changes the race - this is the default command 908 /* Following actually changes the race - this is the default command
958 * if we don't match with one of the options above. 909 * if we don't match with one of the options above.
959 */ 910 */
960 911
961 tmp_loop = 0; 912 do
962 while (!tmp_loop)
963 { 913 {
964 shstr name = op->name; 914 shstr name = ob->name;
965 int x = op->x, y = op->y; 915 int x = ob->x, y = ob->y;
966 916
967 op->remove_statbonus (); 917 ob->remove_statbonus ();
968 op->remove (); 918 ob->remove ();
969 op->arch = get_player_archetype (op->arch); 919 ob->arch = get_player_archetype (ob->arch);
970 op->arch->clone.copy_to (op); 920 ob->arch->copy_to (ob);
971 op->instantiate (); 921 ob->instantiate ();
972 op->stats = op->contr->orig_stats; 922 ob->stats = ob->contr->orig_stats;
973 op->name = op->name_pl = name; 923 ob->name = ob->name_pl = name;
974 op->x = x; 924 ob->x = x;
975 op->y = y; 925 ob->y = y;
976 SET_ANIMATION (op, 2); /* So player faces south */ 926 SET_ANIMATION (ob, 2); /* So player faces south */
977 insert_ob_in_map (op, op->map, op, 0); 927 insert_ob_in_map (ob, ob->map, ob, 0);
978 assign (op->contr->title, op->arch->clone.name); 928 assign (ob->contr->title, ob->arch->object::name);
979 op->add_statbonus (); 929 ob->add_statbonus ();
980 tmp_loop = allowed_class (op);
981 } 930 }
931 while (!allowed_class (ob));
982 932
983 update_object (op, UP_OBJ_FACE); 933 update_object (ob, UP_OBJ_FACE);
984 esrv_update_item (UPD_FACE, op, op); 934 esrv_update_item (UPD_FACE, ob, ob);
985 op->update_stats (); 935 ob->update_stats ();
986 op->stats.hp = op->stats.maxhp; 936 ob->stats.hp = ob->stats.maxhp;
987 op->stats.sp = op->stats.maxsp; 937 ob->stats.sp = ob->stats.maxsp;
988 op->stats.grace = 0; 938 ob->stats.grace = 0;
989
990 if (op->msg)
991 new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994 return 0;
995}
996
997int
998key_confirm_quit (object *op, char key)
999{
1000 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001 {
1002 op->contr->ns->state = ST_PLAYING;
1003 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004 return 1;
1005 }
1006
1007 INVOKE_PLAYER (LOGOUT, op->contr);
1008 INVOKE_PLAYER (QUIT, op->contr);
1009
1010 op->contr->enable_save = false;
1011
1012 terminate_all_pets (op);
1013 op->remove ();
1014 op->direction = 0;
1015 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1016
1017 strcpy (op->contr->killer, "quit");
1018 check_score (op);
1019 op->contr->party = 0;
1020 op->contr->own_title[0] = '\0';
1021 op->contr->destroy ();
1022
1023 return 1;
1024} 939}
1025 940
1026void 941void
1027flee_player (object *op) 942flee_player (object *op)
1028{ 943{
… …
1075 /* Cornered, get rid of scared */ 990 /* Cornered, get rid of scared */
1076 CLEAR_FLAG (op, FLAG_SCARED); 991 CLEAR_FLAG (op, FLAG_SCARED);
1077 op->enemy = NULL; 992 op->enemy = NULL;
1078} 993}
1079 994
1080
1081/* check_pick sees if there is stuff to be picked up/picks up stuff. 995/* check_pick sees if there is stuff to be picked up/picks up stuff.
1082 * IT returns 1 if the player should keep on moving, 0 if he should 996 * It returns 1 if the player should keep on moving, 0 if he should
1083 * stop. 997 * stop.
1084 */ 998 */
1085int 999int
1086check_pick (object *op) 1000check_pick (object *op)
1087{ 1001{
1088 object *tmp, *next; 1002 object *tmp, *next;
1089 int stop = 0; 1003 int stop = 0;
1090 int j, k, wvratio; 1004 int wvratio;
1091 char putstring[128], tmpstr[16]; 1005 char putstring[128];
1092 1006
1093 /* if you're flying, you cna't pick up anything */ 1007 /* if you're flying, you cna't pick up anything */
1094 if (op->move_type & MOVE_FLYING) 1008 if (op->move_type & MOVE_FLYING)
1095 return 1; 1009 return 1;
1096 1010
… …
1164 if (tmp->name != NULL) 1078 if (tmp->name != NULL)
1165 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1079 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1166 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1080 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1167 else 1081 else
1168 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1082 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1169 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1083 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1170 1084
1171 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1085 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1172 } 1086 }
1173 1087
1174 /* philosophy: 1088 /* philosophy:
… …
1249 pick_up (op, tmp); 1163 pick_up (op, tmp);
1250 continue; 1164 continue;
1251 } 1165 }
1252 1166
1253 if (op->contr->mode & PU_READABLES) 1167 if (op->contr->mode & PU_READABLES)
1254 if (tmp->type == BOOK || tmp->type == SCROLL) 1168 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1255 { 1169 {
1256 pick_up (op, tmp); 1170 pick_up (op, tmp);
1257 continue; 1171 continue;
1258 } 1172 }
1259 1173
… …
1367 /* careful: chairs and tables are weapons! */ 1281 /* careful: chairs and tables are weapons! */
1368 if (op->contr->mode & PU_ALLWEAPON) 1282 if (op->contr->mode & PU_ALLWEAPON)
1369 { 1283 {
1370 if (tmp->type == WEAPON && tmp->name != NULL) 1284 if (tmp->type == WEAPON && tmp->name != NULL)
1371 { 1285 {
1372 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1286 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1373 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1287 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1374 { 1288 {
1375 pick_up (op, tmp); 1289 pick_up (op, tmp);
1376 continue; 1290 continue;
1377 } 1291 }
1378 } 1292 }
1379 1293
1380 if (tmp->type == WEAPON && tmp->name == NULL) 1294 if (tmp->type == WEAPON && tmp->name == NULL)
1381 { 1295 {
1382 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1296 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1383 { 1297 {
1384 pick_up (op, tmp); 1298 pick_up (op, tmp);
1385 continue; 1299 continue;
1386 } 1300 }
1387 } 1301 }
… …
1412 if (tmp->name != NULL) 1326 if (tmp->name != NULL)
1413 { 1327 {
1414 fprintf (stderr, "%s", tmp->name); 1328 fprintf (stderr, "%s", tmp->name);
1415 } 1329 }
1416 else 1330 else
1417 fprintf (stderr, "%s", tmp->arch->name); 1331 fprintf (stderr, "%s", tmp->arch->archname);
1418 fprintf (stderr, ",%d] = ", tmp->type); 1332 fprintf (stderr, ",%d] = ", tmp->type);
1419 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1333 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1420#endif 1334#endif
1421 continue; 1335 continue;
1422 } 1336 }
… …
1433 * found object is returned. 1347 * found object is returned.
1434 */ 1348 */
1435object * 1349object *
1436find_arrow (object *op, const char *type) 1350find_arrow (object *op, const char *type)
1437{ 1351{
1438 object *tmp = NULL; 1352 object *tmp = 0;
1439 1353
1440 for (op = op->inv; op; op = op->below) 1354 for (op = op->inv; op; op = op->below)
1441 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1355 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1442 tmp = find_arrow (op, type); 1356 tmp = find_arrow (splay (op), type);
1443 else if (op->type == ARROW && op->race == type) 1357 else if (op->type == ARROW && op->race == type)
1444 return op; 1358 return splay (op);
1359
1445 return tmp; 1360 return tmp;
1446} 1361}
1447 1362
1448/* 1363/*
1449 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1364 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1450 * against the target. A full test is not performed, simply a basic test 1365 * against the target. A full test is not performed, simply a basic test
1451 * of resistances. The archer is making a quick guess at what he sees down 1366 * of resistances. The archer is making a quick guess at what he sees down
1452 * the hall. Failing that it does it's best to pick the highest plus arrow. 1367 * the hall. Failing that it does it's best to pick the highest plus arrow.
1453 */ 1368 */
1454
1455object * 1369object *
1456find_better_arrow (object *op, object *target, const char *type, int *better) 1370find_better_arrow (object *op, object *target, const char *type, int *better)
1457{ 1371{
1458 object *tmp = NULL, *arrow, *ntmp; 1372 object *tmp = NULL, *arrow, *ntmp;
1459 int attacknum, attacktype, betterby = 0, i; 1373 int attacknum, attacktype, betterby = 0, i;
… …
1492 else 1406 else
1493 { 1407 {
1494 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1408 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1495 { 1409 {
1496 attacktype = 1 << attacknum; 1410 attacktype = 1 << attacknum;
1497 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1411 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1498 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1412 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1499 { 1413 {
1500 tmp = arrow; 1414 tmp = arrow;
1501 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1415 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1502 } 1416 }
1503 } 1417 }
1504 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1418 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1505 { 1419 {
1506 tmp = arrow; 1420 tmp = arrow;
… …
1525 * find_better_arrow to find a decent arrow to use. 1439 * find_better_arrow to find a decent arrow to use.
1526 * op = the shooter 1440 * op = the shooter
1527 * type = bow->race 1441 * type = bow->race
1528 * dir = fire direction 1442 * dir = fire direction
1529 */ 1443 */
1530
1531object * 1444object *
1532pick_arrow_target (object *op, const char *type, int dir) 1445pick_arrow_target (object *op, const char *type, int dir)
1533{ 1446{
1534 object *tmp = NULL; 1447 object *tmp = NULL;
1535 maptile *m; 1448 maptile *m;
… …
1600 */ 1513 */
1601int 1514int
1602fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1515fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1603{ 1516{
1604 object *left, *bow; 1517 object *left, *bow;
1605 int bowspeed, mflags; 1518 int mflags;
1606 maptile *m; 1519 maptile *m;
1607 1520
1608 if (!dir) 1521 if (!dir)
1609 { 1522 {
1610 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1523 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1611 return 0; 1524 return 0;
1612 } 1525 }
1613 1526
1614 if (op->type == PLAYER) 1527 if (op->contr)
1615 bow = op->contr->ranges[range_bow]; 1528 bow = op->current_weapon;
1616 else 1529 else
1617 { 1530 {
1618 for (bow = op->inv; bow; bow = bow->below) 1531 for (bow = op->inv; bow; bow = bow->below)
1619 /* Don't check for applied - monsters don't apply bows - in that way, they 1532 /* Don't check for applied - monsters don't apply bows - in that way, they
1620 * don't need to switch back and forth between bows and weapons. 1533 * don't need to switch back and forth between bows and weapons.
… …
1625 if (!bow) 1538 if (!bow)
1626 { 1539 {
1627 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1540 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1628 return 0; 1541 return 0;
1629 } 1542 }
1543
1544 // optimisation: move object to top so we will find it quickly again
1545 if (bow->below)
1546 {
1547 bow->remove ();
1548 op->insert (bow);
1549 }
1550
1630 } 1551 }
1631 1552
1632 if (!bow->race || !bow->skill) 1553 if (!bow->race || !bow->skill)
1633 { 1554 {
1634 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1555 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1635 return 0; 1556 return 0;
1636 } 1557 }
1637
1638 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1639
1640 /* penalize ROF for bestarrow */
1641 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1642 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1643
1644 if (bowspeed < 1)
1645 bowspeed = 1;
1646 1558
1647 if (arrow == NULL) 1559 if (arrow == NULL)
1648 { 1560 {
1649 if ((arrow = find_arrow (op, bow->race)) == NULL) 1561 if ((arrow = find_arrow (op, bow->race)) == NULL)
1650 { 1562 {
1651 if (op->type == PLAYER) 1563 if (op->type == PLAYER)
1652 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1564 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1653 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1565 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1654 else 1566 else
1655 CLEAR_FLAG (op, FLAG_READY_BOW); 1567 CLEAR_FLAG (op, FLAG_READY_BOW);
1568
1656 return 0; 1569 return 0;
1657 } 1570 }
1658 } 1571 }
1659 1572
1660 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1573 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1684 1597
1685 arrow->set_owner (op); 1598 arrow->set_owner (op);
1686 arrow->skill = bow->skill; 1599 arrow->skill = bow->skill;
1687 arrow->direction = dir; 1600 arrow->direction = dir;
1688 1601
1602 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1603 arrow->stats.hp = arrow->stats.dam;
1604 arrow->stats.grace = arrow->attacktype;
1605
1606 if (arrow->slaying)
1607 arrow->spellarg = strdup (arrow->slaying);
1608
1609#if 0
1610 if (player *pl = op->contr)
1611 {
1612 float speed = pl->weapon_sp;
1613
1614 /* penalize ROF for bestarrow */
1615 if (pl->bowtype == bow_bestarrow)
1616 speed *= .9f;
1617 else
1618 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1619
1620 op->speed_left += speed - op->speed;
1621 }
1622#endif
1623
1624 SET_ANIMATION (arrow, arrow->direction);
1625
1626 /* update the speed */
1627 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1628 + bow->stats.dam / 7.f;
1629
1630 arrow->set_speed (max (arrow->speed, 2.f));
1631 arrow->speed_left = 0;
1632
1633 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1634
1689 if (op->type == PLAYER) 1635 if (op->type == PLAYER)
1690 { 1636 {
1691 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1692 op->update_stats ();
1693 }
1694
1695 SET_ANIMATION (arrow, arrow->direction);
1696 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1697 arrow->stats.hp = arrow->stats.dam;
1698 arrow->stats.grace = arrow->attacktype;
1699 if (arrow->slaying != NULL)
1700 arrow->spellarg = strdup (arrow->slaying);
1701
1702 /* Note that this was different for monsters - they got their level
1703 * added to the damage. I think the strength bonus is more proper.
1704 */
1705
1706 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1707
1708 /* update the speed */
1709 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1710 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1711
1712 arrow->set_speed (max (arrow->speed, 1.0));
1713 arrow->speed_left = 0;
1714
1715 if (op->type == PLAYER)
1716 {
1717 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1719 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1637 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1638 wc -= dex_bonus[op->stats.Dex];
1639
1640 if (!arrow->slaying)
1641 arrow->slaying = op->slaying;
1642
1643 arrow->attacktype |= op->attacktype;
1722 } 1644 }
1723 else 1645 else
1724 { 1646 {
1725 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726 arrow->level = op->level; 1647 arrow->level = op->level;
1727 } 1648 arrow->stats.wc -= bow->magic;
1728 1649
1729 if (arrow->attacktype == AT_PHYSICAL) 1650 if (!arrow->slaying)
1651 arrow->slaying = bow->slaying;
1652
1730 arrow->attacktype |= bow->attacktype; 1653 arrow->attacktype |= bow->attacktype;
1654 }
1731 1655
1732 if (bow->slaying) 1656 wc -= arrow->level;
1733 arrow->slaying = bow->slaying; 1657 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1734 1658
1659 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1735 arrow->move_type = MOVE_FLY_LOW; 1660 arrow->move_type = MOVE_FLY_LOW;
1736 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1661 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1737 1662
1738 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1663 op->play_sound (sound_find ("fire_arrow"));
1739 m->insert (arrow, sx, sy, op); 1664 m->insert (arrow, sx, sy, op);
1740 1665
1741 if (!arrow->destroyed ()) 1666 if (!arrow->destroyed ())
1742 move_arrow (arrow); 1667 move_arrow (arrow);
1743 1668
… …
1764{ 1689{
1765 int ret = 0, wcmod = 0; 1690 int ret = 0, wcmod = 0;
1766 1691
1767 if (op->contr->bowtype == bow_bestarrow) 1692 if (op->contr->bowtype == bow_bestarrow)
1768 { 1693 {
1769 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1694 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1770 } 1695 }
1771 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1696 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1772 { 1697 {
1773 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1698 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1774 wcmod = -1; 1699 wcmod = -1;
… …
1784 else if (op->contr->bowtype == bow_spreadshot) 1709 else if (op->contr->bowtype == bow_spreadshot)
1785 { 1710 {
1786 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1711 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1787 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1712 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1788 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1713 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1789
1790 } 1714 }
1791 else 1715 else
1792 { 1716 {
1793 /* Simple case */ 1717 /* Simple case */
1794 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1718 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1795 } 1719 }
1720
1796 return ret; 1721 return ret;
1797} 1722}
1798
1799 1723
1800/* Fires a misc (wand/rod/horn) object in 'dir'. 1724/* Fires a misc (wand/rod/horn) object in 'dir'.
1801 * Broken apart from 'fire' to keep it more readable. 1725 * Broken apart from 'fire' to keep it more readable.
1802 */ 1726 */
1803void 1727void
1804fire_misc_object (object *op, int dir) 1728fire_misc_object (object *op, int dir)
1805{ 1729{
1806 object *item; 1730 object *item = op->contr->ranged_ob;
1807 1731
1808 if (!op->contr->ranges[range_misc]) 1732 if (!item)
1809 { 1733 {
1810 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1734 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1811 return; 1735 return;
1812 } 1736 }
1813 1737
1814 item = op->contr->ranges[range_misc];
1815 if (!item->inv) 1738 if (!item->inv)
1816 { 1739 {
1817 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1740 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1818 return; 1741 return;
1819 } 1742 }
1743
1744 if (!op->change_weapon (item))
1745 return;
1746
1820 if (item->type == WAND) 1747 if (item->type == WAND)
1821 { 1748 {
1822 if (item->stats.food <= 0) 1749 if (item->stats.food <= 0)
1823 { 1750 {
1824 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1751 op->contr->play_sound (sound_find ("wand_poof"));
1825 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1752 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1753
1826 return; 1754 return;
1827 } 1755 }
1828 } 1756 }
1829 else if (item->type == ROD || item->type == HORN) 1757 else if (item->type == ROD || item->type == HORN)
1830 { 1758 {
1831 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1759 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1832 { 1760 {
1833 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1761 op->contr->play_sound (sound_find ("wand_poof"));
1762
1834 if (item->type == ROD) 1763 if (item->type == ROD)
1835 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1764 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1836 else 1765 else
1837 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1766 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1767
1838 return; 1768 return;
1839 } 1769 }
1840 } 1770 }
1841 1771
1842 if (cast_spell (op, item, dir, item->inv, NULL)) 1772 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1849 object *tmp; 1779 object *tmp;
1850 1780
1851 if (item->arch) 1781 if (item->arch)
1852 { 1782 {
1853 CLEAR_FLAG (item, FLAG_ANIMATE); 1783 CLEAR_FLAG (item, FLAG_ANIMATE);
1854 item->face = item->arch->clone.face; 1784 item->face = item->arch->face;
1855 item->set_speed (0); 1785 item->set_speed (0);
1856 } 1786 }
1857 1787
1858 if ((tmp = item->in_player ())) 1788 if ((tmp = item->in_player ()))
1859 esrv_update_item (UPD_ANIM, tmp, item); 1789 esrv_update_item (UPD_ANIM, tmp, item);
… …
1864 } 1794 }
1865} 1795}
1866 1796
1867/* Received a fire command for the player - go and do it. 1797/* Received a fire command for the player - go and do it.
1868 */ 1798 */
1869void 1799bool
1870fire (object *op, int dir) 1800fire (object *op, int dir)
1871{ 1801{
1872 int spellcost = 0; 1802 int spellcost = 0;
1873 1803
1874 /* check for loss of invisiblity/hide */ 1804 /* check for loss of invisiblity/hide */
1875 if (action_makes_visible (op)) 1805 if (action_makes_visible (op))
1876 make_visible (op); 1806 make_visible (op);
1877 1807
1878 switch (op->contr->shoottype) 1808 player *pl = op->contr;
1809
1810 if (pl->golem)
1811 {
1812 control_golem (op->contr->golem, dir);
1813 return false;
1879 { 1814 }
1880 case range_none:
1881 return;
1882 1815
1883 case range_bow: 1816 object *ob = pl->ranged_ob;
1817
1818 if (!ob)
1819 return false;
1820
1821 if (!op->change_weapon (ob))
1822 return false;
1823
1824 if (op->speed_left > 0.f)
1825 --op->speed_left;
1826 else
1827 return false;
1828
1829 switch (ob->type)
1830 {
1831 case BOW:
1884 player_fire_bow (op, dir); 1832 player_fire_bow (op, dir);
1885 return; 1833 break;
1886 1834
1887 case range_magic: /* Casting spells */ 1835 case SPELL:
1888 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1836 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1889 return; 1837 break;
1890 1838
1891 case range_misc: 1839 case BUILDER:
1840 apply_map_builder (op, dir);
1841 break;
1842
1843 case SKILL:
1844 do_skill (op, op, ob, dir, 0);
1845 break;
1846
1847 default:
1892 fire_misc_object (op, dir); 1848 fire_misc_object (op, dir);
1893 return; 1849 break;
1894
1895 case range_golem: /* Control summoned monsters from scrolls */
1896 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1897 {
1898 op->contr->ranges[range_golem] = 0;
1899 op->contr->shoottype = range_none;
1900 }
1901 else
1902 control_golem (op->contr->ranges[range_golem], dir);
1903 return;
1904
1905 case range_skill:
1906 if (!op->chosen_skill)
1907 {
1908 if (op->type == PLAYER)
1909 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1910 return;
1911 }
1912 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1913 return;
1914 case range_builder:
1915 apply_map_builder (op, dir);
1916 return;
1917 default:
1918 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1919 return;
1920 } 1850 }
1921}
1922 1851
1923 1852 return true;
1853}
1924 1854
1925/* find_key 1855/* find_key
1926 * We try to find a key for the door as passed. If we find a key 1856 * We try to find a key for the door as passed. If we find a key
1927 * and successfully use it, we return the key, otherwise NULL 1857 * and successfully use it, we return the key, otherwise NULL
1928 * This function merges both normal and locked door, since the logic 1858 * This function merges both normal and locked door, since the logic
… …
1930 * pl is the player, 1860 * pl is the player,
1931 * inv is the objects inventory to searched 1861 * inv is the objects inventory to searched
1932 * door is the door we are trying to match against. 1862 * door is the door we are trying to match against.
1933 * This function can be called recursively to search containers. 1863 * This function can be called recursively to search containers.
1934 */ 1864 */
1935
1936object * 1865object *
1937find_key (object *pl, object *container, object *door) 1866find_key (object *pl, object *container, object *door)
1938{ 1867{
1939 object *tmp, *key; 1868 object *tmp, *key;
1940 1869
1941 /* Should not happen, but sanity checking is never bad */ 1870 /* Should not happen, but sanity checking is never bad */
1942 if (container->inv == NULL) 1871 if (!container->inv)
1943 return NULL; 1872 return 0;
1944 1873
1945 /* First, lets try to find a key in the top level inventory */ 1874 /* First, lets try to find a key in the top level inventory */
1946 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1875 for (tmp = container->inv; tmp; tmp = tmp->below)
1947 { 1876 {
1948 if (door->type == DOOR && tmp->type == KEY) 1877 if (door->type == DOOR && tmp->type == KEY)
1949 break; 1878 break;
1950 /* For sanity, we should really check door type, but other stuff 1879 /* For sanity, we should really check door type, but other stuff
1951 * (like containers) can be locked with special keys 1880 * (like containers) can be locked with special keys
1952 */ 1881 */
1953 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1882 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1954 break; 1883 break;
1955 } 1884 }
1885
1956 /* No key found - lets search inventories now */ 1886 /* No key found - lets search inventories now */
1957 /* If we find and use a key in an inventory, return at that time. 1887 /* If we find and use a key in an inventory, return at that time.
1958 * otherwise, if we search all the inventories and still don't find 1888 * otherwise, if we search all the inventories and still don't find
1959 * a key, return 1889 * a key, return
1960 */ 1890 */
1961 if (!tmp) 1891 if (!tmp)
1962 { 1892 {
1963 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1893 for (tmp = container->inv; tmp; tmp = tmp->below)
1964 { 1894 {
1965 /* No reason to search empty containers */ 1895 /* No reason to search empty containers */
1966 if (tmp->type == CONTAINER && tmp->inv) 1896 if (tmp->type == CONTAINER && tmp->inv)
1967 { 1897 {
1968 if ((key = find_key (pl, tmp, door)) != NULL) 1898 if ((key = find_key (pl, tmp, door)))
1969 return key; 1899 return key;
1970 } 1900 }
1971 } 1901 }
1902
1972 if (!tmp) 1903 if (!tmp)
1973 return NULL; 1904 return NULL;
1974 } 1905 }
1906
1975 /* We get down here if we have found a key. Now if its in a container, 1907 /* We get down here if we have found a key. Now if its in a container,
1976 * see if we actually want to use it 1908 * see if we actually want to use it
1977 */ 1909 */
1978 if (pl != container) 1910 if (pl != container)
1979 { 1911 {
… …
2000 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1932 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2001 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1933 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2002 return NULL; 1934 return NULL;
2003 } 1935 }
2004 } 1936 }
1937
2005 return tmp; 1938 return tmp;
2006} 1939}
2007 1940
2008/* moved door processing out of move_player_attack. 1941/* moved door processing out of move_player_attack.
2009 * returns 1 if player has opened the door with a key 1942 * returns 1 if player has opened the door with a key
… …
2011 * 0 otherwise 1944 * 0 otherwise
2012 */ 1945 */
2013static int 1946static int
2014player_attack_door (object *op, object *door) 1947player_attack_door (object *op, object *door)
2015{ 1948{
2016 /* If its a door, try to find a use a key. If we do destroy the door, 1949 /* If its a door, try to find a key. If we do destroy the door,
2017 * might as well return immediately as there is nothing more to do - 1950 * might as well return immediately as there is nothing more to do -
2018 * otherwise, we fall through to the rest of the code. 1951 * otherwise, we fall through to the rest of the code.
2019 */ 1952 */
2020 object *key = find_key (op, op, door); 1953 object *key = find_key (op, op, door);
2021 1954
2022 /* IF we found a key, do some extra work */ 1955 /* If we found a key, do some extra work */
2023 if (key) 1956 if (key)
2024 { 1957 {
2025 object *container = key->env; 1958 object *container = key->env;
2026 1959
2027 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2028 if (action_makes_visible (op)) 1960 if (action_makes_visible (op))
2029 make_visible (op); 1961 make_visible (op);
1962
2030 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1963 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2031 spring_trap (door->inv, op); 1964 spring_trap (door->inv, op);
1965
2032 if (door->type == DOOR) 1966 if (door->type == DOOR)
2033 {
2034 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1967 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2035 }
2036 else if (door->type == LOCKED_DOOR) 1968 else if (door->type == LOCKED_DOOR)
2037 { 1969 {
2038 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1970 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2039 remove_door2 (door); /* remove door without violence ;-) */ 1971 remove_door2 (door); /* remove door without violence ;-) */
2040 } 1972 }
1973
2041 /* Do this after we print the message */ 1974 /* Do this after we print the message */
2042 decrease_ob (key); /* Use up one of the keys */ 1975 decrease_ob (key); /* Use up one of the keys */
2043 /* Need to update the weight the container the key was in */ 1976 /* Need to update the weight the container the key was in */
2044 if (container != op) 1977 if (container != op)
2045 esrv_update_item (UPD_WEIGHT, op, container); 1978 esrv_update_item (UPD_WEIGHT, op, container);
1979
2046 return 1; /* Nothing more to do below */ 1980 return 1; /* Nothing more to do below */
2047 } 1981 }
2048 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
2049 { 1983 {
2050 /* Might as well return now - no other way to open this */ 1984 /* Might as well return now - no other way to open this */
2051 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1985 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2052 return 1; 1986 return 1;
2053 } 1987 }
1988
2054 return 0; 1989 return 0;
2055} 1990}
2056 1991
2057/* This function is just part of a breakup from move_player. 1992/* This function is just part of a breakup from move_player.
2058 * It should keep the code cleaner. 1993 * It should keep the code cleaner.
2059 * When this is called, the players direction has been updated 1994 * When this is called, the players direction has been updated
2060 * (taking into account confusion.) The player is also actually 1995 * (taking into account confusion.) The player is also actually
2061 * going to try and move (not fire weapons). 1996 * going to try and move (not fire weapons).
2062 */ 1997 */
2063void 1998bool
2064move_player_attack (object *op, int dir) 1999move_player_attack (object *op, int dir)
2065{ 2000{
2066 object *tmp, *mon;
2067 sint16 nx, ny;
2068 int on_battleground; 2001 int on_battleground;
2069 maptile *m;
2070 2002
2071 nx = freearr_x[dir] + op->x; 2003 sint16 nx = freearr_x[dir] + op->x;
2072 ny = freearr_y[dir] + op->y; 2004 sint16 ny = freearr_y[dir] + op->y;
2073 2005
2074 on_battleground = op_on_battleground (op, 0, 0); 2006 on_battleground = op_on_battleground (op, 0, 0);
2007
2008 if (out_of_map (op->map, nx, ny))
2009 return false;
2010
2011 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2012 {
2013 --op->speed_left;
2014 return true;
2015 }
2075 2016
2076 /* If braced, or can't move to the square, and it is not out of the 2017 /* If braced, or can't move to the square, and it is not out of the
2077 * map, attack it. Note order of if statement is important - don't 2018 * map, attack it. Note order of if statement is important - don't
2078 * want to be calling move_ob if braced, because move_ob will move the 2019 * want to be calling move_ob if braced, because move_ob will move the
2079 * player. This is a pretty nasty hack, because if we could 2020 * player. This is a pretty nasty hack, because if we could
2080 * move to some space, it then means that if we are braced, we should 2021 * move to some space, it then means that if we are braced, we should
2081 * do nothing at all. As it is, if we are braced, we go through 2022 * do nothing at all. As it is, if we are braced, we go through
2082 * quite a bit of processing. However, it probably is less than what 2023 * quite a bit of processing. However, it probably is less than what
2083 * move_ob uses. 2024 * move_ob uses.
2084 */ 2025 */
2085 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2026 maptile *m = op->map->xy_find (nx, ny);
2086 {
2087 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2088 {
2089 m = get_map_from_coord (op->map, &nx, &ny);
2090 if (!m)
2091 return; /* Don't think this should happen */
2092 }
2093 else
2094 m = op->map;
2095 2027
2096 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2097 {
2098 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2099 return;
2100 }
2101
2102 mon = 0;
2103 /* Go through all the objects, and find ones of interest. Only stop if 2028 /* Go through all the objects, and find ones of interest. Only stop if
2104 * we find a monster - that is something we know we want to attack. 2029 * we find a monster - that is something we know we want to attack.
2105 * if its a door or barrel (can roll) see if there may be monsters 2030 * if its a door or barrel (can roll) see if there may be monsters
2106 * on the space 2031 * on the space
2107 */ 2032 */
2108 while (tmp) 2033 object *mon;
2109 { 2034 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2110 if (tmp == op) 2035 {
2111 { 2036 if ((mon->flag [FLAG_ALIVE]
2112 tmp = tmp->above; 2037 || mon->type == LOCKED_DOOR
2113 continue; 2038 || mon->flag [FLAG_CAN_ROLL])
2114 }
2115
2116 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2117 {
2118 mon = tmp; 2039 && mon != op)
2119 break; 2040 break;
2120 } 2041 }
2121 2042
2122 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2123 mon = tmp;
2124
2125 tmp = tmp->above;
2126 }
2127
2128 if (!mon) /* This happens anytime the player tries to move */ 2043 if (!mon) /* This happens anytime the player tries to move */
2129 return; /* into a wall */ 2044 return false; /* into a wall */
2130 2045
2131 if (mon->head)
2132 mon = mon->head; 2046 mon = mon->head_ ();
2133 2047
2134 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2048 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2049 if (op->contr->weapon_sp_left > 0.f)
2135 if (player_attack_door (op, mon)) 2050 if (player_attack_door (op, mon))
2051 {
2052 --op->contr->weapon_sp_left;
2136 return; 2053 return true;
2054 }
2137 2055
2138 /* The following deals with possibly attacking peaceful 2056 /* The following deals with possibly attacking peaceful
2139 * or frienddly creatures. Basically, all players are considered 2057 * or friendly creatures. Basically, all players are considered
2140 * unaggressive. If the moving player has peaceful set, then the 2058 * unaggressive. If the moving player has peaceful set, then the
2141 * object should be pushed instead of attacked. It is assumed that 2059 * object should be pushed instead of attacked. It is assumed that
2142 * if you are braced, you will not attack friends accidently, 2060 * if you are braced, you will not attack friends accidently,
2143 * and thus will not push them. 2061 * and thus will not push them.
2144 */ 2062 */
2145 2063
2146 /* If the creature is a pet, push it even if the player is not 2064 /* If the creature is a pet, push it even if the player is not
2147 * peaceful. Our assumption is the creature is a pet if the 2065 * peaceful. Our assumption is the creature is a pet if the
2148 * player owns it and it is either friendly or unagressive. 2066 * player owns it and it is either friendly or unagressive.
2149 */ 2067 */
2150 if ((op->type == PLAYER) 2068 if (op->type == PLAYER
2151#if COZY_SERVER
2152 &&
2153 ((mon->owner && mon->owner->contr 2069 && ((mon->owner && mon->owner->contr
2154 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2070 && same_party (mon->owner->contr->party, op->contr->party))
2155#else
2156 && mon->owner == op 2071 || mon->owner == op)
2157#endif
2158 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2072 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2159 { 2073 {
2160 /* If we're braced, we don't want to switch places with it */ 2074 /* If we're braced, we don't want to switch places with it */
2161 if (op->contr->braced) 2075 if (op->contr->braced)
2162 return; 2076 return false;
2163 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2077
2078 if (op->speed_left > 0.f)
2079 {
2080 --op->speed_left;
2081
2082 op->play_sound (sound_find ("push_player"));
2164 (void) push_ob (mon, dir, op); 2083 push_ob (mon, dir, op);
2084
2165 if (op->contr->tmp_invis || op->hide) 2085 if (op->contr->tmp_invis || op->hide)
2166 make_visible (op); 2086 make_visible (op);
2087
2167 return; 2088 return true;
2168 } 2089 }
2090 else
2091 return false;
2092 }
2169 2093
2170 /* in certain circumstances, you shouldn't attack friendly 2094 /* in certain circumstances, you shouldn't attack friendly
2171 * creatures. Note that if you are braced, you can't push 2095 * creatures. Note that if you are braced, you can't push
2172 * someone, but put it inside this loop so that you won't 2096 * someone, but put it inside this loop so that you won't
2173 * attack them either. 2097 * attack them either.
2174 */ 2098 */
2175 if ((mon->type == PLAYER || mon->enemy != op) && 2099 if ((mon->type == PLAYER || mon->enemy != op)
2176 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2100 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2177#ifdef PROHIBIT_PLAYERKILL
2178 (op->contr->peaceful 2101 && ((op->contr->peaceful
2179 || (mon->type == PLAYER 2102 || (mon->type == PLAYER && mon->contr->peaceful))
2180 && mon->contr->
2181 peaceful)) &&
2182#else
2183 op->contr->peaceful &&
2184#endif
2185 !on_battleground)) 2103 && !on_battleground))
2104 {
2105 if (op->speed_left > 0.f)
2186 { 2106 {
2107 --op->speed_left;
2108
2187 if (!op->contr->braced) 2109 if (!op->contr->braced)
2188 { 2110 {
2189 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2111 op->play_sound (sound_find ("push_player"));
2190 (void) push_ob (mon, dir, op); 2112 push_ob (mon, dir, op);
2191 } 2113 }
2192 else 2114 else
2193 new_draw_info (0, 0, op, "You withhold your attack"); 2115 op->statusmsg ("You withhold your attack");
2194 2116
2195 if (op->contr->tmp_invis || op->hide) 2117 if (op->contr->tmp_invis || op->hide)
2196 make_visible (op); 2118 make_visible (op);
2197 }
2198 2119
2120 return true;
2121 }
2122 }
2199 /* If the object is a boulder or other rollable object, then 2123 /* If the object is a boulder or other rollable object, then
2200 * roll it if not braced. You can't roll it if you are braced. 2124 * roll it if not braced. You can't roll it if you are braced.
2201 */ 2125 */
2202 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2126 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2127 {
2128 if (op->speed_left > 0.f)
2203 { 2129 {
2130 --op->speed_left;
2131
2204 recursive_roll (mon, dir, op); 2132 recursive_roll (mon, dir, op);
2205 if (action_makes_visible (op)) 2133 if (action_makes_visible (op))
2206 make_visible (op); 2134 make_visible (op);
2207 }
2208 2135
2136 return true;
2137 }
2138 }
2209 /* Any generic living creature. Including things like doors. 2139 /* Any generic living creature. Including things like doors.
2210 * Way it works is like this: First, it must have some hit points 2140 * Way it works is like this: First, it must have some hit points
2211 * and be living. Then, it must be one of the following: 2141 * and be living. Then, it must be one of the following:
2212 * 1) Not a player, 2) A player, but of a different party. Note 2142 * 1) Not a player, 2) A player, but of a different party. Note
2213 * that party_number -1 is no party, so attacks can still happen. 2143 * that party_number -1 is no party, so attacks can still happen.
2214 */ 2144 */
2215
2216 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2145 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2217 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2146 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2218 { 2147 {
2219 2148 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2220 /* If the player hasn't hit something this tick, and does
2221 * so, give them speed boost based on weapon speed. Doing
2222 * it here is better than process_players2, which basically
2223 * incurred a 1 tick offset.
2224 */
2225 if (!op->contr->has_hit)
2226 { 2149 {
2227 op->speed_left += op->speed / op->contr->weapon_sp; 2150 --op->contr->weapon_sp_left;
2228
2229 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2230 }
2231 2151
2232 skill_attack (mon, op, 0, 0, 0); 2152 skill_attack (mon, op, 0, 0, 0);
2233
2234 /* If attacking another player, that player gets automatic
2235 * hitback, and doesn't loose luck either.
2236 * Disable hitback on the battleground or if the target is
2237 * the wiz.
2238 */
2239 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2240 {
2241 short luck = mon->stats.luck;
2242
2243 mon->contr->has_hit = 1;
2244 skill_attack (op, mon, 0, 0, 0);
2245 mon->stats.luck = luck;
2246 }
2247 2153
2248 if (action_makes_visible (op)) 2154 if (action_makes_visible (op))
2249 make_visible (op); 2155 make_visible (op);
2250 }
2251 } /* if player should attack something */
2252}
2253 2156
2254int 2157 return true;
2158 }
2159 }
2160
2161 return false;
2162}
2163
2164bool
2255move_player (object *op, int dir) 2165move_player (object *op, int dir)
2256{ 2166{
2257 int pick; 2167 int pick;
2258 2168
2259 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2169 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2260 return 0; 2170 return 0;
2261 2171
2262 /* Sanity check: make sure dir is valid */ 2172 /* Sanity check: make sure dir is valid */
2263 if ((dir < 0) || (dir >= 9)) 2173 if ((dir < 0) || (dir >= 9))
2264 { 2174 {
2265 LOG (llevError, "move_player: invalid direction %d\n", dir); 2175 LOG (llevError, "move_player: invalid direction %d\n", dir);
2266 return 0; 2176 return 0;
2267 } 2177 }
2268 2178
2269 /* peterm: added following line */ 2179 /* peterm: added following line */
2270 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2180 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2271 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2181 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2272 2182
2273 op->facing = dir; 2183 op->facing = dir;
2274 2184
2275 if (op->hide) 2185 if (op->hide)
2276 do_hidden_move (op); 2186 do_hidden_move (op);
2277 2187
2188 bool retval;
2189
2278 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2190 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2279 /*nop */ ; 2191 retval = RESULT_INT (0);
2280 else if (op->contr->fire_on) 2192 else if (op->contr->fire_on)
2281 fire (op, dir); 2193 retval = fire (op, dir);
2282 else 2194 else
2283 { 2195 {
2284 move_player_attack (op, dir); 2196 retval = move_player_attack (op, dir);
2285 pick = check_pick (op); 2197 pick = check_pick (op);
2286 } 2198 }
2287 2199
2288 /* Add special check for newcs players and fire on - this way, the 2200 /* Add special check for newcs players and fire on - this way, the
2289 * server can handle repeat firing. 2201 * server can handle repeat firing.
… …
2296 /* Update how the player looks. Use the facing, so direction may 2208 /* Update how the player looks. Use the facing, so direction may
2297 * get reset to zero. This allows for full animation capabilities 2209 * get reset to zero. This allows for full animation capabilities
2298 * for players. 2210 * for players.
2299 */ 2211 */
2300 animate_object (op, op->facing); 2212 animate_object (op, op->facing);
2301 return 0; 2213
2214 return retval;
2302} 2215}
2303 2216
2304/* This is similar to handle_player, below, but is only used by the 2217/* This is similar to handle_player, below, but is only used by the
2305 * new client/server stuff. 2218 * new client/server stuff.
2306 * This is sort of special, in that the new client/server actually uses 2219 * This is sort of special, in that the new client/server actually uses
2307 * the new speed values for commands. 2220 * the new speed values for commands.
2308 * 2221 *
2309 * Returns true if there are more actions we can do. 2222 * Returns true if there are more actions we can do. Should not do
2223 * many actions in a row, as that would be too unfair to other
2224 * players.
2310 */ 2225 */
2311int 2226bool
2312handle_newcs_player (object *op) 2227handle_newcs_player (object *op)
2313{ 2228{
2314 if (op->contr->hidden)
2315 {
2316 op->invisible = 1000;
2317 /* the socket code flashes the player visible/invisible
2318 * depending on the value of invisible, so we need to
2319 * alternate it here for it to work correctly.
2320 */
2321 if (pticks & 2)
2322 op->invisible--;
2323 }
2324 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2325 {
2326 op->invisible--;
2327 if (!op->invisible)
2328 {
2329 make_visible (op);
2330 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2331 }
2332 }
2333
2334 if (QUERY_FLAG (op, FLAG_SCARED)) 2229 if (QUERY_FLAG (op, FLAG_SCARED))
2335 { 2230 {
2336 flee_player (op); 2231 if (op->speed_left > 0.f)
2337 /* If player is still scared, that is his action for this tick */
2338 if (QUERY_FLAG (op, FLAG_SCARED))
2339 { 2232 {
2340 op->speed_left--; 2233 --op->speed_left;
2234 flee_player (op);
2235
2341 return 0; 2236 return true;
2342 } 2237 }
2238 else
2239 return false;
2343 } 2240 }
2344
2345 /* I've been seeing crashes where the golem has been destroyed, but
2346 * the player object still points to the defunct golem. The code that
2347 * destroys the golem looks correct, and it doesn't always happen, so
2348 * put this in a a workaround to clean up the golem pointer.
2349 */
2350 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2351 op->contr->ranges[range_golem] = 0;
2352 2241
2353 /* call this here - we also will call this in do_ericserver, but 2242 /* call this here - we also will call this in do_ericserver, but
2354 * the players time has been increased when doericserver has been 2243 * the players time has been increased when doericserver has been
2355 * called, so we recheck it here. 2244 * called, so we recheck it here.
2356 */ 2245 */
2357 op->contr->ns->handle_command (); 2246 if (op->contr->ns->handle_command ())
2358
2359 if (op->speed_left < 0)
2360 return 0; 2247 return true;
2361 2248
2362 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2249 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2363 {
2364 /* All move commands take 1 tick, at least for now */
2365 op->speed_left--;
2366
2367 /* Instead of all the stuff below, let move_player take care
2368 * of it. Also, some of the skill stuff is only put in
2369 * there, as well as the confusion stuff.
2370 */
2371 move_player (op, op->direction); 2250 return move_player (op, op->direction);
2372 if (op->speed_left > 0)
2373 return 1;
2374 else
2375 return 0;
2376 }
2377 2251
2378 return 0; 2252 return false;
2379} 2253}
2380 2254
2381int 2255int
2382save_life (object *op) 2256save_life (object *op)
2383{ 2257{
… …
2385 return 0; 2259 return 0;
2386 2260
2387 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2261 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2388 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2262 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2389 { 2263 {
2390 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2264 op->play_sound (sound_find ("ob_evaporate"));
2391 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2265 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2392 2266
2393 if (op->contr) 2267 if (op->contr)
2394 esrv_del_item (op->contr, tmp->count); 2268 esrv_del_item (op->contr, tmp->count);
2395 2269
… …
2415/* This goes throws the inventory and removes unpaid objects, and puts them 2289/* This goes throws the inventory and removes unpaid objects, and puts them
2416 * back in the map (location and map determined by values of env). This 2290 * back in the map (location and map determined by values of env). This
2417 * function will descend into containers. op is the object to start the search 2291 * function will descend into containers. op is the object to start the search
2418 * from. 2292 * from.
2419 */ 2293 */
2420void 2294static void
2421remove_unpaid_objects (object *op, object *env) 2295drop_unpaid_items (object *op, object *env)
2422{ 2296{
2423 object *next;
2424
2425 while (op) 2297 while (op)
2426 { 2298 {
2427 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2299 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2428 2300
2429 if (QUERY_FLAG (op, FLAG_UNPAID)) 2301 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2432 esrv_del_item (env->contr, op->count); 2304 esrv_del_item (env->contr, op->count);
2433 2305
2434 op->insert_at (env); 2306 op->insert_at (env);
2435 } 2307 }
2436 else if (op->inv) 2308 else if (op->inv)
2437 remove_unpaid_objects (op->inv, env); 2309 drop_unpaid_items (op->inv, env);
2438 2310
2439 op = next; 2311 op = next;
2440 } 2312 }
2313}
2314
2315void
2316object::drop_unpaid_items ()
2317{
2318 if (!flag [FLAG_REMOVED])
2319 ::drop_unpaid_items (inv, this);
2441} 2320}
2442 2321
2443/* 2322/*
2444 * Returns pointer a static string containing gravestone text 2323 * Returns pointer a static string containing gravestone text
2445 * Moved from apply.c to player.c - player.c is what 2324 * Moved from apply.c to player.c - player.c is what
… …
2495 int rate_grace = 2000; 2374 int rate_grace = 2000;
2496 const int max_hp = 1; 2375 const int max_hp = 1;
2497 const int max_sp = 1; 2376 const int max_sp = 1;
2498 const int max_grace = 1; 2377 const int max_grace = 1;
2499 2378
2500 if (op->contr->outputs_sync) 2379 if (op->contr->hidden)
2380 {
2381 op->invisible = 1000;
2382 /* the socket code flashes the player visible/invisible
2383 * depending on the value of invisible, so we need to
2384 * alternate it here for it to work correctly.
2385 */
2386 if (pticks & 2)
2387 op->invisible--;
2501 { 2388 }
2502 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2389 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2503 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2390 {
2504 flush_output_element (op, &op->contr->outputs[i]); 2391 if (!op->invisible--)
2392 {
2393 make_visible (op);
2394 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2395 }
2505 } 2396 }
2506 2397
2507 if (op->contr->ns->state == ST_PLAYING) 2398 if (op->contr->ns->state == ST_PLAYING)
2508 { 2399 {
2509 /* these next three if clauses make it possible to SLOW DOWN 2400 /* these next three if clauses make it possible to SLOW DOWN
… …
2528 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2419 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2529 else 2420 else
2530 { 2421 {
2531 gen_grace = op->stats.maxgrace; 2422 gen_grace = op->stats.maxgrace;
2532 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2423 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2533 }
2534
2535 /* Regenerate Spell Points */
2536 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2537 {
2538 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2539 if (op->stats.sp < op->stats.maxsp)
2540 {
2541 op->stats.sp++;
2542 /* dms do not consume food */
2543 if (!QUERY_FLAG (op, FLAG_WIZ))
2544 {
2545 op->stats.food--;
2546 if (op->contr->digestion < 0)
2547 op->stats.food += op->contr->digestion;
2548 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2549 op->stats.food = last_food;
2550 }
2551 }
2552
2553 if (max_sp > 1)
2554 {
2555 over_sp = (gen_sp + 10) / rate_sp;
2556 if (over_sp > 0)
2557 {
2558 if (op->stats.sp < op->stats.maxsp)
2559 {
2560 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2561
2562 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2563 op->stats.sp--;
2564
2565 if (op->stats.sp > op->stats.maxsp)
2566 op->stats.sp = op->stats.maxsp;
2567 }
2568 op->last_sp = 0;
2569 }
2570 else
2571 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2572 }
2573 else
2574 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2575 } 2424 }
2576 2425
2577 /* Regenerate Grace */ 2426 /* Regenerate Grace */
2578 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2427 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2579 if (--op->last_grace < 0) 2428 if (--op->last_grace < 0)
… …
2600 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2449 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2601 } 2450 }
2602 /* wearing stuff doesn't detract from grace generation. */ 2451 /* wearing stuff doesn't detract from grace generation. */
2603 } 2452 }
2604 2453
2454 if (op->stats.food > 0)
2455 {
2605 /* Regenerate Hit Points */ 2456 /* Regenerate Spell Points */
2606 if (--op->last_heal < 0) 2457 if (!op->contr->golem && --op->last_sp < 0)
2607 {
2608 if (op->stats.hp < op->stats.maxhp)
2609 { 2458 {
2610 op->stats.hp++; 2459 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2611 /* dms do not consume food */ 2460
2612 if (!QUERY_FLAG (op, FLAG_WIZ)) 2461 if (op->stats.sp < op->stats.maxsp)
2613 { 2462 {
2463 op->stats.sp++;
2464
2465 /* dms do not consume food */
2466 if (!QUERY_FLAG (op, FLAG_WIZ))
2467 {
2614 op->stats.food--; 2468 op->stats.food--;
2469
2615 if (op->contr->digestion < 0) 2470 if (op->contr->digestion < 0)
2616 op->stats.food += op->contr->digestion; 2471 op->stats.food += op->contr->digestion;
2617 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2472 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2618 op->stats.food = last_food; 2473 op->stats.food = last_food;
2474 }
2619 } 2475 }
2620 }
2621 2476
2622 if (max_hp > 1) 2477 if (max_sp > 1)
2623 {
2624 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2625 if (over_hp > 0)
2626 { 2478 {
2627 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2479 over_sp = (gen_sp + 10) / rate_sp;
2480 if (over_sp > 0)
2481 {
2482 if (op->stats.sp < op->stats.maxsp)
2483 {
2484 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2485
2486 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2487 op->stats.sp--;
2488
2489 if (op->stats.sp > op->stats.maxsp)
2490 op->stats.sp = op->stats.maxsp;
2491 }
2492
2628 op->last_heal = 0; 2493 op->last_sp = 0;
2494 }
2495 else
2496 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2629 } 2497 }
2630 else 2498 else
2499 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2500 }
2501
2502 /* Regenerate Hit Points */
2503 if (--op->last_heal < 0)
2504 {
2505 if (op->stats.hp < op->stats.maxhp)
2631 { 2506 {
2632 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2507 op->stats.hp++;
2508
2509 /* dms do not consume food */
2510 if (!QUERY_FLAG (op, FLAG_WIZ))
2511 {
2512 op->stats.food--;
2513
2514 if (op->contr->digestion < 0)
2515 op->stats.food += op->contr->digestion;
2516 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2517 op->stats.food = last_food;
2518 }
2633 } 2519 }
2520
2521 if (max_hp > 1)
2522 {
2523 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2524
2525 if (over_hp > 0)
2526 {
2527 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2528 op->last_heal = 0;
2529 }
2530 else
2531 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2634 } 2532 }
2635 else 2533 else
2636 {
2637 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2534 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2638 } 2535 }
2639 } 2536 }
2640 2537
2641 /* Digestion */ 2538 /* Digestion */
2642 if (--op->last_eat < 0) 2539 if (--op->last_eat < 0)
2643 { 2540 {
2644#ifdef COZY_SERVER 2541 int bonus = max (0, op->contr->digestion),
2645 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2542 penalty = max (0, -op->contr->digestion);
2646 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2647#else
2648 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2649#endif
2650 2543
2651 if (op->contr->gen_hp > 0)
2652 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2544 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2653 else
2654 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2655 2545
2656 /* dms do not consume food */ 2546 /* dms do not consume food */
2657 if (!QUERY_FLAG (op, FLAG_WIZ)) 2547 if (!QUERY_FLAG (op, FLAG_WIZ))
2658 op->stats.food--; 2548 op->stats.food--;
2659 } 2549 }
… …
2686 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2576 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2687 manual_apply (op, flesh, 0); 2577 manual_apply (op, flesh, 0);
2688 } 2578 }
2689 } 2579 }
2690 2580
2691 while (op->stats.food < 0 && op->stats.hp >= 0) 2581 if (op->stats.food < 0)
2692 op->stats.food++, op->stats.hp--; 2582 {
2583 op->stats.hp += op->stats.food;
2584 op->stats.food = 0;
2585 }
2693 2586
2694 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2587 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2695 kill_player (op); 2588 kill_player (op);
2696 } 2589 }
2697} 2590}
… …
2702 * file. 2595 * file.
2703 */ 2596 */
2704void 2597void
2705kill_player (object *op) 2598kill_player (object *op)
2706{ 2599{
2600 int x, y;
2707 char buf[MAX_BUF]; 2601 char buf[MAX_BUF];
2708 int x, y;
2709
2710 //int i;
2711 maptile *map; /* this is for resurrection */ 2602 maptile *map; /* this is for resurrection */
2712
2713 /* int z;
2714 int num_stats_lose;
2715 int lost_a_stat;
2716 int lose_this_stat;
2717 int this_stat; */
2718 int will_kill_again; 2603 int will_kill_again;
2719 archetype *at; 2604 archetype *at;
2720 object *tmp; 2605 object *tmp;
2721 2606
2722 if (save_life (op)) 2607 if (save_life (op))
2723 return; 2608 return;
2724
2725 2609
2726 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2610 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2727 * in cities ONLY!!! It is very important that this doesn't get abused. 2611 * in cities ONLY!!! It is very important that this doesn't get abused.
2728 * Look at op_on_battleground() for more info --AndreasV 2612 * Look at op_on_battleground() for more info --AndreasV
2729 */ 2613 */
… …
2745 { 2629 {
2746 tmp->destroy (); 2630 tmp->destroy ();
2747 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2631 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2748 } 2632 }
2749 2633
2750 cure_disease (op, 0); /* remove any disease */ 2634 cure_disease (op, 0, 0); /* remove any disease */
2751 op->stats.hp = op->stats.maxhp; 2635 op->stats.hp = op->stats.maxhp;
2752 if (op->stats.food <= 0) 2636 if (op->stats.food <= 0)
2753 op->stats.food = 999; 2637 op->stats.food = 999;
2754 2638
2755 /* create a bodypart-trophy to make the winner happy */ 2639 /* create a bodypart-trophy to make the winner happy */
2756 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2640 if (object *tmp = arch_to_object (archetype::find ("finger")))
2757 { 2641 {
2758 sprintf (buf, "%s's finger", &op->name); 2642 tmp->name = format ("%s's finger" , &op->name);
2759 tmp->name = buf; 2643 tmp->name_pl = format ("%s's fingers", &op->name);
2760 sprintf (buf, " This finger has been cut off %s\n" 2644 tmp->msg = format (
2761 " the %s, when he was defeated at\n level %d by %s.\n", 2645 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2762 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2646 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2763 tmp->msg = buf; 2647 );
2764 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2648 tmp->value = 0, tmp->type = 0;
2765 tmp->materialname = NULL; 2649 tmp->materialname = "organics";
2766 op->insert_at (tmp, op); 2650 tmp->insert_at (op, tmp);
2767 } 2651 }
2768 2652
2769 /* teleport defeated player to new destination */ 2653 /* teleport defeated player to new destination */
2770 transfer_ob (op, x, y, 0, NULL); 2654 transfer_ob (op, x, y, 0, NULL);
2771 op->contr->braced = 0; 2655 op->contr->braced = 0;
… …
2775 INVOKE_PLAYER (DEATH, op->contr); 2659 INVOKE_PLAYER (DEATH, op->contr);
2776 2660
2777 command_kill_pets (op, 0); 2661 command_kill_pets (op, 0);
2778 2662
2779 if (op->stats.food < 0) 2663 if (op->stats.food < 0)
2780 {
2781 if (op->contr->explore)
2782 {
2783 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2784 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2785 op->stats.food = 999;
2786 return;
2787 }
2788 sprintf (buf, "%s starved to death.", &op->name);
2789 strcpy (op->contr->killer, "starvation"); 2664 strcpy (op->contr->killer, "starvation");
2790 }
2791 else
2792 {
2793 if (op->contr->explore)
2794 {
2795 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2796 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2797 op->stats.hp = op->stats.maxhp;
2798 return;
2799 }
2800 sprintf (buf, "%s died.", &op->name);
2801 }
2802 2665
2803 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2666 op->contr->play_sound (sound_find ("player_dies"));
2804 2667
2805 /* save the map location for corpse, gravestone */ 2668 /* save the map location for corpse, gravestone */
2806 x = op->x; 2669 x = op->x;
2807 y = op->y; 2670 y = op->y;
2808 map = op->map; 2671 map = op->map;
… …
2971 { 2834 {
2972 tmp->destroy (); 2835 tmp->destroy ();
2973 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2836 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2974 } 2837 }
2975 2838
2976 cure_disease (op, 0); /* remove any disease */ 2839 cure_disease (op, 0, 0); /* remove any disease */
2977 2840
2978 /*add_exp(op, (op->stats.exp * -0.20)); */ 2841 /*add_exp(op, (op->stats.exp * -0.20)); */
2979 apply_death_exp_penalty (op); 2842 apply_death_exp_penalty (op);
2980 if (op->stats.food < 100) 2843 if (op->stats.food < 100)
2981 op->stats.food = 900; 2844 op->stats.food = 900;
2982 op->stats.hp = op->stats.maxhp; 2845 op->stats.hp = op->stats.maxhp;
2983 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2984 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2985 2848
2986 /* 2849 /*
2987 * Check to see if the player is in a shop. IF so, then check to see if
2988 * the player has any unpaid items. If so, remove them and put them back 2850 * Check to see if the player has any unpaid items. If so, remove them
2989 * in the map. 2851 * and put them back in the map.
2990 */ 2852 */
2991 2853 op->drop_unpaid_items ();
2992 if (is_in_shop (op))
2993 remove_unpaid_objects (op->inv, op);
2994 2854
2995 /****************************************/ 2855 /****************************************/
2996 /* */ 2856 /* */
2997 /* Move player to his current respawn- */ 2857 /* Move player to his current respawn- */
2998 /* position (usually last savebed) */ 2858 /* position (usually last savebed) */
2999 /* */ 2859 /* */
3000 /****************************************/ 2860 /****************************************/
3001 2861
3002 enter_player_savebed (op); 2862 enter_player_savebed (op);
3003 2863
3004 /* Save the player before inserting the force to reduce
3005 * chance of abuse.
3006 */
3007 op->contr->braced = 0; 2864 op->contr->braced = 0;
3008 op->contr->save ();
3009 2865
3010 /* it is possible that the player has blown something up 2866 /* it is possible that the player has blown something up
3011 * at his savebed location, and that can have long lasting 2867 * at his savebed location, and that can have long lasting
3012 * spell effects. So first see if there is a spell effect 2868 * spell effects. So first see if there is a spell effect
3013 * on the space that might harm the player. 2869 * on the space that might harm the player.
… …
3022 object *force; 2878 object *force;
3023 int at; 2879 int at;
3024 2880
3025 force = get_archetype (FORCE_NAME); 2881 force = get_archetype (FORCE_NAME);
3026 /* 50 ticks should be enough time for the spell to abate */ 2882 /* 50 ticks should be enough time for the spell to abate */
3027 force->speed = 0.1; 2883 force->speed = 0.1f;
3028 force->speed_left = -5.0; 2884 force->speed_left = -5.f;
3029 SET_FLAG (force, FLAG_APPLIED); 2885 SET_FLAG (force, FLAG_APPLIED);
3030 for (at = 0; at < NROFATTACKS; at++) 2886 for (at = 0; at < NROFATTACKS; at++)
3031 if (will_kill_again & (1 << at)) 2887 if (will_kill_again & (1 << at))
3032 force->resist[at] = 100; 2888 force->resist[at] = 100;
3033 2889
… …
3042void 2898void
3043loot_object (object *op) 2899loot_object (object *op)
3044{ /* Grab and destroy some treasure */ 2900{ /* Grab and destroy some treasure */
3045 object *tmp, *tmp2, *next; 2901 object *tmp, *tmp2, *next;
3046 2902
3047 if (op->container) 2903 op->close_container (); /* close open sack first */
3048 esrv_apply_container (op, op->container); /* close open sack first */
3049 2904
3050 for (tmp = op->inv; tmp; tmp = next) 2905 for (tmp = op->inv; tmp; tmp = next)
3051 { 2906 {
3052 next = tmp->below; 2907 next = tmp->below;
3053 2908
3054 if (tmp->invisible) 2909 if (tmp->invisible)
3055 continue; 2910 continue;
3056 2911
3057 tmp->remove (); 2912 tmp->remove ();
3058 tmp->x = op->x, tmp->y = op->y; 2913 tmp->x = op->x, tmp->y = op->y;
2914
3059 if (tmp->type == CONTAINER) 2915 if (tmp->type == CONTAINER)
3060 { /* empty container to ground */ 2916 loot_object (tmp); /* empty container to ground */
3061 loot_object (tmp); 2917
3062 }
3063 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2918 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3064 { 2919 {
3065 if (tmp->nrof > 1) 2920 if (tmp->nrof > 1)
3066 { 2921 {
3067 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2922 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3068 tmp2->destroy (); 2923 tmp2->destroy ();
… …
3079/* 2934/*
3080 * fix_weight(): Check recursively the weight of all players, and fix 2935 * fix_weight(): Check recursively the weight of all players, and fix
3081 * what needs to be fixed. Refresh windows and fix speed if anything 2936 * what needs to be fixed. Refresh windows and fix speed if anything
3082 * was changed. 2937 * was changed.
3083 */ 2938 */
3084
3085void 2939void
3086fix_weight (void) 2940fix_weight (void)
3087{ 2941{
3088 for_all_players (pl) 2942 for_all_players (pl)
3089 { 2943 {
… …
3144void 2998void
3145make_visible (object *op) 2999make_visible (object *op)
3146{ 3000{
3147 op->hide = 0; 3001 op->hide = 0;
3148 op->invisible = 0; 3002 op->invisible = 0;
3003
3149 if (op->type == PLAYER) 3004 if (op->type == PLAYER)
3150 { 3005 {
3151 op->contr->tmp_invis = 0; 3006 op->contr->tmp_invis = 0;
3152 op->contr->invis_race = 0; 3007 op->contr->invis_race = 0;
3153 } 3008 }
3009
3154 update_object (op, UP_OBJ_FACE); 3010 update_object (op, UP_OBJ_CHANGE);
3155} 3011}
3156 3012
3157int 3013int
3158is_true_undead (object *op) 3014is_true_undead (object *op)
3159{ 3015{
3160 object *tmp = NULL;
3161
3162 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3016 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3163 return 1; 3017 return 1;
3164 3018
3165 return 0; 3019 return 0;
3166} 3020}
3167 3021
3168/* look at the surrounding terrain to determine 3022/* look at the surrounding terrain to determine
3169 * the hideability of this object. Positive levels 3023 * the hideability of this object. Positive levels
3170 * indicate greater hideability. 3024 * indicate greater hideability.
3171 */ 3025 */
3172
3173int 3026int
3174hideability (object *ob) 3027hideability (object *ob)
3175{ 3028{
3176 int i, level = 0, mflag; 3029 int i, level = 0, mflag;
3177 sint16 x, y; 3030 sint16 x, y;
… …
3211/* For Hidden creatures - a chance of becoming 'unhidden' 3064/* For Hidden creatures - a chance of becoming 'unhidden'
3212 * every time they move - as we subtract off 'invisibility' 3065 * every time they move - as we subtract off 'invisibility'
3213 * AND, for players, if they move into a ridiculously unhideable 3066 * AND, for players, if they move into a ridiculously unhideable
3214 * spot (surrounded by clear terrain in broad daylight). -b.t. 3067 * spot (surrounded by clear terrain in broad daylight). -b.t.
3215 */ 3068 */
3216
3217void 3069void
3218do_hidden_move (object *op) 3070do_hidden_move (object *op)
3219{ 3071{
3220 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3072 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3221 object *skop; 3073 object *skop;
… …
3225 3077
3226 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3078 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3227 3079
3228 /* its *extremely* hard to run and sneak/hide at the same time! */ 3080 /* its *extremely* hard to run and sneak/hide at the same time! */
3229 if (op->type == PLAYER && op->contr->run_on) 3081 if (op->type == PLAYER && op->contr->run_on)
3230 {
3231 if (!skop || num >= skop->level) 3082 if (!skop || num >= skop->level)
3232 { 3083 {
3233 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3084 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3234 make_visible (op); 3085 make_visible (op);
3235 return; 3086 return;
3236 } 3087 }
3237 else 3088 else
3238 num += 20; 3089 num += 20;
3239 } 3090
3240 num += op->map->difficulty; 3091 num += op->map->difficulty;
3241 hide = hideability (op); /* modify by terrain hidden level */ 3092 hide = hideability (op); /* modify by terrain hidden level */
3242 num -= hide; 3093 num -= hide;
3094
3243 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3095 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3244 { 3096 {
3245 make_visible (op); 3097 make_visible (op);
3246 if (op->type == PLAYER) 3098 if (op->type == PLAYER)
3247 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3099 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3248 } 3100 }
3249 else if (op->type == PLAYER && skop) 3101 else if (op->type == PLAYER && skop)
3250 {
3251 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3102 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3252 }
3253} 3103}
3254 3104
3255/* determine if who is standing near a hostile creature. */ 3105/* determine if who is standing near a hostile creature. */
3256 3106
3257int 3107int
… …
3305 * object op. This function works fine for monsters, 3155 * object op. This function works fine for monsters,
3306 * but we dont worry if the object isnt the top one in 3156 * but we dont worry if the object isnt the top one in
3307 * a pile (say a coin under a table would return "viewable" 3157 * a pile (say a coin under a table would return "viewable"
3308 * by this routine). Another question, should we be 3158 * by this routine). Another question, should we be
3309 * concerned with the direction the player is looking 3159 * concerned with the direction the player is looking
3310 * in? Realistically, most of use cant see stuff behind 3160 * in? Realistically, most of us can't see stuff behind
3311 * our backs...on the other hand, does the "facing" direction 3161 * our backs...on the other hand, does the "facing" direction
3312 * imply the way your head, or body is facing? Its possible 3162 * imply the way your head, or body is facing? It's possible
3313 * for them to differ. Sigh, this fctn could get a bit more complex. 3163 * for them to differ. Sigh, this fctn could get a bit more complex.
3314 * -b.t. 3164 * -b.t.
3315 * This function is now map tiling safe. 3165 * This function is now map tiling safe.
3316 */ 3166 */
3317
3318int 3167int
3319player_can_view (object *pl, object *op) 3168player_can_view (object *pl, object *op)
3320{ 3169{
3321 rv_vector rv; 3170 rv_vector rv;
3322 int dx, dy; 3171 int dx, dy;
… …
3334 3183
3335 get_rangevector (pl, op, &rv, 0x1); 3184 get_rangevector (pl, op, &rv, 0x1);
3336 3185
3337 /* starting with the 'head' part, lets loop 3186 /* starting with the 'head' part, lets loop
3338 * through the object and find if it has any 3187 * through the object and find if it has any
3339 * part that is in the los array but isnt on 3188 * part that is in the los array but isn't on
3340 * a blocked los square. 3189 * a blocked los square.
3341 * we use the archetype to figure out offsets. 3190 * we use the archetype to figure out offsets.
3342 */ 3191 */
3343 while (op) 3192 while (op)
3344 { 3193 {
3345 dx = rv.distance_x + op->arch->clone.x; 3194 dx = rv.distance_x + op->arch->x;
3346 dy = rv.distance_y + op->arch->clone.y; 3195 dy = rv.distance_y + op->arch->y;
3347 3196
3348 /* only the viewable area the player sees is updated by LOS 3197 /* only the viewable area the player sees is updated by LOS
3349 * code, so we need to restrict ourselves to that range of values 3198 * code, so we need to restrict ourselves to that range of values
3350 * for any meaningful values. 3199 * for any meaningful values.
3351 */ 3200 */
3352 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3201 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3353 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3202 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3354 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3203 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3355 return 1; 3204 return 1;
3205
3356 op = op->more; 3206 op = op->more;
3357 } 3207 }
3208
3358 return 0; 3209 return 0;
3359} 3210}
3360 3211
3361/* routine for both players and monsters. We call this when 3212/* routine for both players and monsters. We call this when
3362 * there is a possibility for our action distrubing our hiding 3213 * there is a possibility for our action distrubing our hiding
… …
3365 * return 0. 3216 * return 0.
3366 */ 3217 */
3367int 3218int
3368action_makes_visible (object *op) 3219action_makes_visible (object *op)
3369{ 3220{
3370
3371 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3221 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3372 { 3222 {
3373 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3223 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3374 return 0; 3224 return 0;
3375 3225
… …
3381 { 3231 {
3382 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3232 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3383 return 1; 3233 return 1;
3384 } 3234 }
3385 } 3235 }
3236
3386 return 0; 3237 return 0;
3387} 3238}
3388 3239
3389/* op_on_battleground - checks if the given object op (usually 3240/* op_on_battleground - checks if the given object op (usually
3390 * a player) is standing on a valid battleground-tile, 3241 * a player) is standing on a valid battleground-tile,
… …
3395 * Default is to do the same as before, so only people wanting to have different points need worry about this 3246 * Default is to do the same as before, so only people wanting to have different points need worry about this
3396 */ 3247 */
3397int 3248int
3398op_on_battleground (object *op, int *x, int *y) 3249op_on_battleground (object *op, int *x, int *y)
3399{ 3250{
3400 object *tmp;
3401
3402 /* A battleground-tile needs the following attributes to be valid: 3251 /* A battleground-tile needs the following attributes to be valid:
3403 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3252 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3404 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3253 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3405 * and the exit-coordinates sp/hp must both be > 0. 3254 * and the exit-coordinates sp/hp must both be > 0.
3406 * => The intention here is to prevent abuse of the battleground- 3255 * => The intention here is to prevent abuse of the battleground-
3407 * feature (like pickable or hidden battleground tiles). */ 3256 * feature (like pickable or hidden battleground tiles). */
3408 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3257 for (object *tmp = op->below; tmp; tmp = tmp->below)
3409 { 3258 {
3410 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3259 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3411 { 3260 {
3412 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3261 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3413 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3262 && tmp->type == BATTLEGROUND
3263 && tmp->name == shstr_battleground
3264 && EXIT_X (tmp) && EXIT_Y (tmp))
3414 { 3265 {
3415 /*before we assign the exit, check if this is a teambattle */ 3266 /* before we assign the exit, check if this is a teambattle */
3416 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3267 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3417 { 3268 {
3418 object *invtmp;
3419
3420 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3269 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3421 { 3270 {
3422 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3271 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3423 { 3272 {
3424 if (x != NULL && y != NULL) 3273 if (x && y)
3425 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3274 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3275
3426 return 1; 3276 return 1;
3427 } 3277 }
3428 } 3278 }
3429 } 3279 }
3280
3430 if (x != NULL && y != NULL) 3281 if (x && y)
3431 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3282 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3283
3432 return 1; 3284 return 1;
3433 } 3285 }
3434 } 3286 }
3435 } 3287 }
3288
3436 /* If we got here, did not find a battleground */ 3289 /* If we got here, did not find a battleground */
3437 return 0; 3290 return 0;
3438} 3291}
3439 3292
3440/* 3293/*
… …
3456 char buf[MAX_BUF]; /* tmp. string buffer */ 3309 char buf[MAX_BUF]; /* tmp. string buffer */
3457 int i = 0, j = 0; 3310 int i = 0, j = 0;
3458 3311
3459 /* get the appropriate treasurelist */ 3312 /* get the appropriate treasurelist */
3460 if (atnr == ATNR_FIRE) 3313 if (atnr == ATNR_FIRE)
3461 trlist = find_treasurelist ("dragon_ability_fire"); 3314 trlist = treasurelist::find (shstr_dragon_ability_fire);
3462 else if (atnr == ATNR_COLD) 3315 else if (atnr == ATNR_COLD)
3463 trlist = find_treasurelist ("dragon_ability_cold"); 3316 trlist = treasurelist::find (shstr_dragon_ability_cold);
3464 else if (atnr == ATNR_ELECTRICITY) 3317 else if (atnr == ATNR_ELECTRICITY)
3465 trlist = find_treasurelist ("dragon_ability_elec"); 3318 trlist = treasurelist::find (shstr_dragon_ability_elec);
3466 else if (atnr == ATNR_POISON) 3319 else if (atnr == ATNR_POISON)
3467 trlist = find_treasurelist ("dragon_ability_poison"); 3320 trlist = treasurelist::find (shstr_dragon_ability_poison);
3468 3321
3469 if (trlist == NULL || who->type != PLAYER) 3322 if (trlist == NULL || who->type != PLAYER)
3470 return; 3323 return;
3471 3324
3472 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3325 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3476 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3329 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3477 return; 3330 return;
3478 } 3331 }
3479 3332
3480 /* everything seems okay - now bring on the gift: */ 3333 /* everything seems okay - now bring on the gift: */
3481 item = &(tr->item->clone); 3334 item = tr->item;
3482 3335
3483 if (item->type == SPELL) 3336 if (item->type == SPELL)
3484 { 3337 {
3485 if (check_spell_known (who, item->name)) 3338 if (check_spell_known (who, item->name))
3486 return; 3339 return;
… …
3545 { 3398 {
3546 /* forces in the treasurelist can alter the player's stats */ 3399 /* forces in the treasurelist can alter the player's stats */
3547 object *skin; 3400 object *skin;
3548 3401
3549 /* first get the dragon skin force */ 3402 /* first get the dragon skin force */
3550 shstr_cmp dragon_skin_force ("dragon_skin_force");
3551 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3403 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3552 ; 3404 ;
3553 3405
3554 if (!skin) 3406 if (!skin)
3555 return; 3407 return;
3556 3408
… …
3604 * not readied. 3456 * not readied.
3605 */ 3457 */
3606void 3458void
3607player_unready_range_ob (player *pl, object *ob) 3459player_unready_range_ob (player *pl, object *ob)
3608{ 3460{
3609 rangetype i; 3461 if (pl->ob->current_weapon == ob)
3462 pl->ob->current_weapon = 0;
3610 3463
3611 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3464 if (pl->combat_ob == ob)
3612 { 3465 pl->combat_ob = 0;
3466
3613 if (pl->ranges[i] == ob) 3467 if (pl->ranged_ob == ob)
3614 { 3468 pl->ranged_ob = 0;
3615 pl->ranges[i] = NULL;
3616 if (pl->shoottype == i)
3617 {
3618 pl->shoottype = range_none;
3619 }
3620 }
3621 }
3622} 3469}
3470
3471sint8
3472player::visibility_at (maptile *map, int x, int y) const
3473{
3474 if (!ns)
3475 return 0;
3476
3477 int dx, dy;
3478 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3479 return 0;
3480
3481 x += dx - ns->current_x + ns->mapx / 2;
3482 y += dy - ns->current_y + ns->mapy / 2;
3483
3484 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3485 return 0;
3486
3487 return 100 - blocked_los [x][y];
3488}
3489
3490void
3491player::infobox (const char *title, const char *msg, int color)
3492{
3493 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3494}
3495
3496void
3497player::statusmsg (const char *msg, int color)
3498{
3499 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3500}
3501
3502void
3503player::failmsg (const char *msg, int color)
3504{
3505 play_sound (sound_find ("generic_failure"));
3506 statusmsg (msg, color);
3507}
3508

Diff Legend

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