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

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

Diff Legend

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