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.62 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.171 by root, Sat Sep 8 07:06:51 2007 UTC

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

Diff Legend

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