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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.96 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.161 by root, Thu Aug 23 15:20:33 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;
206 ob->close_container (); //TODO: client-specific
218 207
219 ns->update_look = 0; 208 ns->update_look = 0;
220 ns->look_position = 0; 209 ns->look_position = 0;
221 210
222 clear_los (ob); 211 clear_los (this);
223 212
224 ns->reset_stats (); 213 ns->reset_stats ();
225 214
226 /* make sure he's a player -- needed because of class change. */ 215 /* make sure he's a player -- needed because of class change. */
227 ob->type = PLAYER; // we are paranoid 216 ob->type = PLAYER; // we are paranoid
228 ob->race = ob->arch->clone.race; 217 ob->race = ob->arch->race;
229
230 if (!legal_range (ob, shoottype))
231 shoottype = range_none;
232 218
233 ob->carrying = sum_weight (ob); 219 ob->carrying = sum_weight (ob);
234 link_player_skills (ob); 220 link_player_skills (ob);
235 221
236 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
237 223
238 assign (title, ob->arch->clone.name); 224 assign (title, ob->arch->object::name);
239
240 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
241 * from the class, and not race. I don't see any way to get the class information
242 * to then update this. I don't think this will actually break anything - anyone
243 * that can use armour should be able to use a shield. What this may 'break'
244 * are features new characters get, eg, if someone starts up with a Q, they
245 * should be able to use a shield. However, old Q's won't get that advantage.
246 */
247 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
248 SET_FLAG (ob, FLAG_USE_SHIELD);
249 225
250 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
251 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
252 { 228 {
253 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
254 230
255 shstr_cmp dragon_ability_force ("dragon_ability_force");
256 shstr_cmp dragon_skin_force ("dragon_skin_force");
257
258 for (tmp = ob->inv; tmp; tmp = tmp->below) 231 for (tmp = ob->inv; tmp; tmp = tmp->below)
259 if (tmp->type == FORCE) 232 if (tmp->type == FORCE)
260 if (tmp->arch->name == dragon_ability_force) 233 if (tmp->arch->archname == shstr_dragon_ability_force)
261 abil = tmp; 234 abil = tmp;
262 else if (tmp->arch->name == dragon_skin_force) 235 else if (tmp->arch->archname == shstr_dragon_skin_force)
263 skin = tmp; 236 skin = tmp;
264 237
265 set_dragon_name (ob, abil, skin); 238 set_dragon_name (ob, abil, skin);
266 } 239 }
267 240
268 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 241 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
269 242
270 esrv_new_player (this, ob->weight + ob->carrying); 243 esrv_new_player (this, ob->weight + ob->carrying);
271 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);
272 ob->update_stats (); 270 ob->update_stats ();
271
273 ns->floorbox_update (); 272 ns->floorbox_update ();
274
275 esrv_send_inventory (ob, ob); 273 esrv_send_inventory (ob, ob);
276 esrv_add_spells (this, 0); 274 esrv_add_spells (this, 0);
277 275
278 activate (); 276 activate ();
279 277
… …
286} 284}
287 285
288void 286void
289player::disconnect () 287player::disconnect ()
290{ 288{
289 if (ob)
290 {
291 ob->close_container (); //TODO: client-specific
292 ob->drop_unpaid_items ();
293 }
294
291 if (ns) 295 if (ns)
292 { 296 {
293 if (active) 297 if (active)
294 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 298 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
295 299
296 INVOKE_PLAYER (DISCONNECT, this); 300 INVOKE_PLAYER (DISCONNECT, this);
297 301
302 ns->reset_stats ();
298 ns->pl = 0; 303 ns->pl = 0;
299 this->ns = 0; 304 ns = 0;
300 } 305 }
306
307 observe = ob;
301 308
302 deactivate (); 309 deactivate ();
303} 310}
304 311
305// the need for this function can be explained 312// the need for this function can be explained
306// by load_object not returning the object 313// by load_object not returning the object
307void 314void
308player::set_object (object *op) 315player::set_object (object *op)
309{ 316{
310 ob = op; 317 ob = observe = op;
311 ob->contr = this; /* this aren't yet in archetype */ 318 ob->contr = this; /* this aren't yet in archetype */
312 319
320 ob->speed = 1.0f;
313 ob->speed_left = 0.5; 321 ob->speed_left = 0.5f;
314 ob->speed = 1.0; 322
315 ob->direction = 5; /* So player faces south */ 323 ob->direction = 5; /* So player faces south */
316 ob->stats.wc = 2; 324}
317 ob->run_away = 25; /* Then we panick... */
318 325
319 ob->roll_stats (); 326void
327player::set_observe (object *op)
328{
329 observe = op ? op : ob;
330 do_los = 1;
320} 331}
321 332
322player::player () 333player::player ()
323{ 334{
324 /* There are some elements we want initialised to non zero value - 335 /* There are some elements we want initialised to non zero value -
325 * we deal with that below this point. 336 * we deal with that below this point.
326 */ 337 */
327 outputs_sync = 16; /* Every 2 seconds */ 338 outputs_sync = 4;
328 outputs_count = 8; /* Keeps present behaviour */ 339 outputs_count = 4;
329 unapply = unapply_nochoice; 340 unapply = unapply_nochoice;
330 341
331 savebed_map = first_map_path; /* Init. respawn position */ 342 savebed_map = first_map_path; /* Init. respawn position */
332 343
333 gen_sp_armour = 10; 344 gen_sp_armour = 10;
334 shoottype = range_none;
335 bowtype = bow_normal; 345 bowtype = bow_normal;
336 petmode = pet_normal; 346 petmode = pet_normal;
337 listening = 10; 347 listening = 10;
338 usekeys = containers; 348 usekeys = containers;
339 peaceful = 1; /* default peaceful */ 349 peaceful = 1; /* default peaceful */
340 do_los = 1; 350 do_los = 1;
351
352 weapon_sp = 1.0f;
353 weapon_sp_left = 0.5f;
341} 354}
342 355
343void 356void
344player::do_destroy () 357player::do_destroy ()
345{ 358{
… …
350 if (ob) 363 if (ob)
351 { 364 {
352 ob->destroy_inv (false); 365 ob->destroy_inv (false);
353 ob->destroy (); 366 ob->destroy ();
354 } 367 }
368
369 ob = observe = 0;
355} 370}
356 371
357player::~player () 372player::~player ()
358{ 373{
359 /* Clear item stack */ 374 /* Clear item stack */
… …
368player::create () 383player::create ()
369{ 384{
370 player *pl = new player; 385 player *pl = new player;
371 386
372 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
373 set_first_map (pl->ob); 393 set_first_map (pl->ob);
374 394
375 return pl; 395 return pl;
376} 396}
377 397
… …
381 * Note: there MUST be at least one player archetype! 401 * Note: there MUST be at least one player archetype!
382 */ 402 */
383archetype * 403archetype *
384get_player_archetype (archetype *at) 404get_player_archetype (archetype *at)
385{ 405{
386 archetype *start = at; 406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
387 407
388 for (;;) 408 for (;;)
389 { 409 {
390 if (at == NULL || at->next == NULL) 410 if (++i == archetypes.end ())
391 at = first_archetype; 411 i = archetypes.begin ();
392 else 412 else if (*i == at)
393 at = at->next; 413 cleanup ("not a single player archetype found");
394 414
395 if (at->clone.type == PLAYER) 415 if ((*i)->type == PLAYER)
396 return at; 416 return *i;
397
398 if (at == start)
399 {
400 LOG (llevError, "No Player archetypes\n");
401 exit (-1);
402 }
403 } 417 }
404} 418}
405 419
406object * 420object *
407get_nearest_player (object *mon) 421get_nearest_player (object *mon)
… …
411 unsigned lastdist; 425 unsigned lastdist;
412 rv_vector rv; 426 rv_vector rv;
413 427
414 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 428 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
415 { 429 {
416 /* We should not find free objects on this friendly list, but it
417 * does periodically happen. Given that, lets deal with it.
418 * While unlikely, it is possible the next object on the friendly
419 * list is also free, so encapsulate this in a while loop.
420 */
421 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
422 {
423 object *tmp = ol->ob;
424
425 /* Can't do much more other than log the fact, because the object
426 * itself will have been cleared.
427 */
428 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
429 tmp->debug_desc ());
430 ol = ol->next;
431 remove_friendly_object (tmp);
432 if (!ol)
433 return op;
434 }
435
436 /* Remove special check for player from this. First, it looks to cause
437 * some crashes (ol->ob->contr not set properly?), but secondly, a more
438 * complicated method of state checking would be needed in any case -
439 * as it was, a clever player could type quit, and the function would
440 * skip them over while waiting for confirmation. Remove
441 * on_same_map check, as can_detect_enemy also does this
442 */
443 if (!can_detect_enemy (mon, ol->ob, &rv)) 430 if (!can_detect_enemy (mon, ol->ob, &rv))
444 continue; 431 continue;
445 432
446 if (lastdist > rv.distance) 433 if (lastdist > rv.distance)
447 { 434 {
… …
523 x = mon->x; 510 x = mon->x;
524 y = mon->y; 511 y = mon->y;
525 m = mon->map; 512 m = mon->map;
526 dir = rv.direction; 513 dir = rv.direction;
527 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 */
528 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
529 /* 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. */
530 if (diff > max) 518 if (diff > max)
531 return 0; 519 return 0;
520
532 while (diff > 1 && max > 0) 521 while (diff > 1 && max > 0)
533 { 522 {
534 lastx = x; 523 lastx = x;
535 lasty = y; 524 lasty = y;
536 lastmap = m; 525 lastmap = m;
… …
618 max--; 607 max--;
619 lastdir = dir; 608 lastdir = dir;
620 if (!firstdir) 609 if (!firstdir)
621 firstdir = dir; 610 firstdir = dir;
622 } 611 }
612
623 if (diff <= 1) 613 if (diff <= 1)
624 { 614 {
625 /* Recalculate diff (distance) because we may not have actually 615 /* Recalculate diff (distance) because we may not have actually
626 * headed toward player for entire distance. 616 * headed toward player for entire distance.
627 */ 617 */
628 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 618 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
629 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 619 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
630 } 620 }
621
631 if (diff > max) 622 if (diff > max)
632 return 0; 623 return 0;
633 } 624 }
625
634 /* 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 */
635 if (!max) 627 if (!max)
636 return 0; 628 return 0;
637 629
638 return firstdir; 630 return firstdir;
… …
752roll_stat (void) 744roll_stat (void)
753{ 745{
754 int a[4], i, j, k; 746 int a[4], i, j, k;
755 747
756 for (i = 0; i < 4; i++) 748 for (i = 0; i < 4; i++)
757 a[i] = (int) RANDOM () % 6 + 1; 749 a[i] = (int) rndm (6) + 1;
758 750
759 for (i = 0, j = 0, k = 7; i < 4; i++) 751 for (i = 0, j = 0, k = 7; i < 4; i++)
760 if (a[i] < k) 752 if (a[i] < k)
761 k = a[i], j = i; 753 k = a[i], j = i;
762 754
… …
768} 760}
769 761
770void 762void
771object::roll_stats () 763object::roll_stats ()
772{ 764{
773 int statsort [7]; 765 int statsort [NUM_STATS];
774 766
775 for (;;) 767 for (;;)
776 { 768 {
777 int sum = 0; 769 int sum = 0;
778 for (int i = 7; i--; ) 770 for (int i = NUM_STATS; i--; )
779 sum += statsort [i] = roll_stat (); 771 sum += statsort [i] = roll_stat ();
780 772
781 if (sum >= 82 && sum <= 116) 773 if (sum >= 82 && sum <= 116)
782 break; 774 break;
783 } 775 }
784 776
785 // Sort the stats so that rerolling is easier... 777 // Sort the stats so that rerolling is easier...
786 std::sort (statsort, statsort + 7, std::greater<int>()); 778 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
787 779
780 for (int i = 0; i < NUM_STATS; ++i)
788 stats.Str = statsort[0]; 781 stats.stat (i) = statsort [i];
789 stats.Dex = statsort[1];
790 stats.Con = statsort[2];
791 stats.Int = statsort[3];
792 stats.Wis = statsort[4];
793 stats.Pow = statsort[5];
794 stats.Cha = statsort[6];
795 782
796 stats.exp = 0; 783 stats.exp = 0;
797 stats.ac = 0; 784 stats.ac = 0;
798 785
799 stats.hp = stats.maxhp; 786 stats.hp = stats.maxhp;
… …
811} 798}
812 799
813void 800void
814object::swap_stats (int a, int b) 801object::swap_stats (int a, int b)
815{ 802{
816 int tmp = get_attr_value (&contr->orig_stats, a); 803 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
817 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
818 set_attr_value (&contr->orig_stats, b, tmp);
819 804
805 for (int i = 0; i < NUM_STATS; ++i)
820 stats.Str = contr->orig_stats.Str; 806 stats.stat (i) = contr->orig_stats.stat (i);
821 stats.Dex = contr->orig_stats.Dex;
822 stats.Con = contr->orig_stats.Con;
823 stats.Int = contr->orig_stats.Int;
824 stats.Wis = contr->orig_stats.Wis;
825 stats.Pow = contr->orig_stats.Pow;
826 stats.Cha = contr->orig_stats.Cha;
827 807
828 //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,
829 // be merged with the similar code in roll_stats 809 // be merged with the similar code in roll_stats
830 stats.ac = 0; 810 stats.ac = 0;
831 811
… …
862 * appropriate action with it (change race, or other things). 842 * appropriate action with it (change race, or other things).
863 * The function name is for historical reasons - now we have 843 * The function name is for historical reasons - now we have
864 * separate race and class; this actually changes the RACE, 844 * separate race and class; this actually changes the RACE,
865 * not the class. 845 * not the class.
866 */ 846 */
867int 847void
868key_change_class (object *op, char key) 848player::chargen_race_done ()
869{ 849{
870 int tmp_loop;
871
872 if (key == 'd' || key == 'D')
873 {
874 char buf[MAX_BUF];
875
876 /* this must before then initial items are given */ 850 /* this must before then initial items are given */
877 esrv_new_player (op->contr, op->weight + op->carrying); 851 esrv_new_player (ob->contr, ob->weight + ob->carrying);
878 852
879 treasurelist *tl = find_treasurelist ("starting_wealth"); 853 treasurelist *tl = treasurelist::find ("starting_wealth");
880 if (tl) 854 if (tl)
881 create_treasure (tl, op, 0, 0, 0); 855 create_treasure (tl, ob, 0, 0, 0);
882 856
883 INVOKE_PLAYER (BIRTH, op->contr); 857 INVOKE_PLAYER (BIRTH, ob->contr);
884 INVOKE_PLAYER (LOGIN, op->contr); 858 INVOKE_PLAYER (LOGIN, ob->contr);
885 859
886 op->contr->ns->state = ST_PLAYING; 860 ob->contr->ns->state = ST_PLAYING;
887 861
888 if (op->msg) 862 if (ob->msg)
889 op->msg = NULL; 863 ob->msg = 0;
890 864
891 /* 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
892 * to save here. 866 * to save here.
893 */ 867 */
868 {
869 char buf[MAX_BUF];
894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 870 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
895 make_path_to_file (buf); 871 make_path_to_file (buf);
872 }
896 873
897 start_info (op); 874 start_info (ob);
898 CLEAR_FLAG (op, FLAG_WIZ); 875 CLEAR_FLAG (ob, FLAG_WIZ);
899 give_initial_items (op, op->randomitems); 876 give_initial_items (ob, ob->randomitems);
900 link_player_skills (op); 877 link_player_skills (ob);
901 esrv_send_inventory (op, op); 878 esrv_send_inventory (ob, ob);
902 op->update_stats (); 879 ob->update_stats ();
903 880
904 /* This moves the player to a different start map, if there 881 /* This moves the player to a different start map, if there
905 * is one for this race 882 * is one for this race
906 */ 883 */
907 if (*first_map_ext_path) 884 if (*first_map_ext_path)
908 { 885 {
909 object *tmp; 886 object *tmp;
910 char mapname[MAX_BUF]; 887 char mapname[MAX_BUF];
911 888
912 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);
913 tmp = object::create (); 890 tmp = object::create ();
914 EXIT_PATH (tmp) = mapname; 891 EXIT_PATH (tmp) = mapname;
915 EXIT_X (tmp) = op->x; 892 EXIT_X (tmp) = ob->x;
916 EXIT_Y (tmp) = op->y; 893 EXIT_Y (tmp) = ob->y;
917 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;
918 * if the map isn't there, then stay on the 895 * if the map isn't there, then stay on the
919 * default initial map */ 896 * default initial map */
920 tmp->destroy (); 897 tmp->destroy ();
921 } 898 }
922 else 899 else
923 LOG (llevDebug, "first_map_ext_path not set\n"); 900 LOG (llevDebug, "first_map_ext_path not set\n");
901}
924 902
925 return 0; 903void
926 } 904player::chargen_race_next ()
927 905{
928 /* Following actually changes the race - this is the default command 906 /* Following actually changes the race - this is the default command
929 * if we don't match with one of the options above. 907 * if we don't match with one of the options above.
930 */ 908 */
931 909
932 tmp_loop = 0; 910 do
933 while (!tmp_loop)
934 { 911 {
935 shstr name = op->name; 912 shstr name = ob->name;
936 int x = op->x, y = op->y; 913 int x = ob->x, y = ob->y;
937 914
938 op->remove_statbonus (); 915 ob->remove_statbonus ();
939 op->remove (); 916 ob->remove ();
940 op->arch = get_player_archetype (op->arch); 917 ob->arch = get_player_archetype (ob->arch);
941 op->arch->clone.copy_to (op); 918 ob->arch->copy_to (ob);
942 op->instantiate (); 919 ob->instantiate ();
943 op->stats = op->contr->orig_stats; 920 ob->stats = ob->contr->orig_stats;
944 op->name = op->name_pl = name; 921 ob->name = ob->name_pl = name;
945 op->x = x; 922 ob->x = x;
946 op->y = y; 923 ob->y = y;
947 SET_ANIMATION (op, 2); /* So player faces south */ 924 SET_ANIMATION (ob, 2); /* So player faces south */
948 insert_ob_in_map (op, op->map, op, 0); 925 insert_ob_in_map (ob, ob->map, ob, 0);
949 assign (op->contr->title, op->arch->clone.name); 926 assign (ob->contr->title, ob->arch->object::name);
950 op->add_statbonus (); 927 ob->add_statbonus ();
951 tmp_loop = allowed_class (op);
952 } 928 }
929 while (!allowed_class (ob));
953 930
954 update_object (op, UP_OBJ_FACE); 931 update_object (ob, UP_OBJ_FACE);
955 esrv_update_item (UPD_FACE, op, op); 932 esrv_update_item (UPD_FACE, ob, ob);
956 op->update_stats (); 933 ob->update_stats ();
957 op->stats.hp = op->stats.maxhp; 934 ob->stats.hp = ob->stats.maxhp;
958 op->stats.sp = op->stats.maxsp; 935 ob->stats.sp = ob->stats.maxsp;
959 op->stats.grace = 0; 936 ob->stats.grace = 0;
960
961 if (op->msg)
962 new_draw_info (NDI_BLUE, 0, op, op->msg);
963
964 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
965 return 0;
966} 937}
967 938
968void 939void
969flee_player (object *op) 940flee_player (object *op)
970{ 941{
… …
1017 /* Cornered, get rid of scared */ 988 /* Cornered, get rid of scared */
1018 CLEAR_FLAG (op, FLAG_SCARED); 989 CLEAR_FLAG (op, FLAG_SCARED);
1019 op->enemy = NULL; 990 op->enemy = NULL;
1020} 991}
1021 992
1022
1023/* 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.
1024 * 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
1025 * stop. 995 * stop.
1026 */ 996 */
1027int 997int
1028check_pick (object *op) 998check_pick (object *op)
1029{ 999{
1030 object *tmp, *next; 1000 object *tmp, *next;
1031 int stop = 0; 1001 int stop = 0;
1032 int j, k, wvratio; 1002 int wvratio;
1033 char putstring[128], tmpstr[16]; 1003 char putstring[128];
1034 1004
1035 /* if you're flying, you cna't pick up anything */ 1005 /* if you're flying, you cna't pick up anything */
1036 if (op->move_type & MOVE_FLYING) 1006 if (op->move_type & MOVE_FLYING)
1037 return 1; 1007 return 1;
1038 1008
… …
1106 if (tmp->name != NULL) 1076 if (tmp->name != NULL)
1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1077 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1078 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109 else 1079 else
1110 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1080 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1081 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112 1082
1113 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1083 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114 } 1084 }
1115 1085
1116 /* philosophy: 1086 /* philosophy:
… …
1191 pick_up (op, tmp); 1161 pick_up (op, tmp);
1192 continue; 1162 continue;
1193 } 1163 }
1194 1164
1195 if (op->contr->mode & PU_READABLES) 1165 if (op->contr->mode & PU_READABLES)
1196 if (tmp->type == BOOK || tmp->type == SCROLL) 1166 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1197 { 1167 {
1198 pick_up (op, tmp); 1168 pick_up (op, tmp);
1199 continue; 1169 continue;
1200 } 1170 }
1201 1171
… …
1309 /* careful: chairs and tables are weapons! */ 1279 /* careful: chairs and tables are weapons! */
1310 if (op->contr->mode & PU_ALLWEAPON) 1280 if (op->contr->mode & PU_ALLWEAPON)
1311 { 1281 {
1312 if (tmp->type == WEAPON && tmp->name != NULL) 1282 if (tmp->type == WEAPON && tmp->name != NULL)
1313 { 1283 {
1314 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 &&
1315 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1285 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316 { 1286 {
1317 pick_up (op, tmp); 1287 pick_up (op, tmp);
1318 continue; 1288 continue;
1319 } 1289 }
1320 } 1290 }
1321 1291
1322 if (tmp->type == WEAPON && tmp->name == NULL) 1292 if (tmp->type == WEAPON && tmp->name == NULL)
1323 { 1293 {
1324 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)
1325 { 1295 {
1326 pick_up (op, tmp); 1296 pick_up (op, tmp);
1327 continue; 1297 continue;
1328 } 1298 }
1329 } 1299 }
… …
1354 if (tmp->name != NULL) 1324 if (tmp->name != NULL)
1355 { 1325 {
1356 fprintf (stderr, "%s", tmp->name); 1326 fprintf (stderr, "%s", tmp->name);
1357 } 1327 }
1358 else 1328 else
1359 fprintf (stderr, "%s", tmp->arch->name); 1329 fprintf (stderr, "%s", tmp->arch->archname);
1360 fprintf (stderr, ",%d] = ", tmp->type); 1330 fprintf (stderr, ",%d] = ", tmp->type);
1361 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))));
1362#endif 1332#endif
1363 continue; 1333 continue;
1364 } 1334 }
… …
1375 * found object is returned. 1345 * found object is returned.
1376 */ 1346 */
1377object * 1347object *
1378find_arrow (object *op, const char *type) 1348find_arrow (object *op, const char *type)
1379{ 1349{
1380 object *tmp = NULL; 1350 object *tmp = 0;
1381 1351
1382 for (op = op->inv; op; op = op->below) 1352 for (op = op->inv; op; op = op->below)
1383 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))
1384 tmp = find_arrow (op, type); 1354 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1355 else if (op->type == ARROW && op->race == type)
1386 return op; 1356 return op;
1357
1387 return tmp; 1358 return tmp;
1388} 1359}
1389 1360
1390/* 1361/*
1391 * 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
1392 * 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
1393 * 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
1394 * 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.
1395 */ 1366 */
1396
1397object * 1367object *
1398find_better_arrow (object *op, object *target, const char *type, int *better) 1368find_better_arrow (object *op, object *target, const char *type, int *better)
1399{ 1369{
1400 object *tmp = NULL, *arrow, *ntmp; 1370 object *tmp = NULL, *arrow, *ntmp;
1401 int attacknum, attacktype, betterby = 0, i; 1371 int attacknum, attacktype, betterby = 0, i;
… …
1434 else 1404 else
1435 { 1405 {
1436 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1406 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437 { 1407 {
1438 attacktype = 1 << attacknum; 1408 attacktype = 1 << attacknum;
1439 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1409 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440 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)
1441 { 1411 {
1442 tmp = arrow; 1412 tmp = arrow;
1443 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;
1444 } 1414 }
1445 } 1415 }
1446 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1416 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447 { 1417 {
1448 tmp = arrow; 1418 tmp = arrow;
… …
1467 * find_better_arrow to find a decent arrow to use. 1437 * find_better_arrow to find a decent arrow to use.
1468 * op = the shooter 1438 * op = the shooter
1469 * type = bow->race 1439 * type = bow->race
1470 * dir = fire direction 1440 * dir = fire direction
1471 */ 1441 */
1472
1473object * 1442object *
1474pick_arrow_target (object *op, const char *type, int dir) 1443pick_arrow_target (object *op, const char *type, int dir)
1475{ 1444{
1476 object *tmp = NULL; 1445 object *tmp = NULL;
1477 maptile *m; 1446 maptile *m;
… …
1542 */ 1511 */
1543int 1512int
1544fire_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)
1545{ 1514{
1546 object *left, *bow; 1515 object *left, *bow;
1547 int bowspeed, mflags; 1516 int mflags;
1548 maptile *m; 1517 maptile *m;
1549 1518
1550 if (!dir) 1519 if (!dir)
1551 { 1520 {
1552 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!");
1553 return 0; 1522 return 0;
1554 } 1523 }
1555 1524
1556 if (op->type == PLAYER) 1525 if (op->contr)
1557 bow = op->contr->ranges[range_bow]; 1526 bow = op->current_weapon;
1558 else 1527 else
1559 { 1528 {
1560 for (bow = op->inv; bow; bow = bow->below) 1529 for (bow = op->inv; bow; bow = bow->below)
1561 /* 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
1562 * 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.
… …
1567 if (!bow) 1536 if (!bow)
1568 { 1537 {
1569 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1538 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1570 return 0; 1539 return 0;
1571 } 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
1572 } 1549 }
1573 1550
1574 if (!bow->race || !bow->skill) 1551 if (!bow->race || !bow->skill)
1575 { 1552 {
1576 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);
1577 return 0; 1554 return 0;
1578 } 1555 }
1579
1580 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1581
1582 /* penalize ROF for bestarrow */
1583 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1584 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1585
1586 if (bowspeed < 1)
1587 bowspeed = 1;
1588 1556
1589 if (arrow == NULL) 1557 if (arrow == NULL)
1590 { 1558 {
1591 if ((arrow = find_arrow (op, bow->race)) == NULL) 1559 if ((arrow = find_arrow (op, bow->race)) == NULL)
1592 { 1560 {
1593 if (op->type == PLAYER) 1561 if (op->type == PLAYER)
1594 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);
1595 /* 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 */
1596 else 1564 else
1597 CLEAR_FLAG (op, FLAG_READY_BOW); 1565 CLEAR_FLAG (op, FLAG_READY_BOW);
1566
1598 return 0; 1567 return 0;
1599 } 1568 }
1600 } 1569 }
1601 1570
1602 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1571 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1626 1595
1627 arrow->set_owner (op); 1596 arrow->set_owner (op);
1628 arrow->skill = bow->skill; 1597 arrow->skill = bow->skill;
1629 arrow->direction = dir; 1598 arrow->direction = dir;
1630 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
1631 if (op->type == PLAYER) 1633 if (op->type == PLAYER)
1632 { 1634 {
1633 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1634 op->update_stats ();
1635 }
1636
1637 SET_ANIMATION (arrow, arrow->direction);
1638 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1639 arrow->stats.hp = arrow->stats.dam;
1640 arrow->stats.grace = arrow->attacktype;
1641 if (arrow->slaying != NULL)
1642 arrow->spellarg = strdup (arrow->slaying);
1643
1644 /* Note that this was different for monsters - they got their level
1645 * added to the damage. I think the strength bonus is more proper.
1646 */
1647
1648 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1649
1650 /* update the speed */
1651 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1652 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1653
1654 arrow->set_speed (max (arrow->speed, 1.0));
1655 arrow->speed_left = 0;
1656
1657 if (op->type == PLAYER)
1658 {
1659 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1660 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1661 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1662
1663 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 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;
1664 } 1642 }
1665 else 1643 else
1666 { 1644 {
1667 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1668 arrow->level = op->level; 1645 arrow->level = op->level;
1669 } 1646 arrow->stats.wc -= bow->magic;
1670 1647
1671 if (arrow->attacktype == AT_PHYSICAL) 1648 if (!arrow->slaying)
1649 arrow->slaying = bow->slaying;
1650
1672 arrow->attacktype |= bow->attacktype; 1651 arrow->attacktype |= bow->attacktype;
1652 }
1673 1653
1674 if (bow->slaying) 1654 wc -= arrow->level;
1675 arrow->slaying = bow->slaying; 1655 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1676 1656
1657 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1677 arrow->move_type = MOVE_FLY_LOW; 1658 arrow->move_type = MOVE_FLY_LOW;
1678 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1659 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1679 1660
1680 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1661 op->play_sound (sound_find ("fire_arrow"));
1681 m->insert (arrow, sx, sy, op); 1662 m->insert (arrow, sx, sy, op);
1682 1663
1683 if (!arrow->destroyed ()) 1664 if (!arrow->destroyed ())
1684 move_arrow (arrow); 1665 move_arrow (arrow);
1685 1666
… …
1706{ 1687{
1707 int ret = 0, wcmod = 0; 1688 int ret = 0, wcmod = 0;
1708 1689
1709 if (op->contr->bowtype == bow_bestarrow) 1690 if (op->contr->bowtype == bow_bestarrow)
1710 { 1691 {
1711 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);
1712 } 1693 }
1713 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)
1714 { 1695 {
1715 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1696 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1716 wcmod = -1; 1697 wcmod = -1;
… …
1726 else if (op->contr->bowtype == bow_spreadshot) 1707 else if (op->contr->bowtype == bow_spreadshot)
1727 { 1708 {
1728 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);
1729 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);
1730 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);
1731
1732 } 1712 }
1733 else 1713 else
1734 { 1714 {
1735 /* Simple case */ 1715 /* Simple case */
1736 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);
1737 } 1717 }
1718
1738 return ret; 1719 return ret;
1739} 1720}
1740
1741 1721
1742/* Fires a misc (wand/rod/horn) object in 'dir'. 1722/* Fires a misc (wand/rod/horn) object in 'dir'.
1743 * Broken apart from 'fire' to keep it more readable. 1723 * Broken apart from 'fire' to keep it more readable.
1744 */ 1724 */
1745void 1725void
1746fire_misc_object (object *op, int dir) 1726fire_misc_object (object *op, int dir)
1747{ 1727{
1748 object *item; 1728 object *item = op->contr->ranged_ob;
1749 1729
1750 if (!op->contr->ranges[range_misc]) 1730 if (!item)
1751 { 1731 {
1752 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.");
1753 return; 1733 return;
1754 } 1734 }
1755 1735
1756 item = op->contr->ranges[range_misc];
1757 if (!item->inv) 1736 if (!item->inv)
1758 { 1737 {
1759 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1738 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1760 return; 1739 return;
1761 } 1740 }
1741
1742 if (!op->change_weapon (item))
1743 return;
1744
1762 if (item->type == WAND) 1745 if (item->type == WAND)
1763 { 1746 {
1764 if (item->stats.food <= 0) 1747 if (item->stats.food <= 0)
1765 { 1748 {
1766 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1749 op->contr->play_sound (sound_find ("wand_poof"));
1767 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1750 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1751
1768 return; 1752 return;
1769 } 1753 }
1770 } 1754 }
1771 else if (item->type == ROD || item->type == HORN) 1755 else if (item->type == ROD || item->type == HORN)
1772 { 1756 {
1773 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))
1774 { 1758 {
1775 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1759 op->contr->play_sound (sound_find ("wand_poof"));
1760
1776 if (item->type == ROD) 1761 if (item->type == ROD)
1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1762 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1778 else 1763 else
1779 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
1780 return; 1766 return;
1781 } 1767 }
1782 } 1768 }
1783 1769
1784 if (cast_spell (op, item, dir, item->inv, NULL)) 1770 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1791 object *tmp; 1777 object *tmp;
1792 1778
1793 if (item->arch) 1779 if (item->arch)
1794 { 1780 {
1795 CLEAR_FLAG (item, FLAG_ANIMATE); 1781 CLEAR_FLAG (item, FLAG_ANIMATE);
1796 item->face = item->arch->clone.face; 1782 item->face = item->arch->face;
1797 item->set_speed (0); 1783 item->set_speed (0);
1798 } 1784 }
1799 1785
1800 if ((tmp = item->in_player ())) 1786 if ((tmp = item->in_player ()))
1801 esrv_update_item (UPD_ANIM, tmp, item); 1787 esrv_update_item (UPD_ANIM, tmp, item);
… …
1806 } 1792 }
1807} 1793}
1808 1794
1809/* Received a fire command for the player - go and do it. 1795/* Received a fire command for the player - go and do it.
1810 */ 1796 */
1811void 1797bool
1812fire (object *op, int dir) 1798fire (object *op, int dir)
1813{ 1799{
1814 int spellcost = 0; 1800 int spellcost = 0;
1815 1801
1816 /* check for loss of invisiblity/hide */ 1802 /* check for loss of invisiblity/hide */
1817 if (action_makes_visible (op)) 1803 if (action_makes_visible (op))
1818 make_visible (op); 1804 make_visible (op);
1819 1805
1820 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;
1821 { 1812 }
1822 case range_none:
1823 return;
1824 1813
1825 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:
1826 player_fire_bow (op, dir); 1830 player_fire_bow (op, dir);
1827 return; 1831 break;
1828 1832
1829 case range_magic: /* Casting spells */ 1833 case SPELL:
1830 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);
1831 return; 1835 break;
1832 1836
1833 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:
1834 fire_misc_object (op, dir); 1846 fire_misc_object (op, dir);
1835 return; 1847 break;
1836
1837 case range_golem: /* Control summoned monsters from scrolls */
1838 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1839 {
1840 op->contr->ranges[range_golem] = 0;
1841 op->contr->shoottype = range_none;
1842 }
1843 else
1844 control_golem (op->contr->ranges[range_golem], dir);
1845 return;
1846
1847 case range_skill:
1848 if (!op->chosen_skill)
1849 {
1850 if (op->type == PLAYER)
1851 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1852 return;
1853 }
1854
1855 do_skill (op, op, op->chosen_skill, dir, NULL);
1856 return;
1857 case range_builder:
1858 apply_map_builder (op, dir);
1859 return;
1860 default:
1861 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1862 return;
1863 } 1848 }
1864}
1865 1849
1866 1850 return true;
1851}
1867 1852
1868/* find_key 1853/* find_key
1869 * 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
1870 * and successfully use it, we return the key, otherwise NULL 1855 * and successfully use it, we return the key, otherwise NULL
1871 * This function merges both normal and locked door, since the logic 1856 * This function merges both normal and locked door, since the logic
… …
1873 * pl is the player, 1858 * pl is the player,
1874 * inv is the objects inventory to searched 1859 * inv is the objects inventory to searched
1875 * door is the door we are trying to match against. 1860 * door is the door we are trying to match against.
1876 * This function can be called recursively to search containers. 1861 * This function can be called recursively to search containers.
1877 */ 1862 */
1878
1879object * 1863object *
1880find_key (object *pl, object *container, object *door) 1864find_key (object *pl, object *container, object *door)
1881{ 1865{
1882 object *tmp, *key; 1866 object *tmp, *key;
1883 1867
1884 /* Should not happen, but sanity checking is never bad */ 1868 /* Should not happen, but sanity checking is never bad */
1885 if (container->inv == NULL) 1869 if (!container->inv)
1886 return NULL; 1870 return 0;
1887 1871
1888 /* 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 */
1889 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1873 for (tmp = container->inv; tmp; tmp = tmp->below)
1890 { 1874 {
1891 if (door->type == DOOR && tmp->type == KEY) 1875 if (door->type == DOOR && tmp->type == KEY)
1892 break; 1876 break;
1893 /* For sanity, we should really check door type, but other stuff 1877 /* For sanity, we should really check door type, but other stuff
1894 * (like containers) can be locked with special keys 1878 * (like containers) can be locked with special keys
1895 */ 1879 */
1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1880 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1897 break; 1881 break;
1898 } 1882 }
1883
1899 /* No key found - lets search inventories now */ 1884 /* No key found - lets search inventories now */
1900 /* 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.
1901 * 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
1902 * a key, return 1887 * a key, return
1903 */ 1888 */
1904 if (!tmp) 1889 if (!tmp)
1905 { 1890 {
1906 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1891 for (tmp = container->inv; tmp; tmp = tmp->below)
1907 { 1892 {
1908 /* No reason to search empty containers */ 1893 /* No reason to search empty containers */
1909 if (tmp->type == CONTAINER && tmp->inv) 1894 if (tmp->type == CONTAINER && tmp->inv)
1910 { 1895 {
1911 if ((key = find_key (pl, tmp, door)) != NULL) 1896 if ((key = find_key (pl, tmp, door)))
1912 return key; 1897 return key;
1913 } 1898 }
1914 } 1899 }
1900
1915 if (!tmp) 1901 if (!tmp)
1916 return NULL; 1902 return NULL;
1917 } 1903 }
1904
1918 /* 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,
1919 * see if we actually want to use it 1906 * see if we actually want to use it
1920 */ 1907 */
1921 if (pl != container) 1908 if (pl != container)
1922 { 1909 {
… …
1943 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1930 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1944 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1931 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945 return NULL; 1932 return NULL;
1946 } 1933 }
1947 } 1934 }
1935
1948 return tmp; 1936 return tmp;
1949} 1937}
1950 1938
1951/* moved door processing out of move_player_attack. 1939/* moved door processing out of move_player_attack.
1952 * returns 1 if player has opened the door with a key 1940 * returns 1 if player has opened the door with a key
… …
1954 * 0 otherwise 1942 * 0 otherwise
1955 */ 1943 */
1956static int 1944static int
1957player_attack_door (object *op, object *door) 1945player_attack_door (object *op, object *door)
1958{ 1946{
1959 /* 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,
1960 * 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 -
1961 * otherwise, we fall through to the rest of the code. 1949 * otherwise, we fall through to the rest of the code.
1962 */ 1950 */
1963 object *key = find_key (op, op, door); 1951 object *key = find_key (op, op, door);
1964 1952
1965 /* IF we found a key, do some extra work */ 1953 /* If we found a key, do some extra work */
1966 if (key) 1954 if (key)
1967 { 1955 {
1968 object *container = key->env; 1956 object *container = key->env;
1969 1957
1970 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1971 if (action_makes_visible (op)) 1958 if (action_makes_visible (op))
1972 make_visible (op); 1959 make_visible (op);
1960
1973 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1961 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1974 spring_trap (door->inv, op); 1962 spring_trap (door->inv, op);
1963
1975 if (door->type == DOOR) 1964 if (door->type == DOOR)
1976 {
1977 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 */
1978 }
1979 else if (door->type == LOCKED_DOOR) 1966 else if (door->type == LOCKED_DOOR)
1980 { 1967 {
1981 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));
1982 remove_door2 (door); /* remove door without violence ;-) */ 1969 remove_door2 (door); /* remove door without violence ;-) */
1983 } 1970 }
1971
1984 /* Do this after we print the message */ 1972 /* Do this after we print the message */
1985 decrease_ob (key); /* Use up one of the keys */ 1973 decrease_ob (key); /* Use up one of the keys */
1986 /* Need to update the weight the container the key was in */ 1974 /* Need to update the weight the container the key was in */
1987 if (container != op) 1975 if (container != op)
1988 esrv_update_item (UPD_WEIGHT, op, container); 1976 esrv_update_item (UPD_WEIGHT, op, container);
1977
1989 return 1; /* Nothing more to do below */ 1978 return 1; /* Nothing more to do below */
1990 } 1979 }
1991 else if (door->type == LOCKED_DOOR) 1980 else if (door->type == LOCKED_DOOR)
1992 { 1981 {
1993 /* Might as well return now - no other way to open this */ 1982 /* Might as well return now - no other way to open this */
1994 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1983 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1995 return 1; 1984 return 1;
1996 } 1985 }
1986
1997 return 0; 1987 return 0;
1998} 1988}
1999 1989
2000/* This function is just part of a breakup from move_player. 1990/* This function is just part of a breakup from move_player.
2001 * It should keep the code cleaner. 1991 * It should keep the code cleaner.
2002 * When this is called, the players direction has been updated 1992 * When this is called, the players direction has been updated
2003 * (taking into account confusion.) The player is also actually 1993 * (taking into account confusion.) The player is also actually
2004 * going to try and move (not fire weapons). 1994 * going to try and move (not fire weapons).
2005 */ 1995 */
2006void 1996bool
2007move_player_attack (object *op, int dir) 1997move_player_attack (object *op, int dir)
2008{ 1998{
2009 object *tmp, *mon;
2010 sint16 nx, ny;
2011 int on_battleground; 1999 int on_battleground;
2012 maptile *m;
2013 2000
2014 nx = freearr_x[dir] + op->x; 2001 sint16 nx = freearr_x[dir] + op->x;
2015 ny = freearr_y[dir] + op->y; 2002 sint16 ny = freearr_y[dir] + op->y;
2016 2003
2017 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 }
2018 2014
2019 /* 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
2020 * 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
2021 * 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
2022 * player. This is a pretty nasty hack, because if we could 2018 * player. This is a pretty nasty hack, because if we could
2023 * move to some space, it then means that if we are braced, we should 2019 * move to some space, it then means that if we are braced, we should
2024 * do nothing at all. As it is, if we are braced, we go through 2020 * do nothing at all. As it is, if we are braced, we go through
2025 * quite a bit of processing. However, it probably is less than what 2021 * quite a bit of processing. However, it probably is less than what
2026 * move_ob uses. 2022 * move_ob uses.
2027 */ 2023 */
2028 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2029 {
2030 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2031 {
2032 m = op->map->xy_find (nx, ny); 2024 maptile *m = op->map->xy_find (nx, ny);
2033 if (!m)
2034 return; /* Don't think this should happen */
2035 }
2036 else
2037 m = op->map;
2038 2025
2039 if (!(tmp = m->at (nx, ny).bot))
2040 return;
2041
2042 mon = 0;
2043 /* Go through all the objects, and find ones of interest. Only stop if 2026 /* Go through all the objects, and find ones of interest. Only stop if
2044 * we find a monster - that is something we know we want to attack. 2027 * we find a monster - that is something we know we want to attack.
2045 * if its a door or barrel (can roll) see if there may be monsters 2028 * if its a door or barrel (can roll) see if there may be monsters
2046 * on the space 2029 * on the space
2047 */ 2030 */
2048 while (tmp) 2031 object *mon;
2049 { 2032 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2050 if (tmp == op) 2033 {
2051 { 2034 if ((mon->flag [FLAG_ALIVE]
2052 tmp = tmp->above; 2035 || mon->type == LOCKED_DOOR
2053 continue; 2036 || mon->flag [FLAG_CAN_ROLL])
2054 }
2055
2056 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2057 {
2058 mon = tmp; 2037 && mon != op)
2059 break; 2038 break;
2060 } 2039 }
2061 2040
2062 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2063 mon = tmp;
2064
2065 tmp = tmp->above;
2066 }
2067
2068 if (!mon) /* This happens anytime the player tries to move */ 2041 if (!mon) /* This happens anytime the player tries to move */
2069 return; /* into a wall */ 2042 return false; /* into a wall */
2070 2043
2071 if (mon->head)
2072 mon = mon->head; 2044 mon = mon->head_ ();
2073 2045
2074 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)
2075 if (player_attack_door (op, mon)) 2048 if (player_attack_door (op, mon))
2049 {
2050 --op->contr->weapon_sp_left;
2076 return; 2051 return true;
2052 }
2077 2053
2078 /* The following deals with possibly attacking peaceful 2054 /* The following deals with possibly attacking peaceful
2079 * or frienddly creatures. Basically, all players are considered 2055 * or friendly creatures. Basically, all players are considered
2080 * unaggressive. If the moving player has peaceful set, then the 2056 * unaggressive. If the moving player has peaceful set, then the
2081 * object should be pushed instead of attacked. It is assumed that 2057 * object should be pushed instead of attacked. It is assumed that
2082 * if you are braced, you will not attack friends accidently, 2058 * if you are braced, you will not attack friends accidently,
2083 * and thus will not push them. 2059 * and thus will not push them.
2084 */ 2060 */
2085 2061
2086 /* 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
2087 * peaceful. Our assumption is the creature is a pet if the 2063 * peaceful. Our assumption is the creature is a pet if the
2088 * player owns it and it is either friendly or unagressive. 2064 * player owns it and it is either friendly or unagressive.
2089 */ 2065 */
2090 if ((op->type == PLAYER) 2066 if (op->type == PLAYER
2091#if COZY_SERVER
2092 &&
2093 ((mon->owner && mon->owner->contr 2067 && ((mon->owner && mon->owner->contr
2094 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2068 && same_party (mon->owner->contr->party, op->contr->party))
2095#else
2096 && mon->owner == op 2069 || mon->owner == op)
2097#endif
2098 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2070 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2099 { 2071 {
2100 /* 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 */
2101 if (op->contr->braced) 2073 if (op->contr->braced)
2102 return; 2074 return false;
2103 2075
2104 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"));
2105 (void) push_ob (mon, dir, op); 2081 push_ob (mon, dir, op);
2082
2106 if (op->contr->tmp_invis || op->hide) 2083 if (op->contr->tmp_invis || op->hide)
2107 make_visible (op); 2084 make_visible (op);
2108 2085
2109 return; 2086 return true;
2110 } 2087 }
2088 else
2089 return false;
2090 }
2111 2091
2112 /* in certain circumstances, you shouldn't attack friendly 2092 /* in certain circumstances, you shouldn't attack friendly
2113 * creatures. Note that if you are braced, you can't push 2093 * creatures. Note that if you are braced, you can't push
2114 * 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
2115 * attack them either. 2095 * attack them either.
2116 */ 2096 */
2117 if ((mon->type == PLAYER || mon->enemy != op) && 2097 if ((mon->type == PLAYER || mon->enemy != op)
2118 (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))
2119#ifdef PROHIBIT_PLAYERKILL
2120 (op->contr->peaceful 2099 && ((op->contr->peaceful
2121 || (mon->type == PLAYER 2100 || (mon->type == PLAYER && mon->contr->peaceful))
2122 && mon->contr->
2123 peaceful)) &&
2124#else
2125 op->contr->peaceful &&
2126#endif
2127 !on_battleground)) 2101 && !on_battleground))
2102 {
2103 if (op->speed_left > 0.f)
2128 { 2104 {
2105 --op->speed_left;
2106
2129 if (!op->contr->braced) 2107 if (!op->contr->braced)
2130 { 2108 {
2131 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2109 op->play_sound (sound_find ("push_player"));
2132 push_ob (mon, dir, op); 2110 push_ob (mon, dir, op);
2133 } 2111 }
2134 else 2112 else
2135 new_draw_info (0, 0, op, "You withhold your attack"); 2113 new_draw_info (0, 0, op, "You withhold your attack");
2136 2114
2137 if (op->contr->tmp_invis || op->hide) 2115 if (op->contr->tmp_invis || op->hide)
2138 make_visible (op); 2116 make_visible (op);
2139 }
2140 2117
2118 return true;
2119 }
2120 }
2141 /* If the object is a boulder or other rollable object, then 2121 /* If the object is a boulder or other rollable object, then
2142 * roll it if not braced. You can't roll it if you are braced. 2122 * roll it if not braced. You can't roll it if you are braced.
2143 */ 2123 */
2144 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)
2145 { 2127 {
2128 --op->speed_left;
2129
2146 recursive_roll (mon, dir, op); 2130 recursive_roll (mon, dir, op);
2147 if (action_makes_visible (op)) 2131 if (action_makes_visible (op))
2148 make_visible (op); 2132 make_visible (op);
2149 }
2150 2133
2134 return true;
2135 }
2136 }
2151 /* Any generic living creature. Including things like doors. 2137 /* Any generic living creature. Including things like doors.
2152 * 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
2153 * and be living. Then, it must be one of the following: 2139 * and be living. Then, it must be one of the following:
2154 * 1) Not a player, 2) A player, but of a different party. Note 2140 * 1) Not a player, 2) A player, but of a different party. Note
2155 * that party_number -1 is no party, so attacks can still happen. 2141 * that party_number -1 is no party, so attacks can still happen.
2156 */ 2142 */
2157 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2143 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2158 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2144 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2159 { 2145 {
2160 2146 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2161 /* If the player hasn't hit something this tick, and does
2162 * so, give them speed boost based on weapon speed. Doing
2163 * it here is better than process_players2, which basically
2164 * incurred a 1 tick offset.
2165 */
2166 if (!op->contr->has_hit)
2167 { 2147 {
2168 op->speed_left += op->speed / op->contr->weapon_sp; 2148 --op->contr->weapon_sp_left;
2169
2170 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2171 }
2172 2149
2173 skill_attack (mon, op, 0, 0, 0); 2150 skill_attack (mon, op, 0, 0, 0);
2174
2175 /* If attacking another player, that player gets automatic
2176 * hitback, and doesn't loose luck either.
2177 * Disable hitback on the battleground or if the target is
2178 * the wiz.
2179 */
2180 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2181 {
2182 short luck = mon->stats.luck;
2183
2184 mon->contr->has_hit = 1;
2185 skill_attack (op, mon, 0, 0, 0);
2186 mon->stats.luck = luck;
2187 }
2188 2151
2189 if (action_makes_visible (op)) 2152 if (action_makes_visible (op))
2190 make_visible (op); 2153 make_visible (op);
2191 }
2192 } /* if player should attack something */
2193}
2194 2154
2195int 2155 return true;
2156 }
2157 }
2158
2159 return false;
2160}
2161
2162bool
2196move_player (object *op, int dir) 2163move_player (object *op, int dir)
2197{ 2164{
2198 int pick; 2165 int pick;
2199 2166
2200 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2167 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2207 return 0; 2174 return 0;
2208 } 2175 }
2209 2176
2210 /* peterm: added following line */ 2177 /* peterm: added following line */
2211 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2178 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2212 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2179 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2213 2180
2214 op->facing = dir; 2181 op->facing = dir;
2215 2182
2216 if (op->hide) 2183 if (op->hide)
2217 do_hidden_move (op); 2184 do_hidden_move (op);
2218 2185
2186 bool retval;
2187
2219 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2188 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2220 /*nop */ ; 2189 retval = RESULT_INT (0);
2221 else if (op->contr->fire_on) 2190 else if (op->contr->fire_on)
2222 fire (op, dir); 2191 retval = fire (op, dir);
2223 else 2192 else
2224 { 2193 {
2225 move_player_attack (op, dir); 2194 retval = move_player_attack (op, dir);
2226 pick = check_pick (op); 2195 pick = check_pick (op);
2227 } 2196 }
2228 2197
2229 /* 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
2230 * server can handle repeat firing. 2199 * server can handle repeat firing.
… …
2237 /* Update how the player looks. Use the facing, so direction may 2206 /* Update how the player looks. Use the facing, so direction may
2238 * get reset to zero. This allows for full animation capabilities 2207 * get reset to zero. This allows for full animation capabilities
2239 * for players. 2208 * for players.
2240 */ 2209 */
2241 animate_object (op, op->facing); 2210 animate_object (op, op->facing);
2242 return 0; 2211
2212 return retval;
2243} 2213}
2244 2214
2245/* 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
2246 * new client/server stuff. 2216 * new client/server stuff.
2247 * 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
2248 * the new speed values for commands. 2218 * the new speed values for commands.
2249 * 2219 *
2250 * 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.
2251 */ 2223 */
2252int 2224bool
2253handle_newcs_player (object *op) 2225handle_newcs_player (object *op)
2254{ 2226{
2255 if (op->contr->hidden)
2256 {
2257 op->invisible = 1000;
2258 /* the socket code flashes the player visible/invisible
2259 * depending on the value of invisible, so we need to
2260 * alternate it here for it to work correctly.
2261 */
2262 if (pticks & 2)
2263 op->invisible--;
2264 }
2265 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2266 {
2267 op->invisible--;
2268 if (!op->invisible)
2269 {
2270 make_visible (op);
2271 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2272 }
2273 }
2274
2275 if (QUERY_FLAG (op, FLAG_SCARED)) 2227 if (QUERY_FLAG (op, FLAG_SCARED))
2276 { 2228 {
2277 flee_player (op); 2229 if (op->speed_left > 0.f)
2278 /* If player is still scared, that is his action for this tick */
2279 if (QUERY_FLAG (op, FLAG_SCARED))
2280 { 2230 {
2281 op->speed_left--; 2231 --op->speed_left;
2232 flee_player (op);
2233
2282 return 0; 2234 return true;
2283 } 2235 }
2236 else
2237 return false;
2284 } 2238 }
2285
2286 /* I've been seeing crashes where the golem has been destroyed, but
2287 * the player object still points to the defunct golem. The code that
2288 * destroys the golem looks correct, and it doesn't always happen, so
2289 * put this in a a workaround to clean up the golem pointer.
2290 */
2291 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2292 op->contr->ranges[range_golem] = 0;
2293 2239
2294 /* 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
2295 * the players time has been increased when doericserver has been 2241 * the players time has been increased when doericserver has been
2296 * called, so we recheck it here. 2242 * called, so we recheck it here.
2297 */ 2243 */
2298 if (op->contr->ns->handle_command ()) 2244 if (op->contr->ns->handle_command ())
2299 return 1; 2245 return true;
2300 2246
2301 if (op->speed_left > 0)
2302 {
2303 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2247 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2304 {
2305 /* All move commands take 1 tick, at least for now */
2306 op->speed_left--;
2307
2308 /* Instead of all the stuff below, let move_player take care
2309 * of it. Also, some of the skill stuff is only put in
2310 * there, as well as the confusion stuff.
2311 */
2312 move_player (op, op->direction); 2248 return move_player (op, op->direction);
2313 2249
2314 return op->speed_left > 0;
2315 }
2316 }
2317
2318 return 0; 2250 return false;
2319} 2251}
2320 2252
2321int 2253int
2322save_life (object *op) 2254save_life (object *op)
2323{ 2255{
… …
2325 return 0; 2257 return 0;
2326 2258
2327 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2259 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2328 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2260 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2329 { 2261 {
2330 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2262 op->play_sound (sound_find ("ob_evaporate"));
2331 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2263 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2332 2264
2333 if (op->contr) 2265 if (op->contr)
2334 esrv_del_item (op->contr, tmp->count); 2266 esrv_del_item (op->contr, tmp->count);
2335 2267
… …
2355/* 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
2356 * 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
2357 * 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
2358 * from. 2290 * from.
2359 */ 2291 */
2360void 2292static void
2361remove_unpaid_objects (object *op, object *env) 2293drop_unpaid_items (object *op, object *env)
2362{ 2294{
2363 object *next;
2364
2365 while (op) 2295 while (op)
2366 { 2296 {
2367 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' */
2368 2298
2369 if (QUERY_FLAG (op, FLAG_UNPAID)) 2299 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2372 esrv_del_item (env->contr, op->count); 2302 esrv_del_item (env->contr, op->count);
2373 2303
2374 op->insert_at (env); 2304 op->insert_at (env);
2375 } 2305 }
2376 else if (op->inv) 2306 else if (op->inv)
2377 remove_unpaid_objects (op->inv, env); 2307 drop_unpaid_items (op->inv, env);
2378 2308
2379 op = next; 2309 op = next;
2380 } 2310 }
2311}
2312
2313void
2314object::drop_unpaid_items ()
2315{
2316 if (!flag [FLAG_REMOVED])
2317 ::drop_unpaid_items (inv, this);
2381} 2318}
2382 2319
2383/* 2320/*
2384 * Returns pointer a static string containing gravestone text 2321 * Returns pointer a static string containing gravestone text
2385 * Moved from apply.c to player.c - player.c is what 2322 * Moved from apply.c to player.c - player.c is what
… …
2435 int rate_grace = 2000; 2372 int rate_grace = 2000;
2436 const int max_hp = 1; 2373 const int max_hp = 1;
2437 const int max_sp = 1; 2374 const int max_sp = 1;
2438 const int max_grace = 1; 2375 const int max_grace = 1;
2439 2376
2440 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--;
2441 { 2386 }
2442 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2387 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2443 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2388 {
2444 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 }
2445 } 2394 }
2446 2395
2447 if (op->contr->ns->state == ST_PLAYING) 2396 if (op->contr->ns->state == ST_PLAYING)
2448 { 2397 {
2449 /* these next three if clauses make it possible to SLOW DOWN 2398 /* these next three if clauses make it possible to SLOW DOWN
… …
2468 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2417 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2469 else 2418 else
2470 { 2419 {
2471 gen_grace = op->stats.maxgrace; 2420 gen_grace = op->stats.maxgrace;
2472 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2421 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2473 }
2474
2475 /* Regenerate Spell Points */
2476 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2477 {
2478 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2479 if (op->stats.sp < op->stats.maxsp)
2480 {
2481 op->stats.sp++;
2482 /* dms do not consume food */
2483 if (!QUERY_FLAG (op, FLAG_WIZ))
2484 {
2485 op->stats.food--;
2486 if (op->contr->digestion < 0)
2487 op->stats.food += op->contr->digestion;
2488 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2489 op->stats.food = last_food;
2490 }
2491 }
2492
2493 if (max_sp > 1)
2494 {
2495 over_sp = (gen_sp + 10) / rate_sp;
2496 if (over_sp > 0)
2497 {
2498 if (op->stats.sp < op->stats.maxsp)
2499 {
2500 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2501
2502 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2503 op->stats.sp--;
2504
2505 if (op->stats.sp > op->stats.maxsp)
2506 op->stats.sp = op->stats.maxsp;
2507 }
2508 op->last_sp = 0;
2509 }
2510 else
2511 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2512 }
2513 else
2514 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2515 } 2422 }
2516 2423
2517 /* Regenerate Grace */ 2424 /* Regenerate Grace */
2518 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2425 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2519 if (--op->last_grace < 0) 2426 if (--op->last_grace < 0)
… …
2540 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2447 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2541 } 2448 }
2542 /* wearing stuff doesn't detract from grace generation. */ 2449 /* wearing stuff doesn't detract from grace generation. */
2543 } 2450 }
2544 2451
2452 if (op->stats.food > 0)
2453 {
2545 /* Regenerate Hit Points */ 2454 /* Regenerate Spell Points */
2546 if (--op->last_heal < 0) 2455 if (!op->contr->golem && --op->last_sp < 0)
2547 {
2548 if (op->stats.hp < op->stats.maxhp)
2549 { 2456 {
2550 op->stats.hp++; 2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2551 /* dms do not consume food */ 2458
2552 if (!QUERY_FLAG (op, FLAG_WIZ)) 2459 if (op->stats.sp < op->stats.maxsp)
2553 { 2460 {
2461 op->stats.sp++;
2462
2463 /* dms do not consume food */
2464 if (!QUERY_FLAG (op, FLAG_WIZ))
2465 {
2554 op->stats.food--; 2466 op->stats.food--;
2467
2555 if (op->contr->digestion < 0) 2468 if (op->contr->digestion < 0)
2556 op->stats.food += op->contr->digestion; 2469 op->stats.food += op->contr->digestion;
2557 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2470 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2558 op->stats.food = last_food; 2471 op->stats.food = last_food;
2472 }
2559 } 2473 }
2560 }
2561 2474
2562 if (max_hp > 1) 2475 if (max_sp > 1)
2563 {
2564 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2565 if (over_hp > 0)
2566 { 2476 {
2567 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2477 over_sp = (gen_sp + 10) / rate_sp;
2478 if (over_sp > 0)
2479 {
2480 if (op->stats.sp < op->stats.maxsp)
2481 {
2482 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2483
2484 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2485 op->stats.sp--;
2486
2487 if (op->stats.sp > op->stats.maxsp)
2488 op->stats.sp = op->stats.maxsp;
2489 }
2490
2568 op->last_heal = 0; 2491 op->last_sp = 0;
2492 }
2493 else
2494 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2569 } 2495 }
2570 else 2496 else
2497 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2498 }
2499
2500 /* Regenerate Hit Points */
2501 if (--op->last_heal < 0)
2502 {
2503 if (op->stats.hp < op->stats.maxhp)
2571 { 2504 {
2572 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2505 op->stats.hp++;
2506
2507 /* dms do not consume food */
2508 if (!QUERY_FLAG (op, FLAG_WIZ))
2509 {
2510 op->stats.food--;
2511
2512 if (op->contr->digestion < 0)
2513 op->stats.food += op->contr->digestion;
2514 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2515 op->stats.food = last_food;
2516 }
2573 } 2517 }
2518
2519 if (max_hp > 1)
2520 {
2521 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2522
2523 if (over_hp > 0)
2524 {
2525 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2526 op->last_heal = 0;
2527 }
2528 else
2529 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2574 } 2530 }
2575 else 2531 else
2576 {
2577 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2532 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2578 } 2533 }
2579 } 2534 }
2580 2535
2581 /* Digestion */ 2536 /* Digestion */
2582 if (--op->last_eat < 0) 2537 if (--op->last_eat < 0)
2583 { 2538 {
2584#ifdef COZY_SERVER 2539 int bonus = max (0, op->contr->digestion),
2585 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2540 penalty = max (0, -op->contr->digestion);
2586 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2587#else
2588 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2589#endif
2590 2541
2591 if (op->contr->gen_hp > 0)
2592 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2542 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2593 else
2594 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2595 2543
2596 /* dms do not consume food */ 2544 /* dms do not consume food */
2597 if (!QUERY_FLAG (op, FLAG_WIZ)) 2545 if (!QUERY_FLAG (op, FLAG_WIZ))
2598 op->stats.food--; 2546 op->stats.food--;
2599 } 2547 }
… …
2626 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2574 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2627 manual_apply (op, flesh, 0); 2575 manual_apply (op, flesh, 0);
2628 } 2576 }
2629 } 2577 }
2630 2578
2631 while (op->stats.food < 0 && op->stats.hp >= 0) 2579 if (op->stats.food < 0)
2632 op->stats.food++, op->stats.hp--; 2580 {
2581 op->stats.hp += op->stats.food;
2582 op->stats.food = 0;
2583 }
2633 2584
2634 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2585 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2635 kill_player (op); 2586 kill_player (op);
2636 } 2587 }
2637} 2588}
… …
2660 object *tmp; 2611 object *tmp;
2661 2612
2662 if (save_life (op)) 2613 if (save_life (op))
2663 return; 2614 return;
2664 2615
2665
2666 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2616 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2667 * in cities ONLY!!! It is very important that this doesn't get abused. 2617 * in cities ONLY!!! It is very important that this doesn't get abused.
2668 * Look at op_on_battleground() for more info --AndreasV 2618 * Look at op_on_battleground() for more info --AndreasV
2669 */ 2619 */
2670 if (op_on_battleground (op, &x, &y)) 2620 if (op_on_battleground (op, &x, &y))
… …
2699 tmp->name = buf; 2649 tmp->name = buf;
2700 sprintf (buf, " This finger has been cut off %s\n" 2650 sprintf (buf, " This finger has been cut off %s\n"
2701 " the %s, when he was defeated at\n level %d by %s.\n", 2651 " the %s, when he was defeated at\n level %d by %s.\n",
2702 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2652 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2703 tmp->msg = buf; 2653 tmp->msg = buf;
2704 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2654 tmp->value = 0, tmp->type = 0;
2705 tmp->materialname = NULL; 2655 tmp->materialname = "organics";
2706 tmp->insert_at (op, tmp); 2656 tmp->insert_at (op, tmp);
2707 } 2657 }
2708 2658
2709 /* teleport defeated player to new destination */ 2659 /* teleport defeated player to new destination */
2710 transfer_ob (op, x, y, 0, NULL); 2660 transfer_ob (op, x, y, 0, NULL);
… …
2722 strcpy (op->contr->killer, "starvation"); 2672 strcpy (op->contr->killer, "starvation");
2723 } 2673 }
2724 else 2674 else
2725 sprintf (buf, "%s died.", &op->name); 2675 sprintf (buf, "%s died.", &op->name);
2726 2676
2727 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2677 op->contr->play_sound (sound_find ("player_dies"));
2728 2678
2729 /* save the map location for corpse, gravestone */ 2679 /* save the map location for corpse, gravestone */
2730 x = op->x; 2680 x = op->x;
2731 y = op->y; 2681 y = op->y;
2732 map = op->map; 2682 map = op->map;
… …
2906 op->stats.hp = op->stats.maxhp; 2856 op->stats.hp = op->stats.maxhp;
2907 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2857 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2908 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2858 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2909 2859
2910 /* 2860 /*
2911 * Check to see if the player is in a shop. IF so, then check to see if
2912 * the player has any unpaid items. If so, remove them and put them back 2861 * Check to see if the player has any unpaid items. If so, remove them
2913 * in the map. 2862 * and put them back in the map.
2914 */ 2863 */
2915 2864 op->drop_unpaid_items ();
2916 if (is_in_shop (op))
2917 remove_unpaid_objects (op->inv, op);
2918 2865
2919 /****************************************/ 2866 /****************************************/
2920 /* */ 2867 /* */
2921 /* Move player to his current respawn- */ 2868 /* Move player to his current respawn- */
2922 /* position (usually last savebed) */ 2869 /* position (usually last savebed) */
… …
2942 object *force; 2889 object *force;
2943 int at; 2890 int at;
2944 2891
2945 force = get_archetype (FORCE_NAME); 2892 force = get_archetype (FORCE_NAME);
2946 /* 50 ticks should be enough time for the spell to abate */ 2893 /* 50 ticks should be enough time for the spell to abate */
2947 force->speed = 0.1; 2894 force->speed = 0.1f;
2948 force->speed_left = -5.0; 2895 force->speed_left = -5.f;
2949 SET_FLAG (force, FLAG_APPLIED); 2896 SET_FLAG (force, FLAG_APPLIED);
2950 for (at = 0; at < NROFATTACKS; at++) 2897 for (at = 0; at < NROFATTACKS; at++)
2951 if (will_kill_again & (1 << at)) 2898 if (will_kill_again & (1 << at))
2952 force->resist[at] = 100; 2899 force->resist[at] = 100;
2953 2900
… …
2962void 2909void
2963loot_object (object *op) 2910loot_object (object *op)
2964{ /* Grab and destroy some treasure */ 2911{ /* Grab and destroy some treasure */
2965 object *tmp, *tmp2, *next; 2912 object *tmp, *tmp2, *next;
2966 2913
2967 if (op->container) 2914 op->close_container (); /* close open sack first */
2968 esrv_apply_container (op, op->container); /* close open sack first */
2969 2915
2970 for (tmp = op->inv; tmp; tmp = next) 2916 for (tmp = op->inv; tmp; tmp = next)
2971 { 2917 {
2972 next = tmp->below; 2918 next = tmp->below;
2973 2919
2974 if (tmp->invisible) 2920 if (tmp->invisible)
2975 continue; 2921 continue;
2976 2922
2977 tmp->remove (); 2923 tmp->remove ();
2978 tmp->x = op->x, tmp->y = op->y; 2924 tmp->x = op->x, tmp->y = op->y;
2925
2979 if (tmp->type == CONTAINER) 2926 if (tmp->type == CONTAINER)
2980 { /* empty container to ground */ 2927 loot_object (tmp); /* empty container to ground */
2981 loot_object (tmp); 2928
2982 }
2983 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2929 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2984 { 2930 {
2985 if (tmp->nrof > 1) 2931 if (tmp->nrof > 1)
2986 { 2932 {
2987 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2933 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2988 tmp2->destroy (); 2934 tmp2->destroy ();
… …
2999/* 2945/*
3000 * fix_weight(): Check recursively the weight of all players, and fix 2946 * fix_weight(): Check recursively the weight of all players, and fix
3001 * what needs to be fixed. Refresh windows and fix speed if anything 2947 * what needs to be fixed. Refresh windows and fix speed if anything
3002 * was changed. 2948 * was changed.
3003 */ 2949 */
3004
3005void 2950void
3006fix_weight (void) 2951fix_weight (void)
3007{ 2952{
3008 for_all_players (pl) 2953 for_all_players (pl)
3009 { 2954 {
… …
3069 if (op->type == PLAYER) 3014 if (op->type == PLAYER)
3070 { 3015 {
3071 op->contr->tmp_invis = 0; 3016 op->contr->tmp_invis = 0;
3072 op->contr->invis_race = 0; 3017 op->contr->invis_race = 0;
3073 } 3018 }
3019
3074 update_object (op, UP_OBJ_FACE); 3020 update_object (op, UP_OBJ_CHANGE);
3075} 3021}
3076 3022
3077int 3023int
3078is_true_undead (object *op) 3024is_true_undead (object *op)
3079{ 3025{
3080 object *tmp = NULL;
3081
3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3026 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3083 return 1; 3027 return 1;
3084 3028
3085 return 0; 3029 return 0;
3086} 3030}
3087 3031
… …
3131/* For Hidden creatures - a chance of becoming 'unhidden' 3075/* For Hidden creatures - a chance of becoming 'unhidden'
3132 * every time they move - as we subtract off 'invisibility' 3076 * every time they move - as we subtract off 'invisibility'
3133 * AND, for players, if they move into a ridiculously unhideable 3077 * AND, for players, if they move into a ridiculously unhideable
3134 * spot (surrounded by clear terrain in broad daylight). -b.t. 3078 * spot (surrounded by clear terrain in broad daylight). -b.t.
3135 */ 3079 */
3136
3137void 3080void
3138do_hidden_move (object *op) 3081do_hidden_move (object *op)
3139{ 3082{
3140 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3083 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3141 object *skop; 3084 object *skop;
… …
3258 * a blocked los square. 3201 * a blocked los square.
3259 * we use the archetype to figure out offsets. 3202 * we use the archetype to figure out offsets.
3260 */ 3203 */
3261 while (op) 3204 while (op)
3262 { 3205 {
3263 dx = rv.distance_x + op->arch->clone.x; 3206 dx = rv.distance_x + op->arch->x;
3264 dy = rv.distance_y + op->arch->clone.y; 3207 dy = rv.distance_y + op->arch->y;
3265 3208
3266 /* only the viewable area the player sees is updated by LOS 3209 /* only the viewable area the player sees is updated by LOS
3267 * code, so we need to restrict ourselves to that range of values 3210 * code, so we need to restrict ourselves to that range of values
3268 * for any meaningful values. 3211 * for any meaningful values.
3269 */ 3212 */
… …
3374 char buf[MAX_BUF]; /* tmp. string buffer */ 3317 char buf[MAX_BUF]; /* tmp. string buffer */
3375 int i = 0, j = 0; 3318 int i = 0, j = 0;
3376 3319
3377 /* get the appropriate treasurelist */ 3320 /* get the appropriate treasurelist */
3378 if (atnr == ATNR_FIRE) 3321 if (atnr == ATNR_FIRE)
3379 trlist = find_treasurelist ("dragon_ability_fire"); 3322 trlist = treasurelist::find ("dragon_ability_fire");
3380 else if (atnr == ATNR_COLD) 3323 else if (atnr == ATNR_COLD)
3381 trlist = find_treasurelist ("dragon_ability_cold"); 3324 trlist = treasurelist::find ("dragon_ability_cold");
3382 else if (atnr == ATNR_ELECTRICITY) 3325 else if (atnr == ATNR_ELECTRICITY)
3383 trlist = find_treasurelist ("dragon_ability_elec"); 3326 trlist = treasurelist::find ("dragon_ability_elec");
3384 else if (atnr == ATNR_POISON) 3327 else if (atnr == ATNR_POISON)
3385 trlist = find_treasurelist ("dragon_ability_poison"); 3328 trlist = treasurelist::find ("dragon_ability_poison");
3386 3329
3387 if (trlist == NULL || who->type != PLAYER) 3330 if (trlist == NULL || who->type != PLAYER)
3388 return; 3331 return;
3389 3332
3390 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3333 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3394 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3337 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3395 return; 3338 return;
3396 } 3339 }
3397 3340
3398 /* everything seems okay - now bring on the gift: */ 3341 /* everything seems okay - now bring on the gift: */
3399 item = &(tr->item->clone); 3342 item = tr->item;
3400 3343
3401 if (item->type == SPELL) 3344 if (item->type == SPELL)
3402 { 3345 {
3403 if (check_spell_known (who, item->name)) 3346 if (check_spell_known (who, item->name))
3404 return; 3347 return;
… …
3463 { 3406 {
3464 /* forces in the treasurelist can alter the player's stats */ 3407 /* forces in the treasurelist can alter the player's stats */
3465 object *skin; 3408 object *skin;
3466 3409
3467 /* first get the dragon skin force */ 3410 /* first get the dragon skin force */
3468 shstr_cmp dragon_skin_force ("dragon_skin_force");
3469 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3411 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3470 ; 3412 ;
3471 3413
3472 if (!skin) 3414 if (!skin)
3473 return; 3415 return;
3474 3416
… …
3522 * not readied. 3464 * not readied.
3523 */ 3465 */
3524void 3466void
3525player_unready_range_ob (player *pl, object *ob) 3467player_unready_range_ob (player *pl, object *ob)
3526{ 3468{
3527 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3469 if (pl->ob->current_weapon == ob)
3470 pl->ob->current_weapon = 0;
3471
3472 if (pl->combat_ob == ob)
3473 pl->combat_ob = 0;
3474
3528 if (pl->ranges[i] == ob) 3475 if (pl->ranged_ob == ob)
3529 {
3530 pl->ranges[i] = 0; 3476 pl->ranged_ob = 0;
3531 if (pl->shoottype == i)
3532 pl->shoottype = range_none;
3533 }
3534} 3477}
3478
3479sint8
3480player::visibility_at (maptile *map, int x, int y) const
3481{
3482 if (!ns)
3483 return 0;
3484
3485 int dx, dy;
3486 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3487 return 0;
3488
3489 x += dx - ns->current_x + ns->mapx / 2;
3490 y += dy - ns->current_y + ns->mapy / 2;
3491
3492 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3493 return 0;
3494
3495 return 100 - blocked_los [x][y];
3496}

Diff Legend

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