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.75 by root, Sat Dec 30 21:15:59 2006 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
18 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
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 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>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <sounds.h> 27#include <sounds.h>
28#include <living.h> 28#include <living.h>
29#include <object.h> 29#include <object.h>
30#include <spells.h> 30#include <spells.h>
31#include <skills.h> 31#include <skills.h>
32 32
33#include <algorithm> 33#include <algorithm>
34#include <functional> 34#include <functional>
35 35
36player * 36playervec players;
37find_player (const char *plname)
38{
39 for_all_players (pl)
40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
41 return pl;
42
43 return 0;
44}
45 37
46void 38void
47display_motd (const object *op) 39display_motd (const object *op)
48{ 40{
49 char buf[MAX_BUF]; 41 char buf[MAX_BUF];
… …
123 115
124 news[0] = '\0'; 116 news[0] = '\0';
125 subject[0] = '\0'; 117 subject[0] = '\0';
126 size = 0; 118 size = 0;
127 119
128 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
129 { 121 {
130 if (*buf == '#') 122 if (*buf == '#')
131 continue; 123 continue;
132 124
133 if (*buf == '%') 125 if (*buf == '%')
134 { /* send one news */ 126 { /* send one news */
135 if (size > 0) 127 if (size > 0)
136 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 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 */
129
137 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
138 strip_endline (subject); 131 strip_endline (subject);
139 size = 0; 132 size = 0;
140 news[0] = '\0'; 133 news[0] = '\0';
141 } 134 }
… …
150 size += strlen (buf); 143 size += strlen (buf);
151 } 144 }
152 } 145 }
153 146
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
157} 150}
158 151
159/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
160static void 153static void
161set_first_map (object *op) 154set_first_map (object *op)
162{ 155{
163 strcpy (op->contr->maplevel, first_map_path); 156 op->contr->maplevel = first_map_path;
164 op->x = -1; 157 op->x = -1;
165 op->y = -1; 158 op->y = -1;
166} 159}
167 160
168void 161void
169player::enter_map () 162player::activate ()
170{ 163{
171 object *tmp = object::create (); 164 if (active)
165 return;
172 166
173 EXIT_PATH (tmp) = maplevel; 167 players.insert (this);
174 EXIT_X (tmp) = ob->x; 168 ob->remove ();
175 EXIT_Y (tmp) = ob->y; 169 ob->map = 0;
176 ob->enter_exit (tmp); 170 ob->activate_recursive ();
171 CLEAR_FLAG (ob, FLAG_FRIENDLY);
172 add_friendly_object (ob);
173}
177 174
178 tmp->destroy (); 175void
176player::deactivate ()
177{
178 if (!active)
179 return;
180
181 terminate_all_pets (ob);
182 remove_friendly_object (ob);
183 ob->deactivate_recursive ();
184
185 if (ob->map)
186 maplevel = ob->map->path;
187
188 ob->remove ();
189 ob->map = 0;
190 party = 0;
191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193
194 players.erase (this);
179} 195}
180 196
181// connect the player with a specific client 197// connect the player with a specific client
182// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
183void 199void
184player::connect (client *ns) 200player::connect (client *ns)
185{ 201{
186 this->ns = ns; 202 this->ns = ns;
187 ns->pl = this; 203 ns->pl = this;
188 204
189 next = first_player; 205 run_on = 0;
190 first_player = this; 206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
191 208
192 ns->update_look = 0; 209 ns->update_look = 0;
193 ns->look_position = 0; 210 ns->look_position = 0;
194 211
195 clear_los (ob); 212 clear_los (this);
213
214 ns->reset_stats ();
196 215
197 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->clone.race;
200 219
201 if (!legal_range (ob, shoottype))
202 shoottype = range_none;
203
204 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
205 link_player_skills (ob); 221 link_player_skills (ob);
206 222
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208 224
209 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->clone.name);
210 226
211 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
212 * from the class, and not race. I don't see any way to get the class information
213 * to then update this. I don't think this will actually break anything - anyone
214 * that can use armour should be able to use a shield. What this may 'break'
215 * are features new characters get, eg, if someone starts up with a Q, they
216 * should be able to use a shield. However, old Q's won't get that advantage.
217 */
218 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219 SET_FLAG (ob, FLAG_USE_SHIELD);
220
221 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
223 { 229 {
224 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
225 231
226 shstr_cmp dragon_ability_force ("dragon_ability_force"); 232 shstr_cmp dragon_ability_force ("dragon_ability_force");
227 shstr_cmp dragon_skin_force ("dragon_skin_force"); 233 shstr_cmp dragon_skin_force ("dragon_skin_force");
228 234
229 for (tmp = ob->inv; tmp; tmp = tmp->below) 235 for (tmp = ob->inv; tmp; tmp = tmp->below)
230 if (tmp->type == FORCE) 236 if (tmp->type == FORCE)
231 if (tmp->arch->name == dragon_ability_force) 237 if (tmp->arch->archname == dragon_ability_force)
232 abil = tmp; 238 abil = tmp;
233 else if (tmp->arch->name == dragon_skin_force) 239 else if (tmp->arch->archname == dragon_skin_force)
234 skin = tmp; 240 skin = tmp;
235 241
236 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
237 } 243 }
238 244
239 CLEAR_FLAG (ob, FLAG_FRIENDLY);
240 add_friendly_object (ob);
241
242 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 246
246 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this, ob->weight + ob->carrying);
247 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);
248 ob->update_stats (); 274 ob->update_stats ();
275
249 ns->floorbox_update (); 276 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob); 277 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0); 278 esrv_add_spells (this, 0);
253 279
254 ob->activate (1); 280 activate ();
255 enter_map ();
256 281
257 send_rules (ob); 282 send_rules (ob);
258 send_news (ob); 283 send_news (ob);
259 display_motd (ob); 284 display_motd (ob);
285
286 INVOKE_PLAYER (CONNECT, this);
260 INVOKE_PLAYER (LOGIN, this); 287 INVOKE_PLAYER (LOGIN, this);
261} 288}
262 289
263void 290void
264player::disconnect () 291player::disconnect ()
265{ 292{
293 if (ns)
294 {
295 if (active)
296 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297
298 INVOKE_PLAYER (DISCONNECT, this);
299
300 ns->reset_stats ();
301 ns->pl = 0;
302 ns = 0;
303 }
304
266 if (ob) 305 if (ob)
306 ob->close_container (); //TODO: client-specific
307
267 ob->deactivate (1); 308 deactivate ();
268
269 //TODO: don't be so harsh and destroy :)
270 if (ns)
271 {
272 if (enable_save)
273 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
274
275 client *ns = this->ns;
276 ns->send_packet ("goodbye");
277 ns->flush ();
278 ns->pl = 0;
279 this->ns = 0;
280
281 ns->destroy ();
282 destroy ();
283 }
284} 309}
285 310
286// the need for this function can be explained 311// the need for this function can be explained
287// by load_object not returning the object 312// by load_object not returning the object
288void 313void
289player::set_object (object *op) 314player::set_object (object *op)
290{ 315{
291 ob = op; 316 ob = observe = op;
292 ob->contr = this; /* this aren't yet in archetype */ 317 ob->contr = this; /* this aren't yet in archetype */
293 318
319 ob->speed = 1.0f;
294 ob->speed_left = 0.5; 320 ob->speed_left = 0.5f;
295 ob->speed = 1.0; 321
296 ob->direction = 5; /* So player faces south */ 322 ob->direction = 5; /* So player faces south */
297 ob->stats.wc = 2; 323}
298 ob->run_away = 25; /* Then we panick... */
299 324
300 set_first_map (ob); 325void
301 enter_map (); 326player::set_observe (object *op)
302 327{
303 ob->roll_stats (); 328 observe = op ? op : ob;
329 do_los = 1;
304} 330}
305 331
306player::player () 332player::player ()
307{ 333{
308 /* There are some elements we want initialized to non zero value - 334 /* There are some elements we want initialised to non zero value -
309 * we deal with that below this point. 335 * we deal with that below this point.
310 */ 336 */
311 outputs_sync = 16; /* Every 2 seconds */ 337 outputs_sync = 4;
312 outputs_count = 8; /* Keeps present behaviour */ 338 outputs_count = 4;
313 unapply = unapply_nochoice; 339 unapply = unapply_nochoice;
314 340
315 assign (savebed_map, first_map_path); /* Init. respawn position */ 341 savebed_map = first_map_path; /* Init. respawn position */
316 342
317 gen_sp_armour = 10; 343 gen_sp_armour = 10;
318 last_speed = -1;
319 shoottype = range_none;
320 bowtype = bow_normal; 344 bowtype = bow_normal;
321 petmode = pet_normal; 345 petmode = pet_normal;
322 listening = 10; 346 listening = 10;
323 usekeys = containers; 347 usekeys = containers;
324 last_weapon_sp = -1;
325 peaceful = 1; /* default peaceful */ 348 peaceful = 1; /* default peaceful */
326 do_los = 1; 349 do_los = 1;
327 350
328 /* we need to clear these to -1 and not zero - otherwise, 351 weapon_sp = 1.0f;
329 * if a player quits and starts a new character, we wont 352 weapon_sp_left = 0.5f;
330 * send new values to the client, as things like exp start
331 * at zero.
332 */
333 for (int i = 0; i < NUM_SKILLS; i++)
334 last_skill_exp[i] = -1;
335
336 for (int i = 0; i < NROFATTACKS; i++)
337 last_resist[i] = -1;
338
339 last_stats.exp = -1;
340 last_weight = (uint32) - 1;
341} 353}
342 354
343void 355void
344player::do_destroy () 356player::do_destroy ()
345{ 357{
346 disconnect (); 358 disconnect ();
347 359
348 save (false);
349 enable_save = false;
350
351 attachable::do_destroy (); 360 attachable::do_destroy ();
352
353 terminate_all_pets (ob);
354
355 if (first_player != this)
356 {
357 player *prev = first_player;
358
359 while (prev && prev->next && prev->next != this)
360 prev = prev->next;
361
362 if (prev->next != this)
363 {
364 LOG (llevError, "Free_player: Can't find previous player.\n");
365 abort ();
366 }
367
368 prev->next = next;
369 }
370 else
371 first_player = next;
372 361
373 if (ob) 362 if (ob)
374 { 363 {
375 ob->destroy_inv (false); 364 ob->destroy_inv (false);
376 ob->destroy (); 365 ob->destroy ();
… …
391player::create () 380player::create ()
392{ 381{
393 player *pl = new player; 382 player *pl = new player;
394 383
395 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
390 set_first_map (pl->ob);
396 391
397 return pl; 392 return pl;
398} 393}
399 394
400/* 395/*
… …
431 object *op = NULL; 426 object *op = NULL;
432 objectlink *ol; 427 objectlink *ol;
433 unsigned lastdist; 428 unsigned lastdist;
434 rv_vector rv; 429 rv_vector rv;
435 430
436 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 431 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
437 { 432 {
438 /* We should not find free objects on this friendly list, but it 433 /* We should not find free objects on this friendly list, but it
439 * does periodically happen. Given that, lets deal with it. 434 * does periodically happen. Given that, lets deal with it.
440 * While unlikely, it is possible the next object on the friendly 435 * While unlikely, it is possible the next object on the friendly
441 * list is also free, so encapsulate this in a while loop. 436 * list is also free, so encapsulate this in a while loop.
… …
445 object *tmp = ol->ob; 440 object *tmp = ol->ob;
446 441
447 /* Can't do much more other than log the fact, because the object 442 /* Can't do much more other than log the fact, because the object
448 * itself will have been cleared. 443 * itself will have been cleared.
449 */ 444 */
450 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 445 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
446 tmp->debug_desc ());
451 ol = ol->next; 447 ol = ol->next;
452 remove_friendly_object (tmp); 448 remove_friendly_object (tmp);
453 if (!ol) 449 if (!ol)
454 return op; 450 return op;
455 } 451 }
… …
544 x = mon->x; 540 x = mon->x;
545 y = mon->y; 541 y = mon->y;
546 m = mon->map; 542 m = mon->map;
547 dir = rv.direction; 543 dir = rv.direction;
548 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 544 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
549 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 545 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
546
550 /* If we can't solve it within the search distance, return now. */ 547 /* If we can't solve it within the search distance, return now. */
551 if (diff > max) 548 if (diff > max)
552 return 0; 549 return 0;
550
553 while (diff > 1 && max > 0) 551 while (diff > 1 && max > 0)
554 { 552 {
555 lastx = x; 553 lastx = x;
556 lasty = y; 554 lasty = y;
557 lastmap = m; 555 lastmap = m;
… …
639 max--; 637 max--;
640 lastdir = dir; 638 lastdir = dir;
641 if (!firstdir) 639 if (!firstdir)
642 firstdir = dir; 640 firstdir = dir;
643 } 641 }
642
644 if (diff <= 1) 643 if (diff <= 1)
645 { 644 {
646 /* Recalculate diff (distance) because we may not have actually 645 /* Recalculate diff (distance) because we may not have actually
647 * headed toward player for entire distance. 646 * headed toward player for entire distance.
648 */ 647 */
649 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 648 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
650 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 649 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
651 } 650 }
651
652 if (diff > max) 652 if (diff > max)
653 return 0; 653 return 0;
654 } 654 }
655
655 /* If we reached the max, didn't find a direction in time */ 656 /* If we reached the max, didn't find a direction in time */
656 if (!max) 657 if (!max)
657 return 0; 658 return 0;
658 659
659 return firstdir; 660 return firstdir;
… …
773roll_stat (void) 774roll_stat (void)
774{ 775{
775 int a[4], i, j, k; 776 int a[4], i, j, k;
776 777
777 for (i = 0; i < 4; i++) 778 for (i = 0; i < 4; i++)
778 a[i] = (int) RANDOM () % 6 + 1; 779 a[i] = (int) rndm (6) + 1;
779 780
780 for (i = 0, j = 0, k = 7; i < 4; i++) 781 for (i = 0, j = 0, k = 7; i < 4; i++)
781 if (a[i] < k) 782 if (a[i] < k)
782 k = a[i], j = i; 783 k = a[i], j = i;
783 784
… …
789} 790}
790 791
791void 792void
792object::roll_stats () 793object::roll_stats ()
793{ 794{
794 int statsort [7]; 795 int statsort [NUM_STATS];
795 796
796 for (;;) 797 for (;;)
797 { 798 {
798 int sum = 0; 799 int sum = 0;
799 for (int i = 7; i--; ) 800 for (int i = NUM_STATS; i--; )
800 sum += statsort [i] = roll_stat (); 801 sum += statsort [i] = roll_stat ();
801 802
802 if (sum >= 82 && sum <= 116) 803 if (sum >= 82 && sum <= 116)
803 break; 804 break;
804 } 805 }
805 806
806 // Sort the stats so that rerolling is easier... 807 // Sort the stats so that rerolling is easier...
807 std::sort (statsort, statsort + 7, std::greater<int>()); 808 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
808 809
810 for (int i = 0; i < NUM_STATS; ++i)
809 stats.Str = statsort[0]; 811 stats.stat (i) = statsort [i];
810 stats.Dex = statsort[1];
811 stats.Con = statsort[2];
812 stats.Int = statsort[3];
813 stats.Wis = statsort[4];
814 stats.Pow = statsort[5];
815 stats.Cha = statsort[6];
816 812
817 stats.exp = 0; 813 stats.exp = 0;
818 stats.ac = 0; 814 stats.ac = 0;
819 815
820 stats.hp = stats.maxhp; 816 stats.hp = stats.maxhp;
… …
832} 828}
833 829
834void 830void
835object::swap_stats (int a, int b) 831object::swap_stats (int a, int b)
836{ 832{
837 int tmp = get_attr_value (&contr->orig_stats, a); 833 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
838 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
839 set_attr_value (&contr->orig_stats, b, tmp);
840 834
835 for (int i = 0; i < NUM_STATS; ++i)
841 stats.Str = contr->orig_stats.Str; 836 stats.stat (i) = contr->orig_stats.stat (i);
842 stats.Dex = contr->orig_stats.Dex;
843 stats.Con = contr->orig_stats.Con;
844 stats.Int = contr->orig_stats.Int;
845 stats.Wis = contr->orig_stats.Wis;
846 stats.Pow = contr->orig_stats.Pow;
847 stats.Cha = contr->orig_stats.Cha;
848 837
849 //TODO: the following code looks so borked and should, at the very least, 838 //TODO: the following code looks so borked and should, at the very least,
850 // be merged with the similar code in roll_stats 839 // be merged with the similar code in roll_stats
851 stats.ac = 0; 840 stats.ac = 0;
852 841
… …
883 * appropriate action with it (change race, or other things). 872 * appropriate action with it (change race, or other things).
884 * The function name is for historical reasons - now we have 873 * The function name is for historical reasons - now we have
885 * separate race and class; this actually changes the RACE, 874 * separate race and class; this actually changes the RACE,
886 * not the class. 875 * not the class.
887 */ 876 */
888int 877void
889key_change_class (object *op, char key) 878player::chargen_race_done ()
890{ 879{
891 int tmp_loop;
892
893 if (key == 'd' || key == 'D')
894 {
895 char buf[MAX_BUF];
896
897 /* this must before then initial items are given */ 880 /* this must before then initial items are given */
898 esrv_new_player (op->contr, op->weight + op->carrying); 881 esrv_new_player (ob->contr, ob->weight + ob->carrying);
899 882
900 treasurelist *tl = find_treasurelist ("starting_wealth"); 883 treasurelist *tl = treasurelist::find ("starting_wealth");
901 if (tl) 884 if (tl)
902 create_treasure (tl, op, 0, 0, 0); 885 create_treasure (tl, ob, 0, 0, 0);
903 886
904 INVOKE_PLAYER (BIRTH, op->contr); 887 INVOKE_PLAYER (BIRTH, ob->contr);
905 INVOKE_PLAYER (LOGIN, op->contr); 888 INVOKE_PLAYER (LOGIN, ob->contr);
906 889
907 op->contr->ns->state = ST_PLAYING; 890 ob->contr->ns->state = ST_PLAYING;
908 891
909 if (op->msg) 892 if (ob->msg)
910 op->msg = NULL; 893 ob->msg = 0;
911 894
912 /* We create this now because some of the unique maps will need it 895 /* We create this now because some of the unique maps will need it
913 * to save here. 896 * to save here.
914 */ 897 */
898 {
899 char buf[MAX_BUF];
915 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 900 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
916 make_path_to_file (buf); 901 make_path_to_file (buf);
902 }
917 903
918#ifdef AUTOSAVE
919 op->contr->last_save_tick = pticks;
920#endif
921 start_info (op); 904 start_info (ob);
922 CLEAR_FLAG (op, FLAG_WIZ); 905 CLEAR_FLAG (ob, FLAG_WIZ);
923 give_initial_items (op, op->randomitems); 906 give_initial_items (ob, ob->randomitems);
924 link_player_skills (op); 907 link_player_skills (ob);
925 esrv_send_inventory (op, op); 908 esrv_send_inventory (ob, ob);
926 op->update_stats (); 909 ob->update_stats ();
927 910
928 /* This moves the player to a different start map, if there 911 /* This moves the player to a different start map, if there
929 * is one for this race 912 * is one for this race
930 */ 913 */
931 if (*first_map_ext_path) 914 if (*first_map_ext_path)
932 { 915 {
933 object *tmp; 916 object *tmp;
934 char mapname[MAX_BUF]; 917 char mapname[MAX_BUF];
935 918
936 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 919 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
937 tmp = object::create (); 920 tmp = object::create ();
938 EXIT_PATH (tmp) = mapname; 921 EXIT_PATH (tmp) = mapname;
939 EXIT_X (tmp) = op->x; 922 EXIT_X (tmp) = ob->x;
940 EXIT_Y (tmp) = op->y; 923 EXIT_Y (tmp) = ob->y;
941 op->enter_exit (tmp); /* we don't really care if it succeeded; 924 ob->enter_exit (tmp); /* we don't really care if it succeeded;
942 * if the map isn't there, then stay on the 925 * if the map isn't there, then stay on the
943 * default initial map */ 926 * default initial map */
944 tmp->destroy (); 927 tmp->destroy ();
945 } 928 }
946 else 929 else
947 LOG (llevDebug, "first_map_ext_path not set\n"); 930 LOG (llevDebug, "first_map_ext_path not set\n");
931}
948 932
949 return 0; 933void
950 } 934player::chargen_race_next ()
951 935{
952 /* Following actually changes the race - this is the default command 936 /* Following actually changes the race - this is the default command
953 * if we don't match with one of the options above. 937 * if we don't match with one of the options above.
954 */ 938 */
955 939
956 tmp_loop = 0; 940 do
957 while (!tmp_loop)
958 { 941 {
959 shstr name = op->name; 942 shstr name = ob->name;
960 int x = op->x, y = op->y; 943 int x = ob->x, y = ob->y;
961 944
962 op->remove_statbonus (); 945 ob->remove_statbonus ();
963 op->remove (); 946 ob->remove ();
964 op->arch = get_player_archetype (op->arch); 947 ob->arch = get_player_archetype (ob->arch);
965 op->arch->clone.copy_to (op); 948 ob->arch->clone.copy_to (ob);
966 op->instantiate (); 949 ob->instantiate ();
967 op->stats = op->contr->orig_stats; 950 ob->stats = ob->contr->orig_stats;
968 op->name = op->name_pl = name; 951 ob->name = ob->name_pl = name;
969 op->x = x; 952 ob->x = x;
970 op->y = y; 953 ob->y = y;
971 SET_ANIMATION (op, 2); /* So player faces south */ 954 SET_ANIMATION (ob, 2); /* So player faces south */
972 insert_ob_in_map (op, op->map, op, 0); 955 insert_ob_in_map (ob, ob->map, ob, 0);
973 assign (op->contr->title, op->arch->clone.name); 956 assign (ob->contr->title, ob->arch->clone.name);
974 op->add_statbonus (); 957 ob->add_statbonus ();
975 tmp_loop = allowed_class (op);
976 } 958 }
959 while (!allowed_class (ob));
977 960
978 update_object (op, UP_OBJ_FACE); 961 update_object (ob, UP_OBJ_FACE);
979 esrv_update_item (UPD_FACE, op, op); 962 esrv_update_item (UPD_FACE, ob, ob);
980 op->update_stats (); 963 ob->update_stats ();
981 op->stats.hp = op->stats.maxhp; 964 ob->stats.hp = ob->stats.maxhp;
982 op->stats.sp = op->stats.maxsp; 965 ob->stats.sp = ob->stats.maxsp;
983 op->stats.grace = 0; 966 ob->stats.grace = 0;
984
985 if (op->msg)
986 new_draw_info (NDI_BLUE, 0, op, op->msg);
987
988 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
989 return 0;
990}
991
992int
993key_confirm_quit (object *op, char key)
994{
995 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
996 {
997 op->contr->ns->state = ST_PLAYING;
998 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
999 return 1;
1000 }
1001
1002 INVOKE_PLAYER (LOGOUT, op->contr);
1003 INVOKE_PLAYER (QUIT, op->contr);
1004
1005 op->contr->enable_save = false;
1006
1007 terminate_all_pets (op);
1008 op->remove ();
1009 op->direction = 0;
1010 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1011
1012 strcpy (op->contr->killer, "quit");
1013 check_score (op);
1014 op->contr->party = 0;
1015 op->contr->own_title[0] = '\0';
1016 op->contr->destroy ();
1017
1018 return 1;
1019} 967}
1020 968
1021void 969void
1022flee_player (object *op) 970flee_player (object *op)
1023{ 971{
… …
1070 /* Cornered, get rid of scared */ 1018 /* Cornered, get rid of scared */
1071 CLEAR_FLAG (op, FLAG_SCARED); 1019 CLEAR_FLAG (op, FLAG_SCARED);
1072 op->enemy = NULL; 1020 op->enemy = NULL;
1073} 1021}
1074 1022
1075
1076/* check_pick sees if there is stuff to be picked up/picks up stuff. 1023/* check_pick sees if there is stuff to be picked up/picks up stuff.
1077 * IT returns 1 if the player should keep on moving, 0 if he should 1024 * It returns 1 if the player should keep on moving, 0 if he should
1078 * stop. 1025 * stop.
1079 */ 1026 */
1080int 1027int
1081check_pick (object *op) 1028check_pick (object *op)
1082{ 1029{
1083 object *tmp, *next; 1030 object *tmp, *next;
1084 int stop = 0; 1031 int stop = 0;
1085 int j, k, wvratio; 1032 int wvratio;
1086 char putstring[128], tmpstr[16]; 1033 char putstring[128];
1087 1034
1088 /* if you're flying, you cna't pick up anything */ 1035 /* if you're flying, you cna't pick up anything */
1089 if (op->move_type & MOVE_FLYING) 1036 if (op->move_type & MOVE_FLYING)
1090 return 1; 1037 return 1;
1091 1038
… …
1159 if (tmp->name != NULL) 1106 if (tmp->name != NULL)
1160 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1161 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1108 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1162 else 1109 else
1163 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1110 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1164 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1111 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1165 1112
1166 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1113 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1167 } 1114 }
1168 1115
1169 /* philosophy: 1116 /* philosophy:
… …
1362 /* careful: chairs and tables are weapons! */ 1309 /* careful: chairs and tables are weapons! */
1363 if (op->contr->mode & PU_ALLWEAPON) 1310 if (op->contr->mode & PU_ALLWEAPON)
1364 { 1311 {
1365 if (tmp->type == WEAPON && tmp->name != NULL) 1312 if (tmp->type == WEAPON && tmp->name != NULL)
1366 { 1313 {
1367 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1314 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1368 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1315 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1369 { 1316 {
1370 pick_up (op, tmp); 1317 pick_up (op, tmp);
1371 continue; 1318 continue;
1372 } 1319 }
1373 } 1320 }
1374 1321
1375 if (tmp->type == WEAPON && tmp->name == NULL) 1322 if (tmp->type == WEAPON && tmp->name == NULL)
1376 { 1323 {
1377 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1324 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1378 { 1325 {
1379 pick_up (op, tmp); 1326 pick_up (op, tmp);
1380 continue; 1327 continue;
1381 } 1328 }
1382 } 1329 }
… …
1407 if (tmp->name != NULL) 1354 if (tmp->name != NULL)
1408 { 1355 {
1409 fprintf (stderr, "%s", tmp->name); 1356 fprintf (stderr, "%s", tmp->name);
1410 } 1357 }
1411 else 1358 else
1412 fprintf (stderr, "%s", tmp->arch->name); 1359 fprintf (stderr, "%s", tmp->arch->archname);
1413 fprintf (stderr, ",%d] = ", tmp->type); 1360 fprintf (stderr, ",%d] = ", tmp->type);
1414 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1361 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1415#endif 1362#endif
1416 continue; 1363 continue;
1417 } 1364 }
… …
1428 * found object is returned. 1375 * found object is returned.
1429 */ 1376 */
1430object * 1377object *
1431find_arrow (object *op, const char *type) 1378find_arrow (object *op, const char *type)
1432{ 1379{
1433 object *tmp = NULL; 1380 object *tmp = 0;
1434 1381
1435 for (op = op->inv; op; op = op->below) 1382 for (op = op->inv; op; op = op->below)
1436 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1437 tmp = find_arrow (op, type); 1384 tmp = find_arrow (op, type);
1438 else if (op->type == ARROW && op->race == type) 1385 else if (op->type == ARROW && op->race == type)
1439 return op; 1386 return op;
1387
1440 return tmp; 1388 return tmp;
1441} 1389}
1442 1390
1443/* 1391/*
1444 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1392 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1445 * against the target. A full test is not performed, simply a basic test 1393 * against the target. A full test is not performed, simply a basic test
1446 * of resistances. The archer is making a quick guess at what he sees down 1394 * of resistances. The archer is making a quick guess at what he sees down
1447 * the hall. Failing that it does it's best to pick the highest plus arrow. 1395 * the hall. Failing that it does it's best to pick the highest plus arrow.
1448 */ 1396 */
1449
1450object * 1397object *
1451find_better_arrow (object *op, object *target, const char *type, int *better) 1398find_better_arrow (object *op, object *target, const char *type, int *better)
1452{ 1399{
1453 object *tmp = NULL, *arrow, *ntmp; 1400 object *tmp = NULL, *arrow, *ntmp;
1454 int attacknum, attacktype, betterby = 0, i; 1401 int attacknum, attacktype, betterby = 0, i;
… …
1520 * find_better_arrow to find a decent arrow to use. 1467 * find_better_arrow to find a decent arrow to use.
1521 * op = the shooter 1468 * op = the shooter
1522 * type = bow->race 1469 * type = bow->race
1523 * dir = fire direction 1470 * dir = fire direction
1524 */ 1471 */
1525
1526object * 1472object *
1527pick_arrow_target (object *op, const char *type, int dir) 1473pick_arrow_target (object *op, const char *type, int dir)
1528{ 1474{
1529 object *tmp = NULL; 1475 object *tmp = NULL;
1530 maptile *m; 1476 maptile *m;
… …
1595 */ 1541 */
1596int 1542int
1597fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1543fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1598{ 1544{
1599 object *left, *bow; 1545 object *left, *bow;
1600 int bowspeed, mflags; 1546 int mflags;
1601 maptile *m; 1547 maptile *m;
1602 1548
1603 if (!dir) 1549 if (!dir)
1604 { 1550 {
1605 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1551 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606 return 0; 1552 return 0;
1607 } 1553 }
1608 1554
1609 if (op->type == PLAYER) 1555 if (op->contr)
1610 bow = op->contr->ranges[range_bow]; 1556 bow = op->current_weapon;
1611 else 1557 else
1612 { 1558 {
1613 for (bow = op->inv; bow; bow = bow->below) 1559 for (bow = op->inv; bow; bow = bow->below)
1614 /* Don't check for applied - monsters don't apply bows - in that way, they 1560 /* Don't check for applied - monsters don't apply bows - in that way, they
1615 * don't need to switch back and forth between bows and weapons. 1561 * don't need to switch back and forth between bows and weapons.
… …
1620 if (!bow) 1566 if (!bow)
1621 { 1567 {
1622 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1568 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1623 return 0; 1569 return 0;
1624 } 1570 }
1571
1572 // optimisation: move object to top so we will find it quickly again
1573 if (bow->below)
1574 {
1575 bow->remove ();
1576 op->insert (bow);
1577 }
1578
1625 } 1579 }
1626 1580
1627 if (!bow->race || !bow->skill) 1581 if (!bow->race || !bow->skill)
1628 { 1582 {
1629 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1630 return 0; 1584 return 0;
1631 } 1585 }
1632
1633 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1634
1635 /* penalize ROF for bestarrow */
1636 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1637 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1639 if (bowspeed < 1)
1640 bowspeed = 1;
1641 1586
1642 if (arrow == NULL) 1587 if (arrow == NULL)
1643 { 1588 {
1644 if ((arrow = find_arrow (op, bow->race)) == NULL) 1589 if ((arrow = find_arrow (op, bow->race)) == NULL)
1645 { 1590 {
1646 if (op->type == PLAYER) 1591 if (op->type == PLAYER)
1647 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1592 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1648 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1593 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1649 else 1594 else
1650 CLEAR_FLAG (op, FLAG_READY_BOW); 1595 CLEAR_FLAG (op, FLAG_READY_BOW);
1596
1651 return 0; 1597 return 0;
1652 } 1598 }
1653 } 1599 }
1654 1600
1655 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1601 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1679 1625
1680 arrow->set_owner (op); 1626 arrow->set_owner (op);
1681 arrow->skill = bow->skill; 1627 arrow->skill = bow->skill;
1682 arrow->direction = dir; 1628 arrow->direction = dir;
1683 1629
1630 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1631 arrow->stats.hp = arrow->stats.dam;
1632 arrow->stats.grace = arrow->attacktype;
1633
1634 if (arrow->slaying)
1635 arrow->spellarg = strdup (arrow->slaying);
1636
1637#if 0
1638 if (player *pl = op->contr)
1639 {
1640 float speed = pl->weapon_sp;
1641
1642 /* penalize ROF for bestarrow */
1643 if (pl->bowtype == bow_bestarrow)
1644 speed *= .9f;
1645 else
1646 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1647
1648 op->speed_left += speed - op->speed;
1649 }
1650#endif
1651
1652 SET_ANIMATION (arrow, arrow->direction);
1653
1654 /* update the speed */
1655 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1656 + bow->stats.dam / 7.f;
1657
1658 arrow->set_speed (max (arrow->speed, 2.f));
1659 arrow->speed_left = 0;
1660
1661 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1662
1684 if (op->type == PLAYER) 1663 if (op->type == PLAYER)
1685 { 1664 {
1686 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1687 op->update_stats ();
1688 }
1689
1690 SET_ANIMATION (arrow, arrow->direction);
1691 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1692 arrow->stats.hp = arrow->stats.dam;
1693 arrow->stats.grace = arrow->attacktype;
1694 if (arrow->slaying != NULL)
1695 arrow->spellarg = strdup (arrow->slaying);
1696
1697 /* Note that this was different for monsters - they got their level
1698 * added to the damage. I think the strength bonus is more proper.
1699 */
1700
1701 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1702
1703 /* update the speed */
1704 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1705 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1706
1707 arrow->set_speed (max (arrow->speed, 1.0));
1708 arrow->speed_left = 0;
1709
1710 if (op->type == PLAYER)
1711 {
1712 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1713 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1714 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1715
1716 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1665 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1666 wc -= dex_bonus[op->stats.Dex];
1667
1668 if (!arrow->slaying)
1669 arrow->slaying = op->slaying;
1670
1671 arrow->attacktype |= op->attacktype;
1717 } 1672 }
1718 else 1673 else
1719 { 1674 {
1720 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1721 arrow->level = op->level; 1675 arrow->level = op->level;
1722 } 1676 arrow->stats.wc -= bow->magic;
1723 1677
1724 if (arrow->attacktype == AT_PHYSICAL) 1678 if (!arrow->slaying)
1679 arrow->slaying = bow->slaying;
1680
1725 arrow->attacktype |= bow->attacktype; 1681 arrow->attacktype |= bow->attacktype;
1682 }
1726 1683
1727 if (bow->slaying) 1684 wc -= arrow->level;
1728 arrow->slaying = bow->slaying; 1685 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1729 1686
1687 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1730 arrow->move_type = MOVE_FLY_LOW; 1688 arrow->move_type = MOVE_FLY_LOW;
1731 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1689 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1732 1690
1733 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1691 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1734 m->insert (arrow, sx, sy, op); 1692 m->insert (arrow, sx, sy, op);
… …
1759{ 1717{
1760 int ret = 0, wcmod = 0; 1718 int ret = 0, wcmod = 0;
1761 1719
1762 if (op->contr->bowtype == bow_bestarrow) 1720 if (op->contr->bowtype == bow_bestarrow)
1763 { 1721 {
1764 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1722 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1765 } 1723 }
1766 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1724 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1767 { 1725 {
1768 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1726 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1769 wcmod = -1; 1727 wcmod = -1;
… …
1779 else if (op->contr->bowtype == bow_spreadshot) 1737 else if (op->contr->bowtype == bow_spreadshot)
1780 { 1738 {
1781 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1739 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1782 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1740 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1783 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1741 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1784
1785 } 1742 }
1786 else 1743 else
1787 { 1744 {
1788 /* Simple case */ 1745 /* Simple case */
1789 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1746 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1790 } 1747 }
1748
1791 return ret; 1749 return ret;
1792} 1750}
1793
1794 1751
1795/* Fires a misc (wand/rod/horn) object in 'dir'. 1752/* Fires a misc (wand/rod/horn) object in 'dir'.
1796 * Broken apart from 'fire' to keep it more readable. 1753 * Broken apart from 'fire' to keep it more readable.
1797 */ 1754 */
1798void 1755void
1799fire_misc_object (object *op, int dir) 1756fire_misc_object (object *op, int dir)
1800{ 1757{
1801 object *item; 1758 object *item = op->contr->ranged_ob;
1802 1759
1803 if (!op->contr->ranges[range_misc]) 1760 if (!item)
1804 { 1761 {
1805 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1762 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1806 return; 1763 return;
1807 } 1764 }
1808 1765
1809 item = op->contr->ranges[range_misc];
1810 if (!item->inv) 1766 if (!item->inv)
1811 { 1767 {
1812 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1768 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1813 return; 1769 return;
1814 } 1770 }
1771
1772 if (!op->change_weapon (item))
1773 return;
1774
1815 if (item->type == WAND) 1775 if (item->type == WAND)
1816 { 1776 {
1817 if (item->stats.food <= 0) 1777 if (item->stats.food <= 0)
1818 { 1778 {
1819 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1820 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781
1821 return; 1782 return;
1822 } 1783 }
1823 } 1784 }
1824 else if (item->type == ROD || item->type == HORN) 1785 else if (item->type == ROD || item->type == HORN)
1825 { 1786 {
1826 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1827 { 1788 {
1828 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1790
1829 if (item->type == ROD) 1791 if (item->type == ROD)
1830 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1831 else 1793 else
1832 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1795
1833 return; 1796 return;
1834 } 1797 }
1835 } 1798 }
1836 1799
1837 if (cast_spell (op, item, dir, item->inv, NULL)) 1800 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1859 } 1822 }
1860} 1823}
1861 1824
1862/* Received a fire command for the player - go and do it. 1825/* Received a fire command for the player - go and do it.
1863 */ 1826 */
1864void 1827bool
1865fire (object *op, int dir) 1828fire (object *op, int dir)
1866{ 1829{
1867 int spellcost = 0; 1830 int spellcost = 0;
1868 1831
1869 /* check for loss of invisiblity/hide */ 1832 /* check for loss of invisiblity/hide */
1870 if (action_makes_visible (op)) 1833 if (action_makes_visible (op))
1871 make_visible (op); 1834 make_visible (op);
1872 1835
1873 switch (op->contr->shoottype) 1836 player *pl = op->contr;
1837
1838 if (pl->golem)
1839 {
1840 control_golem (op->contr->golem, dir);
1841 return false;
1874 { 1842 }
1875 case range_none:
1876 return;
1877 1843
1878 case range_bow: 1844 object *ob = pl->ranged_ob;
1845
1846 if (!ob)
1847 return false;
1848
1849 if (!op->change_weapon (ob))
1850 return false;
1851
1852 if (op->speed_left > 0.f)
1853 --op->speed_left;
1854 else
1855 return false;
1856
1857 switch (ob->type)
1858 {
1859 case BOW:
1879 player_fire_bow (op, dir); 1860 player_fire_bow (op, dir);
1880 return; 1861 break;
1881 1862
1882 case range_magic: /* Casting spells */ 1863 case SPELL:
1883 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1864 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1884 return; 1865 break;
1885 1866
1886 case range_misc: 1867 case BUILDER:
1868 apply_map_builder (op, dir);
1869 break;
1870
1871 case SKILL:
1872 do_skill (op, op, ob, dir, 0);
1873 break;
1874
1875 default:
1887 fire_misc_object (op, dir); 1876 fire_misc_object (op, dir);
1888 return; 1877 break;
1889
1890 case range_golem: /* Control summoned monsters from scrolls */
1891 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1892 {
1893 op->contr->ranges[range_golem] = 0;
1894 op->contr->shoottype = range_none;
1895 }
1896 else
1897 control_golem (op->contr->ranges[range_golem], dir);
1898 return;
1899
1900 case range_skill:
1901 if (!op->chosen_skill)
1902 {
1903 if (op->type == PLAYER)
1904 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1905 return;
1906 }
1907 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1908 return;
1909 case range_builder:
1910 apply_map_builder (op, dir);
1911 return;
1912 default:
1913 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1914 return;
1915 } 1878 }
1916}
1917 1879
1918 1880 return true;
1881}
1919 1882
1920/* find_key 1883/* find_key
1921 * We try to find a key for the door as passed. If we find a key 1884 * We try to find a key for the door as passed. If we find a key
1922 * and successfully use it, we return the key, otherwise NULL 1885 * and successfully use it, we return the key, otherwise NULL
1923 * This function merges both normal and locked door, since the logic 1886 * This function merges both normal and locked door, since the logic
… …
1925 * pl is the player, 1888 * pl is the player,
1926 * inv is the objects inventory to searched 1889 * inv is the objects inventory to searched
1927 * door is the door we are trying to match against. 1890 * door is the door we are trying to match against.
1928 * This function can be called recursively to search containers. 1891 * This function can be called recursively to search containers.
1929 */ 1892 */
1930
1931object * 1893object *
1932find_key (object *pl, object *container, object *door) 1894find_key (object *pl, object *container, object *door)
1933{ 1895{
1934 object *tmp, *key; 1896 object *tmp, *key;
1935 1897
1936 /* Should not happen, but sanity checking is never bad */ 1898 /* Should not happen, but sanity checking is never bad */
1937 if (container->inv == NULL) 1899 if (!container->inv)
1938 return NULL; 1900 return 0;
1939 1901
1940 /* First, lets try to find a key in the top level inventory */ 1902 /* First, lets try to find a key in the top level inventory */
1941 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1903 for (tmp = container->inv; tmp; tmp = tmp->below)
1942 { 1904 {
1943 if (door->type == DOOR && tmp->type == KEY) 1905 if (door->type == DOOR && tmp->type == KEY)
1944 break; 1906 break;
1945 /* For sanity, we should really check door type, but other stuff 1907 /* For sanity, we should really check door type, but other stuff
1946 * (like containers) can be locked with special keys 1908 * (like containers) can be locked with special keys
1947 */ 1909 */
1948 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1910 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1949 break; 1911 break;
1950 } 1912 }
1913
1951 /* No key found - lets search inventories now */ 1914 /* No key found - lets search inventories now */
1952 /* If we find and use a key in an inventory, return at that time. 1915 /* If we find and use a key in an inventory, return at that time.
1953 * otherwise, if we search all the inventories and still don't find 1916 * otherwise, if we search all the inventories and still don't find
1954 * a key, return 1917 * a key, return
1955 */ 1918 */
1956 if (!tmp) 1919 if (!tmp)
1957 { 1920 {
1958 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1921 for (tmp = container->inv; tmp; tmp = tmp->below)
1959 { 1922 {
1960 /* No reason to search empty containers */ 1923 /* No reason to search empty containers */
1961 if (tmp->type == CONTAINER && tmp->inv) 1924 if (tmp->type == CONTAINER && tmp->inv)
1962 { 1925 {
1963 if ((key = find_key (pl, tmp, door)) != NULL) 1926 if ((key = find_key (pl, tmp, door)))
1964 return key; 1927 return key;
1965 } 1928 }
1966 } 1929 }
1930
1967 if (!tmp) 1931 if (!tmp)
1968 return NULL; 1932 return NULL;
1969 } 1933 }
1934
1970 /* We get down here if we have found a key. Now if its in a container, 1935 /* We get down here if we have found a key. Now if its in a container,
1971 * see if we actually want to use it 1936 * see if we actually want to use it
1972 */ 1937 */
1973 if (pl != container) 1938 if (pl != container)
1974 { 1939 {
… …
1995 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1960 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1996 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1961 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1997 return NULL; 1962 return NULL;
1998 } 1963 }
1999 } 1964 }
1965
2000 return tmp; 1966 return tmp;
2001} 1967}
2002 1968
2003/* moved door processing out of move_player_attack. 1969/* moved door processing out of move_player_attack.
2004 * returns 1 if player has opened the door with a key 1970 * returns 1 if player has opened the door with a key
… …
2006 * 0 otherwise 1972 * 0 otherwise
2007 */ 1973 */
2008static int 1974static int
2009player_attack_door (object *op, object *door) 1975player_attack_door (object *op, object *door)
2010{ 1976{
2011 /* If its a door, try to find a use a key. If we do destroy the door, 1977 /* If its a door, try to find a key. If we do destroy the door,
2012 * might as well return immediately as there is nothing more to do - 1978 * might as well return immediately as there is nothing more to do -
2013 * otherwise, we fall through to the rest of the code. 1979 * otherwise, we fall through to the rest of the code.
2014 */ 1980 */
2015 object *key = find_key (op, op, door); 1981 object *key = find_key (op, op, door);
2016 1982
2017 /* IF we found a key, do some extra work */ 1983 /* If we found a key, do some extra work */
2018 if (key) 1984 if (key)
2019 { 1985 {
2020 object *container = key->env; 1986 object *container = key->env;
2021 1987
2022 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1988 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989
2023 if (action_makes_visible (op)) 1990 if (action_makes_visible (op))
2024 make_visible (op); 1991 make_visible (op);
1992
2025 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1993 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2026 spring_trap (door->inv, op); 1994 spring_trap (door->inv, op);
1995
2027 if (door->type == DOOR) 1996 if (door->type == DOOR)
2028 {
2029 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1997 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2030 }
2031 else if (door->type == LOCKED_DOOR) 1998 else if (door->type == LOCKED_DOOR)
2032 { 1999 {
2033 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 2000 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2034 remove_door2 (door); /* remove door without violence ;-) */ 2001 remove_door2 (door); /* remove door without violence ;-) */
2035 } 2002 }
2003
2036 /* Do this after we print the message */ 2004 /* Do this after we print the message */
2037 decrease_ob (key); /* Use up one of the keys */ 2005 decrease_ob (key); /* Use up one of the keys */
2038 /* Need to update the weight the container the key was in */ 2006 /* Need to update the weight the container the key was in */
2039 if (container != op) 2007 if (container != op)
2040 esrv_update_item (UPD_WEIGHT, op, container); 2008 esrv_update_item (UPD_WEIGHT, op, container);
2009
2041 return 1; /* Nothing more to do below */ 2010 return 1; /* Nothing more to do below */
2042 } 2011 }
2043 else if (door->type == LOCKED_DOOR) 2012 else if (door->type == LOCKED_DOOR)
2044 { 2013 {
2045 /* Might as well return now - no other way to open this */ 2014 /* Might as well return now - no other way to open this */
2046 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2015 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2047 return 1; 2016 return 1;
2048 } 2017 }
2018
2049 return 0; 2019 return 0;
2050} 2020}
2051 2021
2052/* This function is just part of a breakup from move_player. 2022/* This function is just part of a breakup from move_player.
2053 * It should keep the code cleaner. 2023 * It should keep the code cleaner.
2054 * When this is called, the players direction has been updated 2024 * When this is called, the players direction has been updated
2055 * (taking into account confusion.) The player is also actually 2025 * (taking into account confusion.) The player is also actually
2056 * going to try and move (not fire weapons). 2026 * going to try and move (not fire weapons).
2057 */ 2027 */
2058void 2028bool
2059move_player_attack (object *op, int dir) 2029move_player_attack (object *op, int dir)
2060{ 2030{
2061 object *tmp, *mon;
2062 sint16 nx, ny;
2063 int on_battleground; 2031 int on_battleground;
2064 maptile *m;
2065 2032
2066 nx = freearr_x[dir] + op->x; 2033 sint16 nx = freearr_x[dir] + op->x;
2067 ny = freearr_y[dir] + op->y; 2034 sint16 ny = freearr_y[dir] + op->y;
2068 2035
2069 on_battleground = op_on_battleground (op, 0, 0); 2036 on_battleground = op_on_battleground (op, 0, 0);
2037
2038 if (out_of_map (op->map, nx, ny))
2039 return false;
2040
2041 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2042 {
2043 --op->speed_left;
2044 return true;
2045 }
2070 2046
2071 /* If braced, or can't move to the square, and it is not out of the 2047 /* If braced, or can't move to the square, and it is not out of the
2072 * map, attack it. Note order of if statement is important - don't 2048 * map, attack it. Note order of if statement is important - don't
2073 * want to be calling move_ob if braced, because move_ob will move the 2049 * want to be calling move_ob if braced, because move_ob will move the
2074 * player. This is a pretty nasty hack, because if we could 2050 * player. This is a pretty nasty hack, because if we could
2075 * move to some space, it then means that if we are braced, we should 2051 * move to some space, it then means that if we are braced, we should
2076 * do nothing at all. As it is, if we are braced, we go through 2052 * do nothing at all. As it is, if we are braced, we go through
2077 * quite a bit of processing. However, it probably is less than what 2053 * quite a bit of processing. However, it probably is less than what
2078 * move_ob uses. 2054 * move_ob uses.
2079 */ 2055 */
2080 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2056 maptile *m = op->map->xy_find (nx, ny);
2081 {
2082 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2083 {
2084 m = get_map_from_coord (op->map, &nx, &ny);
2085 if (!m)
2086 return; /* Don't think this should happen */
2087 }
2088 else
2089 m = op->map;
2090 2057
2091 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2092 {
2093 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2094 return;
2095 }
2096
2097 mon = 0;
2098 /* Go through all the objects, and find ones of interest. Only stop if 2058 /* Go through all the objects, and find ones of interest. Only stop if
2099 * we find a monster - that is something we know we want to attack. 2059 * we find a monster - that is something we know we want to attack.
2100 * if its a door or barrel (can roll) see if there may be monsters 2060 * if its a door or barrel (can roll) see if there may be monsters
2101 * on the space 2061 * on the space
2102 */ 2062 */
2103 while (tmp) 2063 object *mon;
2104 { 2064 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2105 if (tmp == op) 2065 {
2106 { 2066 if ((mon->flag [FLAG_ALIVE]
2107 tmp = tmp->above; 2067 || mon->type == LOCKED_DOOR
2108 continue; 2068 || mon->flag [FLAG_CAN_ROLL])
2109 }
2110
2111 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2112 {
2113 mon = tmp; 2069 && mon != op)
2114 break; 2070 break;
2115 } 2071 }
2116 2072
2117 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2118 mon = tmp;
2119
2120 tmp = tmp->above;
2121 }
2122
2123 if (!mon) /* This happens anytime the player tries to move */ 2073 if (!mon) /* This happens anytime the player tries to move */
2124 return; /* into a wall */ 2074 return false; /* into a wall */
2125 2075
2126 if (mon->head)
2127 mon = mon->head; 2076 mon = mon->head_ ();
2128 2077
2129 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2078 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2079 if (op->contr->weapon_sp_left > 0.f)
2130 if (player_attack_door (op, mon)) 2080 if (player_attack_door (op, mon))
2081 {
2082 --op->contr->weapon_sp_left;
2131 return; 2083 return true;
2084 }
2132 2085
2133 /* The following deals with possibly attacking peaceful 2086 /* The following deals with possibly attacking peaceful
2134 * or frienddly creatures. Basically, all players are considered 2087 * or friendly creatures. Basically, all players are considered
2135 * unaggressive. If the moving player has peaceful set, then the 2088 * unaggressive. If the moving player has peaceful set, then the
2136 * object should be pushed instead of attacked. It is assumed that 2089 * object should be pushed instead of attacked. It is assumed that
2137 * if you are braced, you will not attack friends accidently, 2090 * if you are braced, you will not attack friends accidently,
2138 * and thus will not push them. 2091 * and thus will not push them.
2139 */ 2092 */
2140 2093
2141 /* If the creature is a pet, push it even if the player is not 2094 /* If the creature is a pet, push it even if the player is not
2142 * peaceful. Our assumption is the creature is a pet if the 2095 * peaceful. Our assumption is the creature is a pet if the
2143 * player owns it and it is either friendly or unagressive. 2096 * player owns it and it is either friendly or unagressive.
2144 */ 2097 */
2145 if ((op->type == PLAYER) 2098 if (op->type == PLAYER
2146#if COZY_SERVER
2147 &&
2148 ((mon->owner && mon->owner->contr 2099 && ((mon->owner && mon->owner->contr
2149 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2100 && same_party (mon->owner->contr->party, op->contr->party))
2150#else
2151 && mon->owner == op 2101 || mon->owner == op)
2152#endif
2153 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2102 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2154 { 2103 {
2155 /* If we're braced, we don't want to switch places with it */ 2104 /* If we're braced, we don't want to switch places with it */
2156 if (op->contr->braced) 2105 if (op->contr->braced)
2157 return; 2106 return false;
2107
2108 if (op->speed_left > 0.f)
2109 {
2110 --op->speed_left;
2111
2158 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2112 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2159 (void) push_ob (mon, dir, op); 2113 push_ob (mon, dir, op);
2114
2160 if (op->contr->tmp_invis || op->hide) 2115 if (op->contr->tmp_invis || op->hide)
2161 make_visible (op); 2116 make_visible (op);
2117
2162 return; 2118 return true;
2163 } 2119 }
2120 else
2121 return false;
2122 }
2164 2123
2165 /* in certain circumstances, you shouldn't attack friendly 2124 /* in certain circumstances, you shouldn't attack friendly
2166 * creatures. Note that if you are braced, you can't push 2125 * creatures. Note that if you are braced, you can't push
2167 * someone, but put it inside this loop so that you won't 2126 * someone, but put it inside this loop so that you won't
2168 * attack them either. 2127 * attack them either.
2169 */ 2128 */
2170 if ((mon->type == PLAYER || mon->enemy != op) && 2129 if ((mon->type == PLAYER || mon->enemy != op)
2171 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2130 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2172#ifdef PROHIBIT_PLAYERKILL
2173 (op->contr->peaceful 2131 && ((op->contr->peaceful
2174 || (mon->type == PLAYER 2132 || (mon->type == PLAYER && mon->contr->peaceful))
2175 && mon->contr->
2176 peaceful)) &&
2177#else
2178 op->contr->peaceful &&
2179#endif
2180 !on_battleground)) 2133 && !on_battleground))
2134 {
2135 if (op->speed_left > 0.f)
2181 { 2136 {
2137 --op->speed_left;
2138
2182 if (!op->contr->braced) 2139 if (!op->contr->braced)
2183 { 2140 {
2184 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2141 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2185 (void) push_ob (mon, dir, op); 2142 push_ob (mon, dir, op);
2186 } 2143 }
2187 else 2144 else
2188 new_draw_info (0, 0, op, "You withhold your attack"); 2145 new_draw_info (0, 0, op, "You withhold your attack");
2189 2146
2190 if (op->contr->tmp_invis || op->hide) 2147 if (op->contr->tmp_invis || op->hide)
2191 make_visible (op); 2148 make_visible (op);
2192 }
2193 2149
2150 return true;
2151 }
2152 }
2194 /* If the object is a boulder or other rollable object, then 2153 /* If the object is a boulder or other rollable object, then
2195 * roll it if not braced. You can't roll it if you are braced. 2154 * roll it if not braced. You can't roll it if you are braced.
2196 */ 2155 */
2197 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2156 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2157 {
2158 if (op->speed_left > 0.f)
2198 { 2159 {
2160 --op->speed_left;
2161
2199 recursive_roll (mon, dir, op); 2162 recursive_roll (mon, dir, op);
2200 if (action_makes_visible (op)) 2163 if (action_makes_visible (op))
2201 make_visible (op); 2164 make_visible (op);
2202 }
2203 2165
2166 return true;
2167 }
2168 }
2204 /* Any generic living creature. Including things like doors. 2169 /* Any generic living creature. Including things like doors.
2205 * Way it works is like this: First, it must have some hit points 2170 * Way it works is like this: First, it must have some hit points
2206 * and be living. Then, it must be one of the following: 2171 * and be living. Then, it must be one of the following:
2207 * 1) Not a player, 2) A player, but of a different party. Note 2172 * 1) Not a player, 2) A player, but of a different party. Note
2208 * that party_number -1 is no party, so attacks can still happen. 2173 * that party_number -1 is no party, so attacks can still happen.
2209 */ 2174 */
2210
2211 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2175 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2212 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2176 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2213 { 2177 {
2214 2178 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2215 /* If the player hasn't hit something this tick, and does
2216 * so, give them speed boost based on weapon speed. Doing
2217 * it here is better than process_players2, which basically
2218 * incurred a 1 tick offset.
2219 */
2220 if (!op->contr->has_hit)
2221 { 2179 {
2222 op->speed_left += op->speed / op->contr->weapon_sp; 2180 --op->contr->weapon_sp_left;
2223
2224 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2225 }
2226 2181
2227 skill_attack (mon, op, 0, 0, 0); 2182 skill_attack (mon, op, 0, 0, 0);
2228
2229 /* If attacking another player, that player gets automatic
2230 * hitback, and doesn't loose luck either.
2231 * Disable hitback on the battleground or if the target is
2232 * the wiz.
2233 */
2234 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2235 {
2236 short luck = mon->stats.luck;
2237
2238 mon->contr->has_hit = 1;
2239 skill_attack (op, mon, 0, 0, 0);
2240 mon->stats.luck = luck;
2241 }
2242 2183
2243 if (action_makes_visible (op)) 2184 if (action_makes_visible (op))
2244 make_visible (op); 2185 make_visible (op);
2245 }
2246 } /* if player should attack something */
2247}
2248 2186
2249int 2187 return true;
2188 }
2189 }
2190
2191 return false;
2192}
2193
2194bool
2250move_player (object *op, int dir) 2195move_player (object *op, int dir)
2251{ 2196{
2252 int pick; 2197 int pick;
2253 2198
2254 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2199 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2255 return 0; 2200 return 0;
2256 2201
2257 /* Sanity check: make sure dir is valid */ 2202 /* Sanity check: make sure dir is valid */
2258 if ((dir < 0) || (dir >= 9)) 2203 if ((dir < 0) || (dir >= 9))
2259 { 2204 {
2260 LOG (llevError, "move_player: invalid direction %d\n", dir); 2205 LOG (llevError, "move_player: invalid direction %d\n", dir);
2261 return 0; 2206 return 0;
2262 } 2207 }
2263 2208
2264 /* peterm: added following line */ 2209 /* peterm: added following line */
2265 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2210 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2266 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2211 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2267 2212
2268 op->facing = dir; 2213 op->facing = dir;
2269 2214
2270 if (op->hide) 2215 if (op->hide)
2271 do_hidden_move (op); 2216 do_hidden_move (op);
2272 2217
2218 bool retval;
2219
2273 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2220 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2274 /*nop */ ; 2221 retval = RESULT_INT (0);
2275 else if (op->contr->fire_on) 2222 else if (op->contr->fire_on)
2276 fire (op, dir); 2223 retval = fire (op, dir);
2277 else 2224 else
2278 { 2225 {
2279 move_player_attack (op, dir); 2226 retval = move_player_attack (op, dir);
2280 pick = check_pick (op); 2227 pick = check_pick (op);
2281 } 2228 }
2282 2229
2283 /* Add special check for newcs players and fire on - this way, the 2230 /* Add special check for newcs players and fire on - this way, the
2284 * server can handle repeat firing. 2231 * server can handle repeat firing.
… …
2291 /* Update how the player looks. Use the facing, so direction may 2238 /* Update how the player looks. Use the facing, so direction may
2292 * get reset to zero. This allows for full animation capabilities 2239 * get reset to zero. This allows for full animation capabilities
2293 * for players. 2240 * for players.
2294 */ 2241 */
2295 animate_object (op, op->facing); 2242 animate_object (op, op->facing);
2296 return 0; 2243
2244 return retval;
2297} 2245}
2298 2246
2299/* This is similar to handle_player, below, but is only used by the 2247/* This is similar to handle_player, below, but is only used by the
2300 * new client/server stuff. 2248 * new client/server stuff.
2301 * This is sort of special, in that the new client/server actually uses 2249 * This is sort of special, in that the new client/server actually uses
2302 * the new speed values for commands. 2250 * the new speed values for commands.
2303 * 2251 *
2304 * Returns true if there are more actions we can do. 2252 * Returns true if there are more actions we can do. Should not do
2253 * many actions in a row, as that would be too unfair to other
2254 * players.
2305 */ 2255 */
2306int 2256bool
2307handle_newcs_player (object *op) 2257handle_newcs_player (object *op)
2308{ 2258{
2309 if (op->contr->hidden)
2310 {
2311 op->invisible = 1000;
2312 /* the socket code flashes the player visible/invisible
2313 * depending on the value of invisible, so we need to
2314 * alternate it here for it to work correctly.
2315 */
2316 if (pticks & 2)
2317 op->invisible--;
2318 }
2319 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2320 {
2321 op->invisible--;
2322 if (!op->invisible)
2323 {
2324 make_visible (op);
2325 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2326 }
2327 }
2328
2329 if (QUERY_FLAG (op, FLAG_SCARED)) 2259 if (QUERY_FLAG (op, FLAG_SCARED))
2330 { 2260 {
2331 flee_player (op); 2261 if (op->speed_left > 0.f)
2332 /* If player is still scared, that is his action for this tick */
2333 if (QUERY_FLAG (op, FLAG_SCARED))
2334 { 2262 {
2335 op->speed_left--; 2263 --op->speed_left;
2264 flee_player (op);
2265
2336 return 0; 2266 return true;
2337 } 2267 }
2268 else
2269 return false;
2338 } 2270 }
2339
2340 /* I've been seeing crashes where the golem has been destroyed, but
2341 * the player object still points to the defunct golem. The code that
2342 * destroys the golem looks correct, and it doesn't always happen, so
2343 * put this in a a workaround to clean up the golem pointer.
2344 */
2345 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2346 op->contr->ranges[range_golem] = 0;
2347 2271
2348 /* call this here - we also will call this in do_ericserver, but 2272 /* call this here - we also will call this in do_ericserver, but
2349 * the players time has been increased when doericserver has been 2273 * the players time has been increased when doericserver has been
2350 * called, so we recheck it here. 2274 * called, so we recheck it here.
2351 */ 2275 */
2352 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2276 if (op->contr->ns->handle_command ())
2353 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2354 ;
2355
2356 if (op->speed_left < 0)
2357 return 0; 2277 return true;
2358 2278
2359 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2279 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2360 {
2361 /* All move commands take 1 tick, at least for now */
2362 op->speed_left--;
2363
2364 /* Instead of all the stuff below, let move_player take care
2365 * of it. Also, some of the skill stuff is only put in
2366 * there, as well as the confusion stuff.
2367 */
2368 move_player (op, op->direction); 2280 return move_player (op, op->direction);
2369 if (op->speed_left > 0)
2370 return 1;
2371 else
2372 return 0;
2373 }
2374 2281
2375 return 0; 2282 return false;
2376} 2283}
2377 2284
2378int 2285int
2379save_life (object *op) 2286save_life (object *op)
2380{ 2287{
… …
2415 * from. 2322 * from.
2416 */ 2323 */
2417void 2324void
2418remove_unpaid_objects (object *op, object *env) 2325remove_unpaid_objects (object *op, object *env)
2419{ 2326{
2420 object *next;
2421
2422 while (op) 2327 while (op)
2423 { 2328 {
2424 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2329 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2425 2330
2426 if (QUERY_FLAG (op, FLAG_UNPAID)) 2331 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2492 int rate_grace = 2000; 2397 int rate_grace = 2000;
2493 const int max_hp = 1; 2398 const int max_hp = 1;
2494 const int max_sp = 1; 2399 const int max_sp = 1;
2495 const int max_grace = 1; 2400 const int max_grace = 1;
2496 2401
2497 if (op->contr->outputs_sync) 2402 if (op->contr->hidden)
2403 {
2404 op->invisible = 1000;
2405 /* the socket code flashes the player visible/invisible
2406 * depending on the value of invisible, so we need to
2407 * alternate it here for it to work correctly.
2408 */
2409 if (pticks & 2)
2410 op->invisible--;
2498 { 2411 }
2499 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2412 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2500 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2413 {
2501 flush_output_element (op, &op->contr->outputs[i]); 2414 if (!op->invisible--)
2415 {
2416 make_visible (op);
2417 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2418 }
2502 } 2419 }
2503 2420
2504 if (op->contr->ns->state == ST_PLAYING) 2421 if (op->contr->ns->state == ST_PLAYING)
2505 { 2422 {
2506 /* these next three if clauses make it possible to SLOW DOWN 2423 /* these next three if clauses make it possible to SLOW DOWN
… …
2528 gen_grace = op->stats.maxgrace; 2445 gen_grace = op->stats.maxgrace;
2529 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2446 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2530 } 2447 }
2531 2448
2532 /* Regenerate Spell Points */ 2449 /* Regenerate Spell Points */
2533 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2450 if (!op->contr->golem && --op->last_sp < 0)
2534 { 2451 {
2535 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2452 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2536 if (op->stats.sp < op->stats.maxsp) 2453 if (op->stats.sp < op->stats.maxsp)
2537 { 2454 {
2538 op->stats.sp++; 2455 op->stats.sp++;
… …
2636 } 2553 }
2637 2554
2638 /* Digestion */ 2555 /* Digestion */
2639 if (--op->last_eat < 0) 2556 if (--op->last_eat < 0)
2640 { 2557 {
2641#ifdef COZY_SERVER
2642 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2643 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2644#else
2645 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2558 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2646#endif
2647 2559
2648 if (op->contr->gen_hp > 0) 2560 if (op->contr->gen_hp > 0)
2649 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2561 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2650 else 2562 else
2651 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2563 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
… …
2756 tmp->name = buf; 2668 tmp->name = buf;
2757 sprintf (buf, " This finger has been cut off %s\n" 2669 sprintf (buf, " This finger has been cut off %s\n"
2758 " the %s, when he was defeated at\n level %d by %s.\n", 2670 " the %s, when he was defeated at\n level %d by %s.\n",
2759 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2671 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2760 tmp->msg = buf; 2672 tmp->msg = buf;
2761 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2673 tmp->value = 0, tmp->type = 0;
2762 tmp->materialname = NULL; 2674 tmp->materialname = "organics";
2763 op->insert_at (tmp, op); 2675 tmp->insert_at (op, tmp);
2764 } 2676 }
2765 2677
2766 /* teleport defeated player to new destination */ 2678 /* teleport defeated player to new destination */
2767 transfer_ob (op, x, y, 0, NULL); 2679 transfer_ob (op, x, y, 0, NULL);
2768 op->contr->braced = 0; 2680 op->contr->braced = 0;
… …
2773 2685
2774 command_kill_pets (op, 0); 2686 command_kill_pets (op, 0);
2775 2687
2776 if (op->stats.food < 0) 2688 if (op->stats.food < 0)
2777 { 2689 {
2778 if (op->contr->explore)
2779 {
2780 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2781 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2782 op->stats.food = 999;
2783 return;
2784 }
2785 sprintf (buf, "%s starved to death.", &op->name); 2690 sprintf (buf, "%s starved to death.", &op->name);
2786 strcpy (op->contr->killer, "starvation"); 2691 strcpy (op->contr->killer, "starvation");
2787 } 2692 }
2788 else 2693 else
2789 {
2790 if (op->contr->explore)
2791 {
2792 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2793 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2794 op->stats.hp = op->stats.maxhp;
2795 return;
2796 }
2797 sprintf (buf, "%s died.", &op->name); 2694 sprintf (buf, "%s died.", &op->name);
2798 }
2799 2695
2800 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2696 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2801 2697
2802 /* save the map location for corpse, gravestone */ 2698 /* save the map location for corpse, gravestone */
2803 x = op->x; 2699 x = op->x;
… …
2979 op->stats.hp = op->stats.maxhp; 2875 op->stats.hp = op->stats.maxhp;
2980 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2876 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2981 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2877 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2982 2878
2983 /* 2879 /*
2984 * Check to see if the player is in a shop. IF so, then check to see if
2985 * the player has any unpaid items. If so, remove them and put them back 2880 * Check to see if the player has any unpaid items. If so, remove them
2986 * in the map. 2881 * and put them back in the map.
2987 */ 2882 */
2988
2989 if (is_in_shop (op))
2990 remove_unpaid_objects (op->inv, op); 2883 remove_unpaid_objects (op->inv, op);
2991 2884
2992 /****************************************/ 2885 /****************************************/
2993 /* */ 2886 /* */
2994 /* Move player to his current respawn- */ 2887 /* Move player to his current respawn- */
2995 /* position (usually last savebed) */ 2888 /* position (usually last savebed) */
2996 /* */ 2889 /* */
2997 /****************************************/ 2890 /****************************************/
2998 2891
2999 enter_player_savebed (op); 2892 enter_player_savebed (op);
3000 2893
3001 /* Save the player before inserting the force to reduce
3002 * chance of abuse.
3003 */
3004 op->contr->braced = 0; 2894 op->contr->braced = 0;
3005 op->contr->save ();
3006 2895
3007 /* it is possible that the player has blown something up 2896 /* it is possible that the player has blown something up
3008 * at his savebed location, and that can have long lasting 2897 * at his savebed location, and that can have long lasting
3009 * spell effects. So first see if there is a spell effect 2898 * spell effects. So first see if there is a spell effect
3010 * on the space that might harm the player. 2899 * on the space that might harm the player.
… …
3019 object *force; 2908 object *force;
3020 int at; 2909 int at;
3021 2910
3022 force = get_archetype (FORCE_NAME); 2911 force = get_archetype (FORCE_NAME);
3023 /* 50 ticks should be enough time for the spell to abate */ 2912 /* 50 ticks should be enough time for the spell to abate */
3024 force->speed = 0.1; 2913 force->speed = 0.1f;
3025 force->speed_left = -5.0; 2914 force->speed_left = -5.f;
3026 SET_FLAG (force, FLAG_APPLIED); 2915 SET_FLAG (force, FLAG_APPLIED);
3027 for (at = 0; at < NROFATTACKS; at++) 2916 for (at = 0; at < NROFATTACKS; at++)
3028 if (will_kill_again & (1 << at)) 2917 if (will_kill_again & (1 << at))
3029 force->resist[at] = 100; 2918 force->resist[at] = 100;
3030 2919
… …
3039void 2928void
3040loot_object (object *op) 2929loot_object (object *op)
3041{ /* Grab and destroy some treasure */ 2930{ /* Grab and destroy some treasure */
3042 object *tmp, *tmp2, *next; 2931 object *tmp, *tmp2, *next;
3043 2932
3044 if (op->container) 2933 op->close_container (); /* close open sack first */
3045 esrv_apply_container (op, op->container); /* close open sack first */
3046 2934
3047 for (tmp = op->inv; tmp; tmp = next) 2935 for (tmp = op->inv; tmp; tmp = next)
3048 { 2936 {
3049 next = tmp->below; 2937 next = tmp->below;
3050 2938
3051 if (tmp->invisible) 2939 if (tmp->invisible)
3052 continue; 2940 continue;
3053 2941
3054 tmp->remove (); 2942 tmp->remove ();
3055 tmp->x = op->x, tmp->y = op->y; 2943 tmp->x = op->x, tmp->y = op->y;
2944
3056 if (tmp->type == CONTAINER) 2945 if (tmp->type == CONTAINER)
3057 { /* empty container to ground */ 2946 loot_object (tmp); /* empty container to ground */
3058 loot_object (tmp); 2947
3059 }
3060 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2948 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3061 { 2949 {
3062 if (tmp->nrof > 1) 2950 if (tmp->nrof > 1)
3063 { 2951 {
3064 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2952 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3065 tmp2->destroy (); 2953 tmp2->destroy ();
… …
3076/* 2964/*
3077 * fix_weight(): Check recursively the weight of all players, and fix 2965 * fix_weight(): Check recursively the weight of all players, and fix
3078 * what needs to be fixed. Refresh windows and fix speed if anything 2966 * what needs to be fixed. Refresh windows and fix speed if anything
3079 * was changed. 2967 * was changed.
3080 */ 2968 */
3081
3082void 2969void
3083fix_weight (void) 2970fix_weight (void)
3084{ 2971{
3085 for_all_players (pl) 2972 for_all_players (pl)
3086 { 2973 {
… …
3146 if (op->type == PLAYER) 3033 if (op->type == PLAYER)
3147 { 3034 {
3148 op->contr->tmp_invis = 0; 3035 op->contr->tmp_invis = 0;
3149 op->contr->invis_race = 0; 3036 op->contr->invis_race = 0;
3150 } 3037 }
3038
3151 update_object (op, UP_OBJ_FACE); 3039 update_object (op, UP_OBJ_CHANGE);
3152} 3040}
3153 3041
3154int 3042int
3155is_true_undead (object *op) 3043is_true_undead (object *op)
3156{ 3044{
3157 object *tmp = NULL;
3158
3159 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3045 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3160 return 1; 3046 return 1;
3161 3047
3162 return 0; 3048 return 0;
3163} 3049}
… …
3208/* For Hidden creatures - a chance of becoming 'unhidden' 3094/* For Hidden creatures - a chance of becoming 'unhidden'
3209 * every time they move - as we subtract off 'invisibility' 3095 * every time they move - as we subtract off 'invisibility'
3210 * AND, for players, if they move into a ridiculously unhideable 3096 * AND, for players, if they move into a ridiculously unhideable
3211 * spot (surrounded by clear terrain in broad daylight). -b.t. 3097 * spot (surrounded by clear terrain in broad daylight). -b.t.
3212 */ 3098 */
3213
3214void 3099void
3215do_hidden_move (object *op) 3100do_hidden_move (object *op)
3216{ 3101{
3217 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3102 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3218 object *skop; 3103 object *skop;
… …
3222 3107
3223 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3108 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3224 3109
3225 /* its *extremely* hard to run and sneak/hide at the same time! */ 3110 /* its *extremely* hard to run and sneak/hide at the same time! */
3226 if (op->type == PLAYER && op->contr->run_on) 3111 if (op->type == PLAYER && op->contr->run_on)
3227 {
3228 if (!skop || num >= skop->level) 3112 if (!skop || num >= skop->level)
3229 { 3113 {
3230 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3114 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3231 make_visible (op); 3115 make_visible (op);
3232 return; 3116 return;
3233 } 3117 }
3234 else 3118 else
3235 num += 20; 3119 num += 20;
3236 } 3120
3237 num += op->map->difficulty; 3121 num += op->map->difficulty;
3238 hide = hideability (op); /* modify by terrain hidden level */ 3122 hide = hideability (op); /* modify by terrain hidden level */
3239 num -= hide; 3123 num -= hide;
3124
3240 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3125 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3241 { 3126 {
3242 make_visible (op); 3127 make_visible (op);
3243 if (op->type == PLAYER) 3128 if (op->type == PLAYER)
3244 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3129 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3245 } 3130 }
3246 else if (op->type == PLAYER && skop) 3131 else if (op->type == PLAYER && skop)
3247 {
3248 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3132 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3249 }
3250} 3133}
3251 3134
3252/* determine if who is standing near a hostile creature. */ 3135/* determine if who is standing near a hostile creature. */
3253 3136
3254int 3137int
… …
3453 char buf[MAX_BUF]; /* tmp. string buffer */ 3336 char buf[MAX_BUF]; /* tmp. string buffer */
3454 int i = 0, j = 0; 3337 int i = 0, j = 0;
3455 3338
3456 /* get the appropriate treasurelist */ 3339 /* get the appropriate treasurelist */
3457 if (atnr == ATNR_FIRE) 3340 if (atnr == ATNR_FIRE)
3458 trlist = find_treasurelist ("dragon_ability_fire"); 3341 trlist = treasurelist::find ("dragon_ability_fire");
3459 else if (atnr == ATNR_COLD) 3342 else if (atnr == ATNR_COLD)
3460 trlist = find_treasurelist ("dragon_ability_cold"); 3343 trlist = treasurelist::find ("dragon_ability_cold");
3461 else if (atnr == ATNR_ELECTRICITY) 3344 else if (atnr == ATNR_ELECTRICITY)
3462 trlist = find_treasurelist ("dragon_ability_elec"); 3345 trlist = treasurelist::find ("dragon_ability_elec");
3463 else if (atnr == ATNR_POISON) 3346 else if (atnr == ATNR_POISON)
3464 trlist = find_treasurelist ("dragon_ability_poison"); 3347 trlist = treasurelist::find ("dragon_ability_poison");
3465 3348
3466 if (trlist == NULL || who->type != PLAYER) 3349 if (trlist == NULL || who->type != PLAYER)
3467 return; 3350 return;
3468 3351
3469 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3352 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3470 3353
3471 if (tr == NULL || tr->item == NULL) 3354 if (!tr || !tr->item)
3472 { 3355 {
3473 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3356 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3474 return; 3357 return;
3475 } 3358 }
3476 3359
… …
3543 /* forces in the treasurelist can alter the player's stats */ 3426 /* forces in the treasurelist can alter the player's stats */
3544 object *skin; 3427 object *skin;
3545 3428
3546 /* first get the dragon skin force */ 3429 /* first get the dragon skin force */
3547 shstr_cmp dragon_skin_force ("dragon_skin_force"); 3430 shstr_cmp dragon_skin_force ("dragon_skin_force");
3548 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3431 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3549 ; 3432 ;
3550 3433
3551 if (!skin) 3434 if (!skin)
3552 return; 3435 return;
3553 3436
… …
3601 * not readied. 3484 * not readied.
3602 */ 3485 */
3603void 3486void
3604player_unready_range_ob (player *pl, object *ob) 3487player_unready_range_ob (player *pl, object *ob)
3605{ 3488{
3606 rangetype i; 3489 if (pl->ob->current_weapon == ob)
3490 pl->ob->current_weapon = 0;
3607 3491
3608 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3492 if (pl->combat_ob == ob)
3609 { 3493 pl->combat_ob = 0;
3494
3610 if (pl->ranges[i] == ob) 3495 if (pl->ranged_ob == ob)
3611 { 3496 pl->ranged_ob = 0;
3612 pl->ranges[i] = NULL;
3613 if (pl->shoottype == i)
3614 {
3615 pl->shoottype = range_none;
3616 }
3617 }
3618 }
3619} 3497}
3498
3499sint8
3500player::visibility_at (maptile *map, int x, int y) const
3501{
3502 if (!ns)
3503 return 0;
3504
3505 int dx, dy;
3506 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3507 return 0;
3508
3509 x += dx - ns->current_x + ns->mapx / 2;
3510 y += dy - ns->current_y + ns->mapy / 2;
3511
3512 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3513 return 0;
3514
3515 return 100 - blocked_los [x][y];
3516}

Diff Legend

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