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.70 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#include <algorithm> 32#include <algorithm>
34#include <functional> 33#include <functional>
35 34
36player * 35playervec 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 36
46void 37void
47display_motd (const object *op) 38display_motd (const object *op)
48{ 39{
49 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
123 114
124 news[0] = '\0'; 115 news[0] = '\0';
125 subject[0] = '\0'; 116 subject[0] = '\0';
126 size = 0; 117 size = 0;
127 118
128 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
129 { 120 {
130 if (*buf == '#') 121 if (*buf == '#')
131 continue; 122 continue;
132 123
133 if (*buf == '%') 124 if (*buf == '%')
134 { /* send one news */ 125 { /* send one news */
135 if (size > 0) 126 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 */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
128
137 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
138 strip_endline (subject); 130 strip_endline (subject);
139 size = 0; 131 size = 0;
140 news[0] = '\0'; 132 news[0] = '\0';
141 } 133 }
… …
150 size += strlen (buf); 142 size += strlen (buf);
151 } 143 }
152 } 144 }
153 145
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 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); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
157} 149}
158 150
159/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
160static void 152static void
161set_first_map (object *op) 153set_first_map (object *op)
162{ 154{
163 strcpy (op->contr->maplevel, first_map_path); 155 op->contr->maplevel = first_map_path;
164 op->x = -1; 156 op->x = -1;
165 op->y = -1; 157 op->y = -1;
166 enter_exit (op, 0); 158}
159
160void
161player::activate ()
162{
163 if (active)
164 return;
165
166 players.insert (this);
167 ob->remove ();
168 ob->map = 0;
169 ob->activate_recursive ();
170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
171 add_friendly_object (ob);
172}
173
174void
175player::deactivate ()
176{
177 if (!active)
178 return;
179
180 terminate_all_pets (ob);
181 remove_friendly_object (ob);
182 ob->deactivate_recursive ();
183
184 if (ob->map)
185 maplevel = ob->map->path;
186
187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
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);
167} 195}
168 196
169// connect the player with a specific client 197// connect the player with a specific client
170// also changed, rationalises, and fixes some incorrect settings 198// also changes, rationalises, and fixes some incorrect settings
171void 199void
172player::connect (client *ns) 200player::connect (client *ns)
173{ 201{
174 this->ns = ns; 202 this->ns = ns;
175 ns->pl = this; 203 ns->pl = this;
176 204
177 next = first_player; 205 run_on = 0;
178 first_player = this; 206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
179 208
180 ns->update_look = 0; 209 ns->update_look = 0;
181 ns->look_position = 0; 210 ns->look_position = 0;
182 211
183 clear_los (ob); 212 clear_los (this);
213
214 ns->reset_stats ();
184 215
185 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
186 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
187 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
188
189 if (!legal_range (ob, shoottype))
190 shoottype = range_none;
191 219
192 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
193 link_player_skills (ob); 221 link_player_skills (ob);
194 222
195 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196 ob->set_speed (ob->speed);
197 224
198 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
199
200 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
201 * from the class, and not race. I don't see any way to get the class information
202 * to then update this. I don't think this will actually break anything - anyone
203 * that can use armour should be able to use a shield. What this may 'break'
204 * are features new characters get, eg, if someone starts up with a Q, they
205 * should be able to use a shield. However, old Q's won't get that advantage.
206 */
207 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208 SET_FLAG (ob, FLAG_USE_SHIELD);
209 226
210 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
211 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
212 { 229 {
213 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
214 231
215 shstr_cmp dragon_ability_force ("dragon_ability_force");
216 shstr_cmp dragon_skin_force ("dragon_skin_force");
217
218 for (tmp = ob->inv; tmp; tmp = tmp->below) 232 for (tmp = ob->inv; tmp; tmp = tmp->below)
219 if (tmp->type == FORCE) 233 if (tmp->type == FORCE)
220 if (tmp->arch->name == dragon_ability_force) 234 if (tmp->arch->archname == shstr_dragon_ability_force)
221 abil = tmp; 235 abil = tmp;
222 else if (tmp->arch->name == dragon_skin_force) 236 else if (tmp->arch->archname == shstr_dragon_skin_force)
223 skin = tmp; 237 skin = tmp;
224 238
225 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
226 } 240 }
227 241
228 CLEAR_FLAG (ob, FLAG_FRIENDLY);
229 add_friendly_object (ob);
230
231 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235 243
236 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this, ob->weight + ob->carrying);
237 245
238 ob->update_stats (); 246 ob->update_stats ();
247
239 ns->floorbox_update (); 248 ns->floorbox_update ();
240
241 esrv_send_inventory (ob, ob); 249 esrv_send_inventory (ob, ob);
242 esrv_add_spells (this, 0); 250 esrv_add_spells (this, 0);
243 251
244 enter_exit (ob, 0); 252 activate ();
245 253
246 send_rules (ob); 254 send_rules (ob);
247 send_news (ob); 255 send_news (ob);
248 display_motd (ob); 256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
249 INVOKE_PLAYER (LOGIN, this); 259 INVOKE_PLAYER (LOGIN, this);
250} 260}
251 261
252void 262void
253player::disconnect () 263player::disconnect ()
254{ 264{
255 //TODO: don't be so harsh and destroy :) 265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
256 if (ns) 271 if (ns)
257 destroy (); 272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
258} 286}
259 287
260// the need for this function can be explained 288// the need for this function can be explained
261// by load_object not returning the object 289// by load_object not returning the object
262void 290void
263player::set_object (object *op) 291player::set_object (object *op)
264{ 292{
265 ob = op; 293 ob = observe = op;
266 ob->contr = this; /* this aren't yet in archetype */ 294 ob->contr = this; /* this aren't yet in archetype */
267 295
296 ob->speed = 1.0f;
268 ob->speed_left = 0.5; 297 ob->speed_left = 0.5f;
269 ob->speed = 1.0; 298
270 ob->direction = 5; /* So player faces south */ 299 ob->direction = 5; /* So player faces south */
271 ob->stats.wc = 2;
272 ob->run_away = 25; /* Then we panick... */
273 300
274 set_first_map (ob); 301 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false;
275 304
276 ob->roll_stats (); 305 for (object *op = ob->inv; op; op = op->below)
306 if (op->flag [FLAG_APPLIED])
307 switch (op->type)
308 {
309 case SKILL:
310 ob->flag [FLAG_APPLIED] = false;
311 break;
312
313 case WAND:
314 case ROD:
315 case HORN:
316 case BOW:
317 ranged_ob = op;
318 break;
319
320 case WEAPON:
321 combat_ob = op;
322 break;
323 }
324
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326}
327
328void
329player::set_observe (object *op)
330{
331 observe = op ? op : ob;
332 do_los = 1;
277} 333}
278 334
279player::player () 335player::player ()
280{ 336{
281 /* There are some elements we want initialized to non zero value - 337 /* There are some elements we want initialised to non zero value -
282 * we deal with that below this point. 338 * we deal with that below this point.
283 */ 339 */
284 outputs_sync = 16; /* Every 2 seconds */ 340 outputs_sync = 4;
285 outputs_count = 8; /* Keeps present behaviour */ 341 outputs_count = 4;
286 unapply = unapply_nochoice; 342 unapply = unapply_nochoice;
287 343
288 assign (savebed_map, first_map_path); /* Init. respawn position */ 344 savebed_map = first_map_path; /* Init. respawn position */
289 345
290 gen_sp_armour = 10; 346 gen_sp_armour = 10;
291 last_speed = -1;
292 shoottype = range_none;
293 bowtype = bow_normal; 347 bowtype = bow_normal;
294 petmode = pet_normal; 348 petmode = pet_normal;
295 listening = 10; 349 listening = 10;
296 usekeys = containers; 350 usekeys = containers;
297 last_weapon_sp = -1;
298 peaceful = 1; /* default peaceful */ 351 peaceful = 1; /* default peaceful */
299 do_los = 1; 352 do_los = 1;
300 353
301 /* we need to clear these to -1 and not zero - otherwise, 354 weapon_sp = 1.0f;
302 * if a player quits and starts a new character, we wont 355 weapon_sp_left = 0.5f;
303 * send new values to the client, as things like exp start
304 * at zero.
305 */
306 for (int i = 0; i < NUM_SKILLS; i++)
307 last_skill_exp[i] = -1;
308
309 for (int i = 0; i < NROFATTACKS; i++)
310 last_resist[i] = -1;
311
312 last_stats.exp = -1;
313 last_weight = (uint32) - 1;
314} 356}
315 357
316void 358void
317player::do_destroy () 359player::do_destroy ()
318{ 360{
361 disconnect ();
362
319 attachable::do_destroy (); 363 attachable::do_destroy ();
320
321 save (false);
322 enable_save = false;
323
324 disconnect ();
325
326 terminate_all_pets (ob);
327
328 if (first_player != this)
329 {
330 player *prev = first_player;
331
332 while (prev && prev->next && prev->next != this)
333 prev = prev->next;
334
335 if (prev->next != this)
336 {
337 LOG (llevError, "Free_player: Can't find previous player.\n");
338 abort ();
339 }
340
341 prev->next = next;
342 }
343 else
344 first_player = next;
345 364
346 if (ob) 365 if (ob)
347 { 366 {
348 ob->destroy_inv (false); 367 ob->destroy_inv (false);
349 ob->destroy (); 368 ob->destroy ();
350 } 369 }
351 370
352 if (ns) 371 ob = observe = 0;
353 {
354 client *ns = this->ns;
355 ns->send_packet ("goodbye");
356 ns->flush ();
357 ns->pl = 0;
358 this->ns = 0;
359 ns->destroy ();
360 }
361} 372}
362 373
363player::~player () 374player::~player ()
364{ 375{
365 /* Clear item stack */ 376 /* Clear item stack */
… …
374player::create () 385player::create ()
375{ 386{
376 player *pl = new player; 387 player *pl = new player;
377 388
378 pl->set_object (arch_to_object (get_player_archetype (0))); 389 pl->set_object (arch_to_object (get_player_archetype (0)));
390
391 pl->ob->roll_stats ();
392 pl->ob->stats.wc = 2;
393 pl->ob->run_away = 25; /* Then we panick... */
394
395 set_first_map (pl->ob);
379 396
380 return pl; 397 return pl;
381} 398}
382 399
383/* 400/*
… …
386 * Note: there MUST be at least one player archetype! 403 * Note: there MUST be at least one player archetype!
387 */ 404 */
388archetype * 405archetype *
389get_player_archetype (archetype *at) 406get_player_archetype (archetype *at)
390{ 407{
391 archetype *start = at; 408 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
392 409
393 for (;;) 410 for (;;)
394 { 411 {
395 if (at == NULL || at->next == NULL) 412 if (++i == archetypes.end ())
396 at = first_archetype; 413 i = archetypes.begin ();
397 else 414 else if (*i == at)
398 at = at->next; 415 cleanup ("not a single player archetype found");
399 416
400 if (at->clone.type == PLAYER) 417 if ((*i)->type == PLAYER)
401 return at; 418 return *i;
402
403 if (at == start)
404 {
405 LOG (llevError, "No Player archetypes\n");
406 exit (-1);
407 }
408 } 419 }
409} 420}
410 421
411object * 422object *
412get_nearest_player (object *mon) 423get_nearest_player (object *mon)
… …
414 object *op = NULL; 425 object *op = NULL;
415 objectlink *ol; 426 objectlink *ol;
416 unsigned lastdist; 427 unsigned lastdist;
417 rv_vector rv; 428 rv_vector rv;
418 429
419 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 430 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
420 { 431 {
421 /* We should not find free objects on this friendly list, but it
422 * does periodically happen. Given that, lets deal with it.
423 * While unlikely, it is possible the next object on the friendly
424 * list is also free, so encapsulate this in a while loop.
425 */
426 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
427 {
428 object *tmp = ol->ob;
429
430 /* Can't do much more other than log the fact, because the object
431 * itself will have been cleared.
432 */
433 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
434 ol = ol->next;
435 remove_friendly_object (tmp);
436 if (!ol)
437 return op;
438 }
439
440 /* Remove special check for player from this. First, it looks to cause
441 * some crashes (ol->ob->contr not set properly?), but secondly, a more
442 * complicated method of state checking would be needed in any case -
443 * as it was, a clever player could type quit, and the function would
444 * skip them over while waiting for confirmation. Remove
445 * on_same_map check, as can_detect_enemy also does this
446 */
447 if (!can_detect_enemy (mon, ol->ob, &rv)) 432 if (!can_detect_enemy (mon, ol->ob, &rv))
448 continue; 433 continue;
449 434
450 if (lastdist > rv.distance) 435 if (lastdist > rv.distance)
451 { 436 {
… …
527 x = mon->x; 512 x = mon->x;
528 y = mon->y; 513 y = mon->y;
529 m = mon->map; 514 m = mon->map;
530 dir = rv.direction; 515 dir = rv.direction;
531 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 516 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
532 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 517 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
518
533 /* If we can't solve it within the search distance, return now. */ 519 /* If we can't solve it within the search distance, return now. */
534 if (diff > max) 520 if (diff > max)
535 return 0; 521 return 0;
522
536 while (diff > 1 && max > 0) 523 while (diff > 1 && max > 0)
537 { 524 {
538 lastx = x; 525 lastx = x;
539 lasty = y; 526 lasty = y;
540 lastmap = m; 527 lastmap = m;
… …
622 max--; 609 max--;
623 lastdir = dir; 610 lastdir = dir;
624 if (!firstdir) 611 if (!firstdir)
625 firstdir = dir; 612 firstdir = dir;
626 } 613 }
614
627 if (diff <= 1) 615 if (diff <= 1)
628 { 616 {
629 /* Recalculate diff (distance) because we may not have actually 617 /* Recalculate diff (distance) because we may not have actually
630 * headed toward player for entire distance. 618 * headed toward player for entire distance.
631 */ 619 */
632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 620 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
633 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 621 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
634 } 622 }
623
635 if (diff > max) 624 if (diff > max)
636 return 0; 625 return 0;
637 } 626 }
627
638 /* If we reached the max, didn't find a direction in time */ 628 /* If we reached the max, didn't find a direction in time */
639 if (!max) 629 if (!max)
640 return 0; 630 return 0;
641 631
642 return firstdir; 632 return firstdir;
… …
756roll_stat (void) 746roll_stat (void)
757{ 747{
758 int a[4], i, j, k; 748 int a[4], i, j, k;
759 749
760 for (i = 0; i < 4; i++) 750 for (i = 0; i < 4; i++)
761 a[i] = (int) RANDOM () % 6 + 1; 751 a[i] = (int) rndm (6) + 1;
762 752
763 for (i = 0, j = 0, k = 7; i < 4; i++) 753 for (i = 0, j = 0, k = 7; i < 4; i++)
764 if (a[i] < k) 754 if (a[i] < k)
765 k = a[i], j = i; 755 k = a[i], j = i;
766 756
… …
772} 762}
773 763
774void 764void
775object::roll_stats () 765object::roll_stats ()
776{ 766{
777 int statsort [7]; 767 int statsort [NUM_STATS];
778 768
779 for (;;) 769 for (;;)
780 { 770 {
781 int sum = 0; 771 int sum = 0;
782 for (int i = 7; i--; ) 772 for (int i = NUM_STATS; i--; )
783 sum += statsort [i] = roll_stat (); 773 sum += statsort [i] = roll_stat ();
784 774
785 if (sum >= 82 && sum <= 116) 775 if (sum >= 82 && sum <= 116)
786 break; 776 break;
787 } 777 }
788 778
789 // Sort the stats so that rerolling is easier... 779 // Sort the stats so that rerolling is easier...
790 std::sort (statsort, statsort + 7, std::greater<int>()); 780 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
791 781
782 for (int i = 0; i < NUM_STATS; ++i)
792 stats.Str = statsort[0]; 783 stats.stat (i) = statsort [i];
793 stats.Dex = statsort[1];
794 stats.Con = statsort[2];
795 stats.Int = statsort[3];
796 stats.Wis = statsort[4];
797 stats.Pow = statsort[5];
798 stats.Cha = statsort[6];
799 784
800 stats.exp = 0; 785 stats.exp = 0;
801 stats.ac = 0; 786 stats.ac = 0;
802 787
803 stats.hp = stats.maxhp; 788 stats.hp = stats.maxhp;
… …
815} 800}
816 801
817void 802void
818object::swap_stats (int a, int b) 803object::swap_stats (int a, int b)
819{ 804{
820 int tmp = get_attr_value (&contr->orig_stats, a); 805 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
821 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
822 set_attr_value (&contr->orig_stats, b, tmp);
823 806
807 for (int i = 0; i < NUM_STATS; ++i)
824 stats.Str = contr->orig_stats.Str; 808 stats.stat (i) = contr->orig_stats.stat (i);
825 stats.Dex = contr->orig_stats.Dex;
826 stats.Con = contr->orig_stats.Con;
827 stats.Int = contr->orig_stats.Int;
828 stats.Wis = contr->orig_stats.Wis;
829 stats.Pow = contr->orig_stats.Pow;
830 stats.Cha = contr->orig_stats.Cha;
831 809
832 //TODO: the following code looks so borked and should, at the very least, 810 //TODO: the following code looks so borked and should, at the very least,
833 // be merged with the similar code in roll_stats 811 // be merged with the similar code in roll_stats
834 stats.ac = 0; 812 stats.ac = 0;
835 813
… …
847 contr->levsp[1] = 6; 825 contr->levsp[1] = 6;
848 contr->levgrace[1] = 3; 826 contr->levgrace[1] = 3;
849 827
850 contr->orig_stats = stats; 828 contr->orig_stats = stats;
851 } 829 }
830}
831
832static void
833start_info (object *op)
834{
835 char buf[MAX_BUF];
836
837 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
838 new_draw_info (NDI_UNIQUE, 0, op, buf);
839 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
840 //new_draw_info (NDI_UNIQUE, 0, op, " ");
852} 841}
853 842
854/* This function takes the key that is passed, and does the 843/* This function takes the key that is passed, and does the
855 * appropriate action with it (change race, or other things). 844 * appropriate action with it (change race, or other things).
856 * The function name is for historical reasons - now we have 845 * The function name is for historical reasons - now we have
857 * separate race and class; this actually changes the RACE, 846 * separate race and class; this actually changes the RACE,
858 * not the class. 847 * not the class.
859 */ 848 */
860int 849void
861key_change_class (object *op, char key) 850player::chargen_race_done ()
862{ 851{
863 int tmp_loop;
864
865 if (key == 'd' || key == 'D')
866 {
867 char buf[MAX_BUF];
868
869 /* this must before then initial items are given */ 852 /* this must before then initial items are given */
870 esrv_new_player (op->contr, op->weight + op->carrying); 853 esrv_new_player (ob->contr, ob->weight + ob->carrying);
871 854
872 treasurelist *tl = find_treasurelist ("starting_wealth"); 855 treasurelist *tl = treasurelist::find ("starting_wealth");
873 if (tl) 856 if (tl)
874 create_treasure (tl, op, 0, 0, 0); 857 create_treasure (tl, ob, 0, 0, 0);
875 858
876 INVOKE_PLAYER (BIRTH, op->contr); 859 INVOKE_PLAYER (BIRTH, ob->contr);
877 INVOKE_PLAYER (LOGIN, op->contr); 860 INVOKE_PLAYER (LOGIN, ob->contr);
878 861
879 op->contr->ns->state = ST_PLAYING; 862 ob->contr->ns->state = ST_PLAYING;
880 863
881 if (op->msg) 864 if (ob->msg)
882 op->msg = NULL; 865 ob->msg = 0;
883 866
884 /* We create this now because some of the unique maps will need it 867 /* We create this now because some of the unique maps will need it
885 * to save here. 868 * to save here.
886 */ 869 */
870 {
871 char buf[MAX_BUF];
887 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 872 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
888 make_path_to_file (buf); 873 make_path_to_file (buf);
874 }
889 875
890#ifdef AUTOSAVE
891 op->contr->last_save_tick = pticks;
892#endif
893 start_info (op); 876 start_info (ob);
894 CLEAR_FLAG (op, FLAG_WIZ); 877 CLEAR_FLAG (ob, FLAG_WIZ);
895 give_initial_items (op, op->randomitems); 878 give_initial_items (ob, ob->randomitems);
896 link_player_skills (op); 879 link_player_skills (ob);
897 esrv_send_inventory (op, op); 880 esrv_send_inventory (ob, ob);
898 op->update_stats (); 881 ob->update_stats ();
899 882
900 /* This moves the player to a different start map, if there 883 /* This moves the player to a different start map, if there
901 * is one for this race 884 * is one for this race
902 */ 885 */
903 if (*first_map_ext_path) 886 if (*first_map_ext_path)
904 { 887 {
905 object *tmp; 888 object *tmp;
906 char mapname[MAX_BUF]; 889 char mapname[MAX_BUF];
907 890
908 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 891 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
909 tmp = object::create (); 892 tmp = object::create ();
910 EXIT_PATH (tmp) = mapname; 893 EXIT_PATH (tmp) = mapname;
911 EXIT_X (tmp) = op->x; 894 EXIT_X (tmp) = ob->x;
912 EXIT_Y (tmp) = op->y; 895 EXIT_Y (tmp) = ob->y;
913 enter_exit (op, tmp); /* we don't really care if it succeeded; 896 ob->enter_exit (tmp); /* we don't really care if it succeeded;
914 * if the map isn't there, then stay on the 897 * if the map isn't there, then stay on the
915 * default initial map */ 898 * default initial map */
916 tmp->destroy (); 899 tmp->destroy ();
917 } 900 }
918 else 901 else
919 LOG (llevDebug, "first_map_ext_path not set\n"); 902 LOG (llevDebug, "first_map_ext_path not set\n");
903}
920 904
921 return 0; 905void
922 } 906player::chargen_race_next ()
923 907{
924 /* Following actually changes the race - this is the default command 908 /* Following actually changes the race - this is the default command
925 * if we don't match with one of the options above. 909 * if we don't match with one of the options above.
926 */ 910 */
927 911
928 tmp_loop = 0; 912 do
929 while (!tmp_loop)
930 { 913 {
931 shstr name = op->name; 914 shstr name = ob->name;
932 int x = op->x, y = op->y; 915 int x = ob->x, y = ob->y;
933 916
934 op->remove_statbonus (); 917 ob->remove_statbonus ();
935 op->remove (); 918 ob->remove ();
936 op->arch = get_player_archetype (op->arch); 919 ob->arch = get_player_archetype (ob->arch);
937 op->arch->clone.copy_to (op); 920 ob->arch->copy_to (ob);
938 op->instantiate (); 921 ob->instantiate ();
939 op->stats = op->contr->orig_stats; 922 ob->stats = ob->contr->orig_stats;
940 op->name = op->name_pl = name; 923 ob->name = ob->name_pl = name;
941 op->x = x; 924 ob->x = x;
942 op->y = y; 925 ob->y = y;
943 SET_ANIMATION (op, 2); /* So player faces south */ 926 SET_ANIMATION (ob, 2); /* So player faces south */
944 insert_ob_in_map (op, op->map, op, 0); 927 insert_ob_in_map (ob, ob->map, ob, 0);
945 assign (op->contr->title, op->arch->clone.name); 928 assign (ob->contr->title, ob->arch->object::name);
946 op->add_statbonus (); 929 ob->add_statbonus ();
947 tmp_loop = allowed_class (op);
948 } 930 }
931 while (!allowed_class (ob));
949 932
950 update_object (op, UP_OBJ_FACE); 933 update_object (ob, UP_OBJ_FACE);
951 esrv_update_item (UPD_FACE, op, op); 934 esrv_update_item (UPD_FACE, ob, ob);
952 op->update_stats (); 935 ob->update_stats ();
953 op->stats.hp = op->stats.maxhp; 936 ob->stats.hp = ob->stats.maxhp;
954 op->stats.sp = op->stats.maxsp; 937 ob->stats.sp = ob->stats.maxsp;
955 op->stats.grace = 0; 938 ob->stats.grace = 0;
956
957 if (op->msg)
958 new_draw_info (NDI_BLUE, 0, op, op->msg);
959
960 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
961 return 0;
962}
963
964int
965key_confirm_quit (object *op, char key)
966{
967 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
968 {
969 op->contr->ns->state = ST_PLAYING;
970 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
971 return 1;
972 }
973
974 INVOKE_PLAYER (LOGOUT, op->contr);
975 INVOKE_PLAYER (QUIT, op->contr);
976
977 op->contr->enable_save = false;
978
979 terminate_all_pets (op);
980 leave_map (op);
981 op->direction = 0;
982 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
983
984 strcpy (op->contr->killer, "quit");
985 check_score (op);
986 op->contr->party = 0;
987 op->contr->own_title[0] = '\0';
988
989 object_ptr ob = op;
990
991 /* We need to hunt for any per player unique maps in memory and
992 * get rid of them. The trailing slash in the path is intentional,
993 * so that players named 'Ab' won't match against players 'Abe' pathname
994 */
995 char buf[MAX_BUF];
996 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
997
998 for (maptile *next, *mp = first_map; mp; mp = next)
999 {
1000 next = mp->next;
1001
1002 if (!strncmp (mp->path, buf, strlen (buf)))
1003 delete_map (mp);
1004 }
1005
1006 delete_character (ob->name, 1);
1007 ob->contr->destroy ();
1008
1009 return 1;
1010} 939}
1011 940
1012void 941void
1013flee_player (object *op) 942flee_player (object *op)
1014{ 943{
… …
1061 /* Cornered, get rid of scared */ 990 /* Cornered, get rid of scared */
1062 CLEAR_FLAG (op, FLAG_SCARED); 991 CLEAR_FLAG (op, FLAG_SCARED);
1063 op->enemy = NULL; 992 op->enemy = NULL;
1064} 993}
1065 994
1066
1067/* check_pick sees if there is stuff to be picked up/picks up stuff. 995/* check_pick sees if there is stuff to be picked up/picks up stuff.
1068 * IT returns 1 if the player should keep on moving, 0 if he should 996 * It returns 1 if the player should keep on moving, 0 if he should
1069 * stop. 997 * stop.
1070 */ 998 */
1071int 999int
1072check_pick (object *op) 1000check_pick (object *op)
1073{ 1001{
1074 object *tmp, *next; 1002 object *tmp, *next;
1075 int stop = 0; 1003 int stop = 0;
1076 int j, k, wvratio; 1004 int wvratio;
1077 char putstring[128], tmpstr[16]; 1005 char putstring[128];
1078 1006
1079 /* if you're flying, you cna't pick up anything */ 1007 /* if you're flying, you cna't pick up anything */
1080 if (op->move_type & MOVE_FLYING) 1008 if (op->move_type & MOVE_FLYING)
1081 return 1; 1009 return 1;
1082 1010
… …
1150 if (tmp->name != NULL) 1078 if (tmp->name != NULL)
1151 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1079 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1152 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1080 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1153 else 1081 else
1154 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1082 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1155 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1083 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1156 1084
1157 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1085 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1158 } 1086 }
1159 1087
1160 /* philosophy: 1088 /* philosophy:
… …
1235 pick_up (op, tmp); 1163 pick_up (op, tmp);
1236 continue; 1164 continue;
1237 } 1165 }
1238 1166
1239 if (op->contr->mode & PU_READABLES) 1167 if (op->contr->mode & PU_READABLES)
1240 if (tmp->type == BOOK || tmp->type == SCROLL) 1168 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1241 { 1169 {
1242 pick_up (op, tmp); 1170 pick_up (op, tmp);
1243 continue; 1171 continue;
1244 } 1172 }
1245 1173
… …
1353 /* careful: chairs and tables are weapons! */ 1281 /* careful: chairs and tables are weapons! */
1354 if (op->contr->mode & PU_ALLWEAPON) 1282 if (op->contr->mode & PU_ALLWEAPON)
1355 { 1283 {
1356 if (tmp->type == WEAPON && tmp->name != NULL) 1284 if (tmp->type == WEAPON && tmp->name != NULL)
1357 { 1285 {
1358 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1286 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1359 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1287 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1360 { 1288 {
1361 pick_up (op, tmp); 1289 pick_up (op, tmp);
1362 continue; 1290 continue;
1363 } 1291 }
1364 } 1292 }
1365 1293
1366 if (tmp->type == WEAPON && tmp->name == NULL) 1294 if (tmp->type == WEAPON && tmp->name == NULL)
1367 { 1295 {
1368 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1296 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1369 { 1297 {
1370 pick_up (op, tmp); 1298 pick_up (op, tmp);
1371 continue; 1299 continue;
1372 } 1300 }
1373 } 1301 }
… …
1398 if (tmp->name != NULL) 1326 if (tmp->name != NULL)
1399 { 1327 {
1400 fprintf (stderr, "%s", tmp->name); 1328 fprintf (stderr, "%s", tmp->name);
1401 } 1329 }
1402 else 1330 else
1403 fprintf (stderr, "%s", tmp->arch->name); 1331 fprintf (stderr, "%s", tmp->arch->archname);
1404 fprintf (stderr, ",%d] = ", tmp->type); 1332 fprintf (stderr, ",%d] = ", tmp->type);
1405 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1333 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1406#endif 1334#endif
1407 continue; 1335 continue;
1408 } 1336 }
… …
1419 * found object is returned. 1347 * found object is returned.
1420 */ 1348 */
1421object * 1349object *
1422find_arrow (object *op, const char *type) 1350find_arrow (object *op, const char *type)
1423{ 1351{
1424 object *tmp = NULL; 1352 object *tmp = 0;
1425 1353
1426 for (op = op->inv; op; op = op->below) 1354 for (op = op->inv; op; op = op->below)
1427 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1355 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1428 tmp = find_arrow (op, type); 1356 tmp = find_arrow (splay (op), type);
1429 else if (op->type == ARROW && op->race == type) 1357 else if (op->type == ARROW && op->race == type)
1430 return op; 1358 return splay (op);
1359
1431 return tmp; 1360 return tmp;
1432} 1361}
1433 1362
1434/* 1363/*
1435 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1364 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1436 * against the target. A full test is not performed, simply a basic test 1365 * against the target. A full test is not performed, simply a basic test
1437 * of resistances. The archer is making a quick guess at what he sees down 1366 * of resistances. The archer is making a quick guess at what he sees down
1438 * the hall. Failing that it does it's best to pick the highest plus arrow. 1367 * the hall. Failing that it does it's best to pick the highest plus arrow.
1439 */ 1368 */
1440
1441object * 1369object *
1442find_better_arrow (object *op, object *target, const char *type, int *better) 1370find_better_arrow (object *op, object *target, const char *type, int *better)
1443{ 1371{
1444 object *tmp = NULL, *arrow, *ntmp; 1372 object *tmp = NULL, *arrow, *ntmp;
1445 int attacknum, attacktype, betterby = 0, i; 1373 int attacknum, attacktype, betterby = 0, i;
… …
1478 else 1406 else
1479 { 1407 {
1480 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1408 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1481 { 1409 {
1482 attacktype = 1 << attacknum; 1410 attacktype = 1 << attacknum;
1483 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1411 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1484 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1412 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1485 { 1413 {
1486 tmp = arrow; 1414 tmp = arrow;
1487 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1415 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1488 } 1416 }
1489 } 1417 }
1490 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1418 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1491 { 1419 {
1492 tmp = arrow; 1420 tmp = arrow;
… …
1511 * find_better_arrow to find a decent arrow to use. 1439 * find_better_arrow to find a decent arrow to use.
1512 * op = the shooter 1440 * op = the shooter
1513 * type = bow->race 1441 * type = bow->race
1514 * dir = fire direction 1442 * dir = fire direction
1515 */ 1443 */
1516
1517object * 1444object *
1518pick_arrow_target (object *op, const char *type, int dir) 1445pick_arrow_target (object *op, const char *type, int dir)
1519{ 1446{
1520 object *tmp = NULL; 1447 object *tmp = NULL;
1521 maptile *m; 1448 maptile *m;
… …
1586 */ 1513 */
1587int 1514int
1588fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1515fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1589{ 1516{
1590 object *left, *bow; 1517 object *left, *bow;
1591 int bowspeed, mflags; 1518 int mflags;
1592 maptile *m; 1519 maptile *m;
1593 1520
1594 if (!dir) 1521 if (!dir)
1595 { 1522 {
1596 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1523 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1597 return 0; 1524 return 0;
1598 } 1525 }
1599 1526
1600 if (op->type == PLAYER) 1527 if (op->contr)
1601 bow = op->contr->ranges[range_bow]; 1528 bow = op->current_weapon;
1602 else 1529 else
1603 { 1530 {
1604 for (bow = op->inv; bow; bow = bow->below) 1531 for (bow = op->inv; bow; bow = bow->below)
1605 /* Don't check for applied - monsters don't apply bows - in that way, they 1532 /* Don't check for applied - monsters don't apply bows - in that way, they
1606 * don't need to switch back and forth between bows and weapons. 1533 * don't need to switch back and forth between bows and weapons.
… …
1611 if (!bow) 1538 if (!bow)
1612 { 1539 {
1613 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1540 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1614 return 0; 1541 return 0;
1615 } 1542 }
1543
1544 // optimisation: move object to top so we will find it quickly again
1545 if (bow->below)
1546 {
1547 bow->remove ();
1548 op->insert (bow);
1549 }
1550
1616 } 1551 }
1617 1552
1618 if (!bow->race || !bow->skill) 1553 if (!bow->race || !bow->skill)
1619 { 1554 {
1620 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1555 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1621 return 0; 1556 return 0;
1622 } 1557 }
1623
1624 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1625
1626 /* penalize ROF for bestarrow */
1627 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1628 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1629
1630 if (bowspeed < 1)
1631 bowspeed = 1;
1632 1558
1633 if (arrow == NULL) 1559 if (arrow == NULL)
1634 { 1560 {
1635 if ((arrow = find_arrow (op, bow->race)) == NULL) 1561 if ((arrow = find_arrow (op, bow->race)) == NULL)
1636 { 1562 {
1637 if (op->type == PLAYER) 1563 if (op->type == PLAYER)
1638 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1564 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1639 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1565 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1640 else 1566 else
1641 CLEAR_FLAG (op, FLAG_READY_BOW); 1567 CLEAR_FLAG (op, FLAG_READY_BOW);
1568
1642 return 0; 1569 return 0;
1643 } 1570 }
1644 } 1571 }
1645 1572
1646 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1573 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1670 1597
1671 arrow->set_owner (op); 1598 arrow->set_owner (op);
1672 arrow->skill = bow->skill; 1599 arrow->skill = bow->skill;
1673 arrow->direction = dir; 1600 arrow->direction = dir;
1674 1601
1602 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1603 arrow->stats.hp = arrow->stats.dam;
1604 arrow->stats.grace = arrow->attacktype;
1605
1606 if (arrow->slaying)
1607 arrow->spellarg = strdup (arrow->slaying);
1608
1609#if 0
1610 if (player *pl = op->contr)
1611 {
1612 float speed = pl->weapon_sp;
1613
1614 /* penalize ROF for bestarrow */
1615 if (pl->bowtype == bow_bestarrow)
1616 speed *= .9f;
1617 else
1618 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1619
1620 op->speed_left += speed - op->speed;
1621 }
1622#endif
1623
1624 SET_ANIMATION (arrow, arrow->direction);
1625
1626 /* update the speed */
1627 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1628 + bow->stats.dam / 7.f;
1629
1630 arrow->set_speed (max (arrow->speed, 2.f));
1631 arrow->speed_left = 0;
1632
1633 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1634
1675 if (op->type == PLAYER) 1635 if (op->type == PLAYER)
1676 { 1636 {
1677 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1678 op->update_stats ();
1679 }
1680
1681 SET_ANIMATION (arrow, arrow->direction);
1682 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1683 arrow->stats.hp = arrow->stats.dam;
1684 arrow->stats.grace = arrow->attacktype;
1685 if (arrow->slaying != NULL)
1686 arrow->spellarg = strdup (arrow->slaying);
1687
1688 /* Note that this was different for monsters - they got their level
1689 * added to the damage. I think the strength bonus is more proper.
1690 */
1691
1692 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1693
1694 /* update the speed */
1695 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1696 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1697
1698 arrow->set_speed (max (arrow->speed, 1.0));
1699 arrow->speed_left = 0;
1700
1701 if (op->type == PLAYER)
1702 {
1703 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1704 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1705 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1706
1707 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1637 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1638 wc -= dex_bonus[op->stats.Dex];
1639
1640 if (!arrow->slaying)
1641 arrow->slaying = op->slaying;
1642
1643 arrow->attacktype |= op->attacktype;
1708 } 1644 }
1709 else 1645 else
1710 { 1646 {
1711 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1712 arrow->level = op->level; 1647 arrow->level = op->level;
1713 } 1648 arrow->stats.wc -= bow->magic;
1714 1649
1715 if (arrow->attacktype == AT_PHYSICAL) 1650 if (!arrow->slaying)
1651 arrow->slaying = bow->slaying;
1652
1716 arrow->attacktype |= bow->attacktype; 1653 arrow->attacktype |= bow->attacktype;
1654 }
1717 1655
1718 if (bow->slaying) 1656 wc -= arrow->level;
1719 arrow->slaying = bow->slaying; 1657 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1720 1658
1659 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1721 arrow->move_type = MOVE_FLY_LOW; 1660 arrow->move_type = MOVE_FLY_LOW;
1722 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1661 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1723 1662
1724 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1663 op->play_sound (sound_find ("fire_arrow"));
1725 m->insert (arrow, sx, sy, op); 1664 m->insert (arrow, sx, sy, op);
1726 1665
1727 if (!arrow->destroyed ()) 1666 if (!arrow->destroyed ())
1728 move_arrow (arrow); 1667 move_arrow (arrow);
1729 1668
… …
1750{ 1689{
1751 int ret = 0, wcmod = 0; 1690 int ret = 0, wcmod = 0;
1752 1691
1753 if (op->contr->bowtype == bow_bestarrow) 1692 if (op->contr->bowtype == bow_bestarrow)
1754 { 1693 {
1755 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1694 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1756 } 1695 }
1757 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1696 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1758 { 1697 {
1759 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1698 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1760 wcmod = -1; 1699 wcmod = -1;
1700
1761 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1701 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1762 } 1702 }
1763 else if (op->contr->bowtype == bow_threewide) 1703 else if (op->contr->bowtype == bow_threewide)
1764 { 1704 {
1765 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1705 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1769 else if (op->contr->bowtype == bow_spreadshot) 1709 else if (op->contr->bowtype == bow_spreadshot)
1770 { 1710 {
1771 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1711 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1772 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1712 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1773 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1713 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1774
1775 } 1714 }
1776 else 1715 else
1777 { 1716 {
1778 /* Simple case */ 1717 /* Simple case */
1779 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1718 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1780 } 1719 }
1720
1781 return ret; 1721 return ret;
1782} 1722}
1783
1784 1723
1785/* Fires a misc (wand/rod/horn) object in 'dir'. 1724/* Fires a misc (wand/rod/horn) object in 'dir'.
1786 * Broken apart from 'fire' to keep it more readable. 1725 * Broken apart from 'fire' to keep it more readable.
1787 */ 1726 */
1788void 1727void
1789fire_misc_object (object *op, int dir) 1728fire_misc_object (object *op, int dir)
1790{ 1729{
1791 object *item; 1730 object *item = op->contr->ranged_ob;
1792 1731
1793 if (!op->contr->ranges[range_misc]) 1732 if (!item)
1794 { 1733 {
1795 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1734 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1796 return; 1735 return;
1797 } 1736 }
1798 1737
1799 item = op->contr->ranges[range_misc];
1800 if (!item->inv) 1738 if (!item->inv)
1801 { 1739 {
1802 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1740 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1803 return; 1741 return;
1804 } 1742 }
1743
1744 if (!op->change_weapon (item))
1745 return;
1746
1805 if (item->type == WAND) 1747 if (item->type == WAND)
1806 { 1748 {
1807 if (item->stats.food <= 0) 1749 if (item->stats.food <= 0)
1808 { 1750 {
1809 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1751 op->contr->play_sound (sound_find ("wand_poof"));
1810 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1752 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1753
1811 return; 1754 return;
1812 } 1755 }
1813 } 1756 }
1814 else if (item->type == ROD || item->type == HORN) 1757 else if (item->type == ROD || item->type == HORN)
1815 { 1758 {
1816 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1759 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1817 { 1760 {
1818 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1761 op->contr->play_sound (sound_find ("wand_poof"));
1762
1819 if (item->type == ROD) 1763 if (item->type == ROD)
1820 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1764 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1821 else 1765 else
1822 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1766 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1767
1823 return; 1768 return;
1824 } 1769 }
1825 } 1770 }
1826 1771
1827 if (cast_spell (op, item, dir, item->inv, NULL)) 1772 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1834 object *tmp; 1779 object *tmp;
1835 1780
1836 if (item->arch) 1781 if (item->arch)
1837 { 1782 {
1838 CLEAR_FLAG (item, FLAG_ANIMATE); 1783 CLEAR_FLAG (item, FLAG_ANIMATE);
1839 item->face = item->arch->clone.face; 1784 item->face = item->arch->face;
1840 item->set_speed (0); 1785 item->set_speed (0);
1841 } 1786 }
1842 1787
1843 if ((tmp = item->in_player ())) 1788 if ((tmp = item->in_player ()))
1844 esrv_update_item (UPD_ANIM, tmp, item); 1789 esrv_update_item (UPD_ANIM, tmp, item);
… …
1849 } 1794 }
1850} 1795}
1851 1796
1852/* Received a fire command for the player - go and do it. 1797/* Received a fire command for the player - go and do it.
1853 */ 1798 */
1854void 1799bool
1855fire (object *op, int dir) 1800fire (object *op, int dir)
1856{ 1801{
1857 int spellcost = 0; 1802 int spellcost = 0;
1858 1803
1859 /* check for loss of invisiblity/hide */ 1804 /* check for loss of invisiblity/hide */
1860 if (action_makes_visible (op)) 1805 if (action_makes_visible (op))
1861 make_visible (op); 1806 make_visible (op);
1862 1807
1863 switch (op->contr->shoottype) 1808 player *pl = op->contr;
1809
1810 if (pl->golem)
1811 {
1812 control_golem (op->contr->golem, dir);
1813 return false;
1864 { 1814 }
1865 case range_none:
1866 return;
1867 1815
1868 case range_bow: 1816 object *ob = pl->ranged_ob;
1817
1818 if (!ob)
1819 return false;
1820
1821 if (!op->change_weapon (ob))
1822 return false;
1823
1824 if (op->speed_left > 0.f)
1825 --op->speed_left;
1826 else
1827 return false;
1828
1829 switch (ob->type)
1830 {
1831 case BOW:
1869 player_fire_bow (op, dir); 1832 player_fire_bow (op, dir);
1870 return; 1833 break;
1871 1834
1872 case range_magic: /* Casting spells */ 1835 case SPELL:
1873 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1836 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1874 return; 1837 break;
1875 1838
1876 case range_misc: 1839 case BUILDER:
1840 apply_map_builder (op, dir);
1841 break;
1842
1843 case SKILL:
1844 do_skill (op, op, ob, dir, 0);
1845 break;
1846
1847 default:
1877 fire_misc_object (op, dir); 1848 fire_misc_object (op, dir);
1878 return; 1849 break;
1879
1880 case range_golem: /* Control summoned monsters from scrolls */
1881 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1882 {
1883 op->contr->ranges[range_golem] = 0;
1884 op->contr->shoottype = range_none;
1885 }
1886 else
1887 control_golem (op->contr->ranges[range_golem], dir);
1888 return;
1889
1890 case range_skill:
1891 if (!op->chosen_skill)
1892 {
1893 if (op->type == PLAYER)
1894 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1895 return;
1896 }
1897 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1898 return;
1899 case range_builder:
1900 apply_map_builder (op, dir);
1901 return;
1902 default:
1903 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1904 return;
1905 } 1850 }
1906}
1907 1851
1908 1852 return true;
1853}
1909 1854
1910/* find_key 1855/* find_key
1911 * We try to find a key for the door as passed. If we find a key 1856 * We try to find a key for the door as passed. If we find a key
1912 * and successfully use it, we return the key, otherwise NULL 1857 * and successfully use it, we return the key, otherwise NULL
1913 * This function merges both normal and locked door, since the logic 1858 * This function merges both normal and locked door, since the logic
… …
1915 * pl is the player, 1860 * pl is the player,
1916 * inv is the objects inventory to searched 1861 * inv is the objects inventory to searched
1917 * door is the door we are trying to match against. 1862 * door is the door we are trying to match against.
1918 * This function can be called recursively to search containers. 1863 * This function can be called recursively to search containers.
1919 */ 1864 */
1920
1921object * 1865object *
1922find_key (object *pl, object *container, object *door) 1866find_key (object *pl, object *container, object *door)
1923{ 1867{
1924 object *tmp, *key; 1868 object *tmp, *key;
1925 1869
1926 /* Should not happen, but sanity checking is never bad */ 1870 /* Should not happen, but sanity checking is never bad */
1927 if (container->inv == NULL) 1871 if (!container->inv)
1928 return NULL; 1872 return 0;
1929 1873
1930 /* First, lets try to find a key in the top level inventory */ 1874 /* First, lets try to find a key in the top level inventory */
1931 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1875 for (tmp = container->inv; tmp; tmp = tmp->below)
1932 { 1876 {
1933 if (door->type == DOOR && tmp->type == KEY) 1877 if (door->type == DOOR && tmp->type == KEY)
1934 break; 1878 break;
1935 /* For sanity, we should really check door type, but other stuff 1879 /* For sanity, we should really check door type, but other stuff
1936 * (like containers) can be locked with special keys 1880 * (like containers) can be locked with special keys
1937 */ 1881 */
1938 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1882 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1939 break; 1883 break;
1940 } 1884 }
1885
1941 /* No key found - lets search inventories now */ 1886 /* No key found - lets search inventories now */
1942 /* If we find and use a key in an inventory, return at that time. 1887 /* If we find and use a key in an inventory, return at that time.
1943 * otherwise, if we search all the inventories and still don't find 1888 * otherwise, if we search all the inventories and still don't find
1944 * a key, return 1889 * a key, return
1945 */ 1890 */
1946 if (!tmp) 1891 if (!tmp)
1947 { 1892 {
1948 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1893 for (tmp = container->inv; tmp; tmp = tmp->below)
1949 { 1894 {
1950 /* No reason to search empty containers */ 1895 /* No reason to search empty containers */
1951 if (tmp->type == CONTAINER && tmp->inv) 1896 if (tmp->type == CONTAINER && tmp->inv)
1952 { 1897 {
1953 if ((key = find_key (pl, tmp, door)) != NULL) 1898 if ((key = find_key (pl, tmp, door)))
1954 return key; 1899 return key;
1955 } 1900 }
1956 } 1901 }
1902
1957 if (!tmp) 1903 if (!tmp)
1958 return NULL; 1904 return NULL;
1959 } 1905 }
1906
1960 /* We get down here if we have found a key. Now if its in a container, 1907 /* We get down here if we have found a key. Now if its in a container,
1961 * see if we actually want to use it 1908 * see if we actually want to use it
1962 */ 1909 */
1963 if (pl != container) 1910 if (pl != container)
1964 { 1911 {
… …
1985 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1932 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1986 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1933 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1987 return NULL; 1934 return NULL;
1988 } 1935 }
1989 } 1936 }
1937
1990 return tmp; 1938 return tmp;
1991} 1939}
1992 1940
1993/* moved door processing out of move_player_attack. 1941/* moved door processing out of move_player_attack.
1994 * returns 1 if player has opened the door with a key 1942 * returns 1 if player has opened the door with a key
… …
1996 * 0 otherwise 1944 * 0 otherwise
1997 */ 1945 */
1998static int 1946static int
1999player_attack_door (object *op, object *door) 1947player_attack_door (object *op, object *door)
2000{ 1948{
2001 /* If its a door, try to find a use a key. If we do destroy the door, 1949 /* If its a door, try to find a key. If we do destroy the door,
2002 * might as well return immediately as there is nothing more to do - 1950 * might as well return immediately as there is nothing more to do -
2003 * otherwise, we fall through to the rest of the code. 1951 * otherwise, we fall through to the rest of the code.
2004 */ 1952 */
2005 object *key = find_key (op, op, door); 1953 object *key = find_key (op, op, door);
2006 1954
2007 /* IF we found a key, do some extra work */ 1955 /* If we found a key, do some extra work */
2008 if (key) 1956 if (key)
2009 { 1957 {
2010 object *container = key->env; 1958 object *container = key->env;
2011 1959
2012 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2013 if (action_makes_visible (op)) 1960 if (action_makes_visible (op))
2014 make_visible (op); 1961 make_visible (op);
1962
2015 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1963 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2016 spring_trap (door->inv, op); 1964 spring_trap (door->inv, op);
1965
2017 if (door->type == DOOR) 1966 if (door->type == DOOR)
2018 {
2019 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1967 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2020 }
2021 else if (door->type == LOCKED_DOOR) 1968 else if (door->type == LOCKED_DOOR)
2022 { 1969 {
2023 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1970 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2024 remove_door2 (door); /* remove door without violence ;-) */ 1971 remove_door2 (door); /* remove door without violence ;-) */
2025 } 1972 }
1973
2026 /* Do this after we print the message */ 1974 /* Do this after we print the message */
2027 decrease_ob (key); /* Use up one of the keys */ 1975 decrease_ob (key); /* Use up one of the keys */
2028 /* Need to update the weight the container the key was in */ 1976 /* Need to update the weight the container the key was in */
2029 if (container != op) 1977 if (container != op)
2030 esrv_update_item (UPD_WEIGHT, op, container); 1978 esrv_update_item (UPD_WEIGHT, op, container);
1979
2031 return 1; /* Nothing more to do below */ 1980 return 1; /* Nothing more to do below */
2032 } 1981 }
2033 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
2034 { 1983 {
2035 /* Might as well return now - no other way to open this */ 1984 /* Might as well return now - no other way to open this */
2036 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1985 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2037 return 1; 1986 return 1;
2038 } 1987 }
1988
2039 return 0; 1989 return 0;
2040} 1990}
2041 1991
2042/* This function is just part of a breakup from move_player. 1992/* This function is just part of a breakup from move_player.
2043 * It should keep the code cleaner. 1993 * It should keep the code cleaner.
2044 * When this is called, the players direction has been updated 1994 * When this is called, the players direction has been updated
2045 * (taking into account confusion.) The player is also actually 1995 * (taking into account confusion.) The player is also actually
2046 * going to try and move (not fire weapons). 1996 * going to try and move (not fire weapons).
2047 */ 1997 */
2048void 1998bool
2049move_player_attack (object *op, int dir) 1999move_player_attack (object *op, int dir)
2050{ 2000{
2051 object *tmp, *mon;
2052 sint16 nx, ny;
2053 int on_battleground; 2001 int on_battleground;
2054 maptile *m;
2055 2002
2056 nx = freearr_x[dir] + op->x; 2003 sint16 nx = freearr_x[dir] + op->x;
2057 ny = freearr_y[dir] + op->y; 2004 sint16 ny = freearr_y[dir] + op->y;
2058 2005
2059 on_battleground = op_on_battleground (op, 0, 0); 2006 on_battleground = op_on_battleground (op, 0, 0);
2007
2008 if (out_of_map (op->map, nx, ny))
2009 return false;
2010
2011 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2012 {
2013 --op->speed_left;
2014 return true;
2015 }
2060 2016
2061 /* If braced, or can't move to the square, and it is not out of the 2017 /* If braced, or can't move to the square, and it is not out of the
2062 * map, attack it. Note order of if statement is important - don't 2018 * map, attack it. Note order of if statement is important - don't
2063 * want to be calling move_ob if braced, because move_ob will move the 2019 * want to be calling move_ob if braced, because move_ob will move the
2064 * player. This is a pretty nasty hack, because if we could 2020 * player. This is a pretty nasty hack, because if we could
2065 * move to some space, it then means that if we are braced, we should 2021 * move to some space, it then means that if we are braced, we should
2066 * do nothing at all. As it is, if we are braced, we go through 2022 * do nothing at all. As it is, if we are braced, we go through
2067 * quite a bit of processing. However, it probably is less than what 2023 * quite a bit of processing. However, it probably is less than what
2068 * move_ob uses. 2024 * move_ob uses.
2069 */ 2025 */
2070 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2026 maptile *m = op->map->xy_find (nx, ny);
2071 {
2072 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2073 {
2074 m = get_map_from_coord (op->map, &nx, &ny);
2075 if (!m)
2076 return; /* Don't think this should happen */
2077 }
2078 else
2079 m = op->map;
2080 2027
2081 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2082 {
2083 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2084 return;
2085 }
2086
2087 mon = 0;
2088 /* Go through all the objects, and find ones of interest. Only stop if 2028 /* Go through all the objects, and find ones of interest. Only stop if
2089 * we find a monster - that is something we know we want to attack. 2029 * we find a monster - that is something we know we want to attack.
2090 * if its a door or barrel (can roll) see if there may be monsters 2030 * if its a door or barrel (can roll) see if there may be monsters
2091 * on the space 2031 * on the space
2092 */ 2032 */
2093 while (tmp) 2033 object *mon;
2094 { 2034 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2095 if (tmp == op) 2035 {
2096 { 2036 if ((mon->flag [FLAG_ALIVE]
2097 tmp = tmp->above; 2037 || mon->type == LOCKED_DOOR
2098 continue; 2038 || mon->flag [FLAG_CAN_ROLL])
2099 }
2100
2101 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2102 {
2103 mon = tmp; 2039 && mon != op)
2104 break; 2040 break;
2105 } 2041 }
2106 2042
2107 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2108 mon = tmp;
2109
2110 tmp = tmp->above;
2111 }
2112
2113 if (!mon) /* This happens anytime the player tries to move */ 2043 if (!mon) /* This happens anytime the player tries to move */
2114 return; /* into a wall */ 2044 return false; /* into a wall */
2115 2045
2116 if (mon->head)
2117 mon = mon->head; 2046 mon = mon->head_ ();
2118 2047
2119 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2048 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2049 if (op->contr->weapon_sp_left > 0.f)
2120 if (player_attack_door (op, mon)) 2050 if (player_attack_door (op, mon))
2051 {
2052 --op->contr->weapon_sp_left;
2121 return; 2053 return true;
2054 }
2122 2055
2123 /* The following deals with possibly attacking peaceful 2056 /* The following deals with possibly attacking peaceful
2124 * or frienddly creatures. Basically, all players are considered 2057 * or friendly creatures. Basically, all players are considered
2125 * unaggressive. If the moving player has peaceful set, then the 2058 * unaggressive. If the moving player has peaceful set, then the
2126 * object should be pushed instead of attacked. It is assumed that 2059 * object should be pushed instead of attacked. It is assumed that
2127 * if you are braced, you will not attack friends accidently, 2060 * if you are braced, you will not attack friends accidently,
2128 * and thus will not push them. 2061 * and thus will not push them.
2129 */ 2062 */
2130 2063
2131 /* If the creature is a pet, push it even if the player is not 2064 /* If the creature is a pet, push it even if the player is not
2132 * peaceful. Our assumption is the creature is a pet if the 2065 * peaceful. Our assumption is the creature is a pet if the
2133 * player owns it and it is either friendly or unagressive. 2066 * player owns it and it is either friendly or unagressive.
2134 */ 2067 */
2135 if ((op->type == PLAYER) 2068 if (op->type == PLAYER
2136#if COZY_SERVER
2137 &&
2138 ((mon->owner && mon->owner->contr 2069 && ((mon->owner && mon->owner->contr
2139 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2070 && same_party (mon->owner->contr->party, op->contr->party))
2140#else
2141 && mon->owner == op 2071 || mon->owner == op)
2142#endif
2143 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2072 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2144 { 2073 {
2145 /* If we're braced, we don't want to switch places with it */ 2074 /* If we're braced, we don't want to switch places with it */
2146 if (op->contr->braced) 2075 if (op->contr->braced)
2147 return; 2076 return false;
2148 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2077
2078 if (op->speed_left > 0.f)
2079 {
2080 --op->speed_left;
2081
2082 op->play_sound (sound_find ("push_player"));
2149 (void) push_ob (mon, dir, op); 2083 push_ob (mon, dir, op);
2084
2150 if (op->contr->tmp_invis || op->hide) 2085 if (op->contr->tmp_invis || op->hide)
2151 make_visible (op); 2086 make_visible (op);
2087
2152 return; 2088 return true;
2153 } 2089 }
2090 else
2091 return false;
2092 }
2154 2093
2155 /* in certain circumstances, you shouldn't attack friendly 2094 /* in certain circumstances, you shouldn't attack friendly
2156 * creatures. Note that if you are braced, you can't push 2095 * creatures. Note that if you are braced, you can't push
2157 * someone, but put it inside this loop so that you won't 2096 * someone, but put it inside this loop so that you won't
2158 * attack them either. 2097 * attack them either.
2159 */ 2098 */
2160 if ((mon->type == PLAYER || mon->enemy != op) && 2099 if ((mon->type == PLAYER || mon->enemy != op)
2161 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2100 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2162#ifdef PROHIBIT_PLAYERKILL
2163 (op->contr->peaceful 2101 && ((op->contr->peaceful
2164 || (mon->type == PLAYER 2102 || (mon->type == PLAYER && mon->contr->peaceful))
2165 && mon->contr->
2166 peaceful)) &&
2167#else
2168 op->contr->peaceful &&
2169#endif
2170 !on_battleground)) 2103 && !on_battleground))
2104 {
2105 if (op->speed_left > 0.f)
2171 { 2106 {
2107 --op->speed_left;
2108
2172 if (!op->contr->braced) 2109 if (!op->contr->braced)
2173 { 2110 {
2174 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2111 op->play_sound (sound_find ("push_player"));
2175 (void) push_ob (mon, dir, op); 2112 push_ob (mon, dir, op);
2176 } 2113 }
2177 else 2114 else
2178 new_draw_info (0, 0, op, "You withhold your attack"); 2115 op->statusmsg ("You withhold your attack");
2179 2116
2180 if (op->contr->tmp_invis || op->hide) 2117 if (op->contr->tmp_invis || op->hide)
2181 make_visible (op); 2118 make_visible (op);
2182 }
2183 2119
2120 return true;
2121 }
2122 }
2184 /* If the object is a boulder or other rollable object, then 2123 /* If the object is a boulder or other rollable object, then
2185 * roll it if not braced. You can't roll it if you are braced. 2124 * roll it if not braced. You can't roll it if you are braced.
2186 */ 2125 */
2187 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2126 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2127 {
2128 if (op->speed_left > 0.f)
2188 { 2129 {
2130 --op->speed_left;
2131
2189 recursive_roll (mon, dir, op); 2132 recursive_roll (mon, dir, op);
2190 if (action_makes_visible (op)) 2133 if (action_makes_visible (op))
2191 make_visible (op); 2134 make_visible (op);
2192 }
2193 2135
2136 return true;
2137 }
2138 }
2194 /* Any generic living creature. Including things like doors. 2139 /* Any generic living creature. Including things like doors.
2195 * Way it works is like this: First, it must have some hit points 2140 * Way it works is like this: First, it must have some hit points
2196 * and be living. Then, it must be one of the following: 2141 * and be living. Then, it must be one of the following:
2197 * 1) Not a player, 2) A player, but of a different party. Note 2142 * 1) Not a player, 2) A player, but of a different party. Note
2198 * that party_number -1 is no party, so attacks can still happen. 2143 * that party_number -1 is no party, so attacks can still happen.
2199 */ 2144 */
2200
2201 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2145 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2202 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2146 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2203 { 2147 {
2204 2148 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2205 /* If the player hasn't hit something this tick, and does
2206 * so, give them speed boost based on weapon speed. Doing
2207 * it here is better than process_players2, which basically
2208 * incurred a 1 tick offset.
2209 */
2210 if (!op->contr->has_hit)
2211 { 2149 {
2212 op->speed_left += op->speed / op->contr->weapon_sp; 2150 --op->contr->weapon_sp_left;
2213
2214 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2215 }
2216 2151
2217 skill_attack (mon, op, 0, 0, 0); 2152 skill_attack (mon, op, 0, 0, 0);
2218
2219 /* If attacking another player, that player gets automatic
2220 * hitback, and doesn't loose luck either.
2221 * Disable hitback on the battleground or if the target is
2222 * the wiz.
2223 */
2224 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2225 {
2226 short luck = mon->stats.luck;
2227
2228 mon->contr->has_hit = 1;
2229 skill_attack (op, mon, 0, 0, 0);
2230 mon->stats.luck = luck;
2231 }
2232 2153
2233 if (action_makes_visible (op)) 2154 if (action_makes_visible (op))
2234 make_visible (op); 2155 make_visible (op);
2235 }
2236 } /* if player should attack something */
2237}
2238 2156
2239int 2157 return true;
2158 }
2159 }
2160
2161 return false;
2162}
2163
2164bool
2240move_player (object *op, int dir) 2165move_player (object *op, int dir)
2241{ 2166{
2242 int pick; 2167 int pick;
2243 2168
2244 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2169 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2245 return 0; 2170 return 0;
2246 2171
2247 /* Sanity check: make sure dir is valid */ 2172 /* Sanity check: make sure dir is valid */
2248 if ((dir < 0) || (dir >= 9)) 2173 if ((dir < 0) || (dir >= 9))
2249 { 2174 {
2250 LOG (llevError, "move_player: invalid direction %d\n", dir); 2175 LOG (llevError, "move_player: invalid direction %d\n", dir);
2251 return 0; 2176 return 0;
2252 } 2177 }
2253 2178
2254 /* peterm: added following line */ 2179 /* peterm: added following line */
2255 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2180 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2256 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2181 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2257 2182
2258 op->facing = dir; 2183 op->facing = dir;
2259 2184
2260 if (op->hide) 2185 if (op->hide)
2261 do_hidden_move (op); 2186 do_hidden_move (op);
2262 2187
2188 bool retval;
2189
2263 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2190 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2264 /*nop */ ; 2191 retval = RESULT_INT (0);
2265 else if (op->contr->fire_on) 2192 else if (op->contr->fire_on)
2266 fire (op, dir); 2193 retval = fire (op, dir);
2267 else 2194 else
2268 { 2195 {
2269 move_player_attack (op, dir); 2196 retval = move_player_attack (op, dir);
2270 pick = check_pick (op); 2197 pick = check_pick (op);
2271 } 2198 }
2272 2199
2273 /* Add special check for newcs players and fire on - this way, the 2200 /* Add special check for newcs players and fire on - this way, the
2274 * server can handle repeat firing. 2201 * server can handle repeat firing.
… …
2281 /* Update how the player looks. Use the facing, so direction may 2208 /* Update how the player looks. Use the facing, so direction may
2282 * get reset to zero. This allows for full animation capabilities 2209 * get reset to zero. This allows for full animation capabilities
2283 * for players. 2210 * for players.
2284 */ 2211 */
2285 animate_object (op, op->facing); 2212 animate_object (op, op->facing);
2286 return 0; 2213
2214 return retval;
2287} 2215}
2288 2216
2289/* This is similar to handle_player, below, but is only used by the 2217/* This is similar to handle_player, below, but is only used by the
2290 * new client/server stuff. 2218 * new client/server stuff.
2291 * This is sort of special, in that the new client/server actually uses 2219 * This is sort of special, in that the new client/server actually uses
2292 * the new speed values for commands. 2220 * the new speed values for commands.
2293 * 2221 *
2294 * Returns true if there are more actions we can do. 2222 * Returns true if there are more actions we can do. Should not do
2223 * many actions in a row, as that would be too unfair to other
2224 * players.
2295 */ 2225 */
2296int 2226bool
2297handle_newcs_player (object *op) 2227handle_newcs_player (object *op)
2298{ 2228{
2299 if (op->contr->hidden)
2300 {
2301 op->invisible = 1000;
2302 /* the socket code flashes the player visible/invisible
2303 * depending on the value of invisible, so we need to
2304 * alternate it here for it to work correctly.
2305 */
2306 if (pticks & 2)
2307 op->invisible--;
2308 }
2309 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2310 {
2311 op->invisible--;
2312 if (!op->invisible)
2313 {
2314 make_visible (op);
2315 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2316 }
2317 }
2318
2319 if (QUERY_FLAG (op, FLAG_SCARED)) 2229 if (QUERY_FLAG (op, FLAG_SCARED))
2320 { 2230 {
2321 flee_player (op); 2231 if (op->speed_left > 0.f)
2322 /* If player is still scared, that is his action for this tick */
2323 if (QUERY_FLAG (op, FLAG_SCARED))
2324 { 2232 {
2325 op->speed_left--; 2233 --op->speed_left;
2234 flee_player (op);
2235
2326 return 0; 2236 return true;
2327 } 2237 }
2238 else
2239 return false;
2328 } 2240 }
2329
2330 /* I've been seeing crashes where the golem has been destroyed, but
2331 * the player object still points to the defunct golem. The code that
2332 * destroys the golem looks correct, and it doesn't always happen, so
2333 * put this in a a workaround to clean up the golem pointer.
2334 */
2335 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2336 op->contr->ranges[range_golem] = 0;
2337 2241
2338 /* call this here - we also will call this in do_ericserver, but 2242 /* call this here - we also will call this in do_ericserver, but
2339 * the players time has been increased when doericserver has been 2243 * the players time has been increased when doericserver has been
2340 * called, so we recheck it here. 2244 * called, so we recheck it here.
2341 */ 2245 */
2342 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2246 if (op->contr->ns->handle_command ())
2343 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2344 ;
2345
2346 if (op->speed_left < 0)
2347 return 0; 2247 return true;
2348 2248
2349 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2249 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2350 {
2351 /* All move commands take 1 tick, at least for now */
2352 op->speed_left--;
2353
2354 /* Instead of all the stuff below, let move_player take care
2355 * of it. Also, some of the skill stuff is only put in
2356 * there, as well as the confusion stuff.
2357 */
2358 move_player (op, op->direction); 2250 return move_player (op, op->direction);
2359 if (op->speed_left > 0)
2360 return 1;
2361 else
2362 return 0;
2363 }
2364 2251
2365 return 0; 2252 return false;
2366} 2253}
2367 2254
2368int 2255int
2369save_life (object *op) 2256save_life (object *op)
2370{ 2257{
… …
2372 return 0; 2259 return 0;
2373 2260
2374 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2261 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2375 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2262 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2376 { 2263 {
2377 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2264 op->play_sound (sound_find ("ob_evaporate"));
2378 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2265 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2379 2266
2380 if (op->contr) 2267 if (op->contr)
2381 esrv_del_item (op->contr, tmp->count); 2268 esrv_del_item (op->contr, tmp->count);
2382 2269
… …
2402/* This goes throws the inventory and removes unpaid objects, and puts them 2289/* This goes throws the inventory and removes unpaid objects, and puts them
2403 * back in the map (location and map determined by values of env). This 2290 * back in the map (location and map determined by values of env). This
2404 * function will descend into containers. op is the object to start the search 2291 * function will descend into containers. op is the object to start the search
2405 * from. 2292 * from.
2406 */ 2293 */
2407void 2294static void
2408remove_unpaid_objects (object *op, object *env) 2295drop_unpaid_items (object *op, object *env)
2409{ 2296{
2410 object *next;
2411
2412 while (op) 2297 while (op)
2413 { 2298 {
2414 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2299 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2415 2300
2416 if (QUERY_FLAG (op, FLAG_UNPAID)) 2301 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2419 esrv_del_item (env->contr, op->count); 2304 esrv_del_item (env->contr, op->count);
2420 2305
2421 op->insert_at (env); 2306 op->insert_at (env);
2422 } 2307 }
2423 else if (op->inv) 2308 else if (op->inv)
2424 remove_unpaid_objects (op->inv, env); 2309 drop_unpaid_items (op->inv, env);
2425 2310
2426 op = next; 2311 op = next;
2427 } 2312 }
2313}
2314
2315void
2316object::drop_unpaid_items ()
2317{
2318 if (!flag [FLAG_REMOVED])
2319 ::drop_unpaid_items (inv, this);
2428} 2320}
2429 2321
2430/* 2322/*
2431 * Returns pointer a static string containing gravestone text 2323 * Returns pointer a static string containing gravestone text
2432 * Moved from apply.c to player.c - player.c is what 2324 * Moved from apply.c to player.c - player.c is what
… …
2482 int rate_grace = 2000; 2374 int rate_grace = 2000;
2483 const int max_hp = 1; 2375 const int max_hp = 1;
2484 const int max_sp = 1; 2376 const int max_sp = 1;
2485 const int max_grace = 1; 2377 const int max_grace = 1;
2486 2378
2487 if (op->contr->outputs_sync) 2379 if (op->contr->hidden)
2380 {
2381 op->invisible = 1000;
2382 /* the socket code flashes the player visible/invisible
2383 * depending on the value of invisible, so we need to
2384 * alternate it here for it to work correctly.
2385 */
2386 if (pticks & 2)
2387 op->invisible--;
2488 { 2388 }
2489 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2389 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2490 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2390 {
2491 flush_output_element (op, &op->contr->outputs[i]); 2391 if (!op->invisible--)
2392 {
2393 make_visible (op);
2394 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2395 }
2492 } 2396 }
2493 2397
2494 if (op->contr->ns->state == ST_PLAYING) 2398 if (op->contr->ns->state == ST_PLAYING)
2495 { 2399 {
2496 /* these next three if clauses make it possible to SLOW DOWN 2400 /* these next three if clauses make it possible to SLOW DOWN
… …
2515 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2419 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2516 else 2420 else
2517 { 2421 {
2518 gen_grace = op->stats.maxgrace; 2422 gen_grace = op->stats.maxgrace;
2519 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2423 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2520 }
2521
2522 /* Regenerate Spell Points */
2523 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2524 {
2525 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2526 if (op->stats.sp < op->stats.maxsp)
2527 {
2528 op->stats.sp++;
2529 /* dms do not consume food */
2530 if (!QUERY_FLAG (op, FLAG_WIZ))
2531 {
2532 op->stats.food--;
2533 if (op->contr->digestion < 0)
2534 op->stats.food += op->contr->digestion;
2535 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2536 op->stats.food = last_food;
2537 }
2538 }
2539
2540 if (max_sp > 1)
2541 {
2542 over_sp = (gen_sp + 10) / rate_sp;
2543 if (over_sp > 0)
2544 {
2545 if (op->stats.sp < op->stats.maxsp)
2546 {
2547 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2548
2549 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2550 op->stats.sp--;
2551
2552 if (op->stats.sp > op->stats.maxsp)
2553 op->stats.sp = op->stats.maxsp;
2554 }
2555 op->last_sp = 0;
2556 }
2557 else
2558 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2559 }
2560 else
2561 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2562 } 2424 }
2563 2425
2564 /* Regenerate Grace */ 2426 /* Regenerate Grace */
2565 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2427 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2566 if (--op->last_grace < 0) 2428 if (--op->last_grace < 0)
… …
2587 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2449 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2588 } 2450 }
2589 /* wearing stuff doesn't detract from grace generation. */ 2451 /* wearing stuff doesn't detract from grace generation. */
2590 } 2452 }
2591 2453
2454 if (op->stats.food > 0)
2455 {
2592 /* Regenerate Hit Points */ 2456 /* Regenerate Spell Points */
2593 if (--op->last_heal < 0) 2457 if (!op->contr->golem && --op->last_sp < 0)
2594 {
2595 if (op->stats.hp < op->stats.maxhp)
2596 { 2458 {
2597 op->stats.hp++; 2459 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2598 /* dms do not consume food */ 2460
2599 if (!QUERY_FLAG (op, FLAG_WIZ)) 2461 if (op->stats.sp < op->stats.maxsp)
2600 { 2462 {
2463 op->stats.sp++;
2464
2465 /* dms do not consume food */
2466 if (!QUERY_FLAG (op, FLAG_WIZ))
2467 {
2601 op->stats.food--; 2468 op->stats.food--;
2469
2602 if (op->contr->digestion < 0) 2470 if (op->contr->digestion < 0)
2603 op->stats.food += op->contr->digestion; 2471 op->stats.food += op->contr->digestion;
2604 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2472 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2605 op->stats.food = last_food; 2473 op->stats.food = last_food;
2474 }
2606 } 2475 }
2607 }
2608 2476
2609 if (max_hp > 1) 2477 if (max_sp > 1)
2610 {
2611 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2612 if (over_hp > 0)
2613 { 2478 {
2614 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2479 over_sp = (gen_sp + 10) / rate_sp;
2480 if (over_sp > 0)
2481 {
2482 if (op->stats.sp < op->stats.maxsp)
2483 {
2484 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2485
2486 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2487 op->stats.sp--;
2488
2489 if (op->stats.sp > op->stats.maxsp)
2490 op->stats.sp = op->stats.maxsp;
2491 }
2492
2615 op->last_heal = 0; 2493 op->last_sp = 0;
2494 }
2495 else
2496 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2616 } 2497 }
2617 else 2498 else
2499 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2500 }
2501
2502 /* Regenerate Hit Points */
2503 if (--op->last_heal < 0)
2504 {
2505 if (op->stats.hp < op->stats.maxhp)
2618 { 2506 {
2619 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2507 op->stats.hp++;
2508
2509 /* dms do not consume food */
2510 if (!QUERY_FLAG (op, FLAG_WIZ))
2511 {
2512 op->stats.food--;
2513
2514 if (op->contr->digestion < 0)
2515 op->stats.food += op->contr->digestion;
2516 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2517 op->stats.food = last_food;
2518 }
2620 } 2519 }
2520
2521 if (max_hp > 1)
2522 {
2523 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2524
2525 if (over_hp > 0)
2526 {
2527 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2528 op->last_heal = 0;
2529 }
2530 else
2531 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2621 } 2532 }
2622 else 2533 else
2623 {
2624 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2534 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2625 } 2535 }
2626 } 2536 }
2627 2537
2628 /* Digestion */ 2538 /* Digestion */
2629 if (--op->last_eat < 0) 2539 if (--op->last_eat < 0)
2630 { 2540 {
2631#ifdef COZY_SERVER 2541 int bonus = max (0, op->contr->digestion),
2632 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2542 penalty = max (0, -op->contr->digestion);
2633 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2634#else
2635 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2636#endif
2637 2543
2638 if (op->contr->gen_hp > 0)
2639 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2544 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2640 else
2641 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2642 2545
2643 /* dms do not consume food */ 2546 /* dms do not consume food */
2644 if (!QUERY_FLAG (op, FLAG_WIZ)) 2547 if (!QUERY_FLAG (op, FLAG_WIZ))
2645 op->stats.food--; 2548 op->stats.food--;
2646 } 2549 }
… …
2673 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2576 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2674 manual_apply (op, flesh, 0); 2577 manual_apply (op, flesh, 0);
2675 } 2578 }
2676 } 2579 }
2677 2580
2678 while (op->stats.food < 0 && op->stats.hp >= 0) 2581 if (op->stats.food < 0)
2679 op->stats.food++, op->stats.hp--; 2582 {
2583 op->stats.hp += op->stats.food;
2584 op->stats.food = 0;
2585 }
2680 2586
2681 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2587 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2682 kill_player (op); 2588 kill_player (op);
2683 } 2589 }
2684} 2590}
… …
2689 * file. 2595 * file.
2690 */ 2596 */
2691void 2597void
2692kill_player (object *op) 2598kill_player (object *op)
2693{ 2599{
2600 int x, y;
2694 char buf[MAX_BUF]; 2601 char buf[MAX_BUF];
2695 int x, y;
2696
2697 //int i;
2698 maptile *map; /* this is for resurrection */ 2602 maptile *map; /* this is for resurrection */
2699
2700 /* int z;
2701 int num_stats_lose;
2702 int lost_a_stat;
2703 int lose_this_stat;
2704 int this_stat; */
2705 int will_kill_again; 2603 int will_kill_again;
2706 archetype *at; 2604 archetype *at;
2707 object *tmp; 2605 object *tmp;
2708 2606
2709 if (save_life (op)) 2607 if (save_life (op))
2710 return; 2608 return;
2711
2712 2609
2713 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2610 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2714 * in cities ONLY!!! It is very important that this doesn't get abused. 2611 * in cities ONLY!!! It is very important that this doesn't get abused.
2715 * Look at op_on_battleground() for more info --AndreasV 2612 * Look at op_on_battleground() for more info --AndreasV
2716 */ 2613 */
… …
2732 { 2629 {
2733 tmp->destroy (); 2630 tmp->destroy ();
2734 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2631 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2735 } 2632 }
2736 2633
2737 cure_disease (op, 0); /* remove any disease */ 2634 cure_disease (op, 0, 0); /* remove any disease */
2738 op->stats.hp = op->stats.maxhp; 2635 op->stats.hp = op->stats.maxhp;
2739 if (op->stats.food <= 0) 2636 if (op->stats.food <= 0)
2740 op->stats.food = 999; 2637 op->stats.food = 999;
2741 2638
2742 /* create a bodypart-trophy to make the winner happy */ 2639 /* create a bodypart-trophy to make the winner happy */
2743 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2640 if (object *tmp = arch_to_object (archetype::find ("finger")))
2744 { 2641 {
2745 sprintf (buf, "%s's finger", &op->name); 2642 tmp->name = format ("%s's finger" , &op->name);
2746 tmp->name = buf; 2643 tmp->name_pl = format ("%s's fingers", &op->name);
2747 sprintf (buf, " This finger has been cut off %s\n" 2644 tmp->msg = format (
2748 " the %s, when he was defeated at\n level %d by %s.\n", 2645 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2749 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2646 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2750 tmp->msg = buf; 2647 );
2751 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2648 tmp->value = 0, tmp->type = 0;
2752 tmp->materialname = NULL; 2649 tmp->materialname = "organics";
2753 op->insert_at (tmp, op); 2650 tmp->insert_at (op, tmp);
2754 } 2651 }
2755 2652
2756 /* teleport defeated player to new destination */ 2653 /* teleport defeated player to new destination */
2757 transfer_ob (op, x, y, 0, NULL); 2654 transfer_ob (op, x, y, 0, NULL);
2758 op->contr->braced = 0; 2655 op->contr->braced = 0;
… …
2762 INVOKE_PLAYER (DEATH, op->contr); 2659 INVOKE_PLAYER (DEATH, op->contr);
2763 2660
2764 command_kill_pets (op, 0); 2661 command_kill_pets (op, 0);
2765 2662
2766 if (op->stats.food < 0) 2663 if (op->stats.food < 0)
2767 {
2768 if (op->contr->explore)
2769 {
2770 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2771 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2772 op->stats.food = 999;
2773 return;
2774 }
2775 sprintf (buf, "%s starved to death.", &op->name);
2776 strcpy (op->contr->killer, "starvation"); 2664 strcpy (op->contr->killer, "starvation");
2777 }
2778 else
2779 {
2780 if (op->contr->explore)
2781 {
2782 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2783 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2784 op->stats.hp = op->stats.maxhp;
2785 return;
2786 }
2787 sprintf (buf, "%s died.", &op->name);
2788 }
2789 2665
2790 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2666 op->contr->play_sound (sound_find ("player_dies"));
2791 2667
2792 /* save the map location for corpse, gravestone */ 2668 /* save the map location for corpse, gravestone */
2793 x = op->x; 2669 x = op->x;
2794 y = op->y; 2670 y = op->y;
2795 map = op->map; 2671 map = op->map;
… …
2958 { 2834 {
2959 tmp->destroy (); 2835 tmp->destroy ();
2960 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2836 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2961 } 2837 }
2962 2838
2963 cure_disease (op, 0); /* remove any disease */ 2839 cure_disease (op, 0, 0); /* remove any disease */
2964 2840
2965 /*add_exp(op, (op->stats.exp * -0.20)); */ 2841 /*add_exp(op, (op->stats.exp * -0.20)); */
2966 apply_death_exp_penalty (op); 2842 apply_death_exp_penalty (op);
2967 if (op->stats.food < 100) 2843 if (op->stats.food < 100)
2968 op->stats.food = 900; 2844 op->stats.food = 900;
2969 op->stats.hp = op->stats.maxhp; 2845 op->stats.hp = op->stats.maxhp;
2970 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2971 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2972 2848
2973 /* 2849 /*
2974 * Check to see if the player is in a shop. IF so, then check to see if
2975 * the player has any unpaid items. If so, remove them and put them back 2850 * Check to see if the player has any unpaid items. If so, remove them
2976 * in the map. 2851 * and put them back in the map.
2977 */ 2852 */
2978 2853 op->drop_unpaid_items ();
2979 if (is_in_shop (op))
2980 remove_unpaid_objects (op->inv, op);
2981 2854
2982 /****************************************/ 2855 /****************************************/
2983 /* */ 2856 /* */
2984 /* Move player to his current respawn- */ 2857 /* Move player to his current respawn- */
2985 /* position (usually last savebed) */ 2858 /* position (usually last savebed) */
2986 /* */ 2859 /* */
2987 /****************************************/ 2860 /****************************************/
2988 2861
2989 enter_player_savebed (op); 2862 enter_player_savebed (op);
2990 2863
2991 /* Save the player before inserting the force to reduce
2992 * chance of abuse.
2993 */
2994 op->contr->braced = 0; 2864 op->contr->braced = 0;
2995 op->contr->save ();
2996 2865
2997 /* it is possible that the player has blown something up 2866 /* it is possible that the player has blown something up
2998 * at his savebed location, and that can have long lasting 2867 * at his savebed location, and that can have long lasting
2999 * spell effects. So first see if there is a spell effect 2868 * spell effects. So first see if there is a spell effect
3000 * on the space that might harm the player. 2869 * on the space that might harm the player.
… …
3009 object *force; 2878 object *force;
3010 int at; 2879 int at;
3011 2880
3012 force = get_archetype (FORCE_NAME); 2881 force = get_archetype (FORCE_NAME);
3013 /* 50 ticks should be enough time for the spell to abate */ 2882 /* 50 ticks should be enough time for the spell to abate */
3014 force->speed = 0.1; 2883 force->speed = 0.1f;
3015 force->speed_left = -5.0; 2884 force->speed_left = -5.f;
3016 SET_FLAG (force, FLAG_APPLIED); 2885 SET_FLAG (force, FLAG_APPLIED);
3017 for (at = 0; at < NROFATTACKS; at++) 2886 for (at = 0; at < NROFATTACKS; at++)
3018 if (will_kill_again & (1 << at)) 2887 if (will_kill_again & (1 << at))
3019 force->resist[at] = 100; 2888 force->resist[at] = 100;
3020 2889
… …
3029void 2898void
3030loot_object (object *op) 2899loot_object (object *op)
3031{ /* Grab and destroy some treasure */ 2900{ /* Grab and destroy some treasure */
3032 object *tmp, *tmp2, *next; 2901 object *tmp, *tmp2, *next;
3033 2902
3034 if (op->container) 2903 op->close_container (); /* close open sack first */
3035 esrv_apply_container (op, op->container); /* close open sack first */
3036 2904
3037 for (tmp = op->inv; tmp; tmp = next) 2905 for (tmp = op->inv; tmp; tmp = next)
3038 { 2906 {
3039 next = tmp->below; 2907 next = tmp->below;
3040 2908
3041 if (tmp->invisible) 2909 if (tmp->invisible)
3042 continue; 2910 continue;
3043 2911
3044 tmp->remove (); 2912 tmp->remove ();
3045 tmp->x = op->x, tmp->y = op->y; 2913 tmp->x = op->x, tmp->y = op->y;
2914
3046 if (tmp->type == CONTAINER) 2915 if (tmp->type == CONTAINER)
3047 { /* empty container to ground */ 2916 loot_object (tmp); /* empty container to ground */
3048 loot_object (tmp); 2917
3049 }
3050 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2918 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3051 { 2919 {
3052 if (tmp->nrof > 1) 2920 if (tmp->nrof > 1)
3053 { 2921 {
3054 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2922 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3055 tmp2->destroy (); 2923 tmp2->destroy ();
… …
3066/* 2934/*
3067 * fix_weight(): Check recursively the weight of all players, and fix 2935 * fix_weight(): Check recursively the weight of all players, and fix
3068 * what needs to be fixed. Refresh windows and fix speed if anything 2936 * what needs to be fixed. Refresh windows and fix speed if anything
3069 * was changed. 2937 * was changed.
3070 */ 2938 */
3071
3072void 2939void
3073fix_weight (void) 2940fix_weight (void)
3074{ 2941{
3075 for_all_players (pl) 2942 for_all_players (pl)
3076 { 2943 {
… …
3131void 2998void
3132make_visible (object *op) 2999make_visible (object *op)
3133{ 3000{
3134 op->hide = 0; 3001 op->hide = 0;
3135 op->invisible = 0; 3002 op->invisible = 0;
3003
3136 if (op->type == PLAYER) 3004 if (op->type == PLAYER)
3137 { 3005 {
3138 op->contr->tmp_invis = 0; 3006 op->contr->tmp_invis = 0;
3139 op->contr->invis_race = 0; 3007 op->contr->invis_race = 0;
3140 } 3008 }
3009
3141 update_object (op, UP_OBJ_FACE); 3010 update_object (op, UP_OBJ_CHANGE);
3142} 3011}
3143 3012
3144int 3013int
3145is_true_undead (object *op) 3014is_true_undead (object *op)
3146{ 3015{
3147 object *tmp = NULL;
3148
3149 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3016 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3150 return 1; 3017 return 1;
3151 3018
3152 return 0; 3019 return 0;
3153} 3020}
3154 3021
3155/* look at the surrounding terrain to determine 3022/* look at the surrounding terrain to determine
3156 * the hideability of this object. Positive levels 3023 * the hideability of this object. Positive levels
3157 * indicate greater hideability. 3024 * indicate greater hideability.
3158 */ 3025 */
3159
3160int 3026int
3161hideability (object *ob) 3027hideability (object *ob)
3162{ 3028{
3163 int i, level = 0, mflag; 3029 int i, level = 0, mflag;
3164 sint16 x, y; 3030 sint16 x, y;
… …
3198/* For Hidden creatures - a chance of becoming 'unhidden' 3064/* For Hidden creatures - a chance of becoming 'unhidden'
3199 * every time they move - as we subtract off 'invisibility' 3065 * every time they move - as we subtract off 'invisibility'
3200 * AND, for players, if they move into a ridiculously unhideable 3066 * AND, for players, if they move into a ridiculously unhideable
3201 * spot (surrounded by clear terrain in broad daylight). -b.t. 3067 * spot (surrounded by clear terrain in broad daylight). -b.t.
3202 */ 3068 */
3203
3204void 3069void
3205do_hidden_move (object *op) 3070do_hidden_move (object *op)
3206{ 3071{
3207 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3072 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3208 object *skop; 3073 object *skop;
… …
3212 3077
3213 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3078 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3214 3079
3215 /* its *extremely* hard to run and sneak/hide at the same time! */ 3080 /* its *extremely* hard to run and sneak/hide at the same time! */
3216 if (op->type == PLAYER && op->contr->run_on) 3081 if (op->type == PLAYER && op->contr->run_on)
3217 {
3218 if (!skop || num >= skop->level) 3082 if (!skop || num >= skop->level)
3219 { 3083 {
3220 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3084 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3221 make_visible (op); 3085 make_visible (op);
3222 return; 3086 return;
3223 } 3087 }
3224 else 3088 else
3225 num += 20; 3089 num += 20;
3226 } 3090
3227 num += op->map->difficulty; 3091 num += op->map->difficulty;
3228 hide = hideability (op); /* modify by terrain hidden level */ 3092 hide = hideability (op); /* modify by terrain hidden level */
3229 num -= hide; 3093 num -= hide;
3094
3230 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3095 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3231 { 3096 {
3232 make_visible (op); 3097 make_visible (op);
3233 if (op->type == PLAYER) 3098 if (op->type == PLAYER)
3234 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3099 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3235 } 3100 }
3236 else if (op->type == PLAYER && skop) 3101 else if (op->type == PLAYER && skop)
3237 {
3238 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3102 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3239 }
3240} 3103}
3241 3104
3242/* determine if who is standing near a hostile creature. */ 3105/* determine if who is standing near a hostile creature. */
3243 3106
3244int 3107int
… …
3292 * object op. This function works fine for monsters, 3155 * object op. This function works fine for monsters,
3293 * but we dont worry if the object isnt the top one in 3156 * but we dont worry if the object isnt the top one in
3294 * a pile (say a coin under a table would return "viewable" 3157 * a pile (say a coin under a table would return "viewable"
3295 * by this routine). Another question, should we be 3158 * by this routine). Another question, should we be
3296 * concerned with the direction the player is looking 3159 * concerned with the direction the player is looking
3297 * in? Realistically, most of use cant see stuff behind 3160 * in? Realistically, most of us can't see stuff behind
3298 * our backs...on the other hand, does the "facing" direction 3161 * our backs...on the other hand, does the "facing" direction
3299 * imply the way your head, or body is facing? Its possible 3162 * imply the way your head, or body is facing? It's possible
3300 * for them to differ. Sigh, this fctn could get a bit more complex. 3163 * for them to differ. Sigh, this fctn could get a bit more complex.
3301 * -b.t. 3164 * -b.t.
3302 * This function is now map tiling safe. 3165 * This function is now map tiling safe.
3303 */ 3166 */
3304
3305int 3167int
3306player_can_view (object *pl, object *op) 3168player_can_view (object *pl, object *op)
3307{ 3169{
3308 rv_vector rv; 3170 rv_vector rv;
3309 int dx, dy; 3171 int dx, dy;
… …
3311 if (pl->type != PLAYER) 3173 if (pl->type != PLAYER)
3312 { 3174 {
3313 LOG (llevError, "player_can_view() called for non-player object\n"); 3175 LOG (llevError, "player_can_view() called for non-player object\n");
3314 return -1; 3176 return -1;
3315 } 3177 }
3178
3316 if (!pl || !op) 3179 if (!pl || !op)
3317 return 0; 3180 return 0;
3318 3181
3319 if (op->head)
3320 {
3321 op = op->head; 3182 op = op->head_ ();
3322 } 3183
3323 get_rangevector (pl, op, &rv, 0x1); 3184 get_rangevector (pl, op, &rv, 0x1);
3324 3185
3325 /* starting with the 'head' part, lets loop 3186 /* starting with the 'head' part, lets loop
3326 * through the object and find if it has any 3187 * through the object and find if it has any
3327 * part that is in the los array but isnt on 3188 * part that is in the los array but isn't on
3328 * a blocked los square. 3189 * a blocked los square.
3329 * we use the archetype to figure out offsets. 3190 * we use the archetype to figure out offsets.
3330 */ 3191 */
3331 while (op) 3192 while (op)
3332 { 3193 {
3333 dx = rv.distance_x + op->arch->clone.x; 3194 dx = rv.distance_x + op->arch->x;
3334 dy = rv.distance_y + op->arch->clone.y; 3195 dy = rv.distance_y + op->arch->y;
3335 3196
3336 /* only the viewable area the player sees is updated by LOS 3197 /* only the viewable area the player sees is updated by LOS
3337 * code, so we need to restrict ourselves to that range of values 3198 * code, so we need to restrict ourselves to that range of values
3338 * for any meaningful values. 3199 * for any meaningful values.
3339 */ 3200 */
3340 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3201 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3341 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3202 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3342 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)]) 3203 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3343 return 1; 3204 return 1;
3205
3344 op = op->more; 3206 op = op->more;
3345 } 3207 }
3208
3346 return 0; 3209 return 0;
3347} 3210}
3348 3211
3349/* routine for both players and monsters. We call this when 3212/* routine for both players and monsters. We call this when
3350 * there is a possibility for our action distrubing our hiding 3213 * there is a possibility for our action distrubing our hiding
… …
3353 * return 0. 3216 * return 0.
3354 */ 3217 */
3355int 3218int
3356action_makes_visible (object *op) 3219action_makes_visible (object *op)
3357{ 3220{
3358
3359 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3221 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3360 { 3222 {
3361 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3223 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3362 return 0; 3224 return 0;
3363 3225
… …
3369 { 3231 {
3370 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3232 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3371 return 1; 3233 return 1;
3372 } 3234 }
3373 } 3235 }
3236
3374 return 0; 3237 return 0;
3375} 3238}
3376 3239
3377/* op_on_battleground - checks if the given object op (usually 3240/* op_on_battleground - checks if the given object op (usually
3378 * a player) is standing on a valid battleground-tile, 3241 * a player) is standing on a valid battleground-tile,
… …
3383 * Default is to do the same as before, so only people wanting to have different points need worry about this 3246 * Default is to do the same as before, so only people wanting to have different points need worry about this
3384 */ 3247 */
3385int 3248int
3386op_on_battleground (object *op, int *x, int *y) 3249op_on_battleground (object *op, int *x, int *y)
3387{ 3250{
3388 object *tmp;
3389
3390 /* A battleground-tile needs the following attributes to be valid: 3251 /* A battleground-tile needs the following attributes to be valid:
3391 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3252 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3392 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3253 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3393 * and the exit-coordinates sp/hp must both be > 0. 3254 * and the exit-coordinates sp/hp must both be > 0.
3394 * => The intention here is to prevent abuse of the battleground- 3255 * => The intention here is to prevent abuse of the battleground-
3395 * feature (like pickable or hidden battleground tiles). */ 3256 * feature (like pickable or hidden battleground tiles). */
3396 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3257 for (object *tmp = op->below; tmp; tmp = tmp->below)
3397 { 3258 {
3398 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3259 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3399 { 3260 {
3400 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3261 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3401 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3262 && tmp->type == BATTLEGROUND
3263 && tmp->name == shstr_battleground
3264 && EXIT_X (tmp) && EXIT_Y (tmp))
3402 { 3265 {
3403 /*before we assign the exit, check if this is a teambattle */ 3266 /* before we assign the exit, check if this is a teambattle */
3404 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3267 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3405 { 3268 {
3406 object *invtmp;
3407
3408 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3269 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3409 { 3270 {
3410 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3271 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3411 { 3272 {
3412 if (x != NULL && y != NULL) 3273 if (x && y)
3413 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3274 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3275
3414 return 1; 3276 return 1;
3415 } 3277 }
3416 } 3278 }
3417 } 3279 }
3280
3418 if (x != NULL && y != NULL) 3281 if (x && y)
3419 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3282 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3283
3420 return 1; 3284 return 1;
3421 } 3285 }
3422 } 3286 }
3423 } 3287 }
3288
3424 /* If we got here, did not find a battleground */ 3289 /* If we got here, did not find a battleground */
3425 return 0; 3290 return 0;
3426} 3291}
3427 3292
3428/* 3293/*
… …
3444 char buf[MAX_BUF]; /* tmp. string buffer */ 3309 char buf[MAX_BUF]; /* tmp. string buffer */
3445 int i = 0, j = 0; 3310 int i = 0, j = 0;
3446 3311
3447 /* get the appropriate treasurelist */ 3312 /* get the appropriate treasurelist */
3448 if (atnr == ATNR_FIRE) 3313 if (atnr == ATNR_FIRE)
3449 trlist = find_treasurelist ("dragon_ability_fire"); 3314 trlist = treasurelist::find (shstr_dragon_ability_fire);
3450 else if (atnr == ATNR_COLD) 3315 else if (atnr == ATNR_COLD)
3451 trlist = find_treasurelist ("dragon_ability_cold"); 3316 trlist = treasurelist::find (shstr_dragon_ability_cold);
3452 else if (atnr == ATNR_ELECTRICITY) 3317 else if (atnr == ATNR_ELECTRICITY)
3453 trlist = find_treasurelist ("dragon_ability_elec"); 3318 trlist = treasurelist::find (shstr_dragon_ability_elec);
3454 else if (atnr == ATNR_POISON) 3319 else if (atnr == ATNR_POISON)
3455 trlist = find_treasurelist ("dragon_ability_poison"); 3320 trlist = treasurelist::find (shstr_dragon_ability_poison);
3456 3321
3457 if (trlist == NULL || who->type != PLAYER) 3322 if (trlist == NULL || who->type != PLAYER)
3458 return; 3323 return;
3459 3324
3460 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3325 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3461 3326
3462 if (tr == NULL || tr->item == NULL) 3327 if (!tr || !tr->item)
3463 { 3328 {
3464 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3329 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3465 return; 3330 return;
3466 } 3331 }
3467 3332
3468 /* everything seems okay - now bring on the gift: */ 3333 /* everything seems okay - now bring on the gift: */
3469 item = &(tr->item->clone); 3334 item = tr->item;
3470 3335
3471 if (item->type == SPELL) 3336 if (item->type == SPELL)
3472 { 3337 {
3473 if (check_spell_known (who, item->name)) 3338 if (check_spell_known (who, item->name))
3474 return; 3339 return;
… …
3533 { 3398 {
3534 /* forces in the treasurelist can alter the player's stats */ 3399 /* forces in the treasurelist can alter the player's stats */
3535 object *skin; 3400 object *skin;
3536 3401
3537 /* first get the dragon skin force */ 3402 /* first get the dragon skin force */
3538 shstr_cmp dragon_skin_force ("dragon_skin_force");
3539 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3403 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3540 ; 3404 ;
3541 3405
3542 if (!skin) 3406 if (!skin)
3543 return; 3407 return;
3544 3408
… …
3592 * not readied. 3456 * not readied.
3593 */ 3457 */
3594void 3458void
3595player_unready_range_ob (player *pl, object *ob) 3459player_unready_range_ob (player *pl, object *ob)
3596{ 3460{
3597 rangetype i; 3461 if (pl->ob->current_weapon == ob)
3462 pl->ob->current_weapon = 0;
3598 3463
3599 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3464 if (pl->combat_ob == ob)
3600 { 3465 pl->combat_ob = 0;
3466
3601 if (pl->ranges[i] == ob) 3467 if (pl->ranged_ob == ob)
3602 { 3468 pl->ranged_ob = 0;
3603 pl->ranges[i] = NULL;
3604 if (pl->shoottype == i)
3605 {
3606 pl->shoottype = range_none;
3607 }
3608 }
3609 }
3610} 3469}
3470
3471sint8
3472player::visibility_at (maptile *map, int x, int y) const
3473{
3474 if (!ns)
3475 return 0;
3476
3477 int dx, dy;
3478 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3479 return 0;
3480
3481 x += dx - ns->current_x + ns->mapx / 2;
3482 y += dy - ns->current_y + ns->mapy / 2;
3483
3484 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3485 return 0;
3486
3487 return 100 - blocked_los [x][y];
3488}
3489
3490void
3491player::infobox (const char *title, const char *msg, int color)
3492{
3493 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3494}
3495
3496void
3497player::statusmsg (const char *msg, int color)
3498{
3499 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3500}
3501
3502void
3503player::failmsg (const char *msg, int color)
3504{
3505 play_sound (sound_find ("generic_failure"));
3506 statusmsg (msg, color);
3507}
3508

Diff Legend

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