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.64 by root, Tue Dec 26 03:35:59 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 update_ob_speed (ob);
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 364
321 disconnect ();
322
323 terminate_all_pets (ob);
324
325 if (first_player != this)
326 {
327 player *prev = first_player;
328
329 while (prev && prev->next && prev->next != this)
330 prev = prev->next;
331
332 if (prev->next != this)
333 {
334 LOG (llevError, "Free_player: Can't find previous player.\n");
335 abort ();
336 }
337
338 prev->next = next;
339 }
340 else
341 first_player = next;
342
343 if (ob) 365 if (ob)
366 {
344 ob->destroy (true); 367 ob->destroy_inv (false);
345
346 if (ns)
347 {
348 client *ns = this->ns;
349 ns->send_packet ("goodbye");
350 ns->flush ();
351 ns->pl = 0;
352 this->ns = 0;
353 ns->destroy (); 368 ob->destroy ();
354 } 369 }
370
371 ob = observe = 0;
355} 372}
356 373
357player::~player () 374player::~player ()
358{ 375{
359 /* Clear item stack */ 376 /* Clear item stack */
… …
368player::create () 385player::create ()
369{ 386{
370 player *pl = new player; 387 player *pl = new player;
371 388
372 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);
373 396
374 return pl; 397 return pl;
375} 398}
376 399
377/* 400/*
… …
380 * Note: there MUST be at least one player archetype! 403 * Note: there MUST be at least one player archetype!
381 */ 404 */
382archetype * 405archetype *
383get_player_archetype (archetype *at) 406get_player_archetype (archetype *at)
384{ 407{
385 archetype *start = at; 408 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
386 409
387 for (;;) 410 for (;;)
388 { 411 {
389 if (at == NULL || at->next == NULL) 412 if (++i == archetypes.end ())
390 at = first_archetype; 413 i = archetypes.begin ();
391 else 414 else if (*i == at)
392 at = at->next; 415 cleanup ("not a single player archetype found");
393 416
394 if (at->clone.type == PLAYER) 417 if ((*i)->type == PLAYER)
395 return at; 418 return *i;
396
397 if (at == start)
398 {
399 LOG (llevError, "No Player archetypes\n");
400 exit (-1);
401 }
402 } 419 }
403} 420}
404 421
405object * 422object *
406get_nearest_player (object *mon) 423get_nearest_player (object *mon)
… …
408 object *op = NULL; 425 object *op = NULL;
409 objectlink *ol; 426 objectlink *ol;
410 unsigned lastdist; 427 unsigned lastdist;
411 rv_vector rv; 428 rv_vector rv;
412 429
413 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 430 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
414 { 431 {
415 /* We should not find free objects on this friendly list, but it
416 * does periodically happen. Given that, lets deal with it.
417 * While unlikely, it is possible the next object on the friendly
418 * list is also free, so encapsulate this in a while loop.
419 */
420 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
421 {
422 object *tmp = ol->ob;
423
424 /* Can't do much more other than log the fact, because the object
425 * itself will have been cleared.
426 */
427 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
428 ol = ol->next;
429 remove_friendly_object (tmp);
430 if (!ol)
431 return op;
432 }
433
434 /* Remove special check for player from this. First, it looks to cause
435 * some crashes (ol->ob->contr not set properly?), but secondly, a more
436 * complicated method of state checking would be needed in any case -
437 * as it was, a clever player could type quit, and the function would
438 * skip them over while waiting for confirmation. Remove
439 * on_same_map check, as can_detect_enemy also does this
440 */
441 if (!can_detect_enemy (mon, ol->ob, &rv)) 432 if (!can_detect_enemy (mon, ol->ob, &rv))
442 continue; 433 continue;
443 434
444 if (lastdist > rv.distance) 435 if (lastdist > rv.distance)
445 { 436 {
… …
521 x = mon->x; 512 x = mon->x;
522 y = mon->y; 513 y = mon->y;
523 m = mon->map; 514 m = mon->map;
524 dir = rv.direction; 515 dir = rv.direction;
525 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 */
526 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
527 /* 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. */
528 if (diff > max) 520 if (diff > max)
529 return 0; 521 return 0;
522
530 while (diff > 1 && max > 0) 523 while (diff > 1 && max > 0)
531 { 524 {
532 lastx = x; 525 lastx = x;
533 lasty = y; 526 lasty = y;
534 lastmap = m; 527 lastmap = m;
… …
616 max--; 609 max--;
617 lastdir = dir; 610 lastdir = dir;
618 if (!firstdir) 611 if (!firstdir)
619 firstdir = dir; 612 firstdir = dir;
620 } 613 }
614
621 if (diff <= 1) 615 if (diff <= 1)
622 { 616 {
623 /* Recalculate diff (distance) because we may not have actually 617 /* Recalculate diff (distance) because we may not have actually
624 * headed toward player for entire distance. 618 * headed toward player for entire distance.
625 */ 619 */
626 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 620 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
627 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));
628 } 622 }
623
629 if (diff > max) 624 if (diff > max)
630 return 0; 625 return 0;
631 } 626 }
627
632 /* 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 */
633 if (!max) 629 if (!max)
634 return 0; 630 return 0;
635 631
636 return firstdir; 632 return firstdir;
… …
750roll_stat (void) 746roll_stat (void)
751{ 747{
752 int a[4], i, j, k; 748 int a[4], i, j, k;
753 749
754 for (i = 0; i < 4; i++) 750 for (i = 0; i < 4; i++)
755 a[i] = (int) RANDOM () % 6 + 1; 751 a[i] = (int) rndm (6) + 1;
756 752
757 for (i = 0, j = 0, k = 7; i < 4; i++) 753 for (i = 0, j = 0, k = 7; i < 4; i++)
758 if (a[i] < k) 754 if (a[i] < k)
759 k = a[i], j = i; 755 k = a[i], j = i;
760 756
… …
766} 762}
767 763
768void 764void
769object::roll_stats () 765object::roll_stats ()
770{ 766{
771 int statsort [7]; 767 int statsort [NUM_STATS];
772 768
773 for (;;) 769 for (;;)
774 { 770 {
775 int sum = 0; 771 int sum = 0;
776 for (int i = 7; i--; ) 772 for (int i = NUM_STATS; i--; )
777 sum += statsort [i] = roll_stat (); 773 sum += statsort [i] = roll_stat ();
778 774
779 if (sum >= 82 && sum <= 116) 775 if (sum >= 82 && sum <= 116)
780 break; 776 break;
781 } 777 }
782 778
783 // Sort the stats so that rerolling is easier... 779 // Sort the stats so that rerolling is easier...
784 std::sort (statsort, statsort + 7, std::greater<int>()); 780 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
785 781
782 for (int i = 0; i < NUM_STATS; ++i)
786 stats.Str = statsort[0]; 783 stats.stat (i) = statsort [i];
787 stats.Dex = statsort[1];
788 stats.Con = statsort[2];
789 stats.Int = statsort[3];
790 stats.Wis = statsort[4];
791 stats.Pow = statsort[5];
792 stats.Cha = statsort[6];
793 784
794 stats.exp = 0; 785 stats.exp = 0;
795 stats.ac = 0; 786 stats.ac = 0;
796 787
797 stats.hp = stats.maxhp; 788 stats.hp = stats.maxhp;
… …
809} 800}
810 801
811void 802void
812object::swap_stats (int a, int b) 803object::swap_stats (int a, int b)
813{ 804{
814 int tmp = get_attr_value (&contr->orig_stats, a); 805 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
815 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
816 set_attr_value (&contr->orig_stats, b, tmp);
817 806
807 for (int i = 0; i < NUM_STATS; ++i)
818 stats.Str = contr->orig_stats.Str; 808 stats.stat (i) = contr->orig_stats.stat (i);
819 stats.Dex = contr->orig_stats.Dex;
820 stats.Con = contr->orig_stats.Con;
821 stats.Int = contr->orig_stats.Int;
822 stats.Wis = contr->orig_stats.Wis;
823 stats.Pow = contr->orig_stats.Pow;
824 stats.Cha = contr->orig_stats.Cha;
825 809
826 //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,
827 // be merged with the similar code in roll_stats 811 // be merged with the similar code in roll_stats
828 stats.ac = 0; 812 stats.ac = 0;
829 813
… …
841 contr->levsp[1] = 6; 825 contr->levsp[1] = 6;
842 contr->levgrace[1] = 3; 826 contr->levgrace[1] = 3;
843 827
844 contr->orig_stats = stats; 828 contr->orig_stats = stats;
845 } 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, " ");
846} 841}
847 842
848/* This function takes the key that is passed, and does the 843/* This function takes the key that is passed, and does the
849 * appropriate action with it (change race, or other things). 844 * appropriate action with it (change race, or other things).
850 * The function name is for historical reasons - now we have 845 * The function name is for historical reasons - now we have
851 * separate race and class; this actually changes the RACE, 846 * separate race and class; this actually changes the RACE,
852 * not the class. 847 * not the class.
853 */ 848 */
854int 849void
855key_change_class (object *op, char key) 850player::chargen_race_done ()
856{ 851{
857 int tmp_loop;
858
859 if (key == 'd' || key == 'D')
860 {
861 char buf[MAX_BUF];
862
863 /* this must before then initial items are given */ 852 /* this must before then initial items are given */
864 esrv_new_player (op->contr, op->weight + op->carrying); 853 esrv_new_player (ob->contr, ob->weight + ob->carrying);
865 854
866 treasurelist *tl = find_treasurelist ("starting_wealth"); 855 treasurelist *tl = treasurelist::find ("starting_wealth");
867 if (tl) 856 if (tl)
868 create_treasure (tl, op, 0, 0, 0); 857 create_treasure (tl, ob, 0, 0, 0);
869 858
870 INVOKE_PLAYER (BIRTH, op->contr); 859 INVOKE_PLAYER (BIRTH, ob->contr);
871 INVOKE_PLAYER (LOGIN, op->contr); 860 INVOKE_PLAYER (LOGIN, ob->contr);
872 861
873 op->contr->ns->state = ST_PLAYING; 862 ob->contr->ns->state = ST_PLAYING;
874 863
875 if (op->msg) 864 if (ob->msg)
876 op->msg = NULL; 865 ob->msg = 0;
877 866
878 /* 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
879 * to save here. 868 * to save here.
880 */ 869 */
870 {
871 char buf[MAX_BUF];
881 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 872 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
882 make_path_to_file (buf); 873 make_path_to_file (buf);
874 }
883 875
884#ifdef AUTOSAVE
885 op->contr->last_save_tick = pticks;
886#endif
887 start_info (op); 876 start_info (ob);
888 CLEAR_FLAG (op, FLAG_WIZ); 877 CLEAR_FLAG (ob, FLAG_WIZ);
889 give_initial_items (op, op->randomitems); 878 give_initial_items (ob, ob->randomitems);
890 link_player_skills (op); 879 link_player_skills (ob);
891 esrv_send_inventory (op, op); 880 esrv_send_inventory (ob, ob);
892 op->update_stats (); 881 ob->update_stats ();
893 882
894 /* This moves the player to a different start map, if there 883 /* This moves the player to a different start map, if there
895 * is one for this race 884 * is one for this race
896 */ 885 */
897 if (*first_map_ext_path) 886 if (*first_map_ext_path)
898 { 887 {
899 object *tmp; 888 object *tmp;
900 char mapname[MAX_BUF]; 889 char mapname[MAX_BUF];
901 890
902 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);
903 tmp = object::create (); 892 tmp = object::create ();
904 EXIT_PATH (tmp) = mapname; 893 EXIT_PATH (tmp) = mapname;
905 EXIT_X (tmp) = op->x; 894 EXIT_X (tmp) = ob->x;
906 EXIT_Y (tmp) = op->y; 895 EXIT_Y (tmp) = ob->y;
907 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;
908 * if the map isn't there, then stay on the 897 * if the map isn't there, then stay on the
909 * default initial map */ 898 * default initial map */
910 tmp->destroy (); 899 tmp->destroy ();
911 } 900 }
912 else 901 else
913 LOG (llevDebug, "first_map_ext_path not set\n"); 902 LOG (llevDebug, "first_map_ext_path not set\n");
903}
914 904
915 return 0; 905void
916 } 906player::chargen_race_next ()
917 907{
918 /* Following actually changes the race - this is the default command 908 /* Following actually changes the race - this is the default command
919 * if we don't match with one of the options above. 909 * if we don't match with one of the options above.
920 */ 910 */
921 911
922 tmp_loop = 0; 912 do
923 while (!tmp_loop)
924 { 913 {
925 shstr name = op->name; 914 shstr name = ob->name;
926 int x = op->x, y = op->y; 915 int x = ob->x, y = ob->y;
927 916
928 op->remove_statbonus (); 917 ob->remove_statbonus ();
929 op->remove (); 918 ob->remove ();
930 op->arch = get_player_archetype (op->arch); 919 ob->arch = get_player_archetype (ob->arch);
931 op->arch->clone.copy_to (op); 920 ob->arch->copy_to (ob);
932 op->instantiate (); 921 ob->instantiate ();
933 op->stats = op->contr->orig_stats; 922 ob->stats = ob->contr->orig_stats;
934 op->name = op->name_pl = name; 923 ob->name = ob->name_pl = name;
935 op->x = x; 924 ob->x = x;
936 op->y = y; 925 ob->y = y;
937 SET_ANIMATION (op, 2); /* So player faces south */ 926 SET_ANIMATION (ob, 2); /* So player faces south */
938 insert_ob_in_map (op, op->map, op, 0); 927 insert_ob_in_map (ob, ob->map, ob, 0);
939 assign (op->contr->title, op->arch->clone.name); 928 assign (ob->contr->title, ob->arch->object::name);
940 op->add_statbonus (); 929 ob->add_statbonus ();
941 tmp_loop = allowed_class (op);
942 } 930 }
931 while (!allowed_class (ob));
943 932
944 update_object (op, UP_OBJ_FACE); 933 update_object (ob, UP_OBJ_FACE);
945 esrv_update_item (UPD_FACE, op, op); 934 esrv_update_item (UPD_FACE, ob, ob);
946 op->update_stats (); 935 ob->update_stats ();
947 op->stats.hp = op->stats.maxhp; 936 ob->stats.hp = ob->stats.maxhp;
948 op->stats.sp = op->stats.maxsp; 937 ob->stats.sp = ob->stats.maxsp;
949 op->stats.grace = 0; 938 ob->stats.grace = 0;
950
951 if (op->msg)
952 new_draw_info (NDI_BLUE, 0, op, op->msg);
953
954 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
955 return 0;
956}
957
958int
959key_confirm_quit (object *op, char key)
960{
961 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
962 {
963 op->contr->ns->state = ST_PLAYING;
964 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
965 return 1;
966 }
967
968 INVOKE_PLAYER (LOGOUT, op->contr);
969 INVOKE_PLAYER (QUIT, op->contr);
970
971 terminate_all_pets (op);
972 leave_map (op);
973 op->direction = 0;
974 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
975
976 strcpy (op->contr->killer, "quit");
977 check_score (op);
978 op->contr->party = 0;
979 op->contr->own_title[0] = '\0';
980
981 object_ptr ob = op;
982
983 delete ob->contr;
984
985 /* We need to hunt for any per player unique maps in memory and
986 * get rid of them. The trailing slash in the path is intentional,
987 * so that players named 'Ab' won't match against players 'Abe' pathname
988 */
989 char buf[MAX_BUF];
990 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
991
992 for (maptile *next, *mp = first_map; mp; mp = next)
993 {
994 next = mp->next;
995
996 if (!strncmp (mp->path, buf, strlen (buf)))
997 delete_map (mp);
998 }
999
1000 delete_character (ob->name, 1);
1001
1002 return 1;
1003} 939}
1004 940
1005void 941void
1006flee_player (object *op) 942flee_player (object *op)
1007{ 943{
… …
1054 /* Cornered, get rid of scared */ 990 /* Cornered, get rid of scared */
1055 CLEAR_FLAG (op, FLAG_SCARED); 991 CLEAR_FLAG (op, FLAG_SCARED);
1056 op->enemy = NULL; 992 op->enemy = NULL;
1057} 993}
1058 994
1059
1060/* 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.
1061 * 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
1062 * stop. 997 * stop.
1063 */ 998 */
1064int 999int
1065check_pick (object *op) 1000check_pick (object *op)
1066{ 1001{
1067 object *tmp, *next; 1002 object *tmp, *next;
1068 int stop = 0; 1003 int stop = 0;
1069 int j, k, wvratio; 1004 int wvratio;
1070 char putstring[128], tmpstr[16]; 1005 char putstring[128];
1071 1006
1072 /* if you're flying, you cna't pick up anything */ 1007 /* if you're flying, you cna't pick up anything */
1073 if (op->move_type & MOVE_FLYING) 1008 if (op->move_type & MOVE_FLYING)
1074 return 1; 1009 return 1;
1075 1010
… …
1143 if (tmp->name != NULL) 1078 if (tmp->name != NULL)
1144 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1079 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1145 &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))));
1146 else 1081 else
1147 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1082 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1148 &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))));
1149 1084
1150 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1085 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1151 } 1086 }
1152 1087
1153 /* philosophy: 1088 /* philosophy:
… …
1228 pick_up (op, tmp); 1163 pick_up (op, tmp);
1229 continue; 1164 continue;
1230 } 1165 }
1231 1166
1232 if (op->contr->mode & PU_READABLES) 1167 if (op->contr->mode & PU_READABLES)
1233 if (tmp->type == BOOK || tmp->type == SCROLL) 1168 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1234 { 1169 {
1235 pick_up (op, tmp); 1170 pick_up (op, tmp);
1236 continue; 1171 continue;
1237 } 1172 }
1238 1173
… …
1346 /* careful: chairs and tables are weapons! */ 1281 /* careful: chairs and tables are weapons! */
1347 if (op->contr->mode & PU_ALLWEAPON) 1282 if (op->contr->mode & PU_ALLWEAPON)
1348 { 1283 {
1349 if (tmp->type == WEAPON && tmp->name != NULL) 1284 if (tmp->type == WEAPON && tmp->name != NULL)
1350 { 1285 {
1351 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 &&
1352 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1287 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1353 { 1288 {
1354 pick_up (op, tmp); 1289 pick_up (op, tmp);
1355 continue; 1290 continue;
1356 } 1291 }
1357 } 1292 }
1358 1293
1359 if (tmp->type == WEAPON && tmp->name == NULL) 1294 if (tmp->type == WEAPON && tmp->name == NULL)
1360 { 1295 {
1361 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)
1362 { 1297 {
1363 pick_up (op, tmp); 1298 pick_up (op, tmp);
1364 continue; 1299 continue;
1365 } 1300 }
1366 } 1301 }
… …
1391 if (tmp->name != NULL) 1326 if (tmp->name != NULL)
1392 { 1327 {
1393 fprintf (stderr, "%s", tmp->name); 1328 fprintf (stderr, "%s", tmp->name);
1394 } 1329 }
1395 else 1330 else
1396 fprintf (stderr, "%s", tmp->arch->name); 1331 fprintf (stderr, "%s", tmp->arch->archname);
1397 fprintf (stderr, ",%d] = ", tmp->type); 1332 fprintf (stderr, ",%d] = ", tmp->type);
1398 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))));
1399#endif 1334#endif
1400 continue; 1335 continue;
1401 } 1336 }
… …
1412 * found object is returned. 1347 * found object is returned.
1413 */ 1348 */
1414object * 1349object *
1415find_arrow (object *op, const char *type) 1350find_arrow (object *op, const char *type)
1416{ 1351{
1417 object *tmp = NULL; 1352 object *tmp = 0;
1418 1353
1419 for (op = op->inv; op; op = op->below) 1354 for (op = op->inv; op; op = op->below)
1420 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))
1421 tmp = find_arrow (op, type); 1356 tmp = find_arrow (splay (op), type);
1422 else if (op->type == ARROW && op->race == type) 1357 else if (op->type == ARROW && op->race == type)
1423 return op; 1358 return splay (op);
1359
1424 return tmp; 1360 return tmp;
1425} 1361}
1426 1362
1427/* 1363/*
1428 * 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
1429 * 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
1430 * 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
1431 * 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.
1432 */ 1368 */
1433
1434object * 1369object *
1435find_better_arrow (object *op, object *target, const char *type, int *better) 1370find_better_arrow (object *op, object *target, const char *type, int *better)
1436{ 1371{
1437 object *tmp = NULL, *arrow, *ntmp; 1372 object *tmp = NULL, *arrow, *ntmp;
1438 int attacknum, attacktype, betterby = 0, i; 1373 int attacknum, attacktype, betterby = 0, i;
… …
1471 else 1406 else
1472 { 1407 {
1473 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1408 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1474 { 1409 {
1475 attacktype = 1 << attacknum; 1410 attacktype = 1 << attacknum;
1476 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1411 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1477 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)
1478 { 1413 {
1479 tmp = arrow; 1414 tmp = arrow;
1480 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;
1481 } 1416 }
1482 } 1417 }
1483 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1418 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1484 { 1419 {
1485 tmp = arrow; 1420 tmp = arrow;
… …
1504 * find_better_arrow to find a decent arrow to use. 1439 * find_better_arrow to find a decent arrow to use.
1505 * op = the shooter 1440 * op = the shooter
1506 * type = bow->race 1441 * type = bow->race
1507 * dir = fire direction 1442 * dir = fire direction
1508 */ 1443 */
1509
1510object * 1444object *
1511pick_arrow_target (object *op, const char *type, int dir) 1445pick_arrow_target (object *op, const char *type, int dir)
1512{ 1446{
1513 object *tmp = NULL; 1447 object *tmp = NULL;
1514 maptile *m; 1448 maptile *m;
… …
1579 */ 1513 */
1580int 1514int
1581fire_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)
1582{ 1516{
1583 object *left, *bow; 1517 object *left, *bow;
1584 int bowspeed, mflags; 1518 int mflags;
1585 maptile *m; 1519 maptile *m;
1586 1520
1587 if (!dir) 1521 if (!dir)
1588 { 1522 {
1589 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!");
1590 return 0; 1524 return 0;
1591 } 1525 }
1592 1526
1593 if (op->type == PLAYER) 1527 if (op->contr)
1594 bow = op->contr->ranges[range_bow]; 1528 bow = op->current_weapon;
1595 else 1529 else
1596 { 1530 {
1597 for (bow = op->inv; bow; bow = bow->below) 1531 for (bow = op->inv; bow; bow = bow->below)
1598 /* 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
1599 * 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.
… …
1604 if (!bow) 1538 if (!bow)
1605 { 1539 {
1606 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1540 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1607 return 0; 1541 return 0;
1608 } 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
1609 } 1551 }
1610 1552
1611 if (!bow->race || !bow->skill) 1553 if (!bow->race || !bow->skill)
1612 { 1554 {
1613 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);
1614 return 0; 1556 return 0;
1615 } 1557 }
1616
1617 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1618
1619 /* penalize ROF for bestarrow */
1620 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1621 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1622
1623 if (bowspeed < 1)
1624 bowspeed = 1;
1625 1558
1626 if (arrow == NULL) 1559 if (arrow == NULL)
1627 { 1560 {
1628 if ((arrow = find_arrow (op, bow->race)) == NULL) 1561 if ((arrow = find_arrow (op, bow->race)) == NULL)
1629 { 1562 {
1630 if (op->type == PLAYER) 1563 if (op->type == PLAYER)
1631 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);
1632 /* 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 */
1633 else 1566 else
1634 CLEAR_FLAG (op, FLAG_READY_BOW); 1567 CLEAR_FLAG (op, FLAG_READY_BOW);
1568
1635 return 0; 1569 return 0;
1636 } 1570 }
1637 } 1571 }
1638 1572
1639 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1573 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1661 return 0; 1595 return 0;
1662 } 1596 }
1663 1597
1664 arrow->set_owner (op); 1598 arrow->set_owner (op);
1665 arrow->skill = bow->skill; 1599 arrow->skill = bow->skill;
1666
1667 arrow->direction = dir; 1600 arrow->direction = dir;
1668 arrow->x = sx; 1601
1669 arrow->y = sy; 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;
1670 1634
1671 if (op->type == PLAYER) 1635 if (op->type == PLAYER)
1672 { 1636 {
1673 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1674 op->update_stats ();
1675 }
1676
1677 SET_ANIMATION (arrow, arrow->direction);
1678 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1679 arrow->stats.hp = arrow->stats.dam;
1680 arrow->stats.grace = arrow->attacktype;
1681 if (arrow->slaying != NULL)
1682 arrow->spellarg = strdup (arrow->slaying);
1683
1684 /* Note that this was different for monsters - they got their level
1685 * added to the damage. I think the strength bonus is more proper.
1686 */
1687
1688 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1689
1690 /* update the speed */
1691 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1692 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1693
1694 if (arrow->speed < 1.0)
1695 arrow->speed = 1.0;
1696 update_ob_speed (arrow);
1697 arrow->speed_left = 0;
1698
1699 if (op->type == PLAYER)
1700 {
1701 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1702 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1703 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1704
1705 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;
1706 } 1644 }
1707 else 1645 else
1708 { 1646 {
1709 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1710 arrow->level = op->level; 1647 arrow->level = op->level;
1711 } 1648 arrow->stats.wc -= bow->magic;
1712 1649
1713 if (arrow->attacktype == AT_PHYSICAL) 1650 if (!arrow->slaying)
1651 arrow->slaying = bow->slaying;
1652
1714 arrow->attacktype |= bow->attacktype; 1653 arrow->attacktype |= bow->attacktype;
1654 }
1715 1655
1716 if (bow->slaying) 1656 wc -= arrow->level;
1717 arrow->slaying = bow->slaying; 1657 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1718 1658
1719 arrow->map = m; 1659 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1720 arrow->move_type = MOVE_FLY_LOW; 1660 arrow->move_type = MOVE_FLY_LOW;
1721 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1661 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1722 1662
1723 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1663 op->play_sound (sound_find ("fire_arrow"));
1724 insert_ob_in_map (arrow, m, op, 0); 1664 m->insert (arrow, sx, sy, op);
1725 1665
1726 if (!arrow->destroyed ()) 1666 if (!arrow->destroyed ())
1727 move_arrow (arrow); 1667 move_arrow (arrow);
1728 1668
1729 if (op->type == PLAYER) 1669 if (op->type == PLAYER)
… …
1749{ 1689{
1750 int ret = 0, wcmod = 0; 1690 int ret = 0, wcmod = 0;
1751 1691
1752 if (op->contr->bowtype == bow_bestarrow) 1692 if (op->contr->bowtype == bow_bestarrow)
1753 { 1693 {
1754 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);
1755 } 1695 }
1756 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)
1757 { 1697 {
1758 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1698 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1759 wcmod = -1; 1699 wcmod = -1;
1700
1760 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);
1761 } 1702 }
1762 else if (op->contr->bowtype == bow_threewide) 1703 else if (op->contr->bowtype == bow_threewide)
1763 { 1704 {
1764 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);
… …
1768 else if (op->contr->bowtype == bow_spreadshot) 1709 else if (op->contr->bowtype == bow_spreadshot)
1769 { 1710 {
1770 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);
1771 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);
1772 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);
1773
1774 } 1714 }
1775 else 1715 else
1776 { 1716 {
1777 /* Simple case */ 1717 /* Simple case */
1778 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);
1779 } 1719 }
1720
1780 return ret; 1721 return ret;
1781} 1722}
1782
1783 1723
1784/* Fires a misc (wand/rod/horn) object in 'dir'. 1724/* Fires a misc (wand/rod/horn) object in 'dir'.
1785 * Broken apart from 'fire' to keep it more readable. 1725 * Broken apart from 'fire' to keep it more readable.
1786 */ 1726 */
1787void 1727void
1788fire_misc_object (object *op, int dir) 1728fire_misc_object (object *op, int dir)
1789{ 1729{
1790 object *item; 1730 object *item = op->contr->ranged_ob;
1791 1731
1792 if (!op->contr->ranges[range_misc]) 1732 if (!item)
1793 { 1733 {
1794 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.");
1795 return; 1735 return;
1796 } 1736 }
1797 1737
1798 item = op->contr->ranges[range_misc];
1799 if (!item->inv) 1738 if (!item->inv)
1800 { 1739 {
1801 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1740 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1802 return; 1741 return;
1803 } 1742 }
1743
1744 if (!op->change_weapon (item))
1745 return;
1746
1804 if (item->type == WAND) 1747 if (item->type == WAND)
1805 { 1748 {
1806 if (item->stats.food <= 0) 1749 if (item->stats.food <= 0)
1807 { 1750 {
1808 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1751 op->contr->play_sound (sound_find ("wand_poof"));
1809 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
1810 return; 1754 return;
1811 } 1755 }
1812 } 1756 }
1813 else if (item->type == ROD || item->type == HORN) 1757 else if (item->type == ROD || item->type == HORN)
1814 { 1758 {
1815 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))
1816 { 1760 {
1817 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1761 op->contr->play_sound (sound_find ("wand_poof"));
1762
1818 if (item->type == ROD) 1763 if (item->type == ROD)
1819 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));
1820 else 1765 else
1821 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
1822 return; 1768 return;
1823 } 1769 }
1824 } 1770 }
1825 1771
1826 if (cast_spell (op, item, dir, item->inv, NULL)) 1772 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1833 object *tmp; 1779 object *tmp;
1834 1780
1835 if (item->arch) 1781 if (item->arch)
1836 { 1782 {
1837 CLEAR_FLAG (item, FLAG_ANIMATE); 1783 CLEAR_FLAG (item, FLAG_ANIMATE);
1838 item->face = item->arch->clone.face; 1784 item->face = item->arch->face;
1839 item->speed = 0; 1785 item->set_speed (0);
1840 update_ob_speed (item);
1841 } 1786 }
1787
1842 if ((tmp = item->in_player ())) 1788 if ((tmp = item->in_player ()))
1843 esrv_update_item (UPD_ANIM, tmp, item); 1789 esrv_update_item (UPD_ANIM, tmp, item);
1844 } 1790 }
1845 } 1791 }
1846 else if (item->type == ROD || item->type == HORN) 1792 else if (item->type == ROD || item->type == HORN)
1847 {
1848 drain_rod_charge (item); 1793 drain_rod_charge (item);
1849 }
1850 } 1794 }
1851} 1795}
1852 1796
1853/* Received a fire command for the player - go and do it. 1797/* Received a fire command for the player - go and do it.
1854 */ 1798 */
1855void 1799bool
1856fire (object *op, int dir) 1800fire (object *op, int dir)
1857{ 1801{
1858 int spellcost = 0; 1802 int spellcost = 0;
1859 1803
1860 /* check for loss of invisiblity/hide */ 1804 /* check for loss of invisiblity/hide */
1861 if (action_makes_visible (op)) 1805 if (action_makes_visible (op))
1862 make_visible (op); 1806 make_visible (op);
1863 1807
1864 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;
1865 { 1814 }
1866 case range_none:
1867 return;
1868 1815
1869 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:
1870 player_fire_bow (op, dir); 1832 player_fire_bow (op, dir);
1871 return; 1833 break;
1872 1834
1873 case range_magic: /* Casting spells */ 1835 case SPELL:
1874 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);
1875 return; 1837 break;
1876 1838
1877 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:
1878 fire_misc_object (op, dir); 1848 fire_misc_object (op, dir);
1879 return; 1849 break;
1880
1881 case range_golem: /* Control summoned monsters from scrolls */
1882 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1883 {
1884 op->contr->ranges[range_golem] = 0;
1885 op->contr->shoottype = range_none;
1886 }
1887 else
1888 control_golem (op->contr->ranges[range_golem], dir);
1889 return;
1890
1891 case range_skill:
1892 if (!op->chosen_skill)
1893 {
1894 if (op->type == PLAYER)
1895 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1896 return;
1897 }
1898 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1899 return;
1900 case range_builder:
1901 apply_map_builder (op, dir);
1902 return;
1903 default:
1904 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1905 return;
1906 } 1850 }
1907}
1908 1851
1909 1852 return true;
1853}
1910 1854
1911/* find_key 1855/* find_key
1912 * 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
1913 * and successfully use it, we return the key, otherwise NULL 1857 * and successfully use it, we return the key, otherwise NULL
1914 * This function merges both normal and locked door, since the logic 1858 * This function merges both normal and locked door, since the logic
… …
1916 * pl is the player, 1860 * pl is the player,
1917 * inv is the objects inventory to searched 1861 * inv is the objects inventory to searched
1918 * door is the door we are trying to match against. 1862 * door is the door we are trying to match against.
1919 * This function can be called recursively to search containers. 1863 * This function can be called recursively to search containers.
1920 */ 1864 */
1921
1922object * 1865object *
1923find_key (object *pl, object *container, object *door) 1866find_key (object *pl, object *container, object *door)
1924{ 1867{
1925 object *tmp, *key; 1868 object *tmp, *key;
1926 1869
1927 /* Should not happen, but sanity checking is never bad */ 1870 /* Should not happen, but sanity checking is never bad */
1928 if (container->inv == NULL) 1871 if (!container->inv)
1929 return NULL; 1872 return 0;
1930 1873
1931 /* 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 */
1932 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1875 for (tmp = container->inv; tmp; tmp = tmp->below)
1933 { 1876 {
1934 if (door->type == DOOR && tmp->type == KEY) 1877 if (door->type == DOOR && tmp->type == KEY)
1935 break; 1878 break;
1936 /* For sanity, we should really check door type, but other stuff 1879 /* For sanity, we should really check door type, but other stuff
1937 * (like containers) can be locked with special keys 1880 * (like containers) can be locked with special keys
1938 */ 1881 */
1939 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1882 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1940 break; 1883 break;
1941 } 1884 }
1885
1942 /* No key found - lets search inventories now */ 1886 /* No key found - lets search inventories now */
1943 /* 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.
1944 * 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
1945 * a key, return 1889 * a key, return
1946 */ 1890 */
1947 if (!tmp) 1891 if (!tmp)
1948 { 1892 {
1949 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1893 for (tmp = container->inv; tmp; tmp = tmp->below)
1950 { 1894 {
1951 /* No reason to search empty containers */ 1895 /* No reason to search empty containers */
1952 if (tmp->type == CONTAINER && tmp->inv) 1896 if (tmp->type == CONTAINER && tmp->inv)
1953 { 1897 {
1954 if ((key = find_key (pl, tmp, door)) != NULL) 1898 if ((key = find_key (pl, tmp, door)))
1955 return key; 1899 return key;
1956 } 1900 }
1957 } 1901 }
1902
1958 if (!tmp) 1903 if (!tmp)
1959 return NULL; 1904 return NULL;
1960 } 1905 }
1906
1961 /* 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,
1962 * see if we actually want to use it 1908 * see if we actually want to use it
1963 */ 1909 */
1964 if (pl != container) 1910 if (pl != container)
1965 { 1911 {
… …
1986 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1932 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1987 "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));
1988 return NULL; 1934 return NULL;
1989 } 1935 }
1990 } 1936 }
1937
1991 return tmp; 1938 return tmp;
1992} 1939}
1993 1940
1994/* moved door processing out of move_player_attack. 1941/* moved door processing out of move_player_attack.
1995 * returns 1 if player has opened the door with a key 1942 * returns 1 if player has opened the door with a key
… …
1997 * 0 otherwise 1944 * 0 otherwise
1998 */ 1945 */
1999static int 1946static int
2000player_attack_door (object *op, object *door) 1947player_attack_door (object *op, object *door)
2001{ 1948{
2002 /* 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,
2003 * 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 -
2004 * otherwise, we fall through to the rest of the code. 1951 * otherwise, we fall through to the rest of the code.
2005 */ 1952 */
2006 object *key = find_key (op, op, door); 1953 object *key = find_key (op, op, door);
2007 1954
2008 /* IF we found a key, do some extra work */ 1955 /* If we found a key, do some extra work */
2009 if (key) 1956 if (key)
2010 { 1957 {
2011 object *container = key->env; 1958 object *container = key->env;
2012 1959
2013 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2014 if (action_makes_visible (op)) 1960 if (action_makes_visible (op))
2015 make_visible (op); 1961 make_visible (op);
1962
2016 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1963 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2017 spring_trap (door->inv, op); 1964 spring_trap (door->inv, op);
1965
2018 if (door->type == DOOR) 1966 if (door->type == DOOR)
2019 {
2020 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 */
2021 }
2022 else if (door->type == LOCKED_DOOR) 1968 else if (door->type == LOCKED_DOOR)
2023 { 1969 {
2024 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);
2025 remove_door2 (door); /* remove door without violence ;-) */ 1971 remove_door2 (door); /* remove door without violence ;-) */
2026 } 1972 }
1973
2027 /* Do this after we print the message */ 1974 /* Do this after we print the message */
2028 decrease_ob (key); /* Use up one of the keys */ 1975 decrease_ob (key); /* Use up one of the keys */
2029 /* Need to update the weight the container the key was in */ 1976 /* Need to update the weight the container the key was in */
2030 if (container != op) 1977 if (container != op)
2031 esrv_update_item (UPD_WEIGHT, op, container); 1978 esrv_update_item (UPD_WEIGHT, op, container);
1979
2032 return 1; /* Nothing more to do below */ 1980 return 1; /* Nothing more to do below */
2033 } 1981 }
2034 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
2035 { 1983 {
2036 /* Might as well return now - no other way to open this */ 1984 /* Might as well return now - no other way to open this */
2037 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...");
2038 return 1; 1986 return 1;
2039 } 1987 }
1988
2040 return 0; 1989 return 0;
2041} 1990}
2042 1991
2043/* This function is just part of a breakup from move_player. 1992/* This function is just part of a breakup from move_player.
2044 * It should keep the code cleaner. 1993 * It should keep the code cleaner.
2045 * When this is called, the players direction has been updated 1994 * When this is called, the players direction has been updated
2046 * (taking into account confusion.) The player is also actually 1995 * (taking into account confusion.) The player is also actually
2047 * going to try and move (not fire weapons). 1996 * going to try and move (not fire weapons).
2048 */ 1997 */
2049void 1998bool
2050move_player_attack (object *op, int dir) 1999move_player_attack (object *op, int dir)
2051{ 2000{
2052 object *tmp, *mon;
2053 sint16 nx, ny;
2054 int on_battleground; 2001 int on_battleground;
2055 maptile *m;
2056 2002
2057 nx = freearr_x[dir] + op->x; 2003 sint16 nx = freearr_x[dir] + op->x;
2058 ny = freearr_y[dir] + op->y; 2004 sint16 ny = freearr_y[dir] + op->y;
2059 2005
2060 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 }
2061 2016
2062 /* 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
2063 * 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
2064 * 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
2065 * player. This is a pretty nasty hack, because if we could 2020 * player. This is a pretty nasty hack, because if we could
2066 * 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
2067 * 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
2068 * 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
2069 * move_ob uses. 2024 * move_ob uses.
2070 */ 2025 */
2071 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);
2072 {
2073 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2074 {
2075 m = get_map_from_coord (op->map, &nx, &ny);
2076 if (!m)
2077 return; /* Don't think this should happen */
2078 }
2079 else
2080 m = op->map;
2081 2027
2082 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2083 {
2084 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2085 return;
2086 }
2087
2088 mon = 0;
2089 /* 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
2090 * 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.
2091 * 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
2092 * on the space 2031 * on the space
2093 */ 2032 */
2094 while (tmp) 2033 object *mon;
2095 { 2034 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2096 if (tmp == op) 2035 {
2097 { 2036 if ((mon->flag [FLAG_ALIVE]
2098 tmp = tmp->above; 2037 || mon->type == LOCKED_DOOR
2099 continue; 2038 || mon->flag [FLAG_CAN_ROLL])
2100 }
2101
2102 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2103 {
2104 mon = tmp; 2039 && mon != op)
2105 break; 2040 break;
2106 } 2041 }
2107 2042
2108 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2109 mon = tmp;
2110
2111 tmp = tmp->above;
2112 }
2113
2114 if (!mon) /* This happens anytime the player tries to move */ 2043 if (!mon) /* This happens anytime the player tries to move */
2115 return; /* into a wall */ 2044 return false; /* into a wall */
2116 2045
2117 if (mon->head)
2118 mon = mon->head; 2046 mon = mon->head_ ();
2119 2047
2120 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)
2121 if (player_attack_door (op, mon)) 2050 if (player_attack_door (op, mon))
2051 {
2052 --op->contr->weapon_sp_left;
2122 return; 2053 return true;
2054 }
2123 2055
2124 /* The following deals with possibly attacking peaceful 2056 /* The following deals with possibly attacking peaceful
2125 * or frienddly creatures. Basically, all players are considered 2057 * or friendly creatures. Basically, all players are considered
2126 * unaggressive. If the moving player has peaceful set, then the 2058 * unaggressive. If the moving player has peaceful set, then the
2127 * object should be pushed instead of attacked. It is assumed that 2059 * object should be pushed instead of attacked. It is assumed that
2128 * if you are braced, you will not attack friends accidently, 2060 * if you are braced, you will not attack friends accidently,
2129 * and thus will not push them. 2061 * and thus will not push them.
2130 */ 2062 */
2131 2063
2132 /* 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
2133 * peaceful. Our assumption is the creature is a pet if the 2065 * peaceful. Our assumption is the creature is a pet if the
2134 * player owns it and it is either friendly or unagressive. 2066 * player owns it and it is either friendly or unagressive.
2135 */ 2067 */
2136 if ((op->type == PLAYER) 2068 if (op->type == PLAYER
2137#if COZY_SERVER
2138 &&
2139 ((mon->owner && mon->owner->contr 2069 && ((mon->owner && mon->owner->contr
2140 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2070 && same_party (mon->owner->contr->party, op->contr->party))
2141#else
2142 && mon->owner == op 2071 || mon->owner == op)
2143#endif
2144 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2072 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2145 { 2073 {
2146 /* 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 */
2147 if (op->contr->braced) 2075 if (op->contr->braced)
2148 return; 2076 return false;
2149 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"));
2150 (void) push_ob (mon, dir, op); 2083 push_ob (mon, dir, op);
2084
2151 if (op->contr->tmp_invis || op->hide) 2085 if (op->contr->tmp_invis || op->hide)
2152 make_visible (op); 2086 make_visible (op);
2087
2153 return; 2088 return true;
2154 } 2089 }
2090 else
2091 return false;
2092 }
2155 2093
2156 /* in certain circumstances, you shouldn't attack friendly 2094 /* in certain circumstances, you shouldn't attack friendly
2157 * creatures. Note that if you are braced, you can't push 2095 * creatures. Note that if you are braced, you can't push
2158 * 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
2159 * attack them either. 2097 * attack them either.
2160 */ 2098 */
2161 if ((mon->type == PLAYER || mon->enemy != op) && 2099 if ((mon->type == PLAYER || mon->enemy != op)
2162 (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))
2163#ifdef PROHIBIT_PLAYERKILL
2164 (op->contr->peaceful 2101 && ((op->contr->peaceful
2165 || (mon->type == PLAYER 2102 || (mon->type == PLAYER && mon->contr->peaceful))
2166 && mon->contr->
2167 peaceful)) &&
2168#else
2169 op->contr->peaceful &&
2170#endif
2171 !on_battleground)) 2103 && !on_battleground))
2104 {
2105 if (op->speed_left > 0.f)
2172 { 2106 {
2107 --op->speed_left;
2108
2173 if (!op->contr->braced) 2109 if (!op->contr->braced)
2174 { 2110 {
2175 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2111 op->play_sound (sound_find ("push_player"));
2176 (void) push_ob (mon, dir, op); 2112 push_ob (mon, dir, op);
2177 } 2113 }
2178 else 2114 else
2179 new_draw_info (0, 0, op, "You withhold your attack"); 2115 op->statusmsg ("You withhold your attack");
2180 2116
2181 if (op->contr->tmp_invis || op->hide) 2117 if (op->contr->tmp_invis || op->hide)
2182 make_visible (op); 2118 make_visible (op);
2183 }
2184 2119
2120 return true;
2121 }
2122 }
2185 /* If the object is a boulder or other rollable object, then 2123 /* If the object is a boulder or other rollable object, then
2186 * 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.
2187 */ 2125 */
2188 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)
2189 { 2129 {
2130 --op->speed_left;
2131
2190 recursive_roll (mon, dir, op); 2132 recursive_roll (mon, dir, op);
2191 if (action_makes_visible (op)) 2133 if (action_makes_visible (op))
2192 make_visible (op); 2134 make_visible (op);
2193 }
2194 2135
2136 return true;
2137 }
2138 }
2195 /* Any generic living creature. Including things like doors. 2139 /* Any generic living creature. Including things like doors.
2196 * 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
2197 * and be living. Then, it must be one of the following: 2141 * and be living. Then, it must be one of the following:
2198 * 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
2199 * 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.
2200 */ 2144 */
2201
2202 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2145 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2203 ((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)))
2204 { 2147 {
2205 2148 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2206 /* If the player hasn't hit something this tick, and does
2207 * so, give them speed boost based on weapon speed. Doing
2208 * it here is better than process_players2, which basically
2209 * incurred a 1 tick offset.
2210 */
2211 if (!op->contr->has_hit)
2212 { 2149 {
2213 op->speed_left += op->speed / op->contr->weapon_sp; 2150 --op->contr->weapon_sp_left;
2214
2215 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2216 }
2217 2151
2218 skill_attack (mon, op, 0, 0, 0); 2152 skill_attack (mon, op, 0, 0, 0);
2219
2220 /* If attacking another player, that player gets automatic
2221 * hitback, and doesn't loose luck either.
2222 * Disable hitback on the battleground or if the target is
2223 * the wiz.
2224 */
2225 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2226 {
2227 short luck = mon->stats.luck;
2228
2229 mon->contr->has_hit = 1;
2230 skill_attack (op, mon, 0, 0, 0);
2231 mon->stats.luck = luck;
2232 }
2233 2153
2234 if (action_makes_visible (op)) 2154 if (action_makes_visible (op))
2235 make_visible (op); 2155 make_visible (op);
2236 }
2237 } /* if player should attack something */
2238}
2239 2156
2240int 2157 return true;
2158 }
2159 }
2160
2161 return false;
2162}
2163
2164bool
2241move_player (object *op, int dir) 2165move_player (object *op, int dir)
2242{ 2166{
2243 int pick; 2167 int pick;
2244 2168
2245 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2169 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2246 return 0; 2170 return 0;
2247 2171
2248 /* Sanity check: make sure dir is valid */ 2172 /* Sanity check: make sure dir is valid */
2249 if ((dir < 0) || (dir >= 9)) 2173 if ((dir < 0) || (dir >= 9))
2250 { 2174 {
2251 LOG (llevError, "move_player: invalid direction %d\n", dir); 2175 LOG (llevError, "move_player: invalid direction %d\n", dir);
2252 return 0; 2176 return 0;
2253 } 2177 }
2254 2178
2255 /* peterm: added following line */ 2179 /* peterm: added following line */
2256 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2180 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2257 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2181 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2258 2182
2259 op->facing = dir; 2183 op->facing = dir;
2260 2184
2261 if (op->hide) 2185 if (op->hide)
2262 do_hidden_move (op); 2186 do_hidden_move (op);
2263 2187
2188 bool retval;
2189
2264 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2190 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2265 /*nop */ ; 2191 retval = RESULT_INT (0);
2266 else if (op->contr->fire_on) 2192 else if (op->contr->fire_on)
2267 fire (op, dir); 2193 retval = fire (op, dir);
2268 else 2194 else
2269 { 2195 {
2270 move_player_attack (op, dir); 2196 retval = move_player_attack (op, dir);
2271 pick = check_pick (op); 2197 pick = check_pick (op);
2272 } 2198 }
2273 2199
2274 /* 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
2275 * server can handle repeat firing. 2201 * server can handle repeat firing.
… …
2282 /* Update how the player looks. Use the facing, so direction may 2208 /* Update how the player looks. Use the facing, so direction may
2283 * get reset to zero. This allows for full animation capabilities 2209 * get reset to zero. This allows for full animation capabilities
2284 * for players. 2210 * for players.
2285 */ 2211 */
2286 animate_object (op, op->facing); 2212 animate_object (op, op->facing);
2287 return 0; 2213
2214 return retval;
2288} 2215}
2289 2216
2290/* 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
2291 * new client/server stuff. 2218 * new client/server stuff.
2292 * 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
2293 * the new speed values for commands. 2220 * the new speed values for commands.
2294 * 2221 *
2295 * 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.
2296 */ 2225 */
2297int 2226bool
2298handle_newcs_player (object *op) 2227handle_newcs_player (object *op)
2299{ 2228{
2300 if (op->contr->hidden)
2301 {
2302 op->invisible = 1000;
2303 /* the socket code flashes the player visible/invisible
2304 * depending on the value of invisible, so we need to
2305 * alternate it here for it to work correctly.
2306 */
2307 if (pticks & 2)
2308 op->invisible--;
2309 }
2310 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2311 {
2312 op->invisible--;
2313 if (!op->invisible)
2314 {
2315 make_visible (op);
2316 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2317 }
2318 }
2319
2320 if (QUERY_FLAG (op, FLAG_SCARED)) 2229 if (QUERY_FLAG (op, FLAG_SCARED))
2321 { 2230 {
2322 flee_player (op); 2231 if (op->speed_left > 0.f)
2323 /* If player is still scared, that is his action for this tick */
2324 if (QUERY_FLAG (op, FLAG_SCARED))
2325 { 2232 {
2326 op->speed_left--; 2233 --op->speed_left;
2234 flee_player (op);
2235
2327 return 0; 2236 return true;
2328 } 2237 }
2238 else
2239 return false;
2329 } 2240 }
2330
2331 /* I've been seeing crashes where the golem has been destroyed, but
2332 * the player object still points to the defunct golem. The code that
2333 * destroys the golem looks correct, and it doesn't always happen, so
2334 * put this in a a workaround to clean up the golem pointer.
2335 */
2336 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2337 op->contr->ranges[range_golem] = 0;
2338 2241
2339 /* 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
2340 * the players time has been increased when doericserver has been 2243 * the players time has been increased when doericserver has been
2341 * called, so we recheck it here. 2244 * called, so we recheck it here.
2342 */ 2245 */
2343 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2246 if (op->contr->ns->handle_command ())
2344 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2345 ;
2346
2347 if (op->speed_left < 0)
2348 return 0; 2247 return true;
2349 2248
2350 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2249 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2351 {
2352 /* All move commands take 1 tick, at least for now */
2353 op->speed_left--;
2354
2355 /* Instead of all the stuff below, let move_player take care
2356 * of it. Also, some of the skill stuff is only put in
2357 * there, as well as the confusion stuff.
2358 */
2359 move_player (op, op->direction); 2250 return move_player (op, op->direction);
2360 if (op->speed_left > 0)
2361 return 1;
2362 else
2363 return 0;
2364 }
2365 2251
2366 return 0; 2252 return false;
2367} 2253}
2368 2254
2369int 2255int
2370save_life (object *op) 2256save_life (object *op)
2371{ 2257{
… …
2373 return 0; 2259 return 0;
2374 2260
2375 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2261 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2376 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2262 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2377 { 2263 {
2378 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2264 op->play_sound (sound_find ("ob_evaporate"));
2379 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));
2380 2266
2381 if (op->contr) 2267 if (op->contr)
2382 esrv_del_item (op->contr, tmp->count); 2268 esrv_del_item (op->contr, tmp->count);
2383 2269
… …
2403/* 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
2404 * 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
2405 * 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
2406 * from. 2292 * from.
2407 */ 2293 */
2408void 2294static void
2409remove_unpaid_objects (object *op, object *env) 2295drop_unpaid_items (object *op, object *env)
2410{ 2296{
2411 object *next;
2412
2413 while (op) 2297 while (op)
2414 { 2298 {
2415 next = op->below; /* Make sure we have a good value, in case 2299 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2416 * we remove object 'op' 2300
2417 */
2418 if (QUERY_FLAG (op, FLAG_UNPAID)) 2301 if (QUERY_FLAG (op, FLAG_UNPAID))
2419 { 2302 {
2420 op->remove ();
2421 op->x = env->x;
2422 op->y = env->y;
2423 if (env->type == PLAYER) 2303 if (env->type == PLAYER)
2424 esrv_del_item (env->contr, op->count); 2304 esrv_del_item (env->contr, op->count);
2425 insert_ob_in_map (op, env->map, NULL, 0); 2305
2306 op->insert_at (env);
2426 } 2307 }
2427 else if (op->inv) 2308 else if (op->inv)
2428 remove_unpaid_objects (op->inv, env); 2309 drop_unpaid_items (op->inv, env);
2429 2310
2430 op = next; 2311 op = next;
2431 } 2312 }
2313}
2314
2315void
2316object::drop_unpaid_items ()
2317{
2318 if (!flag [FLAG_REMOVED])
2319 ::drop_unpaid_items (inv, this);
2432} 2320}
2433 2321
2434/* 2322/*
2435 * Returns pointer a static string containing gravestone text 2323 * Returns pointer a static string containing gravestone text
2436 * Moved from apply.c to player.c - player.c is what 2324 * Moved from apply.c to player.c - player.c is what
… …
2486 int rate_grace = 2000; 2374 int rate_grace = 2000;
2487 const int max_hp = 1; 2375 const int max_hp = 1;
2488 const int max_sp = 1; 2376 const int max_sp = 1;
2489 const int max_grace = 1; 2377 const int max_grace = 1;
2490 2378
2491 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--;
2492 { 2388 }
2493 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2389 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2494 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2390 {
2495 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 }
2496 } 2396 }
2497 2397
2498 if (op->contr->ns->state == ST_PLAYING) 2398 if (op->contr->ns->state == ST_PLAYING)
2499 { 2399 {
2500 /* these next three if clauses make it possible to SLOW DOWN 2400 /* these next three if clauses make it possible to SLOW DOWN
… …
2519 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2419 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2520 else 2420 else
2521 { 2421 {
2522 gen_grace = op->stats.maxgrace; 2422 gen_grace = op->stats.maxgrace;
2523 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2423 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2524 }
2525
2526 /* Regenerate Spell Points */
2527 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2528 {
2529 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2530 if (op->stats.sp < op->stats.maxsp)
2531 {
2532 op->stats.sp++;
2533 /* dms do not consume food */
2534 if (!QUERY_FLAG (op, FLAG_WIZ))
2535 {
2536 op->stats.food--;
2537 if (op->contr->digestion < 0)
2538 op->stats.food += op->contr->digestion;
2539 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2540 op->stats.food = last_food;
2541 }
2542 }
2543
2544 if (max_sp > 1)
2545 {
2546 over_sp = (gen_sp + 10) / rate_sp;
2547 if (over_sp > 0)
2548 {
2549 if (op->stats.sp < op->stats.maxsp)
2550 {
2551 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2552
2553 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2554 op->stats.sp--;
2555
2556 if (op->stats.sp > op->stats.maxsp)
2557 op->stats.sp = op->stats.maxsp;
2558 }
2559 op->last_sp = 0;
2560 }
2561 else
2562 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2563 }
2564 else
2565 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2566 } 2424 }
2567 2425
2568 /* Regenerate Grace */ 2426 /* Regenerate Grace */
2569 /* 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. */
2570 if (--op->last_grace < 0) 2428 if (--op->last_grace < 0)
… …
2591 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);
2592 } 2450 }
2593 /* wearing stuff doesn't detract from grace generation. */ 2451 /* wearing stuff doesn't detract from grace generation. */
2594 } 2452 }
2595 2453
2454 if (op->stats.food > 0)
2455 {
2596 /* Regenerate Hit Points */ 2456 /* Regenerate Spell Points */
2597 if (--op->last_heal < 0) 2457 if (!op->contr->golem && --op->last_sp < 0)
2598 {
2599 if (op->stats.hp < op->stats.maxhp)
2600 { 2458 {
2601 op->stats.hp++; 2459 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2602 /* dms do not consume food */ 2460
2603 if (!QUERY_FLAG (op, FLAG_WIZ)) 2461 if (op->stats.sp < op->stats.maxsp)
2604 { 2462 {
2463 op->stats.sp++;
2464
2465 /* dms do not consume food */
2466 if (!QUERY_FLAG (op, FLAG_WIZ))
2467 {
2605 op->stats.food--; 2468 op->stats.food--;
2469
2606 if (op->contr->digestion < 0) 2470 if (op->contr->digestion < 0)
2607 op->stats.food += op->contr->digestion; 2471 op->stats.food += op->contr->digestion;
2608 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))
2609 op->stats.food = last_food; 2473 op->stats.food = last_food;
2474 }
2610 } 2475 }
2611 }
2612 2476
2613 if (max_hp > 1) 2477 if (max_sp > 1)
2614 {
2615 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2616 if (over_hp > 0)
2617 { 2478 {
2618 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
2619 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);
2620 } 2497 }
2621 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)
2622 { 2506 {
2623 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 }
2624 } 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);
2625 } 2532 }
2626 else 2533 else
2627 {
2628 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);
2629 } 2535 }
2630 } 2536 }
2631 2537
2632 /* Digestion */ 2538 /* Digestion */
2633 if (--op->last_eat < 0) 2539 if (--op->last_eat < 0)
2634 { 2540 {
2635#ifdef COZY_SERVER 2541 int bonus = max (0, op->contr->digestion),
2636 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2542 penalty = max (0, -op->contr->digestion);
2637 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2638#else
2639 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2640#endif
2641 2543
2642 if (op->contr->gen_hp > 0)
2643 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);
2644 else
2645 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2646 2545
2647 /* dms do not consume food */ 2546 /* dms do not consume food */
2648 if (!QUERY_FLAG (op, FLAG_WIZ)) 2547 if (!QUERY_FLAG (op, FLAG_WIZ))
2649 op->stats.food--; 2548 op->stats.food--;
2650 } 2549 }
… …
2677 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.");
2678 manual_apply (op, flesh, 0); 2577 manual_apply (op, flesh, 0);
2679 } 2578 }
2680 } 2579 }
2681 2580
2682 while (op->stats.food < 0 && op->stats.hp >= 0) 2581 if (op->stats.food < 0)
2683 op->stats.food++, op->stats.hp--; 2582 {
2583 op->stats.hp += op->stats.food;
2584 op->stats.food = 0;
2585 }
2684 2586
2685 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2587 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2686 kill_player (op); 2588 kill_player (op);
2687 } 2589 }
2688} 2590}
… …
2693 * file. 2595 * file.
2694 */ 2596 */
2695void 2597void
2696kill_player (object *op) 2598kill_player (object *op)
2697{ 2599{
2600 int x, y;
2698 char buf[MAX_BUF]; 2601 char buf[MAX_BUF];
2699 int x, y;
2700
2701 //int i;
2702 maptile *map; /* this is for resurrection */ 2602 maptile *map; /* this is for resurrection */
2703
2704 /* int z;
2705 int num_stats_lose;
2706 int lost_a_stat;
2707 int lose_this_stat;
2708 int this_stat; */
2709 int will_kill_again; 2603 int will_kill_again;
2710 archetype *at; 2604 archetype *at;
2711 object *tmp; 2605 object *tmp;
2712 2606
2713 if (save_life (op)) 2607 if (save_life (op))
2714 return; 2608 return;
2715
2716 2609
2717 /* 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
2718 * 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.
2719 * Look at op_on_battleground() for more info --AndreasV 2612 * Look at op_on_battleground() for more info --AndreasV
2720 */ 2613 */
… …
2723 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2616 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2724 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2617 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2725 2618
2726 /* restore player */ 2619 /* restore player */
2727 at = archetype::find ("poisoning"); 2620 at = archetype::find ("poisoning");
2728 tmp = present_arch_in_ob (at, op); 2621 if (object *tmp = present_arch_in_ob (at, op))
2729 if (tmp)
2730 { 2622 {
2731 tmp->destroy (); 2623 tmp->destroy ();
2732 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2624 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2733 } 2625 }
2734 2626
2735 at = archetype::find ("confusion"); 2627 at = archetype::find ("confusion");
2736 tmp = present_arch_in_ob (at, op); 2628 if (object *tmp = present_arch_in_ob (at, op))
2737 if (tmp)
2738 { 2629 {
2739 tmp->destroy (); 2630 tmp->destroy ();
2740 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2631 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2741 } 2632 }
2742 2633
2743 cure_disease (op, 0); /* remove any disease */ 2634 cure_disease (op, 0, 0); /* remove any disease */
2744 op->stats.hp = op->stats.maxhp; 2635 op->stats.hp = op->stats.maxhp;
2745 if (op->stats.food <= 0) 2636 if (op->stats.food <= 0)
2746 op->stats.food = 999; 2637 op->stats.food = 999;
2747 2638
2748 /* create a bodypart-trophy to make the winner happy */ 2639 /* create a bodypart-trophy to make the winner happy */
2749 tmp = arch_to_object (archetype::find ("finger")); 2640 if (object *tmp = arch_to_object (archetype::find ("finger")))
2750 if (tmp != NULL)
2751 { 2641 {
2752 sprintf (buf, "%s's finger", &op->name); 2642 tmp->name = format ("%s's finger" , &op->name);
2753 tmp->name = buf; 2643 tmp->name_pl = format ("%s's fingers", &op->name);
2754 sprintf (buf, " This finger has been cut off %s\n" 2644 tmp->msg = format (
2755 " 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",
2756 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2646 &op->name, op->contr->title, (int) (op->level), op->contr->killer
2757 tmp->msg = buf; 2647 );
2758 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2648 tmp->value = 0, tmp->type = 0;
2759 tmp->materialname = NULL; 2649 tmp->materialname = "organics";
2760 tmp->x = op->x, tmp->y = op->y; 2650 tmp->insert_at (op, tmp);
2761 insert_ob_in_map (tmp, op->map, op, 0);
2762 } 2651 }
2763 2652
2764 /* teleport defeated player to new destination */ 2653 /* teleport defeated player to new destination */
2765 transfer_ob (op, x, y, 0, NULL); 2654 transfer_ob (op, x, y, 0, NULL);
2766 op->contr->braced = 0; 2655 op->contr->braced = 0;
… …
2770 INVOKE_PLAYER (DEATH, op->contr); 2659 INVOKE_PLAYER (DEATH, op->contr);
2771 2660
2772 command_kill_pets (op, 0); 2661 command_kill_pets (op, 0);
2773 2662
2774 if (op->stats.food < 0) 2663 if (op->stats.food < 0)
2775 {
2776 if (op->contr->explore)
2777 {
2778 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2779 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2780 op->stats.food = 999;
2781 return;
2782 }
2783 sprintf (buf, "%s starved to death.", &op->name);
2784 strcpy (op->contr->killer, "starvation"); 2664 strcpy (op->contr->killer, "starvation");
2785 } 2665
2786 else 2666 op->contr->play_sound (sound_find ("player_dies"));
2787 {
2788 if (op->contr->explore)
2789 {
2790 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2791 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2792 op->stats.hp = op->stats.maxhp;
2793 return;
2794 }
2795 sprintf (buf, "%s died.", &op->name);
2796 }
2797 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2798 2667
2799 /* save the map location for corpse, gravestone */ 2668 /* save the map location for corpse, gravestone */
2800 x = op->x; 2669 x = op->x;
2801 y = op->y; 2670 y = op->y;
2802 map = op->map; 2671 map = op->map;
2803
2804 2672
2805 /* NOT_PERMADEATH code. This basically brings the character back to 2673 /* NOT_PERMADEATH code. This basically brings the character back to
2806 * life if they are dead - it takes some exp and a random stat. 2674 * life if they are dead - it takes some exp and a random stat.
2807 * See the config.h file for a little more in depth detail about this. 2675 * See the config.h file for a little more in depth detail about this.
2808 */ 2676 */
… …
2825 num_stats_lose = 1; 2693 num_stats_lose = 1;
2826 else 2694 else
2827 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2695 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2828 } 2696 }
2829 else 2697 else
2830 {
2831 num_stats_lose = 1; 2698 num_stats_lose = 1;
2832 } 2699
2833 lost_a_stat = 0; 2700 lost_a_stat = 0;
2834 2701
2835 for (z = 0; z < num_stats_lose; z++) 2702 for (z = 0; z < num_stats_lose; z++)
2836 { 2703 {
2837 i = RANDOM () % NUM_STATS; 2704 i = RANDOM () % NUM_STATS;
… …
2967 { 2834 {
2968 tmp->destroy (); 2835 tmp->destroy ();
2969 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2836 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2970 } 2837 }
2971 2838
2972 cure_disease (op, 0); /* remove any disease */ 2839 cure_disease (op, 0, 0); /* remove any disease */
2973 2840
2974 /*add_exp(op, (op->stats.exp * -0.20)); */ 2841 /*add_exp(op, (op->stats.exp * -0.20)); */
2975 apply_death_exp_penalty (op); 2842 apply_death_exp_penalty (op);
2976 if (op->stats.food < 100) 2843 if (op->stats.food < 100)
2977 op->stats.food = 900; 2844 op->stats.food = 900;
2978 op->stats.hp = op->stats.maxhp; 2845 op->stats.hp = op->stats.maxhp;
2979 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2980 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2981 2848
2982 /* 2849 /*
2983 * Check to see if the player is in a shop. IF so, then check to see if
2984 * 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
2985 * in the map. 2851 * and put them back in the map.
2986 */ 2852 */
2987 2853 op->drop_unpaid_items ();
2988 if (is_in_shop (op))
2989 remove_unpaid_objects (op->inv, op);
2990 2854
2991 /****************************************/ 2855 /****************************************/
2992 /* */ 2856 /* */
2993 /* Move player to his current respawn- */ 2857 /* Move player to his current respawn- */
2994 /* position (usually last savebed) */ 2858 /* position (usually last savebed) */
2995 /* */ 2859 /* */
2996 /****************************************/ 2860 /****************************************/
2997 2861
2998 enter_player_savebed (op); 2862 enter_player_savebed (op);
2999 2863
3000 /* Save the player before inserting the force to reduce
3001 * chance of abuse.
3002 */
3003 op->contr->braced = 0; 2864 op->contr->braced = 0;
3004 op->contr->save ();
3005 2865
3006 /* it is possible that the player has blown something up 2866 /* it is possible that the player has blown something up
3007 * at his savebed location, and that can have long lasting 2867 * at his savebed location, and that can have long lasting
3008 * spell effects. So first see if there is a spell effect 2868 * spell effects. So first see if there is a spell effect
3009 * on the space that might harm the player. 2869 * on the space that might harm the player.
… …
3018 object *force; 2878 object *force;
3019 int at; 2879 int at;
3020 2880
3021 force = get_archetype (FORCE_NAME); 2881 force = get_archetype (FORCE_NAME);
3022 /* 50 ticks should be enough time for the spell to abate */ 2882 /* 50 ticks should be enough time for the spell to abate */
3023 force->speed = 0.1; 2883 force->speed = 0.1f;
3024 force->speed_left = -5.0; 2884 force->speed_left = -5.f;
3025 SET_FLAG (force, FLAG_APPLIED); 2885 SET_FLAG (force, FLAG_APPLIED);
3026 for (at = 0; at < NROFATTACKS; at++) 2886 for (at = 0; at < NROFATTACKS; at++)
3027 if (will_kill_again & (1 << at)) 2887 if (will_kill_again & (1 << at))
3028 force->resist[at] = 100; 2888 force->resist[at] = 100;
3029 2889
… …
3038void 2898void
3039loot_object (object *op) 2899loot_object (object *op)
3040{ /* Grab and destroy some treasure */ 2900{ /* Grab and destroy some treasure */
3041 object *tmp, *tmp2, *next; 2901 object *tmp, *tmp2, *next;
3042 2902
3043 if (op->container) 2903 op->close_container (); /* close open sack first */
3044 esrv_apply_container (op, op->container); /* close open sack first */
3045 2904
3046 for (tmp = op->inv; tmp; tmp = next) 2905 for (tmp = op->inv; tmp; tmp = next)
3047 { 2906 {
3048 next = tmp->below; 2907 next = tmp->below;
3049 2908
3050 if (tmp->invisible) 2909 if (tmp->invisible)
3051 continue; 2910 continue;
3052 2911
3053 tmp->remove (); 2912 tmp->remove ();
3054 tmp->x = op->x, tmp->y = op->y; 2913 tmp->x = op->x, tmp->y = op->y;
2914
3055 if (tmp->type == CONTAINER) 2915 if (tmp->type == CONTAINER)
3056 { /* empty container to ground */ 2916 loot_object (tmp); /* empty container to ground */
3057 loot_object (tmp); 2917
3058 }
3059 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))))
3060 { 2919 {
3061 if (tmp->nrof > 1) 2920 if (tmp->nrof > 1)
3062 { 2921 {
3063 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2922 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3064 tmp2->destroy (); 2923 tmp2->destroy ();
… …
3075/* 2934/*
3076 * fix_weight(): Check recursively the weight of all players, and fix 2935 * fix_weight(): Check recursively the weight of all players, and fix
3077 * 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
3078 * was changed. 2937 * was changed.
3079 */ 2938 */
3080
3081void 2939void
3082fix_weight (void) 2940fix_weight (void)
3083{ 2941{
3084 for_all_players (pl) 2942 for_all_players (pl)
3085 { 2943 {
… …
3140void 2998void
3141make_visible (object *op) 2999make_visible (object *op)
3142{ 3000{
3143 op->hide = 0; 3001 op->hide = 0;
3144 op->invisible = 0; 3002 op->invisible = 0;
3003
3145 if (op->type == PLAYER) 3004 if (op->type == PLAYER)
3146 { 3005 {
3147 op->contr->tmp_invis = 0; 3006 op->contr->tmp_invis = 0;
3148 op->contr->invis_race = 0; 3007 op->contr->invis_race = 0;
3149 } 3008 }
3009
3150 update_object (op, UP_OBJ_FACE); 3010 update_object (op, UP_OBJ_CHANGE);
3151} 3011}
3152 3012
3153int 3013int
3154is_true_undead (object *op) 3014is_true_undead (object *op)
3155{ 3015{
3156 object *tmp = NULL;
3157
3158 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3016 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3159 return 1; 3017 return 1;
3160 3018
3161 return 0; 3019 return 0;
3162} 3020}
3163 3021
3164/* look at the surrounding terrain to determine 3022/* look at the surrounding terrain to determine
3165 * the hideability of this object. Positive levels 3023 * the hideability of this object. Positive levels
3166 * indicate greater hideability. 3024 * indicate greater hideability.
3167 */ 3025 */
3168
3169int 3026int
3170hideability (object *ob) 3027hideability (object *ob)
3171{ 3028{
3172 int i, level = 0, mflag; 3029 int i, level = 0, mflag;
3173 sint16 x, y; 3030 sint16 x, y;
… …
3207/* For Hidden creatures - a chance of becoming 'unhidden' 3064/* For Hidden creatures - a chance of becoming 'unhidden'
3208 * every time they move - as we subtract off 'invisibility' 3065 * every time they move - as we subtract off 'invisibility'
3209 * AND, for players, if they move into a ridiculously unhideable 3066 * AND, for players, if they move into a ridiculously unhideable
3210 * spot (surrounded by clear terrain in broad daylight). -b.t. 3067 * spot (surrounded by clear terrain in broad daylight). -b.t.
3211 */ 3068 */
3212
3213void 3069void
3214do_hidden_move (object *op) 3070do_hidden_move (object *op)
3215{ 3071{
3216 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3072 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3217 object *skop; 3073 object *skop;
… …
3221 3077
3222 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3078 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3223 3079
3224 /* 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! */
3225 if (op->type == PLAYER && op->contr->run_on) 3081 if (op->type == PLAYER && op->contr->run_on)
3226 {
3227 if (!skop || num >= skop->level) 3082 if (!skop || num >= skop->level)
3228 { 3083 {
3229 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!");
3230 make_visible (op); 3085 make_visible (op);
3231 return; 3086 return;
3232 } 3087 }
3233 else 3088 else
3234 num += 20; 3089 num += 20;
3235 } 3090
3236 num += op->map->difficulty; 3091 num += op->map->difficulty;
3237 hide = hideability (op); /* modify by terrain hidden level */ 3092 hide = hideability (op); /* modify by terrain hidden level */
3238 num -= hide; 3093 num -= hide;
3094
3239 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3095 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3240 { 3096 {
3241 make_visible (op); 3097 make_visible (op);
3242 if (op->type == PLAYER) 3098 if (op->type == PLAYER)
3243 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!");
3244 } 3100 }
3245 else if (op->type == PLAYER && skop) 3101 else if (op->type == PLAYER && skop)
3246 {
3247 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);
3248 }
3249} 3103}
3250 3104
3251/* determine if who is standing near a hostile creature. */ 3105/* determine if who is standing near a hostile creature. */
3252 3106
3253int 3107int
… …
3301 * object op. This function works fine for monsters, 3155 * object op. This function works fine for monsters,
3302 * 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
3303 * a pile (say a coin under a table would return "viewable" 3157 * a pile (say a coin under a table would return "viewable"
3304 * by this routine). Another question, should we be 3158 * by this routine). Another question, should we be
3305 * concerned with the direction the player is looking 3159 * concerned with the direction the player is looking
3306 * in? Realistically, most of use cant see stuff behind 3160 * in? Realistically, most of us can't see stuff behind
3307 * our backs...on the other hand, does the "facing" direction 3161 * our backs...on the other hand, does the "facing" direction
3308 * imply the way your head, or body is facing? Its possible 3162 * imply the way your head, or body is facing? It's possible
3309 * 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.
3310 * -b.t. 3164 * -b.t.
3311 * This function is now map tiling safe. 3165 * This function is now map tiling safe.
3312 */ 3166 */
3313
3314int 3167int
3315player_can_view (object *pl, object *op) 3168player_can_view (object *pl, object *op)
3316{ 3169{
3317 rv_vector rv; 3170 rv_vector rv;
3318 int dx, dy; 3171 int dx, dy;
… …
3320 if (pl->type != PLAYER) 3173 if (pl->type != PLAYER)
3321 { 3174 {
3322 LOG (llevError, "player_can_view() called for non-player object\n"); 3175 LOG (llevError, "player_can_view() called for non-player object\n");
3323 return -1; 3176 return -1;
3324 } 3177 }
3178
3325 if (!pl || !op) 3179 if (!pl || !op)
3326 return 0; 3180 return 0;
3327 3181
3328 if (op->head)
3329 {
3330 op = op->head; 3182 op = op->head_ ();
3331 } 3183
3332 get_rangevector (pl, op, &rv, 0x1); 3184 get_rangevector (pl, op, &rv, 0x1);
3333 3185
3334 /* starting with the 'head' part, lets loop 3186 /* starting with the 'head' part, lets loop
3335 * through the object and find if it has any 3187 * through the object and find if it has any
3336 * part that is in the los array but isnt on 3188 * part that is in the los array but isn't on
3337 * a blocked los square. 3189 * a blocked los square.
3338 * we use the archetype to figure out offsets. 3190 * we use the archetype to figure out offsets.
3339 */ 3191 */
3340 while (op) 3192 while (op)
3341 { 3193 {
3342 dx = rv.distance_x + op->arch->clone.x; 3194 dx = rv.distance_x + op->arch->x;
3343 dy = rv.distance_y + op->arch->clone.y; 3195 dy = rv.distance_y + op->arch->y;
3344 3196
3345 /* only the viewable area the player sees is updated by LOS 3197 /* only the viewable area the player sees is updated by LOS
3346 * 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
3347 * for any meaningful values. 3199 * for any meaningful values.
3348 */ 3200 */
3349 if (FABS (dx) <= (pl->contr->ns->mapx / 2) && 3201 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3350 FABS (dy) <= (pl->contr->ns->mapy / 2) && 3202 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3351 !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)])
3352 return 1; 3204 return 1;
3205
3353 op = op->more; 3206 op = op->more;
3354 } 3207 }
3208
3355 return 0; 3209 return 0;
3356} 3210}
3357 3211
3358/* routine for both players and monsters. We call this when 3212/* routine for both players and monsters. We call this when
3359 * there is a possibility for our action distrubing our hiding 3213 * there is a possibility for our action distrubing our hiding
… …
3362 * return 0. 3216 * return 0.
3363 */ 3217 */
3364int 3218int
3365action_makes_visible (object *op) 3219action_makes_visible (object *op)
3366{ 3220{
3367
3368 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3221 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3369 { 3222 {
3370 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3223 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3371 return 0; 3224 return 0;
3372 3225
… …
3378 { 3231 {
3379 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");
3380 return 1; 3233 return 1;
3381 } 3234 }
3382 } 3235 }
3236
3383 return 0; 3237 return 0;
3384} 3238}
3385 3239
3386/* op_on_battleground - checks if the given object op (usually 3240/* op_on_battleground - checks if the given object op (usually
3387 * a player) is standing on a valid battleground-tile, 3241 * a player) is standing on a valid battleground-tile,
… …
3392 * 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
3393 */ 3247 */
3394int 3248int
3395op_on_battleground (object *op, int *x, int *y) 3249op_on_battleground (object *op, int *x, int *y)
3396{ 3250{
3397 object *tmp;
3398
3399 /* A battleground-tile needs the following attributes to be valid: 3251 /* A battleground-tile needs the following attributes to be valid:
3400 * 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),
3401 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3253 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3402 * and the exit-coordinates sp/hp must both be > 0. 3254 * and the exit-coordinates sp/hp must both be > 0.
3403 * => The intention here is to prevent abuse of the battleground- 3255 * => The intention here is to prevent abuse of the battleground-
3404 * feature (like pickable or hidden battleground tiles). */ 3256 * feature (like pickable or hidden battleground tiles). */
3405 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3257 for (object *tmp = op->below; tmp; tmp = tmp->below)
3406 { 3258 {
3407 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3259 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3408 { 3260 {
3409 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3261 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3410 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))
3411 { 3265 {
3412 /*before we assign the exit, check if this is a teambattle */ 3266 /* before we assign the exit, check if this is a teambattle */
3413 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))
3414 { 3268 {
3415 object *invtmp;
3416
3417 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3269 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3418 { 3270 {
3419 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3271 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3420 { 3272 {
3421 if (x != NULL && y != NULL) 3273 if (x && y)
3422 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3274 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3275
3423 return 1; 3276 return 1;
3424 } 3277 }
3425 } 3278 }
3426 } 3279 }
3280
3427 if (x != NULL && y != NULL) 3281 if (x && y)
3428 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3282 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3283
3429 return 1; 3284 return 1;
3430 } 3285 }
3431 } 3286 }
3432 } 3287 }
3288
3433 /* If we got here, did not find a battleground */ 3289 /* If we got here, did not find a battleground */
3434 return 0; 3290 return 0;
3435} 3291}
3436 3292
3437/* 3293/*
… …
3453 char buf[MAX_BUF]; /* tmp. string buffer */ 3309 char buf[MAX_BUF]; /* tmp. string buffer */
3454 int i = 0, j = 0; 3310 int i = 0, j = 0;
3455 3311
3456 /* get the appropriate treasurelist */ 3312 /* get the appropriate treasurelist */
3457 if (atnr == ATNR_FIRE) 3313 if (atnr == ATNR_FIRE)
3458 trlist = find_treasurelist ("dragon_ability_fire"); 3314 trlist = treasurelist::find (shstr_dragon_ability_fire);
3459 else if (atnr == ATNR_COLD) 3315 else if (atnr == ATNR_COLD)
3460 trlist = find_treasurelist ("dragon_ability_cold"); 3316 trlist = treasurelist::find (shstr_dragon_ability_cold);
3461 else if (atnr == ATNR_ELECTRICITY) 3317 else if (atnr == ATNR_ELECTRICITY)
3462 trlist = find_treasurelist ("dragon_ability_elec"); 3318 trlist = treasurelist::find (shstr_dragon_ability_elec);
3463 else if (atnr == ATNR_POISON) 3319 else if (atnr == ATNR_POISON)
3464 trlist = find_treasurelist ("dragon_ability_poison"); 3320 trlist = treasurelist::find (shstr_dragon_ability_poison);
3465 3321
3466 if (trlist == NULL || who->type != PLAYER) 3322 if (trlist == NULL || who->type != PLAYER)
3467 return; 3323 return;
3468 3324
3469 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++);
3470 3326
3471 if (tr == NULL || tr->item == NULL) 3327 if (!tr || !tr->item)
3472 { 3328 {
3473 /* 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]); */
3474 return; 3330 return;
3475 } 3331 }
3476 3332
3477 /* everything seems okay - now bring on the gift: */ 3333 /* everything seems okay - now bring on the gift: */
3478 item = &(tr->item->clone); 3334 item = tr->item;
3479 3335
3480 if (item->type == SPELL) 3336 if (item->type == SPELL)
3481 { 3337 {
3482 if (check_spell_known (who, item->name)) 3338 if (check_spell_known (who, item->name))
3483 return; 3339 return;
… …
3542 { 3398 {
3543 /* forces in the treasurelist can alter the player's stats */ 3399 /* forces in the treasurelist can alter the player's stats */
3544 object *skin; 3400 object *skin;
3545 3401
3546 /* first get the dragon skin force */ 3402 /* first get the dragon skin force */
3547 shstr_cmp dragon_skin_force ("dragon_skin_force");
3548 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)
3549 ; 3404 ;
3550 3405
3551 if (!skin) 3406 if (!skin)
3552 return; 3407 return;
3553 3408
… …
3601 * not readied. 3456 * not readied.
3602 */ 3457 */
3603void 3458void
3604player_unready_range_ob (player *pl, object *ob) 3459player_unready_range_ob (player *pl, object *ob)
3605{ 3460{
3606 rangetype i; 3461 if (pl->ob->current_weapon == ob)
3462 pl->ob->current_weapon = 0;
3607 3463
3608 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3464 if (pl->combat_ob == ob)
3609 { 3465 pl->combat_ob = 0;
3466
3610 if (pl->ranges[i] == ob) 3467 if (pl->ranged_ob == ob)
3611 { 3468 pl->ranged_ob = 0;
3612 pl->ranges[i] = NULL;
3613 if (pl->shoottype == i)
3614 {
3615 pl->shoottype = range_none;
3616 }
3617 }
3618 }
3619} 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