ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.97 by root, Mon Jan 8 22:32:11 2007 UTC vs.
Revision 1.160 by root, Wed Aug 22 20:46:46 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <pwd.h>
27#include <sproto.h> 25#include <sproto.h>
28#include <sounds.h> 26#include <sounds.h>
29#include <living.h> 27#include <living.h>
30#include <object.h> 28#include <object.h>
31#include <spells.h> 29#include <spells.h>
… …
116 114
117 news[0] = '\0'; 115 news[0] = '\0';
118 subject[0] = '\0'; 116 subject[0] = '\0';
119 size = 0; 117 size = 0;
120 118
121 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
122 { 120 {
123 if (*buf == '#') 121 if (*buf == '#')
124 continue; 122 continue;
125 123
126 if (*buf == '%') 124 if (*buf == '%')
127 { /* send one news */ 125 { /* send one news */
128 if (size > 0) 126 if (size > 0)
129 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
130 128
131 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
132 strip_endline (subject); 130 strip_endline (subject);
133 size = 0; 131 size = 0;
134 news[0] = '\0'; 132 news[0] = '\0';
… …
144 size += strlen (buf); 142 size += strlen (buf);
145 } 143 }
146 } 144 }
147 145
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
151} 149}
152 150
153/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
154static void 152static void
155set_first_map (object *op) 153set_first_map (object *op)
156{ 154{
157 op->contr->maplevel = first_map_path; 155 op->contr->maplevel = first_map_path;
158 op->x = -1; 156 op->x = -1;
159 op->y = -1; 157 op->y = -1;
160}
161
162void
163player::enter_map ()
164{
165 object *tmp = object::create ();
166
167 EXIT_PATH (tmp) = maplevel;
168 EXIT_X (tmp) = ob->x;
169 EXIT_Y (tmp) = ob->y;
170 ob->enter_exit (tmp);
171
172 tmp->destroy ();
173} 158}
174 159
175void 160void
176player::activate () 161player::activate ()
177{ 162{
… …
182 ob->remove (); 167 ob->remove ();
183 ob->map = 0; 168 ob->map = 0;
184 ob->activate_recursive (); 169 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY); 170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob); 171 add_friendly_object (ob);
187 enter_map ();
188} 172}
189 173
190void 174void
191player::deactivate () 175player::deactivate ()
192{ 176{
… …
194 return; 178 return;
195 179
196 terminate_all_pets (ob); 180 terminate_all_pets (ob);
197 remove_friendly_object (ob); 181 remove_friendly_object (ob);
198 ob->deactivate_recursive (); 182 ob->deactivate_recursive ();
183
184 if (ob->map)
185 maplevel = ob->map->path;
186
199 ob->remove (); 187 ob->remove ();
200 ob->map = 0; 188 ob->map = 0;
189 party = 0;
201 190
202 // for weird reasons, this is often "ob", keeping a circular reference 191 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
203 ranges [range_skill] = 0;
204 192
205 players.erase (this); 193 players.erase (this);
206} 194}
207 195
208// connect the player with a specific client 196// connect the player with a specific client
209// also changed, rationalises, and fixes some incorrect settings 197// also changes, rationalises, and fixes some incorrect settings
210void 198void
211player::connect (client *ns) 199player::connect (client *ns)
212{ 200{
213 this->ns = ns; 201 this->ns = ns;
214 ns->pl = this; 202 ns->pl = this;
215 203
216 run_on = 0; 204 run_on = 0;
217 fire_on = 0; 205 fire_on = 0;
218 ob->container = 0; //TODO: client-specific 206 ob->close_container (); //TODO: client-specific
219 207
220 ns->update_look = 0; 208 ns->update_look = 0;
221 ns->look_position = 0; 209 ns->look_position = 0;
222 210
223 clear_los (ob); 211 clear_los (this);
224 212
225 ns->reset_stats (); 213 ns->reset_stats ();
226 214
227 /* make sure he's a player -- needed because of class change. */ 215 /* make sure he's a player -- needed because of class change. */
228 ob->type = PLAYER; // we are paranoid 216 ob->type = PLAYER; // we are paranoid
229 ob->race = ob->arch->clone.race; 217 ob->race = ob->arch->race;
230
231 if (!legal_range (ob, shoottype))
232 shoottype = range_none;
233 218
234 ob->carrying = sum_weight (ob); 219 ob->carrying = sum_weight (ob);
235 link_player_skills (ob); 220 link_player_skills (ob);
236 221
237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238 223
239 assign (title, ob->arch->clone.name); 224 assign (title, ob->arch->object::name);
240
241 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
242 * from the class, and not race. I don't see any way to get the class information
243 * to then update this. I don't think this will actually break anything - anyone
244 * that can use armour should be able to use a shield. What this may 'break'
245 * are features new characters get, eg, if someone starts up with a Q, they
246 * should be able to use a shield. However, old Q's won't get that advantage.
247 */
248 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
249 SET_FLAG (ob, FLAG_USE_SHIELD);
250 225
251 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
252 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
253 { 228 {
254 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
255 230
256 shstr_cmp dragon_ability_force ("dragon_ability_force");
257 shstr_cmp dragon_skin_force ("dragon_skin_force");
258
259 for (tmp = ob->inv; tmp; tmp = tmp->below) 231 for (tmp = ob->inv; tmp; tmp = tmp->below)
260 if (tmp->type == FORCE) 232 if (tmp->type == FORCE)
261 if (tmp->arch->name == dragon_ability_force) 233 if (tmp->arch->archname == shstr_dragon_ability_force)
262 abil = tmp; 234 abil = tmp;
263 else if (tmp->arch->name == dragon_skin_force) 235 else if (tmp->arch->archname == shstr_dragon_skin_force)
264 skin = tmp; 236 skin = tmp;
265 237
266 set_dragon_name (ob, abil, skin); 238 set_dragon_name (ob, abil, skin);
267 } 239 }
268 240
269 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 241 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
270 242
271 esrv_new_player (this, ob->weight + ob->carrying); 243 esrv_new_player (this, ob->weight + ob->carrying);
272 244
245 ob->flag [FLAG_READY_WEAPON] = false;
246 ob->flag [FLAG_READY_SKILL] = false;
247 ob->flag [FLAG_READY_BOW] = false;
248
249 for (object *op = ob->inv; op; op = op->below)
250 if (op->flag [FLAG_APPLIED])
251 switch (op->type)
252 {
253 case SKILL:
254 ob->flag [FLAG_APPLIED] = false;
255 break;
256
257 case WAND:
258 case ROD:
259 case HORN:
260 case BOW:
261 ranged_ob = op;
262 break;
263
264 case WEAPON:
265 combat_ob = op;
266 break;
267 }
268
269 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
273 ob->update_stats (); 270 ob->update_stats ();
271
274 ns->floorbox_update (); 272 ns->floorbox_update ();
275
276 esrv_send_inventory (ob, ob); 273 esrv_send_inventory (ob, ob);
277 esrv_add_spells (this, 0); 274 esrv_add_spells (this, 0);
278 275
279 activate (); 276 activate ();
280 277
… …
287} 284}
288 285
289void 286void
290player::disconnect () 287player::disconnect ()
291{ 288{
289 if (ob)
290 {
291 ob->close_container (); //TODO: client-specific
292 ob->drop_unpaid_items ();
293 }
294
292 if (ns) 295 if (ns)
293 { 296 {
294 if (active) 297 if (active)
295 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 298 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
296 299
297 INVOKE_PLAYER (DISCONNECT, this); 300 INVOKE_PLAYER (DISCONNECT, this);
298 301
299 ns->reset_stats (); 302 ns->reset_stats ();
300 ns->pl = 0; 303 ns->pl = 0;
301 this->ns = 0; 304 ns = 0;
302 } 305 }
303 306
304 ob->container = 0; //TODO: client-specific 307 observe = ob;
308
305 deactivate (); 309 deactivate ();
306} 310}
307 311
308// the need for this function can be explained 312// the need for this function can be explained
309// by load_object not returning the object 313// by load_object not returning the object
310void 314void
311player::set_object (object *op) 315player::set_object (object *op)
312{ 316{
313 ob = op; 317 ob = observe = op;
314 ob->contr = this; /* this aren't yet in archetype */ 318 ob->contr = this; /* this aren't yet in archetype */
315 319
320 ob->speed = 1.0f;
316 ob->speed_left = 0.5; 321 ob->speed_left = 0.5f;
317 ob->speed = 1.0; 322
318 ob->direction = 5; /* So player faces south */ 323 ob->direction = 5; /* So player faces south */
319 ob->stats.wc = 2; 324}
320 ob->run_away = 25; /* Then we panick... */
321 325
322 ob->roll_stats (); 326void
327player::set_observe (object *op)
328{
329 observe = op ? op : ob;
330 do_los = 1;
323} 331}
324 332
325player::player () 333player::player ()
326{ 334{
327 /* There are some elements we want initialised to non zero value - 335 /* There are some elements we want initialised to non zero value -
328 * we deal with that below this point. 336 * we deal with that below this point.
329 */ 337 */
330 outputs_sync = 16; /* Every 2 seconds */ 338 outputs_sync = 4;
331 outputs_count = 8; /* Keeps present behaviour */ 339 outputs_count = 4;
332 unapply = unapply_nochoice; 340 unapply = unapply_nochoice;
333 341
334 savebed_map = first_map_path; /* Init. respawn position */ 342 savebed_map = first_map_path; /* Init. respawn position */
335 343
336 gen_sp_armour = 10; 344 gen_sp_armour = 10;
337 shoottype = range_none;
338 bowtype = bow_normal; 345 bowtype = bow_normal;
339 petmode = pet_normal; 346 petmode = pet_normal;
340 listening = 10; 347 listening = 10;
341 usekeys = containers; 348 usekeys = containers;
342 peaceful = 1; /* default peaceful */ 349 peaceful = 1; /* default peaceful */
343 do_los = 1; 350 do_los = 1;
351
352 weapon_sp = 1.0f;
353 weapon_sp_left = 0.5f;
344} 354}
345 355
346void 356void
347player::do_destroy () 357player::do_destroy ()
348{ 358{
… …
353 if (ob) 363 if (ob)
354 { 364 {
355 ob->destroy_inv (false); 365 ob->destroy_inv (false);
356 ob->destroy (); 366 ob->destroy ();
357 } 367 }
368
369 ob = observe = 0;
358} 370}
359 371
360player::~player () 372player::~player ()
361{ 373{
362 /* Clear item stack */ 374 /* Clear item stack */
… …
371player::create () 383player::create ()
372{ 384{
373 player *pl = new player; 385 player *pl = new player;
374 386
375 pl->set_object (arch_to_object (get_player_archetype (0))); 387 pl->set_object (arch_to_object (get_player_archetype (0)));
388
389 pl->ob->roll_stats ();
390 pl->ob->stats.wc = 2;
391 pl->ob->run_away = 25; /* Then we panick... */
392
376 set_first_map (pl->ob); 393 set_first_map (pl->ob);
377 394
378 return pl; 395 return pl;
379} 396}
380 397
… …
384 * Note: there MUST be at least one player archetype! 401 * Note: there MUST be at least one player archetype!
385 */ 402 */
386archetype * 403archetype *
387get_player_archetype (archetype *at) 404get_player_archetype (archetype *at)
388{ 405{
389 archetype *start = at; 406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
390 407
391 for (;;) 408 for (;;)
392 { 409 {
393 if (at == NULL || at->next == NULL) 410 if (++i == archetypes.end ())
394 at = first_archetype; 411 i = archetypes.begin ();
395 else 412 else if (*i == at)
396 at = at->next; 413 cleanup ("not a single player archetype found");
397 414
398 if (at->clone.type == PLAYER) 415 if ((*i)->type == PLAYER)
399 return at; 416 return *i;
400
401 if (at == start)
402 {
403 LOG (llevError, "No Player archetypes\n");
404 exit (-1);
405 }
406 } 417 }
407} 418}
408 419
409object * 420object *
410get_nearest_player (object *mon) 421get_nearest_player (object *mon)
… …
414 unsigned lastdist; 425 unsigned lastdist;
415 rv_vector rv; 426 rv_vector rv;
416 427
417 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 428 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
418 { 429 {
419 /* We should not find free objects on this friendly list, but it
420 * does periodically happen. Given that, lets deal with it.
421 * While unlikely, it is possible the next object on the friendly
422 * list is also free, so encapsulate this in a while loop.
423 */
424 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
425 {
426 object *tmp = ol->ob;
427
428 /* Can't do much more other than log the fact, because the object
429 * itself will have been cleared.
430 */
431 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
432 tmp->debug_desc ());
433 ol = ol->next;
434 remove_friendly_object (tmp);
435 if (!ol)
436 return op;
437 }
438
439 /* Remove special check for player from this. First, it looks to cause
440 * some crashes (ol->ob->contr not set properly?), but secondly, a more
441 * complicated method of state checking would be needed in any case -
442 * as it was, a clever player could type quit, and the function would
443 * skip them over while waiting for confirmation. Remove
444 * on_same_map check, as can_detect_enemy also does this
445 */
446 if (!can_detect_enemy (mon, ol->ob, &rv)) 430 if (!can_detect_enemy (mon, ol->ob, &rv))
447 continue; 431 continue;
448 432
449 if (lastdist > rv.distance) 433 if (lastdist > rv.distance)
450 { 434 {
… …
526 x = mon->x; 510 x = mon->x;
527 y = mon->y; 511 y = mon->y;
528 m = mon->map; 512 m = mon->map;
529 dir = rv.direction; 513 dir = rv.direction;
530 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 514 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
531 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 515 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
516
532 /* If we can't solve it within the search distance, return now. */ 517 /* If we can't solve it within the search distance, return now. */
533 if (diff > max) 518 if (diff > max)
534 return 0; 519 return 0;
520
535 while (diff > 1 && max > 0) 521 while (diff > 1 && max > 0)
536 { 522 {
537 lastx = x; 523 lastx = x;
538 lasty = y; 524 lasty = y;
539 lastmap = m; 525 lastmap = m;
… …
621 max--; 607 max--;
622 lastdir = dir; 608 lastdir = dir;
623 if (!firstdir) 609 if (!firstdir)
624 firstdir = dir; 610 firstdir = dir;
625 } 611 }
612
626 if (diff <= 1) 613 if (diff <= 1)
627 { 614 {
628 /* Recalculate diff (distance) because we may not have actually 615 /* Recalculate diff (distance) because we may not have actually
629 * headed toward player for entire distance. 616 * headed toward player for entire distance.
630 */ 617 */
631 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 618 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
632 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 619 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
633 } 620 }
621
634 if (diff > max) 622 if (diff > max)
635 return 0; 623 return 0;
636 } 624 }
625
637 /* If we reached the max, didn't find a direction in time */ 626 /* If we reached the max, didn't find a direction in time */
638 if (!max) 627 if (!max)
639 return 0; 628 return 0;
640 629
641 return firstdir; 630 return firstdir;
… …
755roll_stat (void) 744roll_stat (void)
756{ 745{
757 int a[4], i, j, k; 746 int a[4], i, j, k;
758 747
759 for (i = 0; i < 4; i++) 748 for (i = 0; i < 4; i++)
760 a[i] = (int) RANDOM () % 6 + 1; 749 a[i] = (int) rndm (6) + 1;
761 750
762 for (i = 0, j = 0, k = 7; i < 4; i++) 751 for (i = 0, j = 0, k = 7; i < 4; i++)
763 if (a[i] < k) 752 if (a[i] < k)
764 k = a[i], j = i; 753 k = a[i], j = i;
765 754
… …
771} 760}
772 761
773void 762void
774object::roll_stats () 763object::roll_stats ()
775{ 764{
776 int statsort [7]; 765 int statsort [NUM_STATS];
777 766
778 for (;;) 767 for (;;)
779 { 768 {
780 int sum = 0; 769 int sum = 0;
781 for (int i = 7; i--; ) 770 for (int i = NUM_STATS; i--; )
782 sum += statsort [i] = roll_stat (); 771 sum += statsort [i] = roll_stat ();
783 772
784 if (sum >= 82 && sum <= 116) 773 if (sum >= 82 && sum <= 116)
785 break; 774 break;
786 } 775 }
787 776
788 // Sort the stats so that rerolling is easier... 777 // Sort the stats so that rerolling is easier...
789 std::sort (statsort, statsort + 7, std::greater<int>()); 778 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
790 779
780 for (int i = 0; i < NUM_STATS; ++i)
791 stats.Str = statsort[0]; 781 stats.stat (i) = statsort [i];
792 stats.Dex = statsort[1];
793 stats.Con = statsort[2];
794 stats.Int = statsort[3];
795 stats.Wis = statsort[4];
796 stats.Pow = statsort[5];
797 stats.Cha = statsort[6];
798 782
799 stats.exp = 0; 783 stats.exp = 0;
800 stats.ac = 0; 784 stats.ac = 0;
801 785
802 stats.hp = stats.maxhp; 786 stats.hp = stats.maxhp;
… …
814} 798}
815 799
816void 800void
817object::swap_stats (int a, int b) 801object::swap_stats (int a, int b)
818{ 802{
819 int tmp = get_attr_value (&contr->orig_stats, a); 803 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
820 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
821 set_attr_value (&contr->orig_stats, b, tmp);
822 804
805 for (int i = 0; i < NUM_STATS; ++i)
823 stats.Str = contr->orig_stats.Str; 806 stats.stat (i) = contr->orig_stats.stat (i);
824 stats.Dex = contr->orig_stats.Dex;
825 stats.Con = contr->orig_stats.Con;
826 stats.Int = contr->orig_stats.Int;
827 stats.Wis = contr->orig_stats.Wis;
828 stats.Pow = contr->orig_stats.Pow;
829 stats.Cha = contr->orig_stats.Cha;
830 807
831 //TODO: the following code looks so borked and should, at the very least, 808 //TODO: the following code looks so borked and should, at the very least,
832 // be merged with the similar code in roll_stats 809 // be merged with the similar code in roll_stats
833 stats.ac = 0; 810 stats.ac = 0;
834 811
… …
865 * appropriate action with it (change race, or other things). 842 * appropriate action with it (change race, or other things).
866 * The function name is for historical reasons - now we have 843 * The function name is for historical reasons - now we have
867 * separate race and class; this actually changes the RACE, 844 * separate race and class; this actually changes the RACE,
868 * not the class. 845 * not the class.
869 */ 846 */
870int 847void
871key_change_class (object *op, char key) 848player::chargen_race_done ()
872{ 849{
873 int tmp_loop;
874
875 if (key == 'd' || key == 'D')
876 {
877 char buf[MAX_BUF];
878
879 /* this must before then initial items are given */ 850 /* this must before then initial items are given */
880 esrv_new_player (op->contr, op->weight + op->carrying); 851 esrv_new_player (ob->contr, ob->weight + ob->carrying);
881 852
882 treasurelist *tl = find_treasurelist ("starting_wealth"); 853 treasurelist *tl = treasurelist::find ("starting_wealth");
883 if (tl) 854 if (tl)
884 create_treasure (tl, op, 0, 0, 0); 855 create_treasure (tl, ob, 0, 0, 0);
885 856
886 INVOKE_PLAYER (BIRTH, op->contr); 857 INVOKE_PLAYER (BIRTH, ob->contr);
887 INVOKE_PLAYER (LOGIN, op->contr); 858 INVOKE_PLAYER (LOGIN, ob->contr);
888 859
889 op->contr->ns->state = ST_PLAYING; 860 ob->contr->ns->state = ST_PLAYING;
890 861
891 if (op->msg) 862 if (ob->msg)
892 op->msg = NULL; 863 ob->msg = 0;
893 864
894 /* We create this now because some of the unique maps will need it 865 /* We create this now because some of the unique maps will need it
895 * to save here. 866 * to save here.
896 */ 867 */
868 {
869 char buf[MAX_BUF];
897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 870 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898 make_path_to_file (buf); 871 make_path_to_file (buf);
872 }
899 873
900 start_info (op); 874 start_info (ob);
901 CLEAR_FLAG (op, FLAG_WIZ); 875 CLEAR_FLAG (ob, FLAG_WIZ);
902 give_initial_items (op, op->randomitems); 876 give_initial_items (ob, ob->randomitems);
903 link_player_skills (op); 877 link_player_skills (ob);
904 esrv_send_inventory (op, op); 878 esrv_send_inventory (ob, ob);
905 op->update_stats (); 879 ob->update_stats ();
906 880
907 /* This moves the player to a different start map, if there 881 /* This moves the player to a different start map, if there
908 * is one for this race 882 * is one for this race
909 */ 883 */
910 if (*first_map_ext_path) 884 if (*first_map_ext_path)
911 { 885 {
912 object *tmp; 886 object *tmp;
913 char mapname[MAX_BUF]; 887 char mapname[MAX_BUF];
914 888
915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 889 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
916 tmp = object::create (); 890 tmp = object::create ();
917 EXIT_PATH (tmp) = mapname; 891 EXIT_PATH (tmp) = mapname;
918 EXIT_X (tmp) = op->x; 892 EXIT_X (tmp) = ob->x;
919 EXIT_Y (tmp) = op->y; 893 EXIT_Y (tmp) = ob->y;
920 op->enter_exit (tmp); /* we don't really care if it succeeded; 894 ob->enter_exit (tmp); /* we don't really care if it succeeded;
921 * if the map isn't there, then stay on the 895 * if the map isn't there, then stay on the
922 * default initial map */ 896 * default initial map */
923 tmp->destroy (); 897 tmp->destroy ();
924 } 898 }
925 else 899 else
926 LOG (llevDebug, "first_map_ext_path not set\n"); 900 LOG (llevDebug, "first_map_ext_path not set\n");
901}
927 902
928 return 0; 903void
929 } 904player::chargen_race_next ()
930 905{
931 /* Following actually changes the race - this is the default command 906 /* Following actually changes the race - this is the default command
932 * if we don't match with one of the options above. 907 * if we don't match with one of the options above.
933 */ 908 */
934 909
935 tmp_loop = 0; 910 do
936 while (!tmp_loop)
937 { 911 {
938 shstr name = op->name; 912 shstr name = ob->name;
939 int x = op->x, y = op->y; 913 int x = ob->x, y = ob->y;
940 914
941 op->remove_statbonus (); 915 ob->remove_statbonus ();
942 op->remove (); 916 ob->remove ();
943 op->arch = get_player_archetype (op->arch); 917 ob->arch = get_player_archetype (ob->arch);
944 op->arch->clone.copy_to (op); 918 ob->arch->copy_to (ob);
945 op->instantiate (); 919 ob->instantiate ();
946 op->stats = op->contr->orig_stats; 920 ob->stats = ob->contr->orig_stats;
947 op->name = op->name_pl = name; 921 ob->name = ob->name_pl = name;
948 op->x = x; 922 ob->x = x;
949 op->y = y; 923 ob->y = y;
950 SET_ANIMATION (op, 2); /* So player faces south */ 924 SET_ANIMATION (ob, 2); /* So player faces south */
951 insert_ob_in_map (op, op->map, op, 0); 925 insert_ob_in_map (ob, ob->map, ob, 0);
952 assign (op->contr->title, op->arch->clone.name); 926 assign (ob->contr->title, ob->arch->object::name);
953 op->add_statbonus (); 927 ob->add_statbonus ();
954 tmp_loop = allowed_class (op);
955 } 928 }
929 while (!allowed_class (ob));
956 930
957 update_object (op, UP_OBJ_FACE); 931 update_object (ob, UP_OBJ_FACE);
958 esrv_update_item (UPD_FACE, op, op); 932 esrv_update_item (UPD_FACE, ob, ob);
959 op->update_stats (); 933 ob->update_stats ();
960 op->stats.hp = op->stats.maxhp; 934 ob->stats.hp = ob->stats.maxhp;
961 op->stats.sp = op->stats.maxsp; 935 ob->stats.sp = ob->stats.maxsp;
962 op->stats.grace = 0; 936 ob->stats.grace = 0;
963
964 if (op->msg)
965 new_draw_info (NDI_BLUE, 0, op, op->msg);
966
967 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
968 return 0;
969} 937}
970 938
971void 939void
972flee_player (object *op) 940flee_player (object *op)
973{ 941{
… …
1020 /* Cornered, get rid of scared */ 988 /* Cornered, get rid of scared */
1021 CLEAR_FLAG (op, FLAG_SCARED); 989 CLEAR_FLAG (op, FLAG_SCARED);
1022 op->enemy = NULL; 990 op->enemy = NULL;
1023} 991}
1024 992
1025
1026/* check_pick sees if there is stuff to be picked up/picks up stuff. 993/* check_pick sees if there is stuff to be picked up/picks up stuff.
1027 * IT returns 1 if the player should keep on moving, 0 if he should 994 * It returns 1 if the player should keep on moving, 0 if he should
1028 * stop. 995 * stop.
1029 */ 996 */
1030int 997int
1031check_pick (object *op) 998check_pick (object *op)
1032{ 999{
1033 object *tmp, *next; 1000 object *tmp, *next;
1034 int stop = 0; 1001 int stop = 0;
1035 int j, k, wvratio; 1002 int wvratio;
1036 char putstring[128], tmpstr[16]; 1003 char putstring[128];
1037 1004
1038 /* if you're flying, you cna't pick up anything */ 1005 /* if you're flying, you cna't pick up anything */
1039 if (op->move_type & MOVE_FLYING) 1006 if (op->move_type & MOVE_FLYING)
1040 return 1; 1007 return 1;
1041 1008
… …
1109 if (tmp->name != NULL) 1076 if (tmp->name != NULL)
1110 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1077 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1078 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112 else 1079 else
1113 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1080 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1114 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1081 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115 1082
1116 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1083 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1117 } 1084 }
1118 1085
1119 /* philosophy: 1086 /* philosophy:
… …
1194 pick_up (op, tmp); 1161 pick_up (op, tmp);
1195 continue; 1162 continue;
1196 } 1163 }
1197 1164
1198 if (op->contr->mode & PU_READABLES) 1165 if (op->contr->mode & PU_READABLES)
1199 if (tmp->type == BOOK || tmp->type == SCROLL) 1166 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1200 { 1167 {
1201 pick_up (op, tmp); 1168 pick_up (op, tmp);
1202 continue; 1169 continue;
1203 } 1170 }
1204 1171
… …
1312 /* careful: chairs and tables are weapons! */ 1279 /* careful: chairs and tables are weapons! */
1313 if (op->contr->mode & PU_ALLWEAPON) 1280 if (op->contr->mode & PU_ALLWEAPON)
1314 { 1281 {
1315 if (tmp->type == WEAPON && tmp->name != NULL) 1282 if (tmp->type == WEAPON && tmp->name != NULL)
1316 { 1283 {
1317 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1284 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1318 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1285 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1319 { 1286 {
1320 pick_up (op, tmp); 1287 pick_up (op, tmp);
1321 continue; 1288 continue;
1322 } 1289 }
1323 } 1290 }
1324 1291
1325 if (tmp->type == WEAPON && tmp->name == NULL) 1292 if (tmp->type == WEAPON && tmp->name == NULL)
1326 { 1293 {
1327 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1294 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1328 { 1295 {
1329 pick_up (op, tmp); 1296 pick_up (op, tmp);
1330 continue; 1297 continue;
1331 } 1298 }
1332 } 1299 }
… …
1357 if (tmp->name != NULL) 1324 if (tmp->name != NULL)
1358 { 1325 {
1359 fprintf (stderr, "%s", tmp->name); 1326 fprintf (stderr, "%s", tmp->name);
1360 } 1327 }
1361 else 1328 else
1362 fprintf (stderr, "%s", tmp->arch->name); 1329 fprintf (stderr, "%s", tmp->arch->archname);
1363 fprintf (stderr, ",%d] = ", tmp->type); 1330 fprintf (stderr, ",%d] = ", tmp->type);
1364 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1331 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1365#endif 1332#endif
1366 continue; 1333 continue;
1367 } 1334 }
… …
1378 * found object is returned. 1345 * found object is returned.
1379 */ 1346 */
1380object * 1347object *
1381find_arrow (object *op, const char *type) 1348find_arrow (object *op, const char *type)
1382{ 1349{
1383 object *tmp = NULL; 1350 object *tmp = 0;
1384 1351
1385 for (op = op->inv; op; op = op->below) 1352 for (op = op->inv; op; op = op->below)
1386 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1353 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1387 tmp = find_arrow (op, type); 1354 tmp = find_arrow (op, type);
1388 else if (op->type == ARROW && op->race == type) 1355 else if (op->type == ARROW && op->race == type)
1389 return op; 1356 return op;
1357
1390 return tmp; 1358 return tmp;
1391} 1359}
1392 1360
1393/* 1361/*
1394 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1362 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1395 * against the target. A full test is not performed, simply a basic test 1363 * against the target. A full test is not performed, simply a basic test
1396 * of resistances. The archer is making a quick guess at what he sees down 1364 * of resistances. The archer is making a quick guess at what he sees down
1397 * the hall. Failing that it does it's best to pick the highest plus arrow. 1365 * the hall. Failing that it does it's best to pick the highest plus arrow.
1398 */ 1366 */
1399
1400object * 1367object *
1401find_better_arrow (object *op, object *target, const char *type, int *better) 1368find_better_arrow (object *op, object *target, const char *type, int *better)
1402{ 1369{
1403 object *tmp = NULL, *arrow, *ntmp; 1370 object *tmp = NULL, *arrow, *ntmp;
1404 int attacknum, attacktype, betterby = 0, i; 1371 int attacknum, attacktype, betterby = 0, i;
… …
1437 else 1404 else
1438 { 1405 {
1439 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1406 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1440 { 1407 {
1441 attacktype = 1 << attacknum; 1408 attacktype = 1 << attacknum;
1442 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1409 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1443 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1410 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1444 { 1411 {
1445 tmp = arrow; 1412 tmp = arrow;
1446 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1413 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1447 } 1414 }
1448 } 1415 }
1449 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1416 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1450 { 1417 {
1451 tmp = arrow; 1418 tmp = arrow;
… …
1470 * find_better_arrow to find a decent arrow to use. 1437 * find_better_arrow to find a decent arrow to use.
1471 * op = the shooter 1438 * op = the shooter
1472 * type = bow->race 1439 * type = bow->race
1473 * dir = fire direction 1440 * dir = fire direction
1474 */ 1441 */
1475
1476object * 1442object *
1477pick_arrow_target (object *op, const char *type, int dir) 1443pick_arrow_target (object *op, const char *type, int dir)
1478{ 1444{
1479 object *tmp = NULL; 1445 object *tmp = NULL;
1480 maptile *m; 1446 maptile *m;
… …
1545 */ 1511 */
1546int 1512int
1547fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1513fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1548{ 1514{
1549 object *left, *bow; 1515 object *left, *bow;
1550 int bowspeed, mflags; 1516 int mflags;
1551 maptile *m; 1517 maptile *m;
1552 1518
1553 if (!dir) 1519 if (!dir)
1554 { 1520 {
1555 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1521 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1556 return 0; 1522 return 0;
1557 } 1523 }
1558 1524
1559 if (op->type == PLAYER) 1525 if (op->contr)
1560 bow = op->contr->ranges[range_bow]; 1526 bow = op->current_weapon;
1561 else 1527 else
1562 { 1528 {
1563 for (bow = op->inv; bow; bow = bow->below) 1529 for (bow = op->inv; bow; bow = bow->below)
1564 /* Don't check for applied - monsters don't apply bows - in that way, they 1530 /* Don't check for applied - monsters don't apply bows - in that way, they
1565 * don't need to switch back and forth between bows and weapons. 1531 * don't need to switch back and forth between bows and weapons.
… …
1570 if (!bow) 1536 if (!bow)
1571 { 1537 {
1572 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1538 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1573 return 0; 1539 return 0;
1574 } 1540 }
1541
1542 // optimisation: move object to top so we will find it quickly again
1543 if (bow->below)
1544 {
1545 bow->remove ();
1546 op->insert (bow);
1547 }
1548
1575 } 1549 }
1576 1550
1577 if (!bow->race || !bow->skill) 1551 if (!bow->race || !bow->skill)
1578 { 1552 {
1579 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1553 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1580 return 0; 1554 return 0;
1581 } 1555 }
1582
1583 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1584
1585 /* penalize ROF for bestarrow */
1586 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1587 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1588
1589 if (bowspeed < 1)
1590 bowspeed = 1;
1591 1556
1592 if (arrow == NULL) 1557 if (arrow == NULL)
1593 { 1558 {
1594 if ((arrow = find_arrow (op, bow->race)) == NULL) 1559 if ((arrow = find_arrow (op, bow->race)) == NULL)
1595 { 1560 {
1596 if (op->type == PLAYER) 1561 if (op->type == PLAYER)
1597 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1562 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1598 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1563 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1599 else 1564 else
1600 CLEAR_FLAG (op, FLAG_READY_BOW); 1565 CLEAR_FLAG (op, FLAG_READY_BOW);
1566
1601 return 0; 1567 return 0;
1602 } 1568 }
1603 } 1569 }
1604 1570
1605 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1571 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1629 1595
1630 arrow->set_owner (op); 1596 arrow->set_owner (op);
1631 arrow->skill = bow->skill; 1597 arrow->skill = bow->skill;
1632 arrow->direction = dir; 1598 arrow->direction = dir;
1633 1599
1600 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1601 arrow->stats.hp = arrow->stats.dam;
1602 arrow->stats.grace = arrow->attacktype;
1603
1604 if (arrow->slaying)
1605 arrow->spellarg = strdup (arrow->slaying);
1606
1607#if 0
1608 if (player *pl = op->contr)
1609 {
1610 float speed = pl->weapon_sp;
1611
1612 /* penalize ROF for bestarrow */
1613 if (pl->bowtype == bow_bestarrow)
1614 speed *= .9f;
1615 else
1616 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1617
1618 op->speed_left += speed - op->speed;
1619 }
1620#endif
1621
1622 SET_ANIMATION (arrow, arrow->direction);
1623
1624 /* update the speed */
1625 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1626 + bow->stats.dam / 7.f;
1627
1628 arrow->set_speed (max (arrow->speed, 2.f));
1629 arrow->speed_left = 0;
1630
1631 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1632
1634 if (op->type == PLAYER) 1633 if (op->type == PLAYER)
1635 { 1634 {
1636 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1637 op->update_stats ();
1638 }
1639
1640 SET_ANIMATION (arrow, arrow->direction);
1641 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1642 arrow->stats.hp = arrow->stats.dam;
1643 arrow->stats.grace = arrow->attacktype;
1644 if (arrow->slaying != NULL)
1645 arrow->spellarg = strdup (arrow->slaying);
1646
1647 /* Note that this was different for monsters - they got their level
1648 * added to the damage. I think the strength bonus is more proper.
1649 */
1650
1651 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1652
1653 /* update the speed */
1654 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1655 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1656
1657 arrow->set_speed (max (arrow->speed, 1.0));
1658 arrow->speed_left = 0;
1659
1660 if (op->type == PLAYER)
1661 {
1662 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1663 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1664 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1665
1666 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1635 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1636 wc -= dex_bonus[op->stats.Dex];
1637
1638 if (!arrow->slaying)
1639 arrow->slaying = op->slaying;
1640
1641 arrow->attacktype |= op->attacktype;
1667 } 1642 }
1668 else 1643 else
1669 { 1644 {
1670 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1671 arrow->level = op->level; 1645 arrow->level = op->level;
1672 } 1646 arrow->stats.wc -= bow->magic;
1673 1647
1674 if (arrow->attacktype == AT_PHYSICAL) 1648 if (!arrow->slaying)
1649 arrow->slaying = bow->slaying;
1650
1675 arrow->attacktype |= bow->attacktype; 1651 arrow->attacktype |= bow->attacktype;
1652 }
1676 1653
1677 if (bow->slaying) 1654 wc -= arrow->level;
1678 arrow->slaying = bow->slaying; 1655 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1679 1656
1657 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1680 arrow->move_type = MOVE_FLY_LOW; 1658 arrow->move_type = MOVE_FLY_LOW;
1681 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1659 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1682 1660
1683 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1661 op->play_sound (sound_find ("fire_arrow"));
1684 m->insert (arrow, sx, sy, op); 1662 m->insert (arrow, sx, sy, op);
1685 1663
1686 if (!arrow->destroyed ()) 1664 if (!arrow->destroyed ())
1687 move_arrow (arrow); 1665 move_arrow (arrow);
1688 1666
… …
1709{ 1687{
1710 int ret = 0, wcmod = 0; 1688 int ret = 0, wcmod = 0;
1711 1689
1712 if (op->contr->bowtype == bow_bestarrow) 1690 if (op->contr->bowtype == bow_bestarrow)
1713 { 1691 {
1714 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1692 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1715 } 1693 }
1716 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1694 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1717 { 1695 {
1718 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1696 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1719 wcmod = -1; 1697 wcmod = -1;
… …
1729 else if (op->contr->bowtype == bow_spreadshot) 1707 else if (op->contr->bowtype == bow_spreadshot)
1730 { 1708 {
1731 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1709 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1732 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1710 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1733 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1711 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1734
1735 } 1712 }
1736 else 1713 else
1737 { 1714 {
1738 /* Simple case */ 1715 /* Simple case */
1739 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1716 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1740 } 1717 }
1718
1741 return ret; 1719 return ret;
1742} 1720}
1743
1744 1721
1745/* Fires a misc (wand/rod/horn) object in 'dir'. 1722/* Fires a misc (wand/rod/horn) object in 'dir'.
1746 * Broken apart from 'fire' to keep it more readable. 1723 * Broken apart from 'fire' to keep it more readable.
1747 */ 1724 */
1748void 1725void
1749fire_misc_object (object *op, int dir) 1726fire_misc_object (object *op, int dir)
1750{ 1727{
1751 object *item; 1728 object *item = op->contr->ranged_ob;
1752 1729
1753 if (!op->contr->ranges[range_misc]) 1730 if (!item)
1754 { 1731 {
1755 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1732 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1756 return; 1733 return;
1757 } 1734 }
1758 1735
1759 item = op->contr->ranges[range_misc];
1760 if (!item->inv) 1736 if (!item->inv)
1761 { 1737 {
1762 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1738 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1763 return; 1739 return;
1764 } 1740 }
1741
1742 if (!op->change_weapon (item))
1743 return;
1744
1765 if (item->type == WAND) 1745 if (item->type == WAND)
1766 { 1746 {
1767 if (item->stats.food <= 0) 1747 if (item->stats.food <= 0)
1768 { 1748 {
1769 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1749 op->contr->play_sound (sound_find ("wand_poof"));
1770 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1750 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1751
1771 return; 1752 return;
1772 } 1753 }
1773 } 1754 }
1774 else if (item->type == ROD || item->type == HORN) 1755 else if (item->type == ROD || item->type == HORN)
1775 { 1756 {
1776 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1757 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1777 { 1758 {
1778 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1759 op->contr->play_sound (sound_find ("wand_poof"));
1760
1779 if (item->type == ROD) 1761 if (item->type == ROD)
1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1762 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1781 else 1763 else
1782 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1764 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1765
1783 return; 1766 return;
1784 } 1767 }
1785 } 1768 }
1786 1769
1787 if (cast_spell (op, item, dir, item->inv, NULL)) 1770 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1794 object *tmp; 1777 object *tmp;
1795 1778
1796 if (item->arch) 1779 if (item->arch)
1797 { 1780 {
1798 CLEAR_FLAG (item, FLAG_ANIMATE); 1781 CLEAR_FLAG (item, FLAG_ANIMATE);
1799 item->face = item->arch->clone.face; 1782 item->face = item->arch->face;
1800 item->set_speed (0); 1783 item->set_speed (0);
1801 } 1784 }
1802 1785
1803 if ((tmp = item->in_player ())) 1786 if ((tmp = item->in_player ()))
1804 esrv_update_item (UPD_ANIM, tmp, item); 1787 esrv_update_item (UPD_ANIM, tmp, item);
… …
1809 } 1792 }
1810} 1793}
1811 1794
1812/* Received a fire command for the player - go and do it. 1795/* Received a fire command for the player - go and do it.
1813 */ 1796 */
1814void 1797bool
1815fire (object *op, int dir) 1798fire (object *op, int dir)
1816{ 1799{
1817 int spellcost = 0; 1800 int spellcost = 0;
1818 1801
1819 /* check for loss of invisiblity/hide */ 1802 /* check for loss of invisiblity/hide */
1820 if (action_makes_visible (op)) 1803 if (action_makes_visible (op))
1821 make_visible (op); 1804 make_visible (op);
1822 1805
1823 switch (op->contr->shoottype) 1806 player *pl = op->contr;
1807
1808 if (pl->golem)
1809 {
1810 control_golem (op->contr->golem, dir);
1811 return false;
1824 { 1812 }
1825 case range_none:
1826 return;
1827 1813
1828 case range_bow: 1814 object *ob = pl->ranged_ob;
1815
1816 if (!ob)
1817 return false;
1818
1819 if (!op->change_weapon (ob))
1820 return false;
1821
1822 if (op->speed_left > 0.f)
1823 --op->speed_left;
1824 else
1825 return false;
1826
1827 switch (ob->type)
1828 {
1829 case BOW:
1829 player_fire_bow (op, dir); 1830 player_fire_bow (op, dir);
1830 return; 1831 break;
1831 1832
1832 case range_magic: /* Casting spells */ 1833 case SPELL:
1833 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1834 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1834 return; 1835 break;
1835 1836
1836 case range_misc: 1837 case BUILDER:
1838 apply_map_builder (op, dir);
1839 break;
1840
1841 case SKILL:
1842 do_skill (op, op, ob, dir, 0);
1843 break;
1844
1845 default:
1837 fire_misc_object (op, dir); 1846 fire_misc_object (op, dir);
1838 return; 1847 break;
1839
1840 case range_golem: /* Control summoned monsters from scrolls */
1841 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1842 {
1843 op->contr->ranges[range_golem] = 0;
1844 op->contr->shoottype = range_none;
1845 }
1846 else
1847 control_golem (op->contr->ranges[range_golem], dir);
1848 return;
1849
1850 case range_skill:
1851 if (!op->chosen_skill)
1852 {
1853 if (op->type == PLAYER)
1854 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1855 return;
1856 }
1857
1858 do_skill (op, op, op->chosen_skill, dir, NULL);
1859 return;
1860 case range_builder:
1861 apply_map_builder (op, dir);
1862 return;
1863 default:
1864 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1865 return;
1866 } 1848 }
1867}
1868 1849
1869 1850 return true;
1851}
1870 1852
1871/* find_key 1853/* find_key
1872 * We try to find a key for the door as passed. If we find a key 1854 * We try to find a key for the door as passed. If we find a key
1873 * and successfully use it, we return the key, otherwise NULL 1855 * and successfully use it, we return the key, otherwise NULL
1874 * This function merges both normal and locked door, since the logic 1856 * This function merges both normal and locked door, since the logic
… …
1876 * pl is the player, 1858 * pl is the player,
1877 * inv is the objects inventory to searched 1859 * inv is the objects inventory to searched
1878 * door is the door we are trying to match against. 1860 * door is the door we are trying to match against.
1879 * This function can be called recursively to search containers. 1861 * This function can be called recursively to search containers.
1880 */ 1862 */
1881
1882object * 1863object *
1883find_key (object *pl, object *container, object *door) 1864find_key (object *pl, object *container, object *door)
1884{ 1865{
1885 object *tmp, *key; 1866 object *tmp, *key;
1886 1867
1887 /* Should not happen, but sanity checking is never bad */ 1868 /* Should not happen, but sanity checking is never bad */
1888 if (container->inv == NULL) 1869 if (!container->inv)
1889 return NULL; 1870 return 0;
1890 1871
1891 /* First, lets try to find a key in the top level inventory */ 1872 /* First, lets try to find a key in the top level inventory */
1892 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1873 for (tmp = container->inv; tmp; tmp = tmp->below)
1893 { 1874 {
1894 if (door->type == DOOR && tmp->type == KEY) 1875 if (door->type == DOOR && tmp->type == KEY)
1895 break; 1876 break;
1896 /* For sanity, we should really check door type, but other stuff 1877 /* For sanity, we should really check door type, but other stuff
1897 * (like containers) can be locked with special keys 1878 * (like containers) can be locked with special keys
1898 */ 1879 */
1899 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1880 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1900 break; 1881 break;
1901 } 1882 }
1883
1902 /* No key found - lets search inventories now */ 1884 /* No key found - lets search inventories now */
1903 /* If we find and use a key in an inventory, return at that time. 1885 /* If we find and use a key in an inventory, return at that time.
1904 * otherwise, if we search all the inventories and still don't find 1886 * otherwise, if we search all the inventories and still don't find
1905 * a key, return 1887 * a key, return
1906 */ 1888 */
1907 if (!tmp) 1889 if (!tmp)
1908 { 1890 {
1909 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1891 for (tmp = container->inv; tmp; tmp = tmp->below)
1910 { 1892 {
1911 /* No reason to search empty containers */ 1893 /* No reason to search empty containers */
1912 if (tmp->type == CONTAINER && tmp->inv) 1894 if (tmp->type == CONTAINER && tmp->inv)
1913 { 1895 {
1914 if ((key = find_key (pl, tmp, door)) != NULL) 1896 if ((key = find_key (pl, tmp, door)))
1915 return key; 1897 return key;
1916 } 1898 }
1917 } 1899 }
1900
1918 if (!tmp) 1901 if (!tmp)
1919 return NULL; 1902 return NULL;
1920 } 1903 }
1904
1921 /* We get down here if we have found a key. Now if its in a container, 1905 /* We get down here if we have found a key. Now if its in a container,
1922 * see if we actually want to use it 1906 * see if we actually want to use it
1923 */ 1907 */
1924 if (pl != container) 1908 if (pl != container)
1925 { 1909 {
… …
1946 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1930 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1947 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1931 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1948 return NULL; 1932 return NULL;
1949 } 1933 }
1950 } 1934 }
1935
1951 return tmp; 1936 return tmp;
1952} 1937}
1953 1938
1954/* moved door processing out of move_player_attack. 1939/* moved door processing out of move_player_attack.
1955 * returns 1 if player has opened the door with a key 1940 * returns 1 if player has opened the door with a key
… …
1957 * 0 otherwise 1942 * 0 otherwise
1958 */ 1943 */
1959static int 1944static int
1960player_attack_door (object *op, object *door) 1945player_attack_door (object *op, object *door)
1961{ 1946{
1962 /* If its a door, try to find a use a key. If we do destroy the door, 1947 /* If its a door, try to find a key. If we do destroy the door,
1963 * might as well return immediately as there is nothing more to do - 1948 * might as well return immediately as there is nothing more to do -
1964 * otherwise, we fall through to the rest of the code. 1949 * otherwise, we fall through to the rest of the code.
1965 */ 1950 */
1966 object *key = find_key (op, op, door); 1951 object *key = find_key (op, op, door);
1967 1952
1968 /* IF we found a key, do some extra work */ 1953 /* If we found a key, do some extra work */
1969 if (key) 1954 if (key)
1970 { 1955 {
1971 object *container = key->env; 1956 object *container = key->env;
1972 1957
1973 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1974 if (action_makes_visible (op)) 1958 if (action_makes_visible (op))
1975 make_visible (op); 1959 make_visible (op);
1960
1976 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1961 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1977 spring_trap (door->inv, op); 1962 spring_trap (door->inv, op);
1963
1978 if (door->type == DOOR) 1964 if (door->type == DOOR)
1979 {
1980 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1965 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1981 }
1982 else if (door->type == LOCKED_DOOR) 1966 else if (door->type == LOCKED_DOOR)
1983 { 1967 {
1984 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1968 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1985 remove_door2 (door); /* remove door without violence ;-) */ 1969 remove_door2 (door); /* remove door without violence ;-) */
1986 } 1970 }
1971
1987 /* Do this after we print the message */ 1972 /* Do this after we print the message */
1988 decrease_ob (key); /* Use up one of the keys */ 1973 decrease_ob (key); /* Use up one of the keys */
1989 /* Need to update the weight the container the key was in */ 1974 /* Need to update the weight the container the key was in */
1990 if (container != op) 1975 if (container != op)
1991 esrv_update_item (UPD_WEIGHT, op, container); 1976 esrv_update_item (UPD_WEIGHT, op, container);
1977
1992 return 1; /* Nothing more to do below */ 1978 return 1; /* Nothing more to do below */
1993 } 1979 }
1994 else if (door->type == LOCKED_DOOR) 1980 else if (door->type == LOCKED_DOOR)
1995 { 1981 {
1996 /* Might as well return now - no other way to open this */ 1982 /* Might as well return now - no other way to open this */
1997 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1983 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1998 return 1; 1984 return 1;
1999 } 1985 }
1986
2000 return 0; 1987 return 0;
2001} 1988}
2002 1989
2003/* This function is just part of a breakup from move_player. 1990/* This function is just part of a breakup from move_player.
2004 * It should keep the code cleaner. 1991 * It should keep the code cleaner.
2005 * When this is called, the players direction has been updated 1992 * When this is called, the players direction has been updated
2006 * (taking into account confusion.) The player is also actually 1993 * (taking into account confusion.) The player is also actually
2007 * going to try and move (not fire weapons). 1994 * going to try and move (not fire weapons).
2008 */ 1995 */
2009void 1996bool
2010move_player_attack (object *op, int dir) 1997move_player_attack (object *op, int dir)
2011{ 1998{
2012 object *tmp, *mon;
2013 sint16 nx, ny;
2014 int on_battleground; 1999 int on_battleground;
2015 maptile *m;
2016 2000
2017 nx = freearr_x[dir] + op->x; 2001 sint16 nx = freearr_x[dir] + op->x;
2018 ny = freearr_y[dir] + op->y; 2002 sint16 ny = freearr_y[dir] + op->y;
2019 2003
2020 on_battleground = op_on_battleground (op, 0, 0); 2004 on_battleground = op_on_battleground (op, 0, 0);
2005
2006 if (out_of_map (op->map, nx, ny))
2007 return false;
2008
2009 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2010 {
2011 --op->speed_left;
2012 return true;
2013 }
2021 2014
2022 /* If braced, or can't move to the square, and it is not out of the 2015 /* If braced, or can't move to the square, and it is not out of the
2023 * map, attack it. Note order of if statement is important - don't 2016 * map, attack it. Note order of if statement is important - don't
2024 * want to be calling move_ob if braced, because move_ob will move the 2017 * want to be calling move_ob if braced, because move_ob will move the
2025 * player. This is a pretty nasty hack, because if we could 2018 * player. This is a pretty nasty hack, because if we could
2026 * move to some space, it then means that if we are braced, we should 2019 * move to some space, it then means that if we are braced, we should
2027 * do nothing at all. As it is, if we are braced, we go through 2020 * do nothing at all. As it is, if we are braced, we go through
2028 * quite a bit of processing. However, it probably is less than what 2021 * quite a bit of processing. However, it probably is less than what
2029 * move_ob uses. 2022 * move_ob uses.
2030 */ 2023 */
2031 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2032 {
2033 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2034 {
2035 m = op->map->xy_find (nx, ny); 2024 maptile *m = op->map->xy_find (nx, ny);
2036 if (!m)
2037 return; /* Don't think this should happen */
2038 }
2039 else
2040 m = op->map;
2041 2025
2042 if (!(tmp = m->at (nx, ny).bot))
2043 return;
2044
2045 mon = 0;
2046 /* Go through all the objects, and find ones of interest. Only stop if 2026 /* Go through all the objects, and find ones of interest. Only stop if
2047 * we find a monster - that is something we know we want to attack. 2027 * we find a monster - that is something we know we want to attack.
2048 * if its a door or barrel (can roll) see if there may be monsters 2028 * if its a door or barrel (can roll) see if there may be monsters
2049 * on the space 2029 * on the space
2050 */ 2030 */
2051 while (tmp) 2031 object *mon;
2052 { 2032 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2053 if (tmp == op) 2033 {
2054 { 2034 if ((mon->flag [FLAG_ALIVE]
2055 tmp = tmp->above; 2035 || mon->type == LOCKED_DOOR
2056 continue; 2036 || mon->flag [FLAG_CAN_ROLL])
2057 }
2058
2059 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2060 {
2061 mon = tmp; 2037 && mon != op)
2062 break; 2038 break;
2063 } 2039 }
2064 2040
2065 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2066 mon = tmp;
2067
2068 tmp = tmp->above;
2069 }
2070
2071 if (!mon) /* This happens anytime the player tries to move */ 2041 if (!mon) /* This happens anytime the player tries to move */
2072 return; /* into a wall */ 2042 return false; /* into a wall */
2073 2043
2074 if (mon->head)
2075 mon = mon->head; 2044 mon = mon->head_ ();
2076 2045
2077 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2046 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2047 if (op->contr->weapon_sp_left > 0.f)
2078 if (player_attack_door (op, mon)) 2048 if (player_attack_door (op, mon))
2049 {
2050 --op->contr->weapon_sp_left;
2079 return; 2051 return true;
2052 }
2080 2053
2081 /* The following deals with possibly attacking peaceful 2054 /* The following deals with possibly attacking peaceful
2082 * or frienddly creatures. Basically, all players are considered 2055 * or friendly creatures. Basically, all players are considered
2083 * unaggressive. If the moving player has peaceful set, then the 2056 * unaggressive. If the moving player has peaceful set, then the
2084 * object should be pushed instead of attacked. It is assumed that 2057 * object should be pushed instead of attacked. It is assumed that
2085 * if you are braced, you will not attack friends accidently, 2058 * if you are braced, you will not attack friends accidently,
2086 * and thus will not push them. 2059 * and thus will not push them.
2087 */ 2060 */
2088 2061
2089 /* If the creature is a pet, push it even if the player is not 2062 /* If the creature is a pet, push it even if the player is not
2090 * peaceful. Our assumption is the creature is a pet if the 2063 * peaceful. Our assumption is the creature is a pet if the
2091 * player owns it and it is either friendly or unagressive. 2064 * player owns it and it is either friendly or unagressive.
2092 */ 2065 */
2093 if ((op->type == PLAYER) 2066 if (op->type == PLAYER
2094#if COZY_SERVER
2095 &&
2096 ((mon->owner && mon->owner->contr 2067 && ((mon->owner && mon->owner->contr
2097 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2068 && same_party (mon->owner->contr->party, op->contr->party))
2098#else
2099 && mon->owner == op 2069 || mon->owner == op)
2100#endif
2101 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2070 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2102 { 2071 {
2103 /* If we're braced, we don't want to switch places with it */ 2072 /* If we're braced, we don't want to switch places with it */
2104 if (op->contr->braced) 2073 if (op->contr->braced)
2105 return; 2074 return false;
2106 2075
2107 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2076 if (op->speed_left > 0.f)
2077 {
2078 --op->speed_left;
2079
2080 op->play_sound (sound_find ("push_player"));
2108 (void) push_ob (mon, dir, op); 2081 push_ob (mon, dir, op);
2082
2109 if (op->contr->tmp_invis || op->hide) 2083 if (op->contr->tmp_invis || op->hide)
2110 make_visible (op); 2084 make_visible (op);
2111 2085
2112 return; 2086 return true;
2113 } 2087 }
2088 else
2089 return false;
2090 }
2114 2091
2115 /* in certain circumstances, you shouldn't attack friendly 2092 /* in certain circumstances, you shouldn't attack friendly
2116 * creatures. Note that if you are braced, you can't push 2093 * creatures. Note that if you are braced, you can't push
2117 * someone, but put it inside this loop so that you won't 2094 * someone, but put it inside this loop so that you won't
2118 * attack them either. 2095 * attack them either.
2119 */ 2096 */
2120 if ((mon->type == PLAYER || mon->enemy != op) && 2097 if ((mon->type == PLAYER || mon->enemy != op)
2121 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2098 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2122#ifdef PROHIBIT_PLAYERKILL
2123 (op->contr->peaceful 2099 && ((op->contr->peaceful
2124 || (mon->type == PLAYER 2100 || (mon->type == PLAYER && mon->contr->peaceful))
2125 && mon->contr->
2126 peaceful)) &&
2127#else
2128 op->contr->peaceful &&
2129#endif
2130 !on_battleground)) 2101 && !on_battleground))
2102 {
2103 if (op->speed_left > 0.f)
2131 { 2104 {
2105 --op->speed_left;
2106
2132 if (!op->contr->braced) 2107 if (!op->contr->braced)
2133 { 2108 {
2134 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2109 op->play_sound (sound_find ("push_player"));
2135 push_ob (mon, dir, op); 2110 push_ob (mon, dir, op);
2136 } 2111 }
2137 else 2112 else
2138 new_draw_info (0, 0, op, "You withhold your attack"); 2113 new_draw_info (0, 0, op, "You withhold your attack");
2139 2114
2140 if (op->contr->tmp_invis || op->hide) 2115 if (op->contr->tmp_invis || op->hide)
2141 make_visible (op); 2116 make_visible (op);
2142 }
2143 2117
2118 return true;
2119 }
2120 }
2144 /* If the object is a boulder or other rollable object, then 2121 /* If the object is a boulder or other rollable object, then
2145 * roll it if not braced. You can't roll it if you are braced. 2122 * roll it if not braced. You can't roll it if you are braced.
2146 */ 2123 */
2147 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2124 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2125 {
2126 if (op->speed_left > 0.f)
2148 { 2127 {
2128 --op->speed_left;
2129
2149 recursive_roll (mon, dir, op); 2130 recursive_roll (mon, dir, op);
2150 if (action_makes_visible (op)) 2131 if (action_makes_visible (op))
2151 make_visible (op); 2132 make_visible (op);
2152 }
2153 2133
2134 return true;
2135 }
2136 }
2154 /* Any generic living creature. Including things like doors. 2137 /* Any generic living creature. Including things like doors.
2155 * Way it works is like this: First, it must have some hit points 2138 * Way it works is like this: First, it must have some hit points
2156 * and be living. Then, it must be one of the following: 2139 * and be living. Then, it must be one of the following:
2157 * 1) Not a player, 2) A player, but of a different party. Note 2140 * 1) Not a player, 2) A player, but of a different party. Note
2158 * that party_number -1 is no party, so attacks can still happen. 2141 * that party_number -1 is no party, so attacks can still happen.
2159 */ 2142 */
2160 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2143 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2161 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2144 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2162 { 2145 {
2163 2146 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2164 /* If the player hasn't hit something this tick, and does
2165 * so, give them speed boost based on weapon speed. Doing
2166 * it here is better than process_players2, which basically
2167 * incurred a 1 tick offset.
2168 */
2169 if (!op->contr->has_hit)
2170 { 2147 {
2171 op->speed_left += op->speed / op->contr->weapon_sp; 2148 --op->contr->weapon_sp_left;
2172
2173 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2174 }
2175 2149
2176 skill_attack (mon, op, 0, 0, 0); 2150 skill_attack (mon, op, 0, 0, 0);
2177
2178 /* If attacking another player, that player gets automatic
2179 * hitback, and doesn't loose luck either.
2180 * Disable hitback on the battleground or if the target is
2181 * the wiz.
2182 */
2183 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2184 {
2185 short luck = mon->stats.luck;
2186
2187 mon->contr->has_hit = 1;
2188 skill_attack (op, mon, 0, 0, 0);
2189 mon->stats.luck = luck;
2190 }
2191 2151
2192 if (action_makes_visible (op)) 2152 if (action_makes_visible (op))
2193 make_visible (op); 2153 make_visible (op);
2194 }
2195 } /* if player should attack something */
2196}
2197 2154
2198int 2155 return true;
2156 }
2157 }
2158
2159 return false;
2160}
2161
2162bool
2199move_player (object *op, int dir) 2163move_player (object *op, int dir)
2200{ 2164{
2201 int pick; 2165 int pick;
2202 2166
2203 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2167 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2210 return 0; 2174 return 0;
2211 } 2175 }
2212 2176
2213 /* peterm: added following line */ 2177 /* peterm: added following line */
2214 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2178 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2215 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2179 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2216 2180
2217 op->facing = dir; 2181 op->facing = dir;
2218 2182
2219 if (op->hide) 2183 if (op->hide)
2220 do_hidden_move (op); 2184 do_hidden_move (op);
2221 2185
2186 bool retval;
2187
2222 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2188 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2223 /*nop */ ; 2189 retval = RESULT_INT (0);
2224 else if (op->contr->fire_on) 2190 else if (op->contr->fire_on)
2225 fire (op, dir); 2191 retval = fire (op, dir);
2226 else 2192 else
2227 { 2193 {
2228 move_player_attack (op, dir); 2194 retval = move_player_attack (op, dir);
2229 pick = check_pick (op); 2195 pick = check_pick (op);
2230 } 2196 }
2231 2197
2232 /* Add special check for newcs players and fire on - this way, the 2198 /* Add special check for newcs players and fire on - this way, the
2233 * server can handle repeat firing. 2199 * server can handle repeat firing.
… …
2240 /* Update how the player looks. Use the facing, so direction may 2206 /* Update how the player looks. Use the facing, so direction may
2241 * get reset to zero. This allows for full animation capabilities 2207 * get reset to zero. This allows for full animation capabilities
2242 * for players. 2208 * for players.
2243 */ 2209 */
2244 animate_object (op, op->facing); 2210 animate_object (op, op->facing);
2245 return 0; 2211
2212 return retval;
2246} 2213}
2247 2214
2248/* This is similar to handle_player, below, but is only used by the 2215/* This is similar to handle_player, below, but is only used by the
2249 * new client/server stuff. 2216 * new client/server stuff.
2250 * This is sort of special, in that the new client/server actually uses 2217 * This is sort of special, in that the new client/server actually uses
2251 * the new speed values for commands. 2218 * the new speed values for commands.
2252 * 2219 *
2253 * Returns true if there are more actions we can do. 2220 * Returns true if there are more actions we can do. Should not do
2221 * many actions in a row, as that would be too unfair to other
2222 * players.
2254 */ 2223 */
2255int 2224bool
2256handle_newcs_player (object *op) 2225handle_newcs_player (object *op)
2257{ 2226{
2258 if (op->contr->hidden)
2259 {
2260 op->invisible = 1000;
2261 /* the socket code flashes the player visible/invisible
2262 * depending on the value of invisible, so we need to
2263 * alternate it here for it to work correctly.
2264 */
2265 if (pticks & 2)
2266 op->invisible--;
2267 }
2268 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2269 {
2270 op->invisible--;
2271 if (!op->invisible)
2272 {
2273 make_visible (op);
2274 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2275 }
2276 }
2277
2278 if (QUERY_FLAG (op, FLAG_SCARED)) 2227 if (QUERY_FLAG (op, FLAG_SCARED))
2279 { 2228 {
2280 flee_player (op); 2229 if (op->speed_left > 0.f)
2281 /* If player is still scared, that is his action for this tick */
2282 if (QUERY_FLAG (op, FLAG_SCARED))
2283 { 2230 {
2284 op->speed_left--; 2231 --op->speed_left;
2232 flee_player (op);
2233
2285 return 0; 2234 return true;
2286 } 2235 }
2236 else
2237 return false;
2287 } 2238 }
2288
2289 /* I've been seeing crashes where the golem has been destroyed, but
2290 * the player object still points to the defunct golem. The code that
2291 * destroys the golem looks correct, and it doesn't always happen, so
2292 * put this in a a workaround to clean up the golem pointer.
2293 */
2294 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2295 op->contr->ranges[range_golem] = 0;
2296 2239
2297 /* call this here - we also will call this in do_ericserver, but 2240 /* call this here - we also will call this in do_ericserver, but
2298 * the players time has been increased when doericserver has been 2241 * the players time has been increased when doericserver has been
2299 * called, so we recheck it here. 2242 * called, so we recheck it here.
2300 */ 2243 */
2301 if (op->contr->ns->handle_command ()) 2244 if (op->contr->ns->handle_command ())
2302 return 1; 2245 return true;
2303 2246
2304 if (op->speed_left > 0)
2305 {
2306 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2247 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2307 {
2308 /* All move commands take 1 tick, at least for now */
2309 op->speed_left--;
2310
2311 /* Instead of all the stuff below, let move_player take care
2312 * of it. Also, some of the skill stuff is only put in
2313 * there, as well as the confusion stuff.
2314 */
2315 move_player (op, op->direction); 2248 return move_player (op, op->direction);
2316 2249
2317 return op->speed_left > 0;
2318 }
2319 }
2320
2321 return 0; 2250 return false;
2322} 2251}
2323 2252
2324int 2253int
2325save_life (object *op) 2254save_life (object *op)
2326{ 2255{
… …
2328 return 0; 2257 return 0;
2329 2258
2330 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2259 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2331 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2260 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2332 { 2261 {
2333 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2262 op->play_sound (sound_find ("ob_evaporate"));
2334 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2263 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2335 2264
2336 if (op->contr) 2265 if (op->contr)
2337 esrv_del_item (op->contr, tmp->count); 2266 esrv_del_item (op->contr, tmp->count);
2338 2267
… …
2358/* This goes throws the inventory and removes unpaid objects, and puts them 2287/* This goes throws the inventory and removes unpaid objects, and puts them
2359 * back in the map (location and map determined by values of env). This 2288 * back in the map (location and map determined by values of env). This
2360 * function will descend into containers. op is the object to start the search 2289 * function will descend into containers. op is the object to start the search
2361 * from. 2290 * from.
2362 */ 2291 */
2363void 2292static void
2364remove_unpaid_objects (object *op, object *env) 2293drop_unpaid_items (object *op, object *env)
2365{ 2294{
2366 object *next;
2367
2368 while (op) 2295 while (op)
2369 { 2296 {
2370 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2297 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2371 2298
2372 if (QUERY_FLAG (op, FLAG_UNPAID)) 2299 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2375 esrv_del_item (env->contr, op->count); 2302 esrv_del_item (env->contr, op->count);
2376 2303
2377 op->insert_at (env); 2304 op->insert_at (env);
2378 } 2305 }
2379 else if (op->inv) 2306 else if (op->inv)
2380 remove_unpaid_objects (op->inv, env); 2307 drop_unpaid_items (op->inv, env);
2381 2308
2382 op = next; 2309 op = next;
2383 } 2310 }
2311}
2312
2313void
2314object::drop_unpaid_items ()
2315{
2316 if (!flag [FLAG_REMOVED])
2317 ::drop_unpaid_items (inv, this);
2384} 2318}
2385 2319
2386/* 2320/*
2387 * Returns pointer a static string containing gravestone text 2321 * Returns pointer a static string containing gravestone text
2388 * Moved from apply.c to player.c - player.c is what 2322 * Moved from apply.c to player.c - player.c is what
… …
2438 int rate_grace = 2000; 2372 int rate_grace = 2000;
2439 const int max_hp = 1; 2373 const int max_hp = 1;
2440 const int max_sp = 1; 2374 const int max_sp = 1;
2441 const int max_grace = 1; 2375 const int max_grace = 1;
2442 2376
2443 if (op->contr->outputs_sync) 2377 if (op->contr->hidden)
2378 {
2379 op->invisible = 1000;
2380 /* the socket code flashes the player visible/invisible
2381 * depending on the value of invisible, so we need to
2382 * alternate it here for it to work correctly.
2383 */
2384 if (pticks & 2)
2385 op->invisible--;
2444 { 2386 }
2445 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2387 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2446 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2388 {
2447 flush_output_element (op, &op->contr->outputs[i]); 2389 if (!op->invisible--)
2390 {
2391 make_visible (op);
2392 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2393 }
2448 } 2394 }
2449 2395
2450 if (op->contr->ns->state == ST_PLAYING) 2396 if (op->contr->ns->state == ST_PLAYING)
2451 { 2397 {
2452 /* these next three if clauses make it possible to SLOW DOWN 2398 /* these next three if clauses make it possible to SLOW DOWN
… …
2474 gen_grace = op->stats.maxgrace; 2420 gen_grace = op->stats.maxgrace;
2475 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2421 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2476 } 2422 }
2477 2423
2478 /* Regenerate Spell Points */ 2424 /* Regenerate Spell Points */
2479 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2425 if (!op->contr->golem && --op->last_sp < 0)
2480 { 2426 {
2481 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2427 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2482 if (op->stats.sp < op->stats.maxsp) 2428 if (op->stats.sp < op->stats.maxsp)
2483 { 2429 {
2484 op->stats.sp++; 2430 op->stats.sp++;
… …
2582 } 2528 }
2583 2529
2584 /* Digestion */ 2530 /* Digestion */
2585 if (--op->last_eat < 0) 2531 if (--op->last_eat < 0)
2586 { 2532 {
2587#ifdef COZY_SERVER 2533 int bonus = max (0, op->contr->digestion),
2588 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2534 penalty = max (0, -op->contr->digestion);
2589 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2590#else
2591 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2592#endif
2593 2535
2594 if (op->contr->gen_hp > 0)
2595 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2536 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2596 else
2597 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2598 2537
2599 /* dms do not consume food */ 2538 /* dms do not consume food */
2600 if (!QUERY_FLAG (op, FLAG_WIZ)) 2539 if (!QUERY_FLAG (op, FLAG_WIZ))
2601 op->stats.food--; 2540 op->stats.food--;
2602 } 2541 }
… …
2663 object *tmp; 2602 object *tmp;
2664 2603
2665 if (save_life (op)) 2604 if (save_life (op))
2666 return; 2605 return;
2667 2606
2668
2669 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2607 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2670 * in cities ONLY!!! It is very important that this doesn't get abused. 2608 * in cities ONLY!!! It is very important that this doesn't get abused.
2671 * Look at op_on_battleground() for more info --AndreasV 2609 * Look at op_on_battleground() for more info --AndreasV
2672 */ 2610 */
2673 if (op_on_battleground (op, &x, &y)) 2611 if (op_on_battleground (op, &x, &y))
… …
2702 tmp->name = buf; 2640 tmp->name = buf;
2703 sprintf (buf, " This finger has been cut off %s\n" 2641 sprintf (buf, " This finger has been cut off %s\n"
2704 " the %s, when he was defeated at\n level %d by %s.\n", 2642 " the %s, when he was defeated at\n level %d by %s.\n",
2705 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2643 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2706 tmp->msg = buf; 2644 tmp->msg = buf;
2707 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2645 tmp->value = 0, tmp->type = 0;
2708 tmp->materialname = NULL; 2646 tmp->materialname = "organics";
2709 tmp->insert_at (op, tmp); 2647 tmp->insert_at (op, tmp);
2710 } 2648 }
2711 2649
2712 /* teleport defeated player to new destination */ 2650 /* teleport defeated player to new destination */
2713 transfer_ob (op, x, y, 0, NULL); 2651 transfer_ob (op, x, y, 0, NULL);
… …
2725 strcpy (op->contr->killer, "starvation"); 2663 strcpy (op->contr->killer, "starvation");
2726 } 2664 }
2727 else 2665 else
2728 sprintf (buf, "%s died.", &op->name); 2666 sprintf (buf, "%s died.", &op->name);
2729 2667
2730 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2668 op->contr->play_sound (sound_find ("player_dies"));
2731 2669
2732 /* save the map location for corpse, gravestone */ 2670 /* save the map location for corpse, gravestone */
2733 x = op->x; 2671 x = op->x;
2734 y = op->y; 2672 y = op->y;
2735 map = op->map; 2673 map = op->map;
… …
2909 op->stats.hp = op->stats.maxhp; 2847 op->stats.hp = op->stats.maxhp;
2910 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2848 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2911 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2849 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2912 2850
2913 /* 2851 /*
2914 * Check to see if the player is in a shop. IF so, then check to see if
2915 * the player has any unpaid items. If so, remove them and put them back 2852 * Check to see if the player has any unpaid items. If so, remove them
2916 * in the map. 2853 * and put them back in the map.
2917 */ 2854 */
2918 2855 op->drop_unpaid_items ();
2919 if (is_in_shop (op))
2920 remove_unpaid_objects (op->inv, op);
2921 2856
2922 /****************************************/ 2857 /****************************************/
2923 /* */ 2858 /* */
2924 /* Move player to his current respawn- */ 2859 /* Move player to his current respawn- */
2925 /* position (usually last savebed) */ 2860 /* position (usually last savebed) */
… …
2945 object *force; 2880 object *force;
2946 int at; 2881 int at;
2947 2882
2948 force = get_archetype (FORCE_NAME); 2883 force = get_archetype (FORCE_NAME);
2949 /* 50 ticks should be enough time for the spell to abate */ 2884 /* 50 ticks should be enough time for the spell to abate */
2950 force->speed = 0.1; 2885 force->speed = 0.1f;
2951 force->speed_left = -5.0; 2886 force->speed_left = -5.f;
2952 SET_FLAG (force, FLAG_APPLIED); 2887 SET_FLAG (force, FLAG_APPLIED);
2953 for (at = 0; at < NROFATTACKS; at++) 2888 for (at = 0; at < NROFATTACKS; at++)
2954 if (will_kill_again & (1 << at)) 2889 if (will_kill_again & (1 << at))
2955 force->resist[at] = 100; 2890 force->resist[at] = 100;
2956 2891
… …
2965void 2900void
2966loot_object (object *op) 2901loot_object (object *op)
2967{ /* Grab and destroy some treasure */ 2902{ /* Grab and destroy some treasure */
2968 object *tmp, *tmp2, *next; 2903 object *tmp, *tmp2, *next;
2969 2904
2970 if (op->container) 2905 op->close_container (); /* close open sack first */
2971 esrv_apply_container (op, op->container); /* close open sack first */
2972 2906
2973 for (tmp = op->inv; tmp; tmp = next) 2907 for (tmp = op->inv; tmp; tmp = next)
2974 { 2908 {
2975 next = tmp->below; 2909 next = tmp->below;
2976 2910
2977 if (tmp->invisible) 2911 if (tmp->invisible)
2978 continue; 2912 continue;
2979 2913
2980 tmp->remove (); 2914 tmp->remove ();
2981 tmp->x = op->x, tmp->y = op->y; 2915 tmp->x = op->x, tmp->y = op->y;
2916
2982 if (tmp->type == CONTAINER) 2917 if (tmp->type == CONTAINER)
2983 { /* empty container to ground */ 2918 loot_object (tmp); /* empty container to ground */
2984 loot_object (tmp); 2919
2985 }
2986 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2920 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2987 { 2921 {
2988 if (tmp->nrof > 1) 2922 if (tmp->nrof > 1)
2989 { 2923 {
2990 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2924 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2991 tmp2->destroy (); 2925 tmp2->destroy ();
… …
3002/* 2936/*
3003 * fix_weight(): Check recursively the weight of all players, and fix 2937 * fix_weight(): Check recursively the weight of all players, and fix
3004 * what needs to be fixed. Refresh windows and fix speed if anything 2938 * what needs to be fixed. Refresh windows and fix speed if anything
3005 * was changed. 2939 * was changed.
3006 */ 2940 */
3007
3008void 2941void
3009fix_weight (void) 2942fix_weight (void)
3010{ 2943{
3011 for_all_players (pl) 2944 for_all_players (pl)
3012 { 2945 {
… …
3072 if (op->type == PLAYER) 3005 if (op->type == PLAYER)
3073 { 3006 {
3074 op->contr->tmp_invis = 0; 3007 op->contr->tmp_invis = 0;
3075 op->contr->invis_race = 0; 3008 op->contr->invis_race = 0;
3076 } 3009 }
3010
3077 update_object (op, UP_OBJ_FACE); 3011 update_object (op, UP_OBJ_CHANGE);
3078} 3012}
3079 3013
3080int 3014int
3081is_true_undead (object *op) 3015is_true_undead (object *op)
3082{ 3016{
3083 object *tmp = NULL;
3084
3085 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3017 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3086 return 1; 3018 return 1;
3087 3019
3088 return 0; 3020 return 0;
3089} 3021}
3090 3022
… …
3134/* For Hidden creatures - a chance of becoming 'unhidden' 3066/* For Hidden creatures - a chance of becoming 'unhidden'
3135 * every time they move - as we subtract off 'invisibility' 3067 * every time they move - as we subtract off 'invisibility'
3136 * AND, for players, if they move into a ridiculously unhideable 3068 * AND, for players, if they move into a ridiculously unhideable
3137 * spot (surrounded by clear terrain in broad daylight). -b.t. 3069 * spot (surrounded by clear terrain in broad daylight). -b.t.
3138 */ 3070 */
3139
3140void 3071void
3141do_hidden_move (object *op) 3072do_hidden_move (object *op)
3142{ 3073{
3143 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3074 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3144 object *skop; 3075 object *skop;
… …
3261 * a blocked los square. 3192 * a blocked los square.
3262 * we use the archetype to figure out offsets. 3193 * we use the archetype to figure out offsets.
3263 */ 3194 */
3264 while (op) 3195 while (op)
3265 { 3196 {
3266 dx = rv.distance_x + op->arch->clone.x; 3197 dx = rv.distance_x + op->arch->x;
3267 dy = rv.distance_y + op->arch->clone.y; 3198 dy = rv.distance_y + op->arch->y;
3268 3199
3269 /* only the viewable area the player sees is updated by LOS 3200 /* only the viewable area the player sees is updated by LOS
3270 * code, so we need to restrict ourselves to that range of values 3201 * code, so we need to restrict ourselves to that range of values
3271 * for any meaningful values. 3202 * for any meaningful values.
3272 */ 3203 */
… …
3377 char buf[MAX_BUF]; /* tmp. string buffer */ 3308 char buf[MAX_BUF]; /* tmp. string buffer */
3378 int i = 0, j = 0; 3309 int i = 0, j = 0;
3379 3310
3380 /* get the appropriate treasurelist */ 3311 /* get the appropriate treasurelist */
3381 if (atnr == ATNR_FIRE) 3312 if (atnr == ATNR_FIRE)
3382 trlist = find_treasurelist ("dragon_ability_fire"); 3313 trlist = treasurelist::find ("dragon_ability_fire");
3383 else if (atnr == ATNR_COLD) 3314 else if (atnr == ATNR_COLD)
3384 trlist = find_treasurelist ("dragon_ability_cold"); 3315 trlist = treasurelist::find ("dragon_ability_cold");
3385 else if (atnr == ATNR_ELECTRICITY) 3316 else if (atnr == ATNR_ELECTRICITY)
3386 trlist = find_treasurelist ("dragon_ability_elec"); 3317 trlist = treasurelist::find ("dragon_ability_elec");
3387 else if (atnr == ATNR_POISON) 3318 else if (atnr == ATNR_POISON)
3388 trlist = find_treasurelist ("dragon_ability_poison"); 3319 trlist = treasurelist::find ("dragon_ability_poison");
3389 3320
3390 if (trlist == NULL || who->type != PLAYER) 3321 if (trlist == NULL || who->type != PLAYER)
3391 return; 3322 return;
3392 3323
3393 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3324 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3397 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3328 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3398 return; 3329 return;
3399 } 3330 }
3400 3331
3401 /* everything seems okay - now bring on the gift: */ 3332 /* everything seems okay - now bring on the gift: */
3402 item = &(tr->item->clone); 3333 item = tr->item;
3403 3334
3404 if (item->type == SPELL) 3335 if (item->type == SPELL)
3405 { 3336 {
3406 if (check_spell_known (who, item->name)) 3337 if (check_spell_known (who, item->name))
3407 return; 3338 return;
… …
3466 { 3397 {
3467 /* forces in the treasurelist can alter the player's stats */ 3398 /* forces in the treasurelist can alter the player's stats */
3468 object *skin; 3399 object *skin;
3469 3400
3470 /* first get the dragon skin force */ 3401 /* first get the dragon skin force */
3471 shstr_cmp dragon_skin_force ("dragon_skin_force");
3472 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3402 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3473 ; 3403 ;
3474 3404
3475 if (!skin) 3405 if (!skin)
3476 return; 3406 return;
3477 3407
… …
3525 * not readied. 3455 * not readied.
3526 */ 3456 */
3527void 3457void
3528player_unready_range_ob (player *pl, object *ob) 3458player_unready_range_ob (player *pl, object *ob)
3529{ 3459{
3530 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3460 if (pl->ob->current_weapon == ob)
3461 pl->ob->current_weapon = 0;
3462
3463 if (pl->combat_ob == ob)
3464 pl->combat_ob = 0;
3465
3531 if (pl->ranges[i] == ob) 3466 if (pl->ranged_ob == ob)
3532 {
3533 pl->ranges[i] = 0; 3467 pl->ranged_ob = 0;
3534 if (pl->shoottype == i)
3535 pl->shoottype = range_none;
3536 }
3537} 3468}
3469
3470sint8
3471player::visibility_at (maptile *map, int x, int y) const
3472{
3473 if (!ns)
3474 return 0;
3475
3476 int dx, dy;
3477 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3478 return 0;
3479
3480 x += dx - ns->current_x + ns->mapx / 2;
3481 y += dy - ns->current_y + ns->mapy / 2;
3482
3483 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3484 return 0;
3485
3486 return 100 - blocked_los [x][y];
3487}

Diff Legend

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