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.99 by root, Thu Jan 18 19:42:10 2007 UTC vs.
Revision 1.152 by root, Sun Jul 1 05:00:20 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)
199 maplevel = ob->map->path; 185 maplevel = ob->map->path;
186
200 ob->remove (); 187 ob->remove ();
201 ob->map = 0; 188 ob->map = 0;
189 party = 0;
202 190
203 // 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
204 ranges [range_skill] = 0;
205 192
206 players.erase (this); 193 players.erase (this);
207} 194}
208 195
209// connect the player with a specific client 196// connect the player with a specific client
210// also changed, rationalises, and fixes some incorrect settings 197// also changes, rationalises, and fixes some incorrect settings
211void 198void
212player::connect (client *ns) 199player::connect (client *ns)
213{ 200{
214 this->ns = ns; 201 this->ns = ns;
215 ns->pl = this; 202 ns->pl = this;
216 203
217 run_on = 0; 204 run_on = 0;
218 fire_on = 0; 205 fire_on = 0;
219 ob->container = 0; //TODO: client-specific 206 ob->close_container (); //TODO: client-specific
220 207
221 ns->update_look = 0; 208 ns->update_look = 0;
222 ns->look_position = 0; 209 ns->look_position = 0;
223 210
224 clear_los (ob); 211 clear_los (this);
225 212
226 ns->reset_stats (); 213 ns->reset_stats ();
227 214
228 /* make sure he's a player -- needed because of class change. */ 215 /* make sure he's a player -- needed because of class change. */
229 ob->type = PLAYER; // we are paranoid 216 ob->type = PLAYER; // we are paranoid
230 ob->race = ob->arch->clone.race; 217 ob->race = ob->arch->race;
231
232 if (!legal_range (ob, shoottype))
233 shoottype = range_none;
234 218
235 ob->carrying = sum_weight (ob); 219 ob->carrying = sum_weight (ob);
236 link_player_skills (ob); 220 link_player_skills (ob);
237 221
238 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239 223
240 assign (title, ob->arch->clone.name); 224 assign (title, ob->arch->object::name);
241
242 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
243 * from the class, and not race. I don't see any way to get the class information
244 * to then update this. I don't think this will actually break anything - anyone
245 * that can use armour should be able to use a shield. What this may 'break'
246 * are features new characters get, eg, if someone starts up with a Q, they
247 * should be able to use a shield. However, old Q's won't get that advantage.
248 */
249 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
250 SET_FLAG (ob, FLAG_USE_SHIELD);
251 225
252 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
253 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
254 { 228 {
255 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
… …
257 shstr_cmp dragon_ability_force ("dragon_ability_force"); 231 shstr_cmp dragon_ability_force ("dragon_ability_force");
258 shstr_cmp dragon_skin_force ("dragon_skin_force"); 232 shstr_cmp dragon_skin_force ("dragon_skin_force");
259 233
260 for (tmp = ob->inv; tmp; tmp = tmp->below) 234 for (tmp = ob->inv; tmp; tmp = tmp->below)
261 if (tmp->type == FORCE) 235 if (tmp->type == FORCE)
262 if (tmp->arch->name == dragon_ability_force) 236 if (tmp->arch->archname == dragon_ability_force)
263 abil = tmp; 237 abil = tmp;
264 else if (tmp->arch->name == dragon_skin_force) 238 else if (tmp->arch->archname == dragon_skin_force)
265 skin = tmp; 239 skin = tmp;
266 240
267 set_dragon_name (ob, abil, skin); 241 set_dragon_name (ob, abil, skin);
268 } 242 }
269 243
270 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
271 245
272 esrv_new_player (this, ob->weight + ob->carrying); 246 esrv_new_player (this, ob->weight + ob->carrying);
273 247
248 ob->flag [FLAG_READY_WEAPON] = false;
249 ob->flag [FLAG_READY_SKILL] = false;
250 ob->flag [FLAG_READY_BOW] = false;
251
252 for (object *op = ob->inv; op; op = op->below)
253 if (op->flag [FLAG_APPLIED])
254 switch (op->type)
255 {
256 case SKILL:
257 ob->flag [FLAG_APPLIED] = false;
258 break;
259
260 case WAND:
261 case ROD:
262 case HORN:
263 case BOW:
264 ranged_ob = op;
265 break;
266
267 case WEAPON:
268 combat_ob = op;
269 break;
270 }
271
272 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274 ob->update_stats (); 273 ob->update_stats ();
274
275 ns->floorbox_update (); 275 ns->floorbox_update ();
276
277 esrv_send_inventory (ob, ob); 276 esrv_send_inventory (ob, ob);
278 esrv_add_spells (this, 0); 277 esrv_add_spells (this, 0);
279 278
280 activate (); 279 activate ();
281 280
… …
297 296
298 INVOKE_PLAYER (DISCONNECT, this); 297 INVOKE_PLAYER (DISCONNECT, this);
299 298
300 ns->reset_stats (); 299 ns->reset_stats ();
301 ns->pl = 0; 300 ns->pl = 0;
302 this->ns = 0; 301 ns = 0;
303 } 302 }
304 303
304 if (ob)
305 ob->container = 0; //TODO: client-specific 305 ob->close_container (); //TODO: client-specific
306
307 observe = ob;
308
306 deactivate (); 309 deactivate ();
307} 310}
308 311
309// the need for this function can be explained 312// the need for this function can be explained
310// by load_object not returning the object 313// by load_object not returning the object
311void 314void
312player::set_object (object *op) 315player::set_object (object *op)
313{ 316{
314 ob = op; 317 ob = observe = op;
315 ob->contr = this; /* this aren't yet in archetype */ 318 ob->contr = this; /* this aren't yet in archetype */
316 319
320 ob->speed = 1.0f;
317 ob->speed_left = 0.5; 321 ob->speed_left = 0.5f;
318 ob->speed = 1.0; 322
319 ob->direction = 5; /* So player faces south */ 323 ob->direction = 5; /* So player faces south */
320 ob->stats.wc = 2; 324}
321 ob->run_away = 25; /* Then we panick... */
322 325
323 ob->roll_stats (); 326void
327player::set_observe (object *op)
328{
329 observe = op ? op : ob;
330 do_los = 1;
324} 331}
325 332
326player::player () 333player::player ()
327{ 334{
328 /* There are some elements we want initialised to non zero value - 335 /* There are some elements we want initialised to non zero value -
329 * we deal with that below this point. 336 * we deal with that below this point.
330 */ 337 */
331 outputs_sync = 16; /* Every 2 seconds */ 338 outputs_sync = 4;
332 outputs_count = 8; /* Keeps present behaviour */ 339 outputs_count = 4;
333 unapply = unapply_nochoice; 340 unapply = unapply_nochoice;
334 341
335 savebed_map = first_map_path; /* Init. respawn position */ 342 savebed_map = first_map_path; /* Init. respawn position */
336 343
337 gen_sp_armour = 10; 344 gen_sp_armour = 10;
338 shoottype = range_none;
339 bowtype = bow_normal; 345 bowtype = bow_normal;
340 petmode = pet_normal; 346 petmode = pet_normal;
341 listening = 10; 347 listening = 10;
342 usekeys = containers; 348 usekeys = containers;
343 peaceful = 1; /* default peaceful */ 349 peaceful = 1; /* default peaceful */
344 do_los = 1; 350 do_los = 1;
351
352 weapon_sp = 1.0f;
353 weapon_sp_left = 0.5f;
345} 354}
346 355
347void 356void
348player::do_destroy () 357player::do_destroy ()
349{ 358{
… …
354 if (ob) 363 if (ob)
355 { 364 {
356 ob->destroy_inv (false); 365 ob->destroy_inv (false);
357 ob->destroy (); 366 ob->destroy ();
358 } 367 }
368
369 ob = observe = 0;
359} 370}
360 371
361player::~player () 372player::~player ()
362{ 373{
363 /* Clear item stack */ 374 /* Clear item stack */
… …
372player::create () 383player::create ()
373{ 384{
374 player *pl = new player; 385 player *pl = new player;
375 386
376 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
377 set_first_map (pl->ob); 393 set_first_map (pl->ob);
378 394
379 return pl; 395 return pl;
380} 396}
381 397
… …
385 * Note: there MUST be at least one player archetype! 401 * Note: there MUST be at least one player archetype!
386 */ 402 */
387archetype * 403archetype *
388get_player_archetype (archetype *at) 404get_player_archetype (archetype *at)
389{ 405{
390 archetype *start = at; 406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
391 407
392 for (;;) 408 for (;;)
393 { 409 {
394 if (at == NULL || at->next == NULL) 410 if (++i == archetypes.end ())
395 at = first_archetype; 411 i = archetypes.begin ();
396 else 412 else if (*i == at)
397 at = at->next; 413 cleanup ("not a single player archetype found");
398 414
399 if (at->clone.type == PLAYER) 415 if ((*i)->type == PLAYER)
400 return at; 416 return *i;
401
402 if (at == start)
403 {
404 LOG (llevError, "No Player archetypes\n");
405 exit (-1);
406 }
407 } 417 }
408} 418}
409 419
410object * 420object *
411get_nearest_player (object *mon) 421get_nearest_player (object *mon)
… …
527 x = mon->x; 537 x = mon->x;
528 y = mon->y; 538 y = mon->y;
529 m = mon->map; 539 m = mon->map;
530 dir = rv.direction; 540 dir = rv.direction;
531 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 541 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
532 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 542 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
543
533 /* If we can't solve it within the search distance, return now. */ 544 /* If we can't solve it within the search distance, return now. */
534 if (diff > max) 545 if (diff > max)
535 return 0; 546 return 0;
547
536 while (diff > 1 && max > 0) 548 while (diff > 1 && max > 0)
537 { 549 {
538 lastx = x; 550 lastx = x;
539 lasty = y; 551 lasty = y;
540 lastmap = m; 552 lastmap = m;
… …
622 max--; 634 max--;
623 lastdir = dir; 635 lastdir = dir;
624 if (!firstdir) 636 if (!firstdir)
625 firstdir = dir; 637 firstdir = dir;
626 } 638 }
639
627 if (diff <= 1) 640 if (diff <= 1)
628 { 641 {
629 /* Recalculate diff (distance) because we may not have actually 642 /* Recalculate diff (distance) because we may not have actually
630 * headed toward player for entire distance. 643 * headed toward player for entire distance.
631 */ 644 */
632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 645 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
633 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 646 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
634 } 647 }
648
635 if (diff > max) 649 if (diff > max)
636 return 0; 650 return 0;
637 } 651 }
652
638 /* If we reached the max, didn't find a direction in time */ 653 /* If we reached the max, didn't find a direction in time */
639 if (!max) 654 if (!max)
640 return 0; 655 return 0;
641 656
642 return firstdir; 657 return firstdir;
… …
772} 787}
773 788
774void 789void
775object::roll_stats () 790object::roll_stats ()
776{ 791{
777 int statsort [7]; 792 int statsort [NUM_STATS];
778 793
779 for (;;) 794 for (;;)
780 { 795 {
781 int sum = 0; 796 int sum = 0;
782 for (int i = 7; i--; ) 797 for (int i = NUM_STATS; i--; )
783 sum += statsort [i] = roll_stat (); 798 sum += statsort [i] = roll_stat ();
784 799
785 if (sum >= 82 && sum <= 116) 800 if (sum >= 82 && sum <= 116)
786 break; 801 break;
787 } 802 }
788 803
789 // Sort the stats so that rerolling is easier... 804 // Sort the stats so that rerolling is easier...
790 std::sort (statsort, statsort + 7, std::greater<int>()); 805 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
791 806
807 for (int i = 0; i < NUM_STATS; ++i)
792 stats.Str = statsort[0]; 808 stats.stat (i) = statsort [i];
793 stats.Dex = statsort[1];
794 stats.Con = statsort[2];
795 stats.Int = statsort[3];
796 stats.Wis = statsort[4];
797 stats.Pow = statsort[5];
798 stats.Cha = statsort[6];
799 809
800 stats.exp = 0; 810 stats.exp = 0;
801 stats.ac = 0; 811 stats.ac = 0;
802 812
803 stats.hp = stats.maxhp; 813 stats.hp = stats.maxhp;
… …
815} 825}
816 826
817void 827void
818object::swap_stats (int a, int b) 828object::swap_stats (int a, int b)
819{ 829{
820 int tmp = get_attr_value (&contr->orig_stats, a); 830 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
821 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
822 set_attr_value (&contr->orig_stats, b, tmp);
823 831
832 for (int i = 0; i < NUM_STATS; ++i)
824 stats.Str = contr->orig_stats.Str; 833 stats.stat (i) = contr->orig_stats.stat (i);
825 stats.Dex = contr->orig_stats.Dex;
826 stats.Con = contr->orig_stats.Con;
827 stats.Int = contr->orig_stats.Int;
828 stats.Wis = contr->orig_stats.Wis;
829 stats.Pow = contr->orig_stats.Pow;
830 stats.Cha = contr->orig_stats.Cha;
831 834
832 //TODO: the following code looks so borked and should, at the very least, 835 //TODO: the following code looks so borked and should, at the very least,
833 // be merged with the similar code in roll_stats 836 // be merged with the similar code in roll_stats
834 stats.ac = 0; 837 stats.ac = 0;
835 838
… …
866 * appropriate action with it (change race, or other things). 869 * appropriate action with it (change race, or other things).
867 * The function name is for historical reasons - now we have 870 * The function name is for historical reasons - now we have
868 * separate race and class; this actually changes the RACE, 871 * separate race and class; this actually changes the RACE,
869 * not the class. 872 * not the class.
870 */ 873 */
871int 874void
872key_change_class (object *op, char key) 875player::chargen_race_done ()
873{ 876{
874 int tmp_loop;
875
876 if (key == 'd' || key == 'D')
877 {
878 char buf[MAX_BUF];
879
880 /* this must before then initial items are given */ 877 /* this must before then initial items are given */
881 esrv_new_player (op->contr, op->weight + op->carrying); 878 esrv_new_player (ob->contr, ob->weight + ob->carrying);
882 879
883 treasurelist *tl = find_treasurelist ("starting_wealth"); 880 treasurelist *tl = treasurelist::find ("starting_wealth");
884 if (tl) 881 if (tl)
885 create_treasure (tl, op, 0, 0, 0); 882 create_treasure (tl, ob, 0, 0, 0);
886 883
887 INVOKE_PLAYER (BIRTH, op->contr); 884 INVOKE_PLAYER (BIRTH, ob->contr);
888 INVOKE_PLAYER (LOGIN, op->contr); 885 INVOKE_PLAYER (LOGIN, ob->contr);
889 886
890 op->contr->ns->state = ST_PLAYING; 887 ob->contr->ns->state = ST_PLAYING;
891 888
892 if (op->msg) 889 if (ob->msg)
893 op->msg = NULL; 890 ob->msg = 0;
894 891
895 /* We create this now because some of the unique maps will need it 892 /* We create this now because some of the unique maps will need it
896 * to save here. 893 * to save here.
897 */ 894 */
895 {
896 char buf[MAX_BUF];
898 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
899 make_path_to_file (buf); 898 make_path_to_file (buf);
899 }
900 900
901 start_info (op); 901 start_info (ob);
902 CLEAR_FLAG (op, FLAG_WIZ); 902 CLEAR_FLAG (ob, FLAG_WIZ);
903 give_initial_items (op, op->randomitems); 903 give_initial_items (ob, ob->randomitems);
904 link_player_skills (op); 904 link_player_skills (ob);
905 esrv_send_inventory (op, op); 905 esrv_send_inventory (ob, ob);
906 op->update_stats (); 906 ob->update_stats ();
907 907
908 /* This moves the player to a different start map, if there 908 /* This moves the player to a different start map, if there
909 * is one for this race 909 * is one for this race
910 */ 910 */
911 if (*first_map_ext_path) 911 if (*first_map_ext_path)
912 { 912 {
913 object *tmp; 913 object *tmp;
914 char mapname[MAX_BUF]; 914 char mapname[MAX_BUF];
915 915
916 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 916 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
917 tmp = object::create (); 917 tmp = object::create ();
918 EXIT_PATH (tmp) = mapname; 918 EXIT_PATH (tmp) = mapname;
919 EXIT_X (tmp) = op->x; 919 EXIT_X (tmp) = ob->x;
920 EXIT_Y (tmp) = op->y; 920 EXIT_Y (tmp) = ob->y;
921 op->enter_exit (tmp); /* we don't really care if it succeeded; 921 ob->enter_exit (tmp); /* we don't really care if it succeeded;
922 * if the map isn't there, then stay on the 922 * if the map isn't there, then stay on the
923 * default initial map */ 923 * default initial map */
924 tmp->destroy (); 924 tmp->destroy ();
925 } 925 }
926 else 926 else
927 LOG (llevDebug, "first_map_ext_path not set\n"); 927 LOG (llevDebug, "first_map_ext_path not set\n");
928}
928 929
929 return 0; 930void
930 } 931player::chargen_race_next ()
931 932{
932 /* Following actually changes the race - this is the default command 933 /* Following actually changes the race - this is the default command
933 * if we don't match with one of the options above. 934 * if we don't match with one of the options above.
934 */ 935 */
935 936
936 tmp_loop = 0; 937 do
937 while (!tmp_loop)
938 { 938 {
939 shstr name = op->name; 939 shstr name = ob->name;
940 int x = op->x, y = op->y; 940 int x = ob->x, y = ob->y;
941 941
942 op->remove_statbonus (); 942 ob->remove_statbonus ();
943 op->remove (); 943 ob->remove ();
944 op->arch = get_player_archetype (op->arch); 944 ob->arch = get_player_archetype (ob->arch);
945 op->arch->clone.copy_to (op); 945 ob->arch->copy_to (ob);
946 op->instantiate (); 946 ob->instantiate ();
947 op->stats = op->contr->orig_stats; 947 ob->stats = ob->contr->orig_stats;
948 op->name = op->name_pl = name; 948 ob->name = ob->name_pl = name;
949 op->x = x; 949 ob->x = x;
950 op->y = y; 950 ob->y = y;
951 SET_ANIMATION (op, 2); /* So player faces south */ 951 SET_ANIMATION (ob, 2); /* So player faces south */
952 insert_ob_in_map (op, op->map, op, 0); 952 insert_ob_in_map (ob, ob->map, ob, 0);
953 assign (op->contr->title, op->arch->clone.name); 953 assign (ob->contr->title, ob->arch->object::name);
954 op->add_statbonus (); 954 ob->add_statbonus ();
955 tmp_loop = allowed_class (op);
956 } 955 }
956 while (!allowed_class (ob));
957 957
958 update_object (op, UP_OBJ_FACE); 958 update_object (ob, UP_OBJ_FACE);
959 esrv_update_item (UPD_FACE, op, op); 959 esrv_update_item (UPD_FACE, ob, ob);
960 op->update_stats (); 960 ob->update_stats ();
961 op->stats.hp = op->stats.maxhp; 961 ob->stats.hp = ob->stats.maxhp;
962 op->stats.sp = op->stats.maxsp; 962 ob->stats.sp = ob->stats.maxsp;
963 op->stats.grace = 0; 963 ob->stats.grace = 0;
964
965 if (op->msg)
966 new_draw_info (NDI_BLUE, 0, op, op->msg);
967
968 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
969 return 0;
970} 964}
971 965
972void 966void
973flee_player (object *op) 967flee_player (object *op)
974{ 968{
… …
1021 /* Cornered, get rid of scared */ 1015 /* Cornered, get rid of scared */
1022 CLEAR_FLAG (op, FLAG_SCARED); 1016 CLEAR_FLAG (op, FLAG_SCARED);
1023 op->enemy = NULL; 1017 op->enemy = NULL;
1024} 1018}
1025 1019
1026
1027/* check_pick sees if there is stuff to be picked up/picks up stuff. 1020/* check_pick sees if there is stuff to be picked up/picks up stuff.
1028 * IT returns 1 if the player should keep on moving, 0 if he should 1021 * It returns 1 if the player should keep on moving, 0 if he should
1029 * stop. 1022 * stop.
1030 */ 1023 */
1031int 1024int
1032check_pick (object *op) 1025check_pick (object *op)
1033{ 1026{
1034 object *tmp, *next; 1027 object *tmp, *next;
1035 int stop = 0; 1028 int stop = 0;
1036 int j, k, wvratio; 1029 int wvratio;
1037 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1038 1031
1039 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1040 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1041 return 1; 1034 return 1;
1042 1035
… …
1110 if (tmp->name != NULL) 1103 if (tmp->name != NULL)
1111 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1112 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1105 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1113 else 1106 else
1114 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1115 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1108 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1116 1109
1117 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1110 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1118 } 1111 }
1119 1112
1120 /* philosophy: 1113 /* philosophy:
… …
1313 /* careful: chairs and tables are weapons! */ 1306 /* careful: chairs and tables are weapons! */
1314 if (op->contr->mode & PU_ALLWEAPON) 1307 if (op->contr->mode & PU_ALLWEAPON)
1315 { 1308 {
1316 if (tmp->type == WEAPON && tmp->name != NULL) 1309 if (tmp->type == WEAPON && tmp->name != NULL)
1317 { 1310 {
1318 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1311 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1319 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1312 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1320 { 1313 {
1321 pick_up (op, tmp); 1314 pick_up (op, tmp);
1322 continue; 1315 continue;
1323 } 1316 }
1324 } 1317 }
1325 1318
1326 if (tmp->type == WEAPON && tmp->name == NULL) 1319 if (tmp->type == WEAPON && tmp->name == NULL)
1327 { 1320 {
1328 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1321 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1329 { 1322 {
1330 pick_up (op, tmp); 1323 pick_up (op, tmp);
1331 continue; 1324 continue;
1332 } 1325 }
1333 } 1326 }
… …
1358 if (tmp->name != NULL) 1351 if (tmp->name != NULL)
1359 { 1352 {
1360 fprintf (stderr, "%s", tmp->name); 1353 fprintf (stderr, "%s", tmp->name);
1361 } 1354 }
1362 else 1355 else
1363 fprintf (stderr, "%s", tmp->arch->name); 1356 fprintf (stderr, "%s", tmp->arch->archname);
1364 fprintf (stderr, ",%d] = ", tmp->type); 1357 fprintf (stderr, ",%d] = ", tmp->type);
1365 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1358 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1366#endif 1359#endif
1367 continue; 1360 continue;
1368 } 1361 }
… …
1379 * found object is returned. 1372 * found object is returned.
1380 */ 1373 */
1381object * 1374object *
1382find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1383{ 1376{
1384 object *tmp = NULL; 1377 object *tmp = 0;
1385 1378
1386 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1387 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1388 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1389 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1390 return op; 1383 return op;
1384
1391 return tmp; 1385 return tmp;
1392} 1386}
1393 1387
1394/* 1388/*
1395 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1389 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1396 * against the target. A full test is not performed, simply a basic test 1390 * against the target. A full test is not performed, simply a basic test
1397 * of resistances. The archer is making a quick guess at what he sees down 1391 * of resistances. The archer is making a quick guess at what he sees down
1398 * the hall. Failing that it does it's best to pick the highest plus arrow. 1392 * the hall. Failing that it does it's best to pick the highest plus arrow.
1399 */ 1393 */
1400
1401object * 1394object *
1402find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1403{ 1396{
1404 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1405 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1438 else 1431 else
1439 { 1432 {
1440 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1433 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1441 { 1434 {
1442 attacktype = 1 << attacknum; 1435 attacktype = 1 << attacknum;
1443 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1436 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1444 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1437 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1445 { 1438 {
1446 tmp = arrow; 1439 tmp = arrow;
1447 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1440 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1448 } 1441 }
1449 } 1442 }
1450 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1443 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1451 { 1444 {
1452 tmp = arrow; 1445 tmp = arrow;
… …
1471 * find_better_arrow to find a decent arrow to use. 1464 * find_better_arrow to find a decent arrow to use.
1472 * op = the shooter 1465 * op = the shooter
1473 * type = bow->race 1466 * type = bow->race
1474 * dir = fire direction 1467 * dir = fire direction
1475 */ 1468 */
1476
1477object * 1469object *
1478pick_arrow_target (object *op, const char *type, int dir) 1470pick_arrow_target (object *op, const char *type, int dir)
1479{ 1471{
1480 object *tmp = NULL; 1472 object *tmp = NULL;
1481 maptile *m; 1473 maptile *m;
… …
1546 */ 1538 */
1547int 1539int
1548fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1540fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1549{ 1541{
1550 object *left, *bow; 1542 object *left, *bow;
1551 int bowspeed, mflags; 1543 int mflags;
1552 maptile *m; 1544 maptile *m;
1553 1545
1554 if (!dir) 1546 if (!dir)
1555 { 1547 {
1556 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1548 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1557 return 0; 1549 return 0;
1558 } 1550 }
1559 1551
1560 if (op->type == PLAYER) 1552 if (op->contr)
1561 bow = op->contr->ranges[range_bow]; 1553 bow = op->current_weapon;
1562 else 1554 else
1563 { 1555 {
1564 for (bow = op->inv; bow; bow = bow->below) 1556 for (bow = op->inv; bow; bow = bow->below)
1565 /* Don't check for applied - monsters don't apply bows - in that way, they 1557 /* Don't check for applied - monsters don't apply bows - in that way, they
1566 * don't need to switch back and forth between bows and weapons. 1558 * don't need to switch back and forth between bows and weapons.
… …
1571 if (!bow) 1563 if (!bow)
1572 { 1564 {
1573 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1565 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1574 return 0; 1566 return 0;
1575 } 1567 }
1568
1569 // optimisation: move object to top so we will find it quickly again
1570 if (bow->below)
1571 {
1572 bow->remove ();
1573 op->insert (bow);
1574 }
1575
1576 } 1576 }
1577 1577
1578 if (!bow->race || !bow->skill) 1578 if (!bow->race || !bow->skill)
1579 { 1579 {
1580 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1580 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1581 return 0; 1581 return 0;
1582 } 1582 }
1583
1584 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1585
1586 /* penalize ROF for bestarrow */
1587 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1588 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1589
1590 if (bowspeed < 1)
1591 bowspeed = 1;
1592 1583
1593 if (arrow == NULL) 1584 if (arrow == NULL)
1594 { 1585 {
1595 if ((arrow = find_arrow (op, bow->race)) == NULL) 1586 if ((arrow = find_arrow (op, bow->race)) == NULL)
1596 { 1587 {
1597 if (op->type == PLAYER) 1588 if (op->type == PLAYER)
1598 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1589 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1599 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1590 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1600 else 1591 else
1601 CLEAR_FLAG (op, FLAG_READY_BOW); 1592 CLEAR_FLAG (op, FLAG_READY_BOW);
1593
1602 return 0; 1594 return 0;
1603 } 1595 }
1604 } 1596 }
1605 1597
1606 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1598 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1630 1622
1631 arrow->set_owner (op); 1623 arrow->set_owner (op);
1632 arrow->skill = bow->skill; 1624 arrow->skill = bow->skill;
1633 arrow->direction = dir; 1625 arrow->direction = dir;
1634 1626
1627 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1628 arrow->stats.hp = arrow->stats.dam;
1629 arrow->stats.grace = arrow->attacktype;
1630
1631 if (arrow->slaying)
1632 arrow->spellarg = strdup (arrow->slaying);
1633
1634#if 0
1635 if (player *pl = op->contr)
1636 {
1637 float speed = pl->weapon_sp;
1638
1639 /* penalize ROF for bestarrow */
1640 if (pl->bowtype == bow_bestarrow)
1641 speed *= .9f;
1642 else
1643 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1644
1645 op->speed_left += speed - op->speed;
1646 }
1647#endif
1648
1649 SET_ANIMATION (arrow, arrow->direction);
1650
1651 /* update the speed */
1652 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1653 + bow->stats.dam / 7.f;
1654
1655 arrow->set_speed (max (arrow->speed, 2.f));
1656 arrow->speed_left = 0;
1657
1658 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1659
1635 if (op->type == PLAYER) 1660 if (op->type == PLAYER)
1636 { 1661 {
1637 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1638 op->update_stats ();
1639 }
1640
1641 SET_ANIMATION (arrow, arrow->direction);
1642 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1643 arrow->stats.hp = arrow->stats.dam;
1644 arrow->stats.grace = arrow->attacktype;
1645 if (arrow->slaying != NULL)
1646 arrow->spellarg = strdup (arrow->slaying);
1647
1648 /* Note that this was different for monsters - they got their level
1649 * added to the damage. I think the strength bonus is more proper.
1650 */
1651
1652 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1653
1654 /* update the speed */
1655 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1656 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1657
1658 arrow->set_speed (max (arrow->speed, 1.0));
1659 arrow->speed_left = 0;
1660
1661 if (op->type == PLAYER)
1662 {
1663 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1664 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1665 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1666
1667 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1662 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1663 wc -= dex_bonus[op->stats.Dex];
1664
1665 if (!arrow->slaying)
1666 arrow->slaying = op->slaying;
1667
1668 arrow->attacktype |= op->attacktype;
1668 } 1669 }
1669 else 1670 else
1670 { 1671 {
1671 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1672 arrow->level = op->level; 1672 arrow->level = op->level;
1673 } 1673 arrow->stats.wc -= bow->magic;
1674 1674
1675 if (arrow->attacktype == AT_PHYSICAL) 1675 if (!arrow->slaying)
1676 arrow->slaying = bow->slaying;
1677
1676 arrow->attacktype |= bow->attacktype; 1678 arrow->attacktype |= bow->attacktype;
1679 }
1677 1680
1678 if (bow->slaying) 1681 wc -= arrow->level;
1679 arrow->slaying = bow->slaying; 1682 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1680 1683
1684 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1681 arrow->move_type = MOVE_FLY_LOW; 1685 arrow->move_type = MOVE_FLY_LOW;
1682 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1686 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1683 1687
1684 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1688 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1685 m->insert (arrow, sx, sy, op); 1689 m->insert (arrow, sx, sy, op);
… …
1710{ 1714{
1711 int ret = 0, wcmod = 0; 1715 int ret = 0, wcmod = 0;
1712 1716
1713 if (op->contr->bowtype == bow_bestarrow) 1717 if (op->contr->bowtype == bow_bestarrow)
1714 { 1718 {
1715 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1719 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1716 } 1720 }
1717 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1721 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1718 { 1722 {
1719 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1723 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1720 wcmod = -1; 1724 wcmod = -1;
… …
1730 else if (op->contr->bowtype == bow_spreadshot) 1734 else if (op->contr->bowtype == bow_spreadshot)
1731 { 1735 {
1732 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1736 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1733 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1737 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1734 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1738 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1735
1736 } 1739 }
1737 else 1740 else
1738 { 1741 {
1739 /* Simple case */ 1742 /* Simple case */
1740 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1743 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1741 } 1744 }
1745
1742 return ret; 1746 return ret;
1743} 1747}
1744
1745 1748
1746/* Fires a misc (wand/rod/horn) object in 'dir'. 1749/* Fires a misc (wand/rod/horn) object in 'dir'.
1747 * Broken apart from 'fire' to keep it more readable. 1750 * Broken apart from 'fire' to keep it more readable.
1748 */ 1751 */
1749void 1752void
1750fire_misc_object (object *op, int dir) 1753fire_misc_object (object *op, int dir)
1751{ 1754{
1752 object *item; 1755 object *item = op->contr->ranged_ob;
1753 1756
1754 if (!op->contr->ranges[range_misc]) 1757 if (!item)
1755 { 1758 {
1756 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1759 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1757 return; 1760 return;
1758 } 1761 }
1759 1762
1760 item = op->contr->ranges[range_misc];
1761 if (!item->inv) 1763 if (!item->inv)
1762 { 1764 {
1763 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1765 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1764 return; 1766 return;
1765 } 1767 }
1768
1769 if (!op->change_weapon (item))
1770 return;
1771
1766 if (item->type == WAND) 1772 if (item->type == WAND)
1767 { 1773 {
1768 if (item->stats.food <= 0) 1774 if (item->stats.food <= 0)
1769 { 1775 {
1770 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1776 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1771 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1778
1772 return; 1779 return;
1773 } 1780 }
1774 } 1781 }
1775 else if (item->type == ROD || item->type == HORN) 1782 else if (item->type == ROD || item->type == HORN)
1776 { 1783 {
1777 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1784 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1778 { 1785 {
1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1786 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1787
1780 if (item->type == ROD) 1788 if (item->type == ROD)
1781 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1789 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1782 else 1790 else
1783 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1792
1784 return; 1793 return;
1785 } 1794 }
1786 } 1795 }
1787 1796
1788 if (cast_spell (op, item, dir, item->inv, NULL)) 1797 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1795 object *tmp; 1804 object *tmp;
1796 1805
1797 if (item->arch) 1806 if (item->arch)
1798 { 1807 {
1799 CLEAR_FLAG (item, FLAG_ANIMATE); 1808 CLEAR_FLAG (item, FLAG_ANIMATE);
1800 item->face = item->arch->clone.face; 1809 item->face = item->arch->face;
1801 item->set_speed (0); 1810 item->set_speed (0);
1802 } 1811 }
1803 1812
1804 if ((tmp = item->in_player ())) 1813 if ((tmp = item->in_player ()))
1805 esrv_update_item (UPD_ANIM, tmp, item); 1814 esrv_update_item (UPD_ANIM, tmp, item);
… …
1810 } 1819 }
1811} 1820}
1812 1821
1813/* Received a fire command for the player - go and do it. 1822/* Received a fire command for the player - go and do it.
1814 */ 1823 */
1815void 1824bool
1816fire (object *op, int dir) 1825fire (object *op, int dir)
1817{ 1826{
1818 int spellcost = 0; 1827 int spellcost = 0;
1819 1828
1820 /* check for loss of invisiblity/hide */ 1829 /* check for loss of invisiblity/hide */
1821 if (action_makes_visible (op)) 1830 if (action_makes_visible (op))
1822 make_visible (op); 1831 make_visible (op);
1823 1832
1824 switch (op->contr->shoottype) 1833 player *pl = op->contr;
1834
1835 if (pl->golem)
1836 {
1837 control_golem (op->contr->golem, dir);
1838 return false;
1825 { 1839 }
1826 case range_none:
1827 return;
1828 1840
1829 case range_bow: 1841 object *ob = pl->ranged_ob;
1842
1843 if (!ob)
1844 return false;
1845
1846 if (!op->change_weapon (ob))
1847 return false;
1848
1849 if (op->speed_left > 0.f)
1850 --op->speed_left;
1851 else
1852 return false;
1853
1854 switch (ob->type)
1855 {
1856 case BOW:
1830 player_fire_bow (op, dir); 1857 player_fire_bow (op, dir);
1831 return; 1858 break;
1832 1859
1833 case range_magic: /* Casting spells */ 1860 case SPELL:
1834 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1861 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1835 return; 1862 break;
1836 1863
1837 case range_misc: 1864 case BUILDER:
1865 apply_map_builder (op, dir);
1866 break;
1867
1868 case SKILL:
1869 do_skill (op, op, ob, dir, 0);
1870 break;
1871
1872 default:
1838 fire_misc_object (op, dir); 1873 fire_misc_object (op, dir);
1839 return; 1874 break;
1840
1841 case range_golem: /* Control summoned monsters from scrolls */
1842 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1843 {
1844 op->contr->ranges[range_golem] = 0;
1845 op->contr->shoottype = range_none;
1846 }
1847 else
1848 control_golem (op->contr->ranges[range_golem], dir);
1849 return;
1850
1851 case range_skill:
1852 if (!op->chosen_skill)
1853 {
1854 if (op->type == PLAYER)
1855 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1856 return;
1857 }
1858
1859 do_skill (op, op, op->chosen_skill, dir, NULL);
1860 return;
1861 case range_builder:
1862 apply_map_builder (op, dir);
1863 return;
1864 default:
1865 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1866 return;
1867 } 1875 }
1868}
1869 1876
1870 1877 return true;
1878}
1871 1879
1872/* find_key 1880/* find_key
1873 * We try to find a key for the door as passed. If we find a key 1881 * We try to find a key for the door as passed. If we find a key
1874 * and successfully use it, we return the key, otherwise NULL 1882 * and successfully use it, we return the key, otherwise NULL
1875 * This function merges both normal and locked door, since the logic 1883 * This function merges both normal and locked door, since the logic
… …
1877 * pl is the player, 1885 * pl is the player,
1878 * inv is the objects inventory to searched 1886 * inv is the objects inventory to searched
1879 * door is the door we are trying to match against. 1887 * door is the door we are trying to match against.
1880 * This function can be called recursively to search containers. 1888 * This function can be called recursively to search containers.
1881 */ 1889 */
1882
1883object * 1890object *
1884find_key (object *pl, object *container, object *door) 1891find_key (object *pl, object *container, object *door)
1885{ 1892{
1886 object *tmp, *key; 1893 object *tmp, *key;
1887 1894
1888 /* Should not happen, but sanity checking is never bad */ 1895 /* Should not happen, but sanity checking is never bad */
1889 if (container->inv == NULL) 1896 if (!container->inv)
1890 return NULL; 1897 return 0;
1891 1898
1892 /* First, lets try to find a key in the top level inventory */ 1899 /* First, lets try to find a key in the top level inventory */
1893 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1900 for (tmp = container->inv; tmp; tmp = tmp->below)
1894 { 1901 {
1895 if (door->type == DOOR && tmp->type == KEY) 1902 if (door->type == DOOR && tmp->type == KEY)
1896 break; 1903 break;
1897 /* For sanity, we should really check door type, but other stuff 1904 /* For sanity, we should really check door type, but other stuff
1898 * (like containers) can be locked with special keys 1905 * (like containers) can be locked with special keys
1899 */ 1906 */
1900 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1907 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1901 break; 1908 break;
1902 } 1909 }
1910
1903 /* No key found - lets search inventories now */ 1911 /* No key found - lets search inventories now */
1904 /* If we find and use a key in an inventory, return at that time. 1912 /* If we find and use a key in an inventory, return at that time.
1905 * otherwise, if we search all the inventories and still don't find 1913 * otherwise, if we search all the inventories and still don't find
1906 * a key, return 1914 * a key, return
1907 */ 1915 */
1908 if (!tmp) 1916 if (!tmp)
1909 { 1917 {
1910 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1918 for (tmp = container->inv; tmp; tmp = tmp->below)
1911 { 1919 {
1912 /* No reason to search empty containers */ 1920 /* No reason to search empty containers */
1913 if (tmp->type == CONTAINER && tmp->inv) 1921 if (tmp->type == CONTAINER && tmp->inv)
1914 { 1922 {
1915 if ((key = find_key (pl, tmp, door)) != NULL) 1923 if ((key = find_key (pl, tmp, door)))
1916 return key; 1924 return key;
1917 } 1925 }
1918 } 1926 }
1927
1919 if (!tmp) 1928 if (!tmp)
1920 return NULL; 1929 return NULL;
1921 } 1930 }
1931
1922 /* We get down here if we have found a key. Now if its in a container, 1932 /* We get down here if we have found a key. Now if its in a container,
1923 * see if we actually want to use it 1933 * see if we actually want to use it
1924 */ 1934 */
1925 if (pl != container) 1935 if (pl != container)
1926 { 1936 {
… …
1947 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1957 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1948 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1958 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1949 return NULL; 1959 return NULL;
1950 } 1960 }
1951 } 1961 }
1962
1952 return tmp; 1963 return tmp;
1953} 1964}
1954 1965
1955/* moved door processing out of move_player_attack. 1966/* moved door processing out of move_player_attack.
1956 * returns 1 if player has opened the door with a key 1967 * returns 1 if player has opened the door with a key
… …
1958 * 0 otherwise 1969 * 0 otherwise
1959 */ 1970 */
1960static int 1971static int
1961player_attack_door (object *op, object *door) 1972player_attack_door (object *op, object *door)
1962{ 1973{
1963 /* If its a door, try to find a use a key. If we do destroy the door, 1974 /* If its a door, try to find a key. If we do destroy the door,
1964 * might as well return immediately as there is nothing more to do - 1975 * might as well return immediately as there is nothing more to do -
1965 * otherwise, we fall through to the rest of the code. 1976 * otherwise, we fall through to the rest of the code.
1966 */ 1977 */
1967 object *key = find_key (op, op, door); 1978 object *key = find_key (op, op, door);
1968 1979
1969 /* IF we found a key, do some extra work */ 1980 /* If we found a key, do some extra work */
1970 if (key) 1981 if (key)
1971 { 1982 {
1972 object *container = key->env; 1983 object *container = key->env;
1973 1984
1974 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1985 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1986
1975 if (action_makes_visible (op)) 1987 if (action_makes_visible (op))
1976 make_visible (op); 1988 make_visible (op);
1989
1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1990 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1978 spring_trap (door->inv, op); 1991 spring_trap (door->inv, op);
1992
1979 if (door->type == DOOR) 1993 if (door->type == DOOR)
1980 {
1981 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1994 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1982 }
1983 else if (door->type == LOCKED_DOOR) 1995 else if (door->type == LOCKED_DOOR)
1984 { 1996 {
1985 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1997 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1986 remove_door2 (door); /* remove door without violence ;-) */ 1998 remove_door2 (door); /* remove door without violence ;-) */
1987 } 1999 }
2000
1988 /* Do this after we print the message */ 2001 /* Do this after we print the message */
1989 decrease_ob (key); /* Use up one of the keys */ 2002 decrease_ob (key); /* Use up one of the keys */
1990 /* Need to update the weight the container the key was in */ 2003 /* Need to update the weight the container the key was in */
1991 if (container != op) 2004 if (container != op)
1992 esrv_update_item (UPD_WEIGHT, op, container); 2005 esrv_update_item (UPD_WEIGHT, op, container);
2006
1993 return 1; /* Nothing more to do below */ 2007 return 1; /* Nothing more to do below */
1994 } 2008 }
1995 else if (door->type == LOCKED_DOOR) 2009 else if (door->type == LOCKED_DOOR)
1996 { 2010 {
1997 /* Might as well return now - no other way to open this */ 2011 /* Might as well return now - no other way to open this */
1998 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2012 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1999 return 1; 2013 return 1;
2000 } 2014 }
2015
2001 return 0; 2016 return 0;
2002} 2017}
2003 2018
2004/* This function is just part of a breakup from move_player. 2019/* This function is just part of a breakup from move_player.
2005 * It should keep the code cleaner. 2020 * It should keep the code cleaner.
2006 * When this is called, the players direction has been updated 2021 * When this is called, the players direction has been updated
2007 * (taking into account confusion.) The player is also actually 2022 * (taking into account confusion.) The player is also actually
2008 * going to try and move (not fire weapons). 2023 * going to try and move (not fire weapons).
2009 */ 2024 */
2010void 2025bool
2011move_player_attack (object *op, int dir) 2026move_player_attack (object *op, int dir)
2012{ 2027{
2013 object *tmp, *mon;
2014 sint16 nx, ny;
2015 int on_battleground; 2028 int on_battleground;
2016 maptile *m;
2017 2029
2018 nx = freearr_x[dir] + op->x; 2030 sint16 nx = freearr_x[dir] + op->x;
2019 ny = freearr_y[dir] + op->y; 2031 sint16 ny = freearr_y[dir] + op->y;
2020 2032
2021 on_battleground = op_on_battleground (op, 0, 0); 2033 on_battleground = op_on_battleground (op, 0, 0);
2034
2035 if (out_of_map (op->map, nx, ny))
2036 return false;
2037
2038 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2039 {
2040 --op->speed_left;
2041 return true;
2042 }
2022 2043
2023 /* If braced, or can't move to the square, and it is not out of the 2044 /* If braced, or can't move to the square, and it is not out of the
2024 * map, attack it. Note order of if statement is important - don't 2045 * map, attack it. Note order of if statement is important - don't
2025 * want to be calling move_ob if braced, because move_ob will move the 2046 * want to be calling move_ob if braced, because move_ob will move the
2026 * player. This is a pretty nasty hack, because if we could 2047 * player. This is a pretty nasty hack, because if we could
2027 * move to some space, it then means that if we are braced, we should 2048 * move to some space, it then means that if we are braced, we should
2028 * do nothing at all. As it is, if we are braced, we go through 2049 * do nothing at all. As it is, if we are braced, we go through
2029 * quite a bit of processing. However, it probably is less than what 2050 * quite a bit of processing. However, it probably is less than what
2030 * move_ob uses. 2051 * move_ob uses.
2031 */ 2052 */
2032 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2033 {
2034 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2035 {
2036 m = op->map->xy_find (nx, ny); 2053 maptile *m = op->map->xy_find (nx, ny);
2037 if (!m)
2038 return; /* Don't think this should happen */
2039 }
2040 else
2041 m = op->map;
2042 2054
2043 if (!(tmp = m->at (nx, ny).bot))
2044 return;
2045
2046 mon = 0;
2047 /* Go through all the objects, and find ones of interest. Only stop if 2055 /* Go through all the objects, and find ones of interest. Only stop if
2048 * we find a monster - that is something we know we want to attack. 2056 * we find a monster - that is something we know we want to attack.
2049 * if its a door or barrel (can roll) see if there may be monsters 2057 * if its a door or barrel (can roll) see if there may be monsters
2050 * on the space 2058 * on the space
2051 */ 2059 */
2052 while (tmp) 2060 object *mon;
2053 { 2061 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2054 if (tmp == op) 2062 {
2055 { 2063 if ((mon->flag [FLAG_ALIVE]
2056 tmp = tmp->above; 2064 || mon->type == LOCKED_DOOR
2057 continue; 2065 || mon->flag [FLAG_CAN_ROLL])
2058 }
2059
2060 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2061 {
2062 mon = tmp; 2066 && mon != op)
2063 break; 2067 break;
2064 } 2068 }
2065 2069
2066 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2067 mon = tmp;
2068
2069 tmp = tmp->above;
2070 }
2071
2072 if (!mon) /* This happens anytime the player tries to move */ 2070 if (!mon) /* This happens anytime the player tries to move */
2073 return; /* into a wall */ 2071 return false; /* into a wall */
2074 2072
2075 if (mon->head)
2076 mon = mon->head; 2073 mon = mon->head_ ();
2077 2074
2078 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2075 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2076 if (op->contr->weapon_sp_left > 0.f)
2079 if (player_attack_door (op, mon)) 2077 if (player_attack_door (op, mon))
2078 {
2079 --op->contr->weapon_sp_left;
2080 return; 2080 return true;
2081 }
2081 2082
2082 /* The following deals with possibly attacking peaceful 2083 /* The following deals with possibly attacking peaceful
2083 * or frienddly creatures. Basically, all players are considered 2084 * or friendly creatures. Basically, all players are considered
2084 * unaggressive. If the moving player has peaceful set, then the 2085 * unaggressive. If the moving player has peaceful set, then the
2085 * object should be pushed instead of attacked. It is assumed that 2086 * object should be pushed instead of attacked. It is assumed that
2086 * if you are braced, you will not attack friends accidently, 2087 * if you are braced, you will not attack friends accidently,
2087 * and thus will not push them. 2088 * and thus will not push them.
2088 */ 2089 */
2089 2090
2090 /* If the creature is a pet, push it even if the player is not 2091 /* If the creature is a pet, push it even if the player is not
2091 * peaceful. Our assumption is the creature is a pet if the 2092 * peaceful. Our assumption is the creature is a pet if the
2092 * player owns it and it is either friendly or unagressive. 2093 * player owns it and it is either friendly or unagressive.
2093 */ 2094 */
2094 if ((op->type == PLAYER) 2095 if (op->type == PLAYER
2095#if COZY_SERVER
2096 &&
2097 ((mon->owner && mon->owner->contr 2096 && ((mon->owner && mon->owner->contr
2098 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2097 && same_party (mon->owner->contr->party, op->contr->party))
2099#else
2100 && mon->owner == op 2098 || mon->owner == op)
2101#endif
2102 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2099 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2103 { 2100 {
2104 /* If we're braced, we don't want to switch places with it */ 2101 /* If we're braced, we don't want to switch places with it */
2105 if (op->contr->braced) 2102 if (op->contr->braced)
2106 return; 2103 return false;
2104
2105 if (op->speed_left > 0.f)
2106 {
2107 --op->speed_left;
2107 2108
2108 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2109 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2109 (void) push_ob (mon, dir, op); 2110 push_ob (mon, dir, op);
2111
2110 if (op->contr->tmp_invis || op->hide) 2112 if (op->contr->tmp_invis || op->hide)
2111 make_visible (op); 2113 make_visible (op);
2112 2114
2113 return; 2115 return true;
2114 } 2116 }
2117 else
2118 return false;
2119 }
2115 2120
2116 /* in certain circumstances, you shouldn't attack friendly 2121 /* in certain circumstances, you shouldn't attack friendly
2117 * creatures. Note that if you are braced, you can't push 2122 * creatures. Note that if you are braced, you can't push
2118 * someone, but put it inside this loop so that you won't 2123 * someone, but put it inside this loop so that you won't
2119 * attack them either. 2124 * attack them either.
2120 */ 2125 */
2121 if ((mon->type == PLAYER || mon->enemy != op) && 2126 if ((mon->type == PLAYER || mon->enemy != op)
2122 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2127 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2123#ifdef PROHIBIT_PLAYERKILL
2124 (op->contr->peaceful 2128 && ((op->contr->peaceful
2125 || (mon->type == PLAYER 2129 || (mon->type == PLAYER && mon->contr->peaceful))
2126 && mon->contr->
2127 peaceful)) &&
2128#else
2129 op->contr->peaceful &&
2130#endif
2131 !on_battleground)) 2130 && !on_battleground))
2131 {
2132 if (op->speed_left > 0.f)
2132 { 2133 {
2134 --op->speed_left;
2135
2133 if (!op->contr->braced) 2136 if (!op->contr->braced)
2134 { 2137 {
2135 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2138 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2136 push_ob (mon, dir, op); 2139 push_ob (mon, dir, op);
2137 } 2140 }
2138 else 2141 else
2139 new_draw_info (0, 0, op, "You withhold your attack"); 2142 new_draw_info (0, 0, op, "You withhold your attack");
2140 2143
2141 if (op->contr->tmp_invis || op->hide) 2144 if (op->contr->tmp_invis || op->hide)
2142 make_visible (op); 2145 make_visible (op);
2143 }
2144 2146
2147 return true;
2148 }
2149 }
2145 /* If the object is a boulder or other rollable object, then 2150 /* If the object is a boulder or other rollable object, then
2146 * roll it if not braced. You can't roll it if you are braced. 2151 * roll it if not braced. You can't roll it if you are braced.
2147 */ 2152 */
2148 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2153 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2154 {
2155 if (op->speed_left > 0.f)
2149 { 2156 {
2157 --op->speed_left;
2158
2150 recursive_roll (mon, dir, op); 2159 recursive_roll (mon, dir, op);
2151 if (action_makes_visible (op)) 2160 if (action_makes_visible (op))
2152 make_visible (op); 2161 make_visible (op);
2153 }
2154 2162
2163 return true;
2164 }
2165 }
2155 /* Any generic living creature. Including things like doors. 2166 /* Any generic living creature. Including things like doors.
2156 * Way it works is like this: First, it must have some hit points 2167 * Way it works is like this: First, it must have some hit points
2157 * and be living. Then, it must be one of the following: 2168 * and be living. Then, it must be one of the following:
2158 * 1) Not a player, 2) A player, but of a different party. Note 2169 * 1) Not a player, 2) A player, but of a different party. Note
2159 * that party_number -1 is no party, so attacks can still happen. 2170 * that party_number -1 is no party, so attacks can still happen.
2160 */ 2171 */
2161 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2172 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2162 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2173 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2163 { 2174 {
2164 2175 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2165 /* If the player hasn't hit something this tick, and does
2166 * so, give them speed boost based on weapon speed. Doing
2167 * it here is better than process_players2, which basically
2168 * incurred a 1 tick offset.
2169 */
2170 if (!op->contr->has_hit)
2171 { 2176 {
2172 op->speed_left += op->speed / op->contr->weapon_sp; 2177 --op->contr->weapon_sp_left;
2173
2174 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2175 }
2176 2178
2177 skill_attack (mon, op, 0, 0, 0); 2179 skill_attack (mon, op, 0, 0, 0);
2178
2179 /* If attacking another player, that player gets automatic
2180 * hitback, and doesn't loose luck either.
2181 * Disable hitback on the battleground or if the target is
2182 * the wiz.
2183 */
2184 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2185 {
2186 short luck = mon->stats.luck;
2187
2188 mon->contr->has_hit = 1;
2189 skill_attack (op, mon, 0, 0, 0);
2190 mon->stats.luck = luck;
2191 }
2192 2180
2193 if (action_makes_visible (op)) 2181 if (action_makes_visible (op))
2194 make_visible (op); 2182 make_visible (op);
2195 }
2196 } /* if player should attack something */
2197}
2198 2183
2199int 2184 return true;
2185 }
2186 }
2187
2188 return false;
2189}
2190
2191bool
2200move_player (object *op, int dir) 2192move_player (object *op, int dir)
2201{ 2193{
2202 int pick; 2194 int pick;
2203 2195
2204 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2196 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2218 op->facing = dir; 2210 op->facing = dir;
2219 2211
2220 if (op->hide) 2212 if (op->hide)
2221 do_hidden_move (op); 2213 do_hidden_move (op);
2222 2214
2215 bool retval;
2216
2223 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2217 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2224 /*nop */ ; 2218 retval = RESULT_INT (0);
2225 else if (op->contr->fire_on) 2219 else if (op->contr->fire_on)
2226 fire (op, dir); 2220 retval = fire (op, dir);
2227 else 2221 else
2228 { 2222 {
2229 move_player_attack (op, dir); 2223 retval = move_player_attack (op, dir);
2230 pick = check_pick (op); 2224 pick = check_pick (op);
2231 } 2225 }
2232 2226
2233 /* Add special check for newcs players and fire on - this way, the 2227 /* Add special check for newcs players and fire on - this way, the
2234 * server can handle repeat firing. 2228 * server can handle repeat firing.
… …
2241 /* Update how the player looks. Use the facing, so direction may 2235 /* Update how the player looks. Use the facing, so direction may
2242 * get reset to zero. This allows for full animation capabilities 2236 * get reset to zero. This allows for full animation capabilities
2243 * for players. 2237 * for players.
2244 */ 2238 */
2245 animate_object (op, op->facing); 2239 animate_object (op, op->facing);
2246 return 0; 2240
2241 return retval;
2247} 2242}
2248 2243
2249/* This is similar to handle_player, below, but is only used by the 2244/* This is similar to handle_player, below, but is only used by the
2250 * new client/server stuff. 2245 * new client/server stuff.
2251 * This is sort of special, in that the new client/server actually uses 2246 * This is sort of special, in that the new client/server actually uses
2252 * the new speed values for commands. 2247 * the new speed values for commands.
2253 * 2248 *
2254 * Returns true if there are more actions we can do. 2249 * Returns true if there are more actions we can do. Should not do
2250 * many actions in a row, as that would be too unfair to other
2251 * players.
2255 */ 2252 */
2256int 2253bool
2257handle_newcs_player (object *op) 2254handle_newcs_player (object *op)
2258{ 2255{
2259 if (op->contr->hidden)
2260 {
2261 op->invisible = 1000;
2262 /* the socket code flashes the player visible/invisible
2263 * depending on the value of invisible, so we need to
2264 * alternate it here for it to work correctly.
2265 */
2266 if (pticks & 2)
2267 op->invisible--;
2268 }
2269 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2270 {
2271 op->invisible--;
2272 if (!op->invisible)
2273 {
2274 make_visible (op);
2275 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2276 }
2277 }
2278
2279 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2280 { 2257 {
2281 flee_player (op); 2258 if (op->speed_left > 0.f)
2282 /* If player is still scared, that is his action for this tick */
2283 if (QUERY_FLAG (op, FLAG_SCARED))
2284 { 2259 {
2285 op->speed_left--; 2260 --op->speed_left;
2261 flee_player (op);
2262
2286 return 0; 2263 return true;
2287 } 2264 }
2265 else
2266 return false;
2288 } 2267 }
2289
2290 /* I've been seeing crashes where the golem has been destroyed, but
2291 * the player object still points to the defunct golem. The code that
2292 * destroys the golem looks correct, and it doesn't always happen, so
2293 * put this in a a workaround to clean up the golem pointer.
2294 */
2295 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2296 op->contr->ranges[range_golem] = 0;
2297 2268
2298 /* call this here - we also will call this in do_ericserver, but 2269 /* call this here - we also will call this in do_ericserver, but
2299 * the players time has been increased when doericserver has been 2270 * the players time has been increased when doericserver has been
2300 * called, so we recheck it here. 2271 * called, so we recheck it here.
2301 */ 2272 */
2302 if (op->contr->ns->handle_command ()) 2273 if (op->contr->ns->handle_command ())
2303 return 1; 2274 return true;
2304 2275
2305 if (op->speed_left > 0)
2306 {
2307 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2276 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2308 {
2309 /* All move commands take 1 tick, at least for now */
2310 op->speed_left--;
2311
2312 /* Instead of all the stuff below, let move_player take care
2313 * of it. Also, some of the skill stuff is only put in
2314 * there, as well as the confusion stuff.
2315 */
2316 move_player (op, op->direction); 2277 return move_player (op, op->direction);
2317 2278
2318 return op->speed_left > 0;
2319 }
2320 }
2321
2322 return 0; 2279 return false;
2323} 2280}
2324 2281
2325int 2282int
2326save_life (object *op) 2283save_life (object *op)
2327{ 2284{
… …
2362 * from. 2319 * from.
2363 */ 2320 */
2364void 2321void
2365remove_unpaid_objects (object *op, object *env) 2322remove_unpaid_objects (object *op, object *env)
2366{ 2323{
2367 object *next;
2368
2369 while (op) 2324 while (op)
2370 { 2325 {
2371 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2326 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2372 2327
2373 if (QUERY_FLAG (op, FLAG_UNPAID)) 2328 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2439 int rate_grace = 2000; 2394 int rate_grace = 2000;
2440 const int max_hp = 1; 2395 const int max_hp = 1;
2441 const int max_sp = 1; 2396 const int max_sp = 1;
2442 const int max_grace = 1; 2397 const int max_grace = 1;
2443 2398
2444 if (op->contr->outputs_sync) 2399 if (op->contr->hidden)
2400 {
2401 op->invisible = 1000;
2402 /* the socket code flashes the player visible/invisible
2403 * depending on the value of invisible, so we need to
2404 * alternate it here for it to work correctly.
2405 */
2406 if (pticks & 2)
2407 op->invisible--;
2445 { 2408 }
2446 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2409 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2447 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2410 {
2448 flush_output_element (op, &op->contr->outputs[i]); 2411 if (!op->invisible--)
2412 {
2413 make_visible (op);
2414 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2415 }
2449 } 2416 }
2450 2417
2451 if (op->contr->ns->state == ST_PLAYING) 2418 if (op->contr->ns->state == ST_PLAYING)
2452 { 2419 {
2453 /* these next three if clauses make it possible to SLOW DOWN 2420 /* these next three if clauses make it possible to SLOW DOWN
… …
2475 gen_grace = op->stats.maxgrace; 2442 gen_grace = op->stats.maxgrace;
2476 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2443 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2477 } 2444 }
2478 2445
2479 /* Regenerate Spell Points */ 2446 /* Regenerate Spell Points */
2480 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2447 if (!op->contr->golem && --op->last_sp < 0)
2481 { 2448 {
2482 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2449 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2483 if (op->stats.sp < op->stats.maxsp) 2450 if (op->stats.sp < op->stats.maxsp)
2484 { 2451 {
2485 op->stats.sp++; 2452 op->stats.sp++;
… …
2583 } 2550 }
2584 2551
2585 /* Digestion */ 2552 /* Digestion */
2586 if (--op->last_eat < 0) 2553 if (--op->last_eat < 0)
2587 { 2554 {
2588#ifdef COZY_SERVER
2589 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2590 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2591#else
2592 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2555 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2593#endif
2594 2556
2595 if (op->contr->gen_hp > 0) 2557 if (op->contr->gen_hp > 0)
2596 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2558 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2597 else 2559 else
2598 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2560 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
… …
2703 tmp->name = buf; 2665 tmp->name = buf;
2704 sprintf (buf, " This finger has been cut off %s\n" 2666 sprintf (buf, " This finger has been cut off %s\n"
2705 " the %s, when he was defeated at\n level %d by %s.\n", 2667 " the %s, when he was defeated at\n level %d by %s.\n",
2706 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2668 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2707 tmp->msg = buf; 2669 tmp->msg = buf;
2708 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2670 tmp->value = 0, tmp->type = 0;
2709 tmp->materialname = NULL; 2671 tmp->materialname = "organics";
2710 tmp->insert_at (op, tmp); 2672 tmp->insert_at (op, tmp);
2711 } 2673 }
2712 2674
2713 /* teleport defeated player to new destination */ 2675 /* teleport defeated player to new destination */
2714 transfer_ob (op, x, y, 0, NULL); 2676 transfer_ob (op, x, y, 0, NULL);
… …
2910 op->stats.hp = op->stats.maxhp; 2872 op->stats.hp = op->stats.maxhp;
2911 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2873 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2912 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2874 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2913 2875
2914 /* 2876 /*
2915 * Check to see if the player is in a shop. IF so, then check to see if
2916 * the player has any unpaid items. If so, remove them and put them back 2877 * Check to see if the player has any unpaid items. If so, remove them
2917 * in the map. 2878 * and put them back in the map.
2918 */ 2879 */
2919
2920 if (is_in_shop (op))
2921 remove_unpaid_objects (op->inv, op); 2880 remove_unpaid_objects (op->inv, op);
2922 2881
2923 /****************************************/ 2882 /****************************************/
2924 /* */ 2883 /* */
2925 /* Move player to his current respawn- */ 2884 /* Move player to his current respawn- */
2926 /* position (usually last savebed) */ 2885 /* position (usually last savebed) */
… …
2946 object *force; 2905 object *force;
2947 int at; 2906 int at;
2948 2907
2949 force = get_archetype (FORCE_NAME); 2908 force = get_archetype (FORCE_NAME);
2950 /* 50 ticks should be enough time for the spell to abate */ 2909 /* 50 ticks should be enough time for the spell to abate */
2951 force->speed = 0.1; 2910 force->speed = 0.1f;
2952 force->speed_left = -5.0; 2911 force->speed_left = -5.f;
2953 SET_FLAG (force, FLAG_APPLIED); 2912 SET_FLAG (force, FLAG_APPLIED);
2954 for (at = 0; at < NROFATTACKS; at++) 2913 for (at = 0; at < NROFATTACKS; at++)
2955 if (will_kill_again & (1 << at)) 2914 if (will_kill_again & (1 << at))
2956 force->resist[at] = 100; 2915 force->resist[at] = 100;
2957 2916
… …
2966void 2925void
2967loot_object (object *op) 2926loot_object (object *op)
2968{ /* Grab and destroy some treasure */ 2927{ /* Grab and destroy some treasure */
2969 object *tmp, *tmp2, *next; 2928 object *tmp, *tmp2, *next;
2970 2929
2971 if (op->container) 2930 op->close_container (); /* close open sack first */
2972 esrv_apply_container (op, op->container); /* close open sack first */
2973 2931
2974 for (tmp = op->inv; tmp; tmp = next) 2932 for (tmp = op->inv; tmp; tmp = next)
2975 { 2933 {
2976 next = tmp->below; 2934 next = tmp->below;
2977 2935
2978 if (tmp->invisible) 2936 if (tmp->invisible)
2979 continue; 2937 continue;
2980 2938
2981 tmp->remove (); 2939 tmp->remove ();
2982 tmp->x = op->x, tmp->y = op->y; 2940 tmp->x = op->x, tmp->y = op->y;
2941
2983 if (tmp->type == CONTAINER) 2942 if (tmp->type == CONTAINER)
2984 { /* empty container to ground */ 2943 loot_object (tmp); /* empty container to ground */
2985 loot_object (tmp); 2944
2986 }
2987 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2945 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2988 { 2946 {
2989 if (tmp->nrof > 1) 2947 if (tmp->nrof > 1)
2990 { 2948 {
2991 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2949 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
… …
3003/* 2961/*
3004 * fix_weight(): Check recursively the weight of all players, and fix 2962 * fix_weight(): Check recursively the weight of all players, and fix
3005 * what needs to be fixed. Refresh windows and fix speed if anything 2963 * what needs to be fixed. Refresh windows and fix speed if anything
3006 * was changed. 2964 * was changed.
3007 */ 2965 */
3008
3009void 2966void
3010fix_weight (void) 2967fix_weight (void)
3011{ 2968{
3012 for_all_players (pl) 2969 for_all_players (pl)
3013 { 2970 {
… …
3073 if (op->type == PLAYER) 3030 if (op->type == PLAYER)
3074 { 3031 {
3075 op->contr->tmp_invis = 0; 3032 op->contr->tmp_invis = 0;
3076 op->contr->invis_race = 0; 3033 op->contr->invis_race = 0;
3077 } 3034 }
3035
3078 update_object (op, UP_OBJ_FACE); 3036 update_object (op, UP_OBJ_CHANGE);
3079} 3037}
3080 3038
3081int 3039int
3082is_true_undead (object *op) 3040is_true_undead (object *op)
3083{ 3041{
3084 object *tmp = NULL;
3085
3086 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3042 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3087 return 1; 3043 return 1;
3088 3044
3089 return 0; 3045 return 0;
3090} 3046}
3091 3047
… …
3135/* For Hidden creatures - a chance of becoming 'unhidden' 3091/* For Hidden creatures - a chance of becoming 'unhidden'
3136 * every time they move - as we subtract off 'invisibility' 3092 * every time they move - as we subtract off 'invisibility'
3137 * AND, for players, if they move into a ridiculously unhideable 3093 * AND, for players, if they move into a ridiculously unhideable
3138 * spot (surrounded by clear terrain in broad daylight). -b.t. 3094 * spot (surrounded by clear terrain in broad daylight). -b.t.
3139 */ 3095 */
3140
3141void 3096void
3142do_hidden_move (object *op) 3097do_hidden_move (object *op)
3143{ 3098{
3144 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3099 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3145 object *skop; 3100 object *skop;
… …
3262 * a blocked los square. 3217 * a blocked los square.
3263 * we use the archetype to figure out offsets. 3218 * we use the archetype to figure out offsets.
3264 */ 3219 */
3265 while (op) 3220 while (op)
3266 { 3221 {
3267 dx = rv.distance_x + op->arch->clone.x; 3222 dx = rv.distance_x + op->arch->x;
3268 dy = rv.distance_y + op->arch->clone.y; 3223 dy = rv.distance_y + op->arch->y;
3269 3224
3270 /* only the viewable area the player sees is updated by LOS 3225 /* only the viewable area the player sees is updated by LOS
3271 * code, so we need to restrict ourselves to that range of values 3226 * code, so we need to restrict ourselves to that range of values
3272 * for any meaningful values. 3227 * for any meaningful values.
3273 */ 3228 */
… …
3378 char buf[MAX_BUF]; /* tmp. string buffer */ 3333 char buf[MAX_BUF]; /* tmp. string buffer */
3379 int i = 0, j = 0; 3334 int i = 0, j = 0;
3380 3335
3381 /* get the appropriate treasurelist */ 3336 /* get the appropriate treasurelist */
3382 if (atnr == ATNR_FIRE) 3337 if (atnr == ATNR_FIRE)
3383 trlist = find_treasurelist ("dragon_ability_fire"); 3338 trlist = treasurelist::find ("dragon_ability_fire");
3384 else if (atnr == ATNR_COLD) 3339 else if (atnr == ATNR_COLD)
3385 trlist = find_treasurelist ("dragon_ability_cold"); 3340 trlist = treasurelist::find ("dragon_ability_cold");
3386 else if (atnr == ATNR_ELECTRICITY) 3341 else if (atnr == ATNR_ELECTRICITY)
3387 trlist = find_treasurelist ("dragon_ability_elec"); 3342 trlist = treasurelist::find ("dragon_ability_elec");
3388 else if (atnr == ATNR_POISON) 3343 else if (atnr == ATNR_POISON)
3389 trlist = find_treasurelist ("dragon_ability_poison"); 3344 trlist = treasurelist::find ("dragon_ability_poison");
3390 3345
3391 if (trlist == NULL || who->type != PLAYER) 3346 if (trlist == NULL || who->type != PLAYER)
3392 return; 3347 return;
3393 3348
3394 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3349 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3398 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3353 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3399 return; 3354 return;
3400 } 3355 }
3401 3356
3402 /* everything seems okay - now bring on the gift: */ 3357 /* everything seems okay - now bring on the gift: */
3403 item = &(tr->item->clone); 3358 item = tr->item;
3404 3359
3405 if (item->type == SPELL) 3360 if (item->type == SPELL)
3406 { 3361 {
3407 if (check_spell_known (who, item->name)) 3362 if (check_spell_known (who, item->name))
3408 return; 3363 return;
… …
3468 /* forces in the treasurelist can alter the player's stats */ 3423 /* forces in the treasurelist can alter the player's stats */
3469 object *skin; 3424 object *skin;
3470 3425
3471 /* first get the dragon skin force */ 3426 /* first get the dragon skin force */
3472 shstr_cmp dragon_skin_force ("dragon_skin_force"); 3427 shstr_cmp dragon_skin_force ("dragon_skin_force");
3473 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3428 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3474 ; 3429 ;
3475 3430
3476 if (!skin) 3431 if (!skin)
3477 return; 3432 return;
3478 3433
… …
3526 * not readied. 3481 * not readied.
3527 */ 3482 */
3528void 3483void
3529player_unready_range_ob (player *pl, object *ob) 3484player_unready_range_ob (player *pl, object *ob)
3530{ 3485{
3531 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3486 if (pl->ob->current_weapon == ob)
3487 pl->ob->current_weapon = 0;
3488
3489 if (pl->combat_ob == ob)
3490 pl->combat_ob = 0;
3491
3532 if (pl->ranges[i] == ob) 3492 if (pl->ranged_ob == ob)
3533 {
3534 pl->ranges[i] = 0; 3493 pl->ranged_ob = 0;
3535 if (pl->shoottype == i)
3536 pl->shoottype = range_none;
3537 }
3538} 3494}
3495
3496sint8
3497player::visibility_at (maptile *map, int x, int y) const
3498{
3499 if (!ns)
3500 return 0;
3501
3502 int dx, dy;
3503 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3504 return 0;
3505
3506 x += dx - ns->current_x + ns->mapx / 2;
3507 y += dy - ns->current_y + ns->mapy / 2;
3508
3509 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3510 return 0;
3511
3512 return 100 - blocked_los [x][y];
3513}

Diff Legend

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