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.43 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.201 by root, Sun Aug 17 01:26:35 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#ifdef COZY_SERVER 32#include <algorithm>
34extern int same_party (partylist *a, partylist *b); 33#include <functional>
35#endif
36 34
37player * 35playervec players;
38find_player (const char *plname)
39{
40 player *pl;
41
42 for (pl = first_player; pl != NULL; pl = pl->next)
43 {
44 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))
45 return pl;
46 };
47 return NULL;
48}
49
50player *
51find_player_partial_name (const char *plname)
52{
53 player *pl;
54 player *found = NULL;
55 size_t namelen = strlen (plname);
56
57 for (pl = first_player; pl != NULL; pl = pl->next)
58 {
59 if ((size_t) strlen (pl->ob->name) < namelen)
60 continue;
61
62 if (!strcmp (pl->ob->name, plname))
63 return pl;
64
65 if (!strncasecmp (pl->ob->name, plname, namelen))
66 {
67 if (found)
68 return NULL;
69
70 found = pl;
71 }
72 }
73 return found;
74}
75 36
76void 37void
77display_motd (const object *op) 38display_motd (const object *op)
78{ 39{
79 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
82 int comp; 43 int comp;
83 int size; 44 int size;
84 45
85 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 46 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
86 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 47 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
87 {
88 return; 48 return;
89 } 49
90 motd[0] = '\0'; 50 motd[0] = '\0';
91 size = 0; 51 size = 0;
52
92 while (fgets (buf, MAX_BUF, fp) != NULL) 53 while (fgets (buf, MAX_BUF, fp))
93 { 54 {
94 if (*buf == '#') 55 if (*buf == '#')
95 continue; 56 continue;
57
96 strncat (motd + size, buf, HUGE_BUF - size); 58 strncat (motd + size, buf, HUGE_BUF - size);
97 size += strlen (buf); 59 size += strlen (buf);
98 } 60 }
61
99 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 62 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
100 close_and_delete (fp, comp); 63 close_and_delete (fp, comp);
101} 64}
102 65
103void 66void
… …
109 int comp; 72 int comp;
110 int size; 73 int size;
111 74
112 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 75 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
113 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 76 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
114 {
115 return; 77 return;
116 } 78
117 rules[0] = '\0'; 79 rules[0] = '\0';
118 size = 0; 80 size = 0;
81
119 while (fgets (buf, MAX_BUF, fp) != NULL) 82 while (fgets (buf, MAX_BUF, fp))
120 { 83 {
121 if (*buf == '#') 84 if (*buf == '#')
122 continue; 85 continue;
86
123 if (size + strlen (buf) >= HUGE_BUF) 87 if (size + strlen (buf) >= HUGE_BUF)
124 { 88 {
125 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 89 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
126 break; 90 break;
127 } 91 }
92
128 strncat (rules + size, buf, HUGE_BUF - size); 93 strncat (rules + size, buf, HUGE_BUF - size);
129 size += strlen (buf); 94 size += strlen (buf);
130 } 95 }
96
131 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 97 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
132 close_and_delete (fp, comp); 98 close_and_delete (fp, comp);
133} 99}
134 100
135void 101void
… …
143 int size; 109 int size;
144 110
145 sprintf (buf, "%s/%s", settings.confdir, settings.news); 111 sprintf (buf, "%s/%s", settings.confdir, settings.news);
146 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 112 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
147 return; 113 return;
114
148 news[0] = '\0'; 115 news[0] = '\0';
149 subject[0] = '\0'; 116 subject[0] = '\0';
150 size = 0; 117 size = 0;
118
151 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
152 { 120 {
153 if (*buf == '#') 121 if (*buf == '#')
154 continue; 122 continue;
123
155 if (*buf == '%') 124 if (*buf == '%')
156 { /* send one news */ 125 { /* send one news */
157 if (size > 0) 126 if (size > 0)
158 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,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
131
159 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
160 strip_endline (subject); 133 strip_endline (subject);
161 size = 0; 134 size = 0;
162 news[0] = '\0'; 135 news[0] = '\0';
163 } 136 }
… …
172 size += strlen (buf); 145 size += strlen (buf);
173 } 146 }
174 } 147 }
175 148
176 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 149 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
177 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 150 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
178 close_and_delete (fp, comp); 151 close_and_delete (fp, comp);
179}
180
181int
182playername_ok (const char *cp)
183{
184 /* Don't allow - or _ as first character in the name */
185 if (*cp == '-' || *cp == '_')
186 return 0;
187
188 for (; *cp != '\0'; cp++)
189 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
190 return 0;
191 return 1;
192}
193
194/* This no longer sets the player map. Also, it now updates
195 * all the pointers so the caller doesn't need to do that.
196 * Caller is responsible for setting the correct map.
197 */
198
199/* Redo this to do both get_player_ob and get_player.
200 * Hopefully this will be less bugfree and simpler.
201 * Returns the player structure. If 'p' is null,
202 * we create a new one. Otherwise, we recycle
203 * the one that is passed.
204 */
205static player *
206get_player (player *p)
207{
208 object *op = arch_to_object (get_player_archetype (0));
209 int i;
210
211 /* Clears basically the entire player structure except
212 * for next and socket.
213 */
214 p->clear ();
215
216 /* There are some elements we want initialized to non zero value -
217 * we deal with that below this point.
218 */
219 p->party = NULL;
220 p->outputs_sync = 16; /* Every 2 seconds */
221 p->outputs_count = 8; /* Keeps present behaviour */
222 p->unapply = unapply_nochoice;
223 p->Swap_First = -1;
224
225#ifdef AUTOSAVE
226 p->last_save_tick = 9999999;
227#endif
228
229 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */
230
231 op->contr = p; /* this aren't yet in archetype */
232 p->ob = op;
233 op->speed_left = 0.5;
234 op->speed = 1.0;
235 op->direction = 5; /* So player faces south */
236 op->stats.wc = 2;
237 op->run_away = 25; /* Then we panick... */
238
239 {
240 int oldmon = p->socket->monitor_spells; // what a hack
241 p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
242 roll_stats (op);
243 p->socket->monitor_spells = oldmon;
244 }
245 p->state = ST_ROLL_STAT;
246 clear_los (op);
247
248 p->gen_sp_armour = 10;
249 p->last_speed = -1;
250 p->shoottype = range_none;
251 p->bowtype = bow_normal;
252 p->petmode = pet_normal;
253 p->listening = 10;
254 p->usekeys = containers;
255 p->last_weapon_sp = -1;
256 p->peaceful = 1; /* default peaceful */
257 p->do_los = 1;
258 p->explore = 0;
259 p->no_shout = 0; /* default can shout */
260
261 assign (p->title, op->arch->clone.name);
262 op->race = op->arch->clone.race;
263
264 CLEAR_FLAG (op, FLAG_READY_SKILL);
265
266 /* we need to clear these to -1 and not zero - otherwise,
267 * if a player quits and starts a new character, we wont
268 * send new values to the client, as things like exp start
269 * at zero.
270 */
271 for (i = 0; i < NUM_SKILLS; i++)
272 {
273 p->last_skill_exp[i] = -1;
274 p->last_skill_ob[i] = NULL;
275 }
276
277 for (i = 0; i < NROFATTACKS; i++)
278 p->last_resist[i] = -1;
279
280 p->last_stats.exp = -1;
281 p->last_weight = (uint32) - 1;
282
283 p->socket->update_look = 0;
284 p->socket->look_position = 0;
285
286 return p;
287} 152}
288 153
289/* This loads the first map an puts the player on it. */ 154/* This loads the first map an puts the player on it. */
290static void 155static void
291set_first_map (object *op) 156set_first_map (object *op)
292{ 157{
293 strcpy (op->contr->maplevel, first_map_path); 158 op->contr->maplevel = first_map_path;
294 op->x = -1; 159 op->x = -1;
295 op->y = -1; 160 op->y = -1;
296 enter_exit (op, NULL);
297} 161}
298 162
163void
164player::activate ()
165{
166 if (active)
167 return;
168
169 players.insert (this);
170 ob->remove ();
171 ob->map = 0;
172 ob->activate_recursive ();
173 CLEAR_FLAG (ob, FLAG_FRIENDLY);
174 add_friendly_object (ob);
175}
176
177void
178player::deactivate ()
179{
180 if (!active)
181 return;
182
183 terminate_all_pets (ob);
184 remove_friendly_object (ob);
185 ob->deactivate_recursive ();
186
187 if (ob->map)
188 maplevel = ob->map->path;
189
190 ob->remove ();
191 ob->enemy = 0; // sometimes keeps an extra refcount on itself
192 ob->map = 0;
193 party = 0;
194
195 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
196
197 players.erase (this);
198}
199
200// connect the player with a specific client
201// also changes, rationalises, and fixes some incorrect settings
202void
203player::connect (client *ns)
204{
205 this->ns = ns;
206 ns->pl = this;
207
208 run_on = 0;
209 fire_on = 0;
210 ob->close_container (); //TODO: client-specific
211
212 ns->update_look = 0;
213 ns->look_position = 0;
214
215 clear_los (this);
216
217 ns->reset_stats ();
218
219 /* make sure he's a player -- needed because of class change. */
220 ob->type = PLAYER; // we are paranoid
221 ob->race = ob->arch->race;
222
223 ob->update_weight ();
224 link_player_skills (ob);
225
226 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
227
228 assign (title, ob->arch->object::name);
229
230 /* if it's a dragon player, set the correct title here */
231 if (is_dragon_pl (ob))
232 {
233 object *tmp, *abil = 0, *skin = 0;
234
235 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE)
237 if (tmp->arch->archname == shstr_dragon_ability_force)
238 abil = tmp;
239 else if (tmp->arch->archname == shstr_dragon_skin_force)
240 skin = tmp;
241
242 set_dragon_name (ob, abil, skin);
243 }
244
245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246
247 esrv_new_player (this);
248
249 ob->update_stats ();
250
251 ns->floorbox_update ();
252 esrv_send_inventory (ob, ob);
253 esrv_add_spells (this, 0);
254
255 activate ();
256
257 send_rules (ob);
258 send_news (ob);
259 display_motd (ob);
260
261 INVOKE_PLAYER (CONNECT, this);
262 INVOKE_PLAYER (LOGIN, this);
263}
264
265void
266player::disconnect ()
267{
268 if (ob)
269 {
270 ob->close_container (); //TODO: client-specific
271 ob->drop_unpaid_items ();
272 }
273
274 if (ns)
275 {
276 if (active)
277 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
278
279 INVOKE_PLAYER (DISCONNECT, this);
280
281 ns->reset_stats ();
282 ns->pl = 0;
283 ns = 0;
284 }
285
286 observe = ob;
287
288 deactivate ();
289}
290
291// the need for this function can be explained
292// by load_object not returning the object
293void
294player::set_object (object *op)
295{
296 ob = observe = op;
297 ob->contr = this; /* this aren't yet in archetype */
298
299 ob->speed = 1.0f;
300 ob->speed_left = 0.5f;
301
302 ob->direction = 5; /* So player faces south */
303
304 ob->flag [FLAG_READY_WEAPON] = false;
305 ob->flag [FLAG_READY_SKILL] = false;
306 ob->flag [FLAG_READY_BOW] = false;
307
308 for (object *op = ob->inv; op; op = op->below)
309 if (op->flag [FLAG_APPLIED])
310 switch (op->type)
311 {
312 case SKILL:
313 ob->flag [FLAG_APPLIED] = false;
314 break;
315
316 case WAND:
317 case ROD:
318 case HORN:
319 case BOW:
320 ranged_ob = op;
321 break;
322
323 case WEAPON:
324 combat_ob = op;
325 break;
326 }
327
328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329 ob->deactivate (); // change_weapon activates, fix this better
330}
331
332void
333player::set_observe (object *op)
334{
335 observe = op ? op : ob;
336 do_los = 1;
337}
338
339player::player ()
340{
341 /* There are some elements we want initialised to non zero value -
342 * we deal with that below this point.
343 */
344 outputs_sync = 4;
345 outputs_count = 4;
346 unapply = unapply_nochoice;
347
348 savebed_map = first_map_path; /* Init. respawn position */
349
350 gen_sp_armour = 10;
351 bowtype = bow_normal;
352 petmode = pet_normal;
353 listening = 10;
354 usekeys = containers;
355 peaceful = 1; /* default peaceful */
356 do_los = 1;
357
358 weapon_sp = 1.0f;
359 weapon_sp_left = 0.5f;
360}
361
362void
363player::do_destroy ()
364{
365 disconnect ();
366
367 attachable::do_destroy ();
368
369 if (ob)
370 {
371 ob->destroy_inv (false);
372 ob->destroy ();
373 }
374
375 ob = observe = 0;
376}
377
378player::~player ()
379{
380 /* Clear item stack */
381 free (stack_items);
382}
383
299/* Tries to add player on the connection passwd in ns. 384/* Tries to add player on the connection passed in ns.
300 * All we can really get in this is some settings like host and display 385 * All we can really get in this is some settings like host and display
301 * mode. 386 * mode.
302 */ 387 */
303 388player *
304int 389player::create ()
305add_player (client *ns)
306{ 390{
307 player *p = new player; 391 player *pl = new player;
308 392
309 p->socket = ns; 393 pl->set_object (arch_to_object (get_player_archetype (0)));
310 ns->pl = p;
311 394
312 p->next = first_player; 395 pl->ob->roll_stats ();
313 first_player = p; 396 pl->ob->stats.wc = 2;
397 pl->ob->run_away = 25; /* Then we panick... */
314 398
315 p = get_player (p);
316
317 set_first_map (p->ob); 399 set_first_map (pl->ob);
318 400
319 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
320 add_friendly_object (p->ob);
321 send_rules (p->ob);
322 send_news (p->ob);
323 display_motd (p->ob);
324 get_name (p->ob);
325
326 return 0; 401 return pl;
327} 402}
328 403
329/* 404/*
330 * get_player_archetype() return next player archetype from archetype 405 * get_player_archetype() return next player archetype from archetype
331 * list. Not very efficient routine, but used only creating new players. 406 * list. Not very efficient routine, but used only creating new players.
332 * Note: there MUST be at least one player archetype! 407 * Note: there MUST be at least one player archetype!
333 */ 408 */
334archetype * 409archetype *
335get_player_archetype (archetype *at) 410get_player_archetype (archetype *at)
336{ 411{
337 archetype *start = at; 412 // archetypes could have been reloaded
413 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
414
415 if (!nat)
416 return at;
417
418 archvec::iterator i = archetypes.find (nat);
338 419
339 for (;;) 420 for (;;)
340 { 421 {
341 if (at == NULL || at->next == NULL) 422 if (++i == archetypes.end ())
342 at = first_archetype; 423 i = archetypes.begin ();
343 else 424 else if (*i == at)
344 at = at->next; 425 cleanup ("not a single player archetype found");
426
345 if (at->clone.type == PLAYER) 427 if ((*i)->type == PLAYER)
346 return at; 428 return *i;
347 if (at == start)
348 {
349 LOG (llevError, "No Player archetypes\n");
350 exit (-1);
351 }
352 } 429 }
353} 430}
354
355 431
356object * 432object *
357get_nearest_player (object *mon) 433get_nearest_player (object *mon)
358{ 434{
359 object *op = NULL; 435 object *op = NULL;
360 player *pl = NULL;
361 objectlink *ol; 436 objectlink *ol;
362 unsigned lastdist; 437 unsigned lastdist;
363 rv_vector rv; 438 rv_vector rv;
364 439
365 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 440 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
366 { 441 {
367 /* We should not find free objects on this friendly list, but it
368 * does periodically happen. Given that, lets deal with it.
369 * While unlikely, it is possible the next object on the friendly
370 * list is also free, so encapsulate this in a while loop.
371 */
372 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
373 {
374 object *tmp = ol->ob;
375
376 /* Can't do much more other than log the fact, because the object
377 * itself will have been cleared.
378 */
379 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
380 ol = ol->next;
381 remove_friendly_object (tmp);
382 if (!ol)
383 return op;
384 }
385
386 /* Remove special check for player from this. First, it looks to cause
387 * some crashes (ol->ob->contr not set properly?), but secondly, a more
388 * complicated method of state checking would be needed in any case -
389 * as it was, a clever player could type quit, and the function would
390 * skip them over while waiting for confirmation. Remove
391 * on_same_map check, as can_detect_enemy also does this
392 */
393 if (!can_detect_enemy (mon, ol->ob, &rv)) 442 if (!can_detect_enemy (mon, ol->ob, &rv))
394 continue; 443 continue;
395 444
396 if (lastdist > rv.distance) 445 if (lastdist > rv.distance)
397 { 446 {
398 op = ol->ob; 447 op = ol->ob;
399 lastdist = rv.distance; 448 lastdist = rv.distance;
400 } 449 }
401 } 450 }
402 for (pl = first_player; pl != NULL; pl = pl->next) 451
403 { 452 for_all_players (pl)
404 if (can_detect_enemy (mon, pl->ob, &rv)) 453 if (can_detect_enemy (mon, pl->ob, &rv))
405 {
406
407 if (lastdist > rv.distance) 454 if (lastdist > rv.distance)
408 { 455 {
409 op = pl->ob; 456 op = pl->ob;
410 lastdist = rv.distance; 457 lastdist = rv.distance;
411 } 458 }
412 } 459
413 }
414#if 0 460#if 0
415 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 461 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
416#endif 462#endif
417 return op; 463 return op;
418} 464}
… …
436 * circling behaviour. Unfortunately, this function is also used to determined 482 * circling behaviour. Unfortunately, this function is also used to determined
437 * if the creature should cast a spell, so returning a direction in that case 483 * if the creature should cast a spell, so returning a direction in that case
438 * is probably not a good thing. 484 * is probably not a good thing.
439 */ 485 */
440#define MAX_SPACES 50 486#define MAX_SPACES 50
441
442 487
443/* 488/*
444 * Returns the direction to the player, if valid. Returns 0 otherwise. 489 * Returns the direction to the player, if valid. Returns 0 otherwise.
445 * modified to verify there is a path to the player. Does this by stepping towards 490 * modified to verify there is a path to the player. Does this by stepping towards
446 * player and if path is blocked then see if blockage is close enough to player that 491 * player and if path is blocked then see if blockage is close enough to player that
… …
477 x = mon->x; 522 x = mon->x;
478 y = mon->y; 523 y = mon->y;
479 m = mon->map; 524 m = mon->map;
480 dir = rv.direction; 525 dir = rv.direction;
481 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 526 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
482 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 527 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
528
483 /* If we can't solve it within the search distance, return now. */ 529 /* If we can't solve it within the search distance, return now. */
484 if (diff > max) 530 if (diff > max)
485 return 0; 531 return 0;
532
486 while (diff > 1 && max > 0) 533 while (diff > 1 && max > 0)
487 { 534 {
488 lastx = x; 535 lastx = x;
489 lasty = y; 536 lasty = y;
490 lastmap = m; 537 lastmap = m;
… …
572 max--; 619 max--;
573 lastdir = dir; 620 lastdir = dir;
574 if (!firstdir) 621 if (!firstdir)
575 firstdir = dir; 622 firstdir = dir;
576 } 623 }
624
577 if (diff <= 1) 625 if (diff <= 1)
578 { 626 {
579 /* Recalculate diff (distance) because we may not have actually 627 /* Recalculate diff (distance) because we may not have actually
580 * headed toward player for entire distance. 628 * headed toward player for entire distance.
581 */ 629 */
582 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 630 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
583 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 631 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
584 } 632 }
633
585 if (diff > max) 634 if (diff > max)
586 return 0; 635 return 0;
587 } 636 }
637
588 /* If we reached the max, didn't find a direction in time */ 638 /* If we reached the max, didn't find a direction in time */
589 if (!max) 639 if (!max)
590 return 0; 640 return 0;
591 641
592 return firstdir; 642 return firstdir;
593} 643}
594 644
595void 645void
596give_initial_items (object *pl, treasurelist * items) 646give_initial_items (object *pl, treasurelist *items)
597{ 647{
598 object *op, *next = NULL;
599
600 if (pl->randomitems != NULL) 648 if (pl->randomitems)
601 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 649 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
602 650
603 for (op = pl->inv; op; op = next) 651 for (object *next, *op = pl->inv; op; op = next)
604 { 652 {
605 next = op->below; 653 next = op->below;
606 654
607 /* Forces get applied per default, unless they have the 655 /* Forces get applied per default, unless they have the
608 * flag "neutral" set. Sorry but I can't think of a better way 656 * flag "neutral" set. Sorry but I can't think of a better way
… …
613 /* we never give weapons/armour if these cannot be used 661 /* we never give weapons/armour if these cannot be used
614 * by this player due to race restrictions 662 * by this player due to race restrictions
615 */ 663 */
616 if (pl->type == PLAYER) 664 if (pl->type == PLAYER)
617 { 665 {
618 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 666 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
667 &&
619 (op->type == ARMOUR || op->type == BOOTS || 668 (op->type == ARMOUR || op->type == BOOTS
620 op->type == CLOAK || op->type == HELMET || 669 || op->type == CLOAK || op->type == HELMET
621 op->type == SHIELD || op->type == GLOVES || 670 || op->type == SHIELD || op->type == GLOVES
671 || op->type == BRACERS || op->type == GIRDLE))
622 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 672 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
623 { 673 {
624 op->destroy (); 674 op->destroy ();
625 continue; 675 continue;
626 } 676 }
627 } 677 }
… …
650 if (op->nrof > 1) 700 if (op->nrof > 1)
651 op->nrof = 1; 701 op->nrof = 1;
652 } 702 }
653 703
654 if (op->type == SPELLBOOK && op->inv) 704 if (op->type == SPELLBOOK && op->inv)
655 {
656 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 705 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
657 }
658 706
659 /* Give starting characters identified, uncursed, and undamned 707 /* Give starting characters identified, uncursed, and undamned
660 * items. Just don't identify gold or silver, or it won't be 708 * items. Just don't identify gold or silver, or it won't be
661 * merged properly. 709 * merged properly.
662 */ 710 */
663 if (need_identify (op)) 711 if (need_identify (op))
664 { 712 {
665 SET_FLAG (op, FLAG_IDENTIFIED); 713 SET_FLAG (op, FLAG_IDENTIFIED);
666 CLEAR_FLAG (op, FLAG_CURSED); 714 CLEAR_FLAG (op, FLAG_CURSED);
667 CLEAR_FLAG (op, FLAG_DAMNED); 715 CLEAR_FLAG (op, FLAG_DAMNED);
668 } 716 }
717
669 if (op->type == SPELL) 718 if (op->type == SPELL)
670 { 719 {
671 op->destroy (); 720 op->destroy ();
672 continue; 721 continue;
673 } 722 }
… …
675 { 724 {
676 SET_FLAG (op, FLAG_CAN_USE_SKILL); 725 SET_FLAG (op, FLAG_CAN_USE_SKILL);
677 op->stats.exp = 0; 726 op->stats.exp = 0;
678 op->level = 1; 727 op->level = 1;
679 } 728 }
680 /* lock all 'normal items by default */ 729 else /* lock all 'normal items by default */
681 else
682 SET_FLAG (op, FLAG_INV_LOCKED); 730 SET_FLAG (op, FLAG_INV_LOCKED);
683 } /* for loop of objects in player inv */ 731 } /* for loop of objects in player inv */
684 732
685 /* Need to set up the skill pointers */ 733 /* Need to set up the skill pointers */
686 link_player_skills (pl); 734 link_player_skills (pl);
687} 735}
688 736
689void 737void
690get_name (object *op)
691{
692 op->contr->write_buf[0] = '\0';
693 op->contr->state = ST_GET_NAME;
694 send_query (op->contr->socket, 0, "What is your name?\n:");
695}
696
697void
698get_password (object *op)
699{
700 op->contr->write_buf[0] = '\0';
701 op->contr->state = ST_GET_PASSWORD;
702 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
703}
704
705void
706play_again (object *op)
707{
708 op->contr->state = ST_PLAY_AGAIN;
709 op->chosen_skill = NULL;
710 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
711 /* a bit of a hack, but there are various places early in th
712 * player creation process that a user can quit (eg, roll
713 * stats) that isn't removing the player. Taking a quick
714 * look, there are many places that call play_again without
715 * removing the player - it probably makes more sense
716 * to leave it to play_again to remove the object in all
717 * cases.
718 */
719 if (!QUERY_FLAG (op, FLAG_REMOVED))
720 op->remove ();
721 /* Need to set this to null - otherwise, it could point to garbage,
722 * and draw() doesn't check to see if the player is removed, only if
723 * the map is null or not swapped out.
724 */
725 op->map = NULL;
726}
727
728int
729receive_play_again (object *op, char key)
730{
731 if (key == 'q' || key == 'Q')
732 {
733 remove_friendly_object (op);
734 leave (op->contr, 0); /* ericserver will draw the message */
735 return 2;
736 }
737 else if (key == 'a' || key == 'A')
738 {
739 player *pl = op->contr;
740 shstr name = op->name;
741
742 op->contr = 0;
743 op->type = 0;
744 op->destroy (1);
745 pl = get_player (pl);
746 op = pl->ob;
747 add_friendly_object (op);
748 op->contr->password[0] = '~';
749 op->name = op->name_pl = 0;
750 /* Lets put a space in here */
751 new_draw_info (NDI_UNIQUE, 0, op, "\n");
752 get_name (op);
753 op->name = op->name_pl = name;
754 set_first_map (op);
755 }
756 else
757 /* user pressed something else so just ask again... */
758 play_again (op);
759
760 return 0;
761}
762
763void
764confirm_password (object *op)
765{
766
767 op->contr->write_buf[0] = '\0';
768 op->contr->state = ST_CONFIRM_PASSWORD;
769 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
770}
771
772void
773get_party_password (object *op, partylist *party) 738get_party_password (object *op, partylist *party)
774{ 739{
775 if (party == NULL) 740 if (party == NULL)
776 { 741 {
777 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 742 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
778 return; 743 return;
779 } 744 }
745
780 op->contr->write_buf[0] = '\0'; 746 op->contr->write_buf[0] = '\0';
781 op->contr->state = ST_GET_PARTY_PASSWORD; 747 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
782 op->contr->party_to_join = party; 748 op->contr->party_to_join = party;
783 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 749 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
784} 750}
785
786 751
787/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 752/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
788int 753static int
789roll_stat (void) 754roll_stat (void)
790{ 755{
791 int a[4], i, j, k; 756 int a[4], i, j, k;
792 757
793 for (i = 0; i < 4; i++) 758 for (i = 0; i < 4; i++)
794 a[i] = (int) RANDOM () % 6 + 1; 759 a[i] = (int) rndm (6) + 1;
795 760
796 for (i = 0, j = 0, k = 7; i < 4; i++) 761 for (i = 0, j = 0, k = 7; i < 4; i++)
797 if (a[i] < k) 762 if (a[i] < k)
798 k = a[i], j = i; 763 k = a[i], j = i;
799 764
800 for (i = 0, k = 0; i < 4; i++) 765 for (i = 0, k = 0; i < 4; i++)
801 {
802 if (i != j) 766 if (i != j)
803 k += a[i]; 767 k += a[i];
804 } 768
805 return k; 769 return k;
806} 770}
807 771
808void 772void
809roll_stats (object *op) 773object::roll_stats ()
810{ 774{
775 int statsort [NUM_STATS];
776
777 for (;;)
778 {
811 int sum = 0; 779 int sum = 0;
812 int i = 0, j = 0; 780 for (int i = NUM_STATS; i--; )
813 int statsort[7]; 781 sum += statsort [i] = roll_stat ();
814 782
815 do 783 if (sum >= 82 && sum <= 116)
784 break;
816 { 785 }
817 op->stats.Str = roll_stat ();
818 op->stats.Dex = roll_stat ();
819 op->stats.Int = roll_stat ();
820 op->stats.Con = roll_stat ();
821 op->stats.Wis = roll_stat ();
822 op->stats.Pow = roll_stat ();
823 op->stats.Cha = roll_stat ();
824 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
825 }
826 while (sum < 82 || sum > 116);
827 786
828 /* Sort the stats so that rerolling is easier... */ 787 // Sort the stats so that rerolling is easier...
829 statsort[0] = op->stats.Str; 788 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
830 statsort[1] = op->stats.Dex;
831 statsort[2] = op->stats.Int;
832 statsort[3] = op->stats.Con;
833 statsort[4] = op->stats.Wis;
834 statsort[5] = op->stats.Pow;
835 statsort[6] = op->stats.Cha;
836 789
837 /* a quick and dirty bubblesort? */ 790 for (int i = 0; i < NUM_STATS; ++i)
838 do 791 stats.stat (i) = statsort [i];
839 {
840 if (statsort[i] < statsort[i + 1])
841 {
842 j = statsort[i];
843 statsort[i] = statsort[i + 1];
844 statsort[i + 1] = j;
845 i = 0;
846 }
847 else
848 {
849 i++;
850 }
851 }
852 while (i < 6);
853 792
854 op->stats.Str = statsort[0];
855 op->stats.Dex = statsort[1];
856 op->stats.Con = statsort[2];
857 op->stats.Int = statsort[3];
858 op->stats.Wis = statsort[4];
859 op->stats.Pow = statsort[5];
860 op->stats.Cha = statsort[6];
861
862
863 op->contr->orig_stats.Str = op->stats.Str;
864 op->contr->orig_stats.Dex = op->stats.Dex;
865 op->contr->orig_stats.Int = op->stats.Int;
866 op->contr->orig_stats.Con = op->stats.Con;
867 op->contr->orig_stats.Wis = op->stats.Wis;
868 op->contr->orig_stats.Pow = op->stats.Pow;
869 op->contr->orig_stats.Cha = op->stats.Cha;
870
871 op->level = 1;
872 op->stats.exp = 0; 793 stats.exp = 0;
873 op->stats.ac = 0; 794 stats.ac = 0;
874 795
875 op->contr->levhp[1] = 9;
876 op->contr->levsp[1] = 6;
877 op->contr->levgrace[1] = 3;
878
879 fix_player (op);
880 op->stats.hp = op->stats.maxhp; 796 stats.hp = stats.maxhp;
881 op->stats.sp = op->stats.maxsp; 797 stats.sp = stats.maxsp;
882 op->stats.grace = op->stats.maxgrace; 798 stats.grace = stats.maxgrace;
799
800 if (contr)
801 {
802 contr->levhp[1] = 9;
803 contr->levsp[1] = 6;
804 contr->levgrace[1] = 3;
805
883 op->contr->orig_stats = op->stats; 806 contr->orig_stats = stats;
807 }
884} 808}
885 809
886void 810void
887Roll_Again (object *op) 811object::swap_stats (int a, int b)
888{ 812{
889 esrv_new_player (op->contr, 0); 813 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
890 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
891 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
892}
893 814
894void 815 for (int i = 0; i < NUM_STATS; ++i)
895Swap_Stat (object *op, int Swap_Second) 816 stats.stat (i) = contr->orig_stats.stat (i);
817
818 //TODO: the following code looks so borked and should, at the very least,
819 // be merged with the similar code in roll_stats
820 stats.ac = 0;
821
822 level = 1;
823 stats.exp = 0;
824 stats.ac = 0;
825
826 stats.hp = stats.maxhp;
827 stats.sp = stats.maxsp;
828 stats.grace = stats.maxgrace;
829
830 if (contr)
831 {
832 contr->levhp[1] = 9;
833 contr->levsp[1] = 6;
834 contr->levgrace[1] = 3;
835
836 contr->orig_stats = stats;
837 }
838}
839
840static void
841start_info (object *op)
896{ 842{
897 signed char tmp;
898 char buf[MAX_BUF]; 843 char buf[MAX_BUF];
899 844
900 if (op->contr->Swap_First == -1) 845 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
901 {
902 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
903 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
904 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
905 return;
906 }
907
908 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
909
910 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
911
912 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
913
914 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
915 new_draw_info (NDI_UNIQUE, 0, op, buf); 846 new_draw_info (NDI_UNIQUE, 0, op, buf);
916 op->stats.Str = op->contr->orig_stats.Str;
917 op->stats.Dex = op->contr->orig_stats.Dex;
918 op->stats.Con = op->contr->orig_stats.Con;
919 op->stats.Int = op->contr->orig_stats.Int;
920 op->stats.Wis = op->contr->orig_stats.Wis;
921 op->stats.Pow = op->contr->orig_stats.Pow;
922 op->stats.Cha = op->contr->orig_stats.Cha;
923 op->stats.ac = 0;
924
925 op->level = 1;
926 op->stats.exp = 0;
927 op->stats.ac = 0;
928
929 op->contr->levhp[1] = 9;
930 op->contr->levsp[1] = 6;
931 op->contr->levgrace[1] = 3;
932
933 fix_player (op);
934 op->stats.hp = op->stats.maxhp;
935 op->stats.sp = op->stats.maxsp;
936 op->stats.grace = op->stats.maxgrace;
937 op->contr->orig_stats = op->stats;
938 op->contr->Swap_First = -1;
939}
940
941
942/* This code has been greatly reduced, because with set_attr_value
943 * and get_attr_value, the stats can be accessed just numeric
944 * ids. stat_trans is a table that translate the number entered
945 * into the actual stat. It is needed because the order the stats
946 * are displayed in the stat window is not the same as how
947 * the number's access that stat. The table does that translation.
948 */
949int
950key_roll_stat (object *op, char key)
951{
952 int keynum = key - '0';
953 char buf[MAX_BUF];
954 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
955
956 if (keynum > 0 && keynum <= 7)
957 {
958 if (op->contr->Swap_First == -1)
959 {
960 op->contr->Swap_First = stat_trans[keynum];
961 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
962 new_draw_info (NDI_UNIQUE, 0, op, buf);
963 }
964 else
965 Swap_Stat (op, stat_trans[keynum]);
966
967 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
968 return 1;
969 }
970 switch (key)
971 {
972 case 'n':
973 case 'N':
974 {
975 SET_FLAG (op, FLAG_WIZ);
976 if (op->map == NULL)
977 {
978 LOG (llevError, "Map == NULL in state 2\n");
979 break;
980 }
981
982#if 0
983 /* So that enter_exit will put us at startx/starty */
984 op->x = -1;
985
986 enter_exit (op, NULL);
987#endif
988 SET_ANIMATION (op, 2); /* So player faces south */
989 /* Enter exit adds a player otherwise */
990 add_statbonus (op);
991 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
992 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
993 op->contr->state = ST_CHANGE_CLASS;
994 if (op->msg)
995 new_draw_info (NDI_BLUE, 0, op, op->msg);
996 return 0;
997 }
998 case 'y':
999 case 'Y':
1000 roll_stats (op);
1001 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1002 return 1;
1003
1004 case 'q':
1005 case 'Q':
1006 play_again (op);
1007 return 1;
1008
1009 default:
1010 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1011 return 0;
1012 }
1013 return 0;
1014} 847}
1015 848
1016/* This function takes the key that is passed, and does the 849/* This function takes the key that is passed, and does the
1017 * appropriate action with it (change race, or other things). 850 * appropriate action with it (change race, or other things).
1018 * The function name is for historical reasons - now we have 851 * The function name is for historical reasons - now we have
1019 * separate race and class; this actually changes the RACE, 852 * separate race and class; this actually changes the RACE,
1020 * not the class. 853 * not the class.
1021 */ 854 */
1022 855void
1023int 856player::chargen_race_done ()
1024key_change_class (object *op, char key)
1025{ 857{
1026 int tmp_loop;
1027
1028 if (key == 'q' || key == 'Q')
1029 {
1030 op->remove ();
1031 play_again (op);
1032 return 0;
1033 }
1034 if (key == 'd' || key == 'D')
1035 {
1036 char buf[MAX_BUF];
1037
1038 /* this must before then initial items are given */ 858 /* this must before then initial items are given */
1039 esrv_new_player (op->contr, op->weight + op->carrying); 859 esrv_new_player (ob->contr);
1040 860
1041 treasurelist *tl = find_treasurelist ("starting_wealth"); 861 treasurelist *tl = treasurelist::find ("starting_wealth");
1042 if (tl) 862 if (tl)
1043 create_treasure (tl, op, 0, 0, 0); 863 create_treasure (tl, ob, 0, 0, 0);
1044 864
1045 INVOKE_PLAYER (BIRTH, op->contr); 865 INVOKE_PLAYER (BIRTH, ob->contr);
1046 INVOKE_PLAYER (LOGIN, op->contr); 866 INVOKE_PLAYER (LOGIN, ob->contr);
1047 867
1048 op->contr->state = ST_PLAYING; 868 ob->contr->ns->state = ST_PLAYING;
1049 869
1050 if (op->msg) 870 if (ob->msg)
1051 op->msg = NULL; 871 ob->msg = 0;
1052 872
1053 /* We create this now because some of the unique maps will need it
1054 * to save here.
1055 */
1056 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
1057 make_path_to_file (buf);
1058
1059#ifdef AUTOSAVE
1060 op->contr->last_save_tick = pticks;
1061#endif
1062 start_info (op); 873 start_info (ob);
1063 CLEAR_FLAG (op, FLAG_WIZ); 874 CLEAR_FLAG (ob, FLAG_WIZ);
1064 give_initial_items (op, op->randomitems); 875 give_initial_items (ob, ob->randomitems);
1065 link_player_skills (op); 876 link_player_skills (ob);
1066 esrv_send_inventory (op, op); 877 esrv_send_inventory (ob, ob);
1067 fix_player (op); 878 ob->update_stats ();
1068 879
1069 /* This moves the player to a different start map, if there 880 /* This moves the player to a different start map, if there
1070 * is one for this race 881 * is one for this race
1071 */ 882 */
1072 if (*first_map_ext_path) 883 if (*first_map_ext_path)
1073 { 884 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
1074 object *tmp;
1075 char mapname[MAX_BUF];
1076
1077 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);
1078 tmp = object::create ();
1079 EXIT_PATH (tmp) = mapname;
1080 EXIT_X (tmp) = op->x;
1081 EXIT_Y (tmp) = op->y;
1082 enter_exit (op, tmp); /* we don't really care if it succeeded;
1083 * if the map isn't there, then stay on the
1084 * default initial map */
1085 tmp->destroy ();
1086 }
1087 else 885 else
1088 {
1089 LOG (llevDebug, "first_map_ext_path not set\n"); 886 LOG (llevDebug, "first_map_ext_path not set\n");
1090 } 887}
1091 return 0;
1092 }
1093 888
889void
890player::chargen_race_next ()
891{
1094 /* Following actually changes the race - this is the default command 892 /* Following actually changes the race - this is the default command
1095 * if we don't match with one of the options above. 893 * if we don't match with one of the options above.
1096 */ 894 */
1097 895
1098 tmp_loop = 0; 896 do
1099 while (!tmp_loop)
1100 { 897 {
1101 shstr name = op->name; 898 shstr name = ob->name;
1102 int x = op->x, y = op->y; 899 int x = ob->x, y = ob->y;
1103 900
1104 remove_statbonus (op); 901 ob->remove_statbonus ();
1105 op->remove (); 902 ob->remove ();
1106 op->arch = get_player_archetype (op->arch); 903 ob->arch = get_player_archetype (ob->arch);
1107 op->arch->clone.copy_to (op); 904 ob->arch->copy_to (ob);
1108 op->instantiate (); 905 ob->instantiate ();
1109 op->stats = op->contr->orig_stats; 906 ob->stats = ob->contr->orig_stats;
1110 op->name = op->name_pl = name; 907 ob->name = ob->name_pl = name;
1111 op->x = x; 908 ob->x = x;
1112 op->y = y; 909 ob->y = y;
1113 SET_ANIMATION (op, 2); /* So player faces south */ 910 SET_ANIMATION (ob, 2); /* So player faces south */
1114 insert_ob_in_map (op, op->map, op, 0); 911 insert_ob_in_map (ob, ob->map, ob, 0);
1115 assign (op->contr->title, op->arch->clone.name); 912 assign (ob->contr->title, ob->arch->object::name);
1116 add_statbonus (op); 913 ob->add_statbonus ();
1117 tmp_loop = allowed_class (op);
1118 } 914 }
915 while (!allowed_class (ob));
1119 916
1120 update_object (op, UP_OBJ_FACE); 917 update_object (ob, UP_OBJ_FACE);
1121 esrv_update_item (UPD_FACE, op, op); 918 esrv_update_item (UPD_FACE, ob, ob);
1122 fix_player (op); 919 ob->update_stats ();
1123 op->stats.hp = op->stats.maxhp; 920 ob->stats.hp = ob->stats.maxhp;
1124 op->stats.sp = op->stats.maxsp; 921 ob->stats.sp = ob->stats.maxsp;
1125 op->stats.grace = 0; 922 ob->stats.grace = 0;
1126
1127 if (op->msg)
1128 new_draw_info (NDI_BLUE, 0, op, op->msg);
1129
1130 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1131 return 0;
1132}
1133
1134int
1135key_confirm_quit (object *op, char key)
1136{
1137 char buf[MAX_BUF];
1138
1139 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1140 {
1141 op->contr->state = ST_PLAYING;
1142 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1143 return 1;
1144 }
1145
1146 INVOKE_PLAYER (LOGOUT, op->contr);
1147 INVOKE_PLAYER (QUIT, op->contr);
1148
1149 terminate_all_pets (op);
1150 leave_map (op);
1151 op->direction = 0;
1152 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1153
1154 strcpy (op->contr->killer, "quit");
1155 check_score (op);
1156 op->contr->party = NULL;
1157 if (settings.set_title == TRUE)
1158 op->contr->own_title[0] = '\0';
1159
1160 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1161 {
1162 maptile *mp, *next;
1163
1164 /* We need to hunt for any per player unique maps in memory and
1165 * get rid of them. The trailing slash in the path is intentional,
1166 * so that players named 'Ab' won't match against players 'Abe' pathname
1167 */
1168 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1169 for (mp = first_map; mp != NULL; mp = next)
1170 {
1171 next = mp->next;
1172 if (!strncmp (mp->path, buf, strlen (buf)))
1173 delete_map (mp);
1174 }
1175
1176 delete_character (op->name, 1);
1177 }
1178
1179 play_again (op);
1180 return 1;
1181} 923}
1182 924
1183void 925void
1184flee_player (object *op) 926flee_player (object *op)
1185{ 927{
… …
1215 { 957 {
1216 op->enemy = NULL; 958 op->enemy = NULL;
1217 CLEAR_FLAG (op, FLAG_SCARED); 959 CLEAR_FLAG (op, FLAG_SCARED);
1218 return; 960 return;
1219 } 961 }
962
1220 get_rangevector (op, op->enemy, &rv, 0); 963 get_rangevector (op, op->enemy, &rv, 0);
1221 964
1222 dir = absdir (4 + rv.direction); 965 dir = absdir (4 + rv.direction);
1223 for (diff = 0; diff < 3; diff++) 966 for (diff = 0; diff < 3; diff++)
1224 { 967 {
1225 int m = 1 - (RANDOM () & 2); 968 int m = 1 - (RANDOM () & 2);
1226 969
1227 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 970 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1228 {
1229 return; 971 return;
1230 }
1231 } 972 }
973
1232 /* Cornered, get rid of scared */ 974 /* Cornered, get rid of scared */
1233 CLEAR_FLAG (op, FLAG_SCARED); 975 CLEAR_FLAG (op, FLAG_SCARED);
1234 op->enemy = NULL; 976 op->enemy = NULL;
1235} 977}
1236 978
1237
1238/* check_pick sees if there is stuff to be picked up/picks up stuff. 979/* check_pick sees if there is stuff to be picked up/picks up stuff.
1239 * IT returns 1 if the player should keep on moving, 0 if he should 980 * It returns 1 if the player should keep on moving, 0 if he should
1240 * stop. 981 * stop.
1241 */ 982 */
1242int 983int
1243check_pick (object *op) 984check_pick (object *op)
1244{ 985{
1245 object *tmp, *next; 986 object *tmp, *next;
1246 int stop = 0; 987 int stop = 0;
1247 int j, k, wvratio; 988 int wvratio;
1248 char putstring[128], tmpstr[16]; 989 char putstring[128];
1249 990
1250 /* if you're flying, you cna't pick up anything */ 991 /* if you're flying, you cna't pick up anything */
1251 if (op->move_type & MOVE_FLYING) 992 if (op->move_type & MOVE_FLYING)
1252 return 1; 993 return 1;
1253 994
1254 next = op->below; 995 next = op->below;
1255 996
997 int cnt = MAX_ITEM_PER_DROP;
998#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
999
1256 /* loop while there are items on the floor that are not marked as 1000 /* loop while there are items on the floor that are not marked as
1257 * destroyed */ 1001 * destroyed */
1258 while (next && !next->destroyed ()) 1002 while (next && !next->destroyed ())
1259 { 1003 {
1260 tmp = next; 1004 tmp = next;
1261 next = tmp->below; 1005 next = tmp->below;
1262 1006
1007 if (cnt <= 0)
1008 {
1009 op->failmsg ("Couldn't pickup all items at once.");
1010 return 0;
1011 }
1012
1263 if (op->destroyed ()) 1013 if (op->destroyed ())
1264 return 0; 1014 return 0;
1265 1015
1266 if (!can_pick (op, tmp)) 1016 if (!can_pick (op, tmp))
1267 continue; 1017 continue;
1268 1018
1269 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1019 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1270 { 1020 {
1271 if (item_matched_string (op, tmp, op->contr->search_str)) 1021 if (item_matched_string (op, tmp, op->contr->search_str))
1272 pick_up (op, tmp); 1022 CHK_PICK_PICKUP;
1273 continue; 1023 continue;
1274 } 1024 }
1275 1025
1276 /* high not bit set? We're using the old autopickup model */ 1026 /* high not bit set? We're using the old autopickup model */
1277 if (!(op->contr->mode & PU_NEWMODE)) 1027 if (!(op->contr->mode & PU_NEWMODE))
… …
1279 switch (op->contr->mode) 1029 switch (op->contr->mode)
1280 { 1030 {
1281 case 0: 1031 case 0:
1282 return 1; /* don't pick up */ 1032 return 1; /* don't pick up */
1283 case 1: 1033 case 1:
1284 pick_up (op, tmp); 1034 CHK_PICK_PICKUP;
1285 return 1; 1035 return 1;
1286 case 2: 1036 case 2:
1287 pick_up (op, tmp); 1037 CHK_PICK_PICKUP;
1288 return 0; 1038 return 0;
1289 case 3: 1039 case 3:
1290 return 0; /* stop before pickup */ 1040 return 0; /* stop before pickup */
1291 case 4: 1041 case 4:
1292 pick_up (op, tmp); 1042 CHK_PICK_PICKUP;
1293 break; 1043 break;
1294 case 5: 1044 case 5:
1295 pick_up (op, tmp); 1045 CHK_PICK_PICKUP;
1296 stop = 1; 1046 stop = 1;
1297 break; 1047 break;
1298 case 6: 1048 case 6:
1299 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1049 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1300 pick_up (op, tmp); 1050 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1051 CHK_PICK_PICKUP;
1301 break; 1052 break;
1302 1053
1303 case 7: 1054 case 7:
1304 if (tmp->type == MONEY || tmp->type == GEM) 1055 if (tmp->type == MONEY || tmp->type == GEM)
1305 pick_up (op, tmp); 1056 CHK_PICK_PICKUP;
1306 break; 1057 break;
1307 1058
1308 default: 1059 default:
1309 /* use value density */ 1060 /* use value density */
1310 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1061 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1311 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1062 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1312 pick_up (op, tmp); 1063 CHK_PICK_PICKUP;
1313 } 1064 }
1314 } 1065 }
1315 else 1066 else
1316 { /* old model */ 1067 { /* old model */
1317 /* NEW pickup handling */ 1068 /* NEW pickup handling */
… …
1321 if (tmp->name != NULL) 1072 if (tmp->name != NULL)
1322 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1073 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1323 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1074 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1324 else 1075 else
1325 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1076 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1326 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1077 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1078
1327 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1079 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1328
1329 sprintf (putstring, "...flags: ");
1330 for (k = 0; k < 4; k++)
1331 {
1332 for (j = 0; j < 32; j++)
1333 {
1334 if ((tmp->flags[k] >> j) & 0x01)
1335 {
1336 sprintf (tmpstr, "%d ", k * 32 + j);
1337 strcat (putstring, tmpstr);
1338 }
1339 }
1340 }
1341 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1342
1343#if 0
1344 /* print the flags too */
1345 for (k = 0; k < 4; k++)
1346 {
1347 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1348 for (j = 0; j < 32; j++)
1349 {
1350 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1351 if (!((j + 1) % 4))
1352 fprintf (stderr, " ");
1353 }
1354 fprintf (stderr, " [%d]\n", k * 32);
1355 }
1356#endif
1357 } 1080 }
1081
1358 /* philosophy: 1082 /* philosophy:
1359 * It's easy to grab an item type from a pile, as long as it's 1083 * It's easy to grab an item type from a pile, as long as it's
1360 * generic. This takes no game-time. For more detailed pickups 1084 * generic. This takes no game-time. For more detailed pickups
1361 * and selections, select-items shoul dbe used. This is a 1085 * and selections, select-items should be used. This is a
1362 * grab-as-you-run type mode that's really useful for arrows for 1086 * grab-as-you-run type mode that's really useful for arrows for
1363 * example. 1087 * example.
1364 * The drawback: right now it has no frontend, so you need to 1088 * The drawback: right now it has no frontend, so you need to
1365 * stick the bits you want into a calculator in hex mode and then 1089 * stick the bits you want into a calculator in hex mode and then
1366 * convert to decimal and then 'pickup <#> 1090 * convert to decimal and then 'pickup <#>
… …
1399 /* all food and drink if desired */ 1123 /* all food and drink if desired */
1400 /* question: don't pick up known-poisonous stuff? */ 1124 /* question: don't pick up known-poisonous stuff? */
1401 if (op->contr->mode & PU_FOOD) 1125 if (op->contr->mode & PU_FOOD)
1402 if (tmp->type == FOOD) 1126 if (tmp->type == FOOD)
1403 { 1127 {
1404 pick_up (op, tmp); 1128 CHK_PICK_PICKUP;
1405 continue; 1129 continue;
1406 } 1130 }
1407 1131
1408 if (op->contr->mode & PU_DRINK) 1132 if (op->contr->mode & PU_DRINK)
1409 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1133 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1410 { 1134 {
1411 pick_up (op, tmp); 1135 CHK_PICK_PICKUP;
1412 continue; 1136 continue;
1413 } 1137 }
1414 1138
1415 if (op->contr->mode & PU_POTION) 1139 if (op->contr->mode & PU_POTION)
1416 if (tmp->type == POTION) 1140 if (tmp->type == POTION)
1417 { 1141 {
1418 pick_up (op, tmp); 1142 CHK_PICK_PICKUP;
1419 continue; 1143 continue;
1420 } 1144 }
1421 1145
1422 /* spellbooks, skillscrolls and normal books/scrolls */ 1146 /* spellbooks, skillscrolls and normal books/scrolls */
1423 if (op->contr->mode & PU_SPELLBOOK) 1147 if (op->contr->mode & PU_SPELLBOOK)
1424 if (tmp->type == SPELLBOOK) 1148 if (tmp->type == SPELLBOOK)
1425 { 1149 {
1426 pick_up (op, tmp); 1150 CHK_PICK_PICKUP;
1427 continue; 1151 continue;
1428 } 1152 }
1429 1153
1430 if (op->contr->mode & PU_SKILLSCROLL) 1154 if (op->contr->mode & PU_SKILLSCROLL)
1431 if (tmp->type == SKILLSCROLL) 1155 if (tmp->type == SKILLSCROLL)
1432 { 1156 {
1433 pick_up (op, tmp); 1157 CHK_PICK_PICKUP;
1434 continue; 1158 continue;
1435 } 1159 }
1436 1160
1437 if (op->contr->mode & PU_READABLES) 1161 if (op->contr->mode & PU_READABLES)
1438 if (tmp->type == BOOK || tmp->type == SCROLL) 1162 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1439 { 1163 {
1440 pick_up (op, tmp); 1164 CHK_PICK_PICKUP;
1441 continue; 1165 continue;
1442 } 1166 }
1443 1167
1444 /* wands/staves/rods/horns */ 1168 /* wands/staves/rods/horns */
1445 if (op->contr->mode & PU_MAGIC_DEVICE) 1169 if (op->contr->mode & PU_MAGIC_DEVICE)
1446 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1170 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1447 { 1171 {
1448 pick_up (op, tmp); 1172 CHK_PICK_PICKUP;
1449 continue; 1173 continue;
1450 } 1174 }
1451 1175
1452 /* pick up all magical items */ 1176 /* pick up all magical items */
1453 if (op->contr->mode & PU_MAGICAL) 1177 if (op->contr->mode & PU_MAGICAL)
1454 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1178 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1455 { 1179 {
1456 pick_up (op, tmp); 1180 CHK_PICK_PICKUP;
1457 continue; 1181 continue;
1458 } 1182 }
1459 1183
1460 if (op->contr->mode & PU_VALUABLES) 1184 if (op->contr->mode & PU_VALUABLES)
1461 { 1185 {
1462 if (tmp->type == MONEY || tmp->type == GEM) 1186 if (tmp->type == MONEY || tmp->type == GEM)
1463 { 1187 {
1464 pick_up (op, tmp); 1188 CHK_PICK_PICKUP;
1465 continue; 1189 continue;
1466 } 1190 }
1467 } 1191 }
1468 1192
1469 /* rings & amulets - talismans seems to be typed AMULET */ 1193 /* rings & amulets - talismans seems to be typed AMULET */
1470 if (op->contr->mode & PU_JEWELS) 1194 if (op->contr->mode & PU_JEWELS)
1471 if (tmp->type == RING || tmp->type == AMULET) 1195 if (tmp->type == RING || tmp->type == AMULET)
1472 { 1196 {
1473 pick_up (op, tmp); 1197 CHK_PICK_PICKUP;
1474 continue; 1198 continue;
1475 } 1199 }
1476 1200
1477 /* we don't forget dragon food */ 1201 /* we don't forget dragon food */
1478 if (op->contr->mode & PU_FLESH) 1202 if (op->contr->mode & PU_FLESH)
1479 if (tmp->type == FLESH) 1203 if (tmp->type == FLESH)
1480 { 1204 {
1481 pick_up (op, tmp); 1205 CHK_PICK_PICKUP;
1482 continue; 1206 continue;
1483 } 1207 }
1484 1208
1485 /* bows and arrows. Bows are good for selling! */ 1209 /* bows and arrows. Bows are good for selling! */
1486 if (op->contr->mode & PU_BOW) 1210 if (op->contr->mode & PU_BOW)
1487 if (tmp->type == BOW) 1211 if (tmp->type == BOW)
1488 { 1212 {
1489 pick_up (op, tmp); 1213 CHK_PICK_PICKUP;
1490 continue; 1214 continue;
1491 } 1215 }
1492 1216
1493 if (op->contr->mode & PU_ARROW) 1217 if (op->contr->mode & PU_ARROW)
1494 if (tmp->type == ARROW) 1218 if (tmp->type == ARROW)
1495 { 1219 {
1496 pick_up (op, tmp); 1220 CHK_PICK_PICKUP;
1497 continue; 1221 continue;
1498 } 1222 }
1499 1223
1500 /* all kinds of armor etc. */ 1224 /* all kinds of armor etc. */
1501 if (op->contr->mode & PU_ARMOUR) 1225 if (op->contr->mode & PU_ARMOUR)
1502 if (tmp->type == ARMOUR) 1226 if (tmp->type == ARMOUR)
1503 { 1227 {
1504 pick_up (op, tmp); 1228 CHK_PICK_PICKUP;
1505 continue; 1229 continue;
1506 } 1230 }
1507 1231
1508 if (op->contr->mode & PU_HELMET) 1232 if (op->contr->mode & PU_HELMET)
1509 if (tmp->type == HELMET) 1233 if (tmp->type == HELMET)
1510 { 1234 {
1511 pick_up (op, tmp); 1235 CHK_PICK_PICKUP;
1512 continue; 1236 continue;
1513 } 1237 }
1514 1238
1515 if (op->contr->mode & PU_SHIELD) 1239 if (op->contr->mode & PU_SHIELD)
1516 if (tmp->type == SHIELD) 1240 if (tmp->type == SHIELD)
1517 { 1241 {
1518 pick_up (op, tmp); 1242 CHK_PICK_PICKUP;
1519 continue; 1243 continue;
1520 } 1244 }
1521 1245
1522 if (op->contr->mode & PU_BOOTS) 1246 if (op->contr->mode & PU_BOOTS)
1523 if (tmp->type == BOOTS) 1247 if (tmp->type == BOOTS)
1524 { 1248 {
1525 pick_up (op, tmp); 1249 CHK_PICK_PICKUP;
1526 continue; 1250 continue;
1527 } 1251 }
1528 1252
1529 if (op->contr->mode & PU_GLOVES) 1253 if (op->contr->mode & PU_GLOVES)
1530 if (tmp->type == GLOVES) 1254 if (tmp->type == GLOVES)
1531 { 1255 {
1532 pick_up (op, tmp); 1256 CHK_PICK_PICKUP;
1533 continue; 1257 continue;
1534 } 1258 }
1535 1259
1536 if (op->contr->mode & PU_CLOAK) 1260 if (op->contr->mode & PU_CLOAK)
1537 if (tmp->type == CLOAK) 1261 if (tmp->type == CLOAK)
1538 { 1262 {
1539 pick_up (op, tmp); 1263 CHK_PICK_PICKUP;
1540 continue; 1264 continue;
1541 } 1265 }
1542 1266
1543 /* hoping to catch throwing daggers here */ 1267 /* hoping to catch throwing daggers here */
1544 if (op->contr->mode & PU_MISSILEWEAPON) 1268 if (op->contr->mode & PU_MISSILEWEAPON)
1545 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1269 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1546 { 1270 {
1547 pick_up (op, tmp); 1271 CHK_PICK_PICKUP;
1548 continue; 1272 continue;
1549 } 1273 }
1550 1274
1551 /* careful: chairs and tables are weapons! */ 1275 /* careful: chairs and tables are weapons! */
1552 if (op->contr->mode & PU_ALLWEAPON) 1276 if (op->contr->mode & PU_ALLWEAPON)
1553 { 1277 {
1554 if (tmp->type == WEAPON && tmp->name != NULL) 1278 if (tmp->type == WEAPON && tmp->name != NULL)
1555 { 1279 {
1556 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1280 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1557 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1281 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1558 { 1282 {
1559 pick_up (op, tmp); 1283 CHK_PICK_PICKUP;
1560 continue; 1284 continue;
1561 } 1285 }
1562 } 1286 }
1563 1287
1564 if (tmp->type == WEAPON && tmp->name == NULL) 1288 if (tmp->type == WEAPON && tmp->name == NULL)
1565 { 1289 {
1566 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1290 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1567 { 1291 {
1568 pick_up (op, tmp); 1292 CHK_PICK_PICKUP;
1569 continue; 1293 continue;
1570 } 1294 }
1571 } 1295 }
1572 } 1296 }
1573 1297
1574 /* misc stuff that's useful */ 1298 /* misc stuff that's useful */
1575 if (op->contr->mode & PU_KEY) 1299 if (op->contr->mode & PU_KEY)
1576 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1300 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1577 { 1301 {
1578 pick_up (op, tmp); 1302 CHK_PICK_PICKUP;
1579 continue; 1303 continue;
1580 } 1304 }
1581 1305
1582 /* any of the last 4 bits set means we use the ratio for value 1306 /* any of the last 4 bits set means we use the ratio for value
1583 * pickups */ 1307 * pickups */
1584 if (op->contr->mode & PU_RATIO) 1308 if (op->contr->mode & PU_RATIO)
1585 { 1309 {
1586 /* use value density to decide what else to grab */ 1310 /* use value density to decide what else to grab */
1587 /* >=7 was >= op->contr->mode */ 1311 /* >=7 was >= op->contr->mode */
1588 /* >=7 is the old standard setting. Now we take the last 4 bits 1312 /* >=7 is the old standard setting. Now we take the last 4 bits
1589 * and multiply them by 5, giving 0..15*5== 5..75 */ 1313 */
1590 wvratio = (op->contr->mode & PU_RATIO) * 5; 1314 wvratio = op->contr->mode & PU_RATIO;
1591 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1315 if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1592 { 1316 {
1593 pick_up (op, tmp); 1317 CHK_PICK_PICKUP;
1594#if 0 1318#if 0
1595 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1319 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1596 if (tmp->name != NULL) 1320 if (tmp->name != NULL)
1597 { 1321 {
1598 fprintf (stderr, "%s", tmp->name); 1322 fprintf (stderr, "%s", tmp->name);
1599 } 1323 }
1600 else 1324 else
1601 fprintf (stderr, "%s", tmp->arch->name); 1325 fprintf (stderr, "%s", tmp->arch->archname);
1602 fprintf (stderr, ",%d] = ", tmp->type); 1326 fprintf (stderr, ",%d] = ", tmp->type);
1603 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1327 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1604#endif 1328#endif
1605 continue; 1329 continue;
1606 } 1330 }
… …
1617 * found object is returned. 1341 * found object is returned.
1618 */ 1342 */
1619object * 1343object *
1620find_arrow (object *op, const char *type) 1344find_arrow (object *op, const char *type)
1621{ 1345{
1622 object *tmp = NULL;
1623
1624 for (op = op->inv; op; op = op->below) 1346 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1625 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1626 tmp = find_arrow (op, type);
1627 else if (op->type == ARROW && op->race == type) 1347 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1348 return splay (tmp);
1349
1350 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1351 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1352 if (object *arrow = find_arrow (tmp, type))
1353 {
1354 splay (tmp);
1628 return op; 1355 return arrow;
1356 }
1357
1629 return tmp; 1358 return 0;
1630} 1359}
1631 1360
1632/* 1361/*
1633 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1362 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1634 * against the target. A full test is not performed, simply a basic test 1363 * against the target. A full test is not performed, simply a basic test
1635 * of resistances. The archer is making a quick guess at what he sees down 1364 * of resistances. The archer is making a quick guess at what he sees down
1636 * the hall. Failing that it does it's best to pick the highest plus arrow. 1365 * the hall. Failing that it does it's best to pick the highest plus arrow.
1637 */ 1366 */
1638
1639object * 1367object *
1640find_better_arrow (object *op, object *target, const char *type, int *better) 1368find_better_arrow (object *op, object *target, const char *type, int *better)
1641{ 1369{
1642 object *tmp = NULL, *arrow, *ntmp; 1370 object *tmp = NULL, *arrow, *ntmp;
1643 int attacknum, attacktype, betterby = 0, i; 1371 int attacknum, attacktype, betterby = 0, i;
… …
1658 } 1386 }
1659 } 1387 }
1660 else if (arrow->type == ARROW && arrow->race == type) 1388 else if (arrow->type == ARROW && arrow->race == type)
1661 { 1389 {
1662 /* allways prefer assasination/slaying */ 1390 /* allways prefer assasination/slaying */
1663 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1391 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1664 { 1392 {
1665 if (arrow->attacktype & AT_DEATH) 1393 if (arrow->attacktype & AT_DEATH)
1666 { 1394 {
1667 *better = 100; 1395 *better = 100;
1668 return arrow; 1396 return arrow;
… …
1676 else 1404 else
1677 { 1405 {
1678 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1406 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1679 { 1407 {
1680 attacktype = 1 << attacknum; 1408 attacktype = 1 << attacknum;
1681 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1409 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1682 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1410 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1683 { 1411 {
1684 tmp = arrow; 1412 tmp = arrow;
1685 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1413 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1686 } 1414 }
1687 } 1415 }
1688 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1416 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1689 { 1417 {
1690 tmp = arrow; 1418 tmp = arrow;
… …
1696 betterby = 1 + arrow->magic + arrow->stats.dam; 1424 betterby = 1 + arrow->magic + arrow->stats.dam;
1697 } 1425 }
1698 } 1426 }
1699 } 1427 }
1700 } 1428 }
1429
1701 if (tmp == NULL && arrow == NULL) 1430 if (tmp == NULL && arrow == NULL)
1702 return find_arrow (op, type); 1431 return find_arrow (op, type);
1703 1432
1704 *better = betterby; 1433 *better = betterby;
1705 return tmp; 1434 return tmp;
… …
1709 * find_better_arrow to find a decent arrow to use. 1438 * find_better_arrow to find a decent arrow to use.
1710 * op = the shooter 1439 * op = the shooter
1711 * type = bow->race 1440 * type = bow->race
1712 * dir = fire direction 1441 * dir = fire direction
1713 */ 1442 */
1714
1715object * 1443object *
1716pick_arrow_target (object *op, const char *type, int dir) 1444pick_arrow_target (object *op, const char *type, int dir)
1717{ 1445{
1718 object *tmp = NULL; 1446 object *tmp = NULL;
1719 maptile *m; 1447 maptile *m;
… …
1784 */ 1512 */
1785int 1513int
1786fire_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)
1787{ 1515{
1788 object *left, *bow; 1516 object *left, *bow;
1789 int bowspeed, mflags; 1517 int mflags;
1790 maptile *m; 1518 maptile *m;
1791 1519
1792 if (!dir) 1520 if (!dir)
1793 { 1521 {
1794 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!");
1795 return 0; 1523 return 0;
1796 } 1524 }
1797 if (op->type == PLAYER) 1525
1798 bow = op->contr->ranges[range_bow]; 1526 if (op->contr)
1527 bow = op->current_weapon;
1799 else 1528 else
1800 { 1529 {
1801 for (bow = op->inv; bow; bow = bow->below) 1530 for (bow = op->inv; bow; bow = bow->below)
1802 /* 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
1803 * 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.
… …
1808 if (!bow) 1537 if (!bow)
1809 { 1538 {
1810 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1539 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1811 return 0; 1540 return 0;
1812 } 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
1813 } 1550 }
1551
1814 if (!bow->race || !bow->skill) 1552 if (!bow->race || !bow->skill)
1815 { 1553 {
1816 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);
1817 return 0; 1555 return 0;
1818 } 1556 }
1819
1820 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1821
1822 /* penalize ROF for bestarrow */
1823 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1824 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1825 if (bowspeed < 1)
1826 bowspeed = 1;
1827 1557
1828 if (arrow == NULL) 1558 if (arrow == NULL)
1829 { 1559 {
1830 if ((arrow = find_arrow (op, bow->race)) == NULL) 1560 if ((arrow = find_arrow (op, bow->race)) == NULL)
1831 { 1561 {
1832 if (op->type == PLAYER) 1562 if (op->type == PLAYER)
1833 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);
1834 /* 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 */
1835 else 1565 else
1836 CLEAR_FLAG (op, FLAG_READY_BOW); 1566 CLEAR_FLAG (op, FLAG_READY_BOW);
1567
1837 return 0; 1568 return 0;
1838 } 1569 }
1839 } 1570 }
1571
1840 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1572 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1841 if (mflags & P_OUT_OF_MAP) 1573 if (mflags & P_OUT_OF_MAP)
1842 {
1843 return 0; 1574 return 0;
1844 } 1575
1845 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1576 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1846 { 1577 {
1847 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1578 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1848 return 0; 1579 return 0;
1849 } 1580 }
… …
1854 arrow->destroy (); 1585 arrow->destroy ();
1855 return 0; 1586 return 0;
1856 } 1587 }
1857 1588
1858 left = arrow; /* these are arrows left to the player */ 1589 left = arrow; /* these are arrows left to the player */
1859 arrow = get_split_ob (arrow, 1); 1590 arrow = arrow->split ();
1860 if (arrow == NULL) 1591 if (!arrow)
1861 { 1592 {
1862 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1593 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1863 return 0; 1594 return 0;
1864 } 1595 }
1596
1865 arrow->set_owner (op); 1597 arrow->set_owner (op);
1866 arrow->skill = bow->skill; 1598 arrow->skill = bow->skill;
1867
1868 arrow->direction = dir; 1599 arrow->direction = dir;
1869 arrow->x = sx; 1600
1870 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;
1871 1633
1872 if (op->type == PLAYER) 1634 if (op->type == PLAYER)
1873 { 1635 {
1874 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1875 fix_player (op);
1876 }
1877
1878 SET_ANIMATION (arrow, arrow->direction);
1879 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1880 arrow->stats.hp = arrow->stats.dam;
1881 arrow->stats.grace = arrow->attacktype;
1882 if (arrow->slaying != NULL)
1883 arrow->spellarg = strdup (arrow->slaying);
1884
1885 /* Note that this was different for monsters - they got their level
1886 * added to the damage. I think the strength bonus is more proper.
1887 */
1888
1889 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1890
1891 /* update the speed */
1892 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1893 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1894
1895 if (arrow->speed < 1.0)
1896 arrow->speed = 1.0;
1897 update_ob_speed (arrow);
1898 arrow->speed_left = 0;
1899
1900 if (op->type == PLAYER)
1901 {
1902 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1903 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1904 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1905
1906 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;
1907 } 1643 }
1908 else 1644 else
1909 { 1645 {
1910 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1911 arrow->level = op->level; 1646 arrow->level = op->level;
1912 } 1647 arrow->stats.wc -= bow->magic;
1913 1648
1914 if (arrow->attacktype == AT_PHYSICAL) 1649 if (!arrow->slaying)
1650 arrow->slaying = bow->slaying;
1651
1915 arrow->attacktype |= bow->attacktype; 1652 arrow->attacktype |= bow->attacktype;
1653 }
1916 1654
1917 if (bow->slaying != NULL) 1655 wc -= arrow->level;
1918 arrow->slaying = bow->slaying; 1656 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1919 1657
1920 arrow->map = m; 1658 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1921 arrow->move_type = MOVE_FLY_LOW; 1659 arrow->move_type = MOVE_FLY_LOW;
1922 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1660 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1923 1661
1924 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1662 op->play_sound (sound_find ("fire_arrow"));
1925 insert_ob_in_map (arrow, m, op, 0); 1663 m->insert (arrow, sx, sy, op);
1926 1664
1927 if (!arrow->destroyed ()) 1665 if (!arrow->destroyed ())
1928 move_arrow (arrow); 1666 move_arrow (arrow);
1929
1930 if (op->type == PLAYER)
1931 {
1932 if (left->destroyed ())
1933 esrv_del_item (op->contr, left->count);
1934 else
1935 esrv_send_item (op, left);
1936 }
1937 1667
1938 return 1; 1668 return 1;
1939} 1669}
1940 1670
1941/* Special fire code for players - this takes into 1671/* Special fire code for players - this takes into
… …
1950{ 1680{
1951 int ret = 0, wcmod = 0; 1681 int ret = 0, wcmod = 0;
1952 1682
1953 if (op->contr->bowtype == bow_bestarrow) 1683 if (op->contr->bowtype == bow_bestarrow)
1954 { 1684 {
1955 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1685 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1956 } 1686 }
1957 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1687 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1958 { 1688 {
1959 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1689 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1960 wcmod = -1; 1690 wcmod = -1;
1691
1961 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1692 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1962 } 1693 }
1963 else if (op->contr->bowtype == bow_threewide) 1694 else if (op->contr->bowtype == bow_threewide)
1964 { 1695 {
1965 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1696 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1969 else if (op->contr->bowtype == bow_spreadshot) 1700 else if (op->contr->bowtype == bow_spreadshot)
1970 { 1701 {
1971 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1702 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1972 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1703 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1973 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1704 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1974
1975 } 1705 }
1976 else 1706 else
1977 { 1707 {
1978 /* Simple case */ 1708 /* Simple case */
1979 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1709 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1980 } 1710 }
1711
1981 return ret; 1712 return ret;
1982} 1713}
1983
1984 1714
1985/* Fires a misc (wand/rod/horn) object in 'dir'. 1715/* Fires a misc (wand/rod/horn) object in 'dir'.
1986 * Broken apart from 'fire' to keep it more readable. 1716 * Broken apart from 'fire' to keep it more readable.
1987 */ 1717 */
1988void 1718void
1989fire_misc_object (object *op, int dir) 1719fire_misc_object (object *op, int dir)
1990{ 1720{
1991 object *item; 1721 object *item = op->contr->ranged_ob;
1992 1722
1993 if (!op->contr->ranges[range_misc]) 1723 if (!item)
1994 { 1724 {
1995 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1725 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1996 return; 1726 return;
1997 } 1727 }
1998 1728
1999 item = op->contr->ranges[range_misc];
2000 if (!item->inv) 1729 if (!item->inv)
2001 { 1730 {
2002 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1731 LOG (llevError, "Object %s lacks a spell\n", &item->name);
2003 return; 1732 return;
2004 } 1733 }
1734
1735 if (!op->change_weapon (item))
1736 return;
1737
2005 if (item->type == WAND) 1738 if (item->type == WAND)
2006 { 1739 {
2007 if (item->stats.food <= 0) 1740 if (item->stats.food <= 0)
2008 { 1741 {
2009 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1742 op->contr->play_sound (sound_find ("wand_poof"));
2010 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1743 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1744
2011 return; 1745 return;
2012 } 1746 }
2013 } 1747 }
2014 else if (item->type == ROD || item->type == HORN) 1748 else if (item->type == ROD || item->type == HORN)
2015 { 1749 {
2016 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1750 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1751
1752 // using the maximum of the rods charge allows at least one spell cast
1753 // for a rod or horn, this fixes some broken rods.
1754 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
2017 { 1755 {
2018 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1756 op->contr->play_sound (sound_find ("wand_poof"));
1757
2019 if (item->type == ROD) 1758 if (item->type == ROD)
2020 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1759 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
2021 else 1760 else
2022 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1761 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1762
2023 return; 1763 return;
2024 } 1764 }
2025 } 1765 }
2026 1766
2027 if (cast_spell (op, item, dir, item->inv, NULL)) 1767 if (cast_spell (op, item, dir, item->inv, NULL))
… …
2034 object *tmp; 1774 object *tmp;
2035 1775
2036 if (item->arch) 1776 if (item->arch)
2037 { 1777 {
2038 CLEAR_FLAG (item, FLAG_ANIMATE); 1778 CLEAR_FLAG (item, FLAG_ANIMATE);
2039 item->face = item->arch->clone.face; 1779 item->face = item->arch->face;
2040 item->speed = 0; 1780 item->set_speed (0);
2041 update_ob_speed (item);
2042 } 1781 }
2043 if ((tmp = is_player_inv (item))) 1782
1783 if (object *pl = item->visible_to ())
2044 esrv_update_item (UPD_ANIM, tmp, item); 1784 esrv_update_item (UPD_ANIM, pl, item);
2045 } 1785 }
2046 } 1786 }
2047 else if (item->type == ROD || item->type == HORN) 1787 else if (item->type == ROD || item->type == HORN)
2048 {
2049 drain_rod_charge (item); 1788 drain_rod_charge (item);
2050 }
2051 } 1789 }
2052} 1790}
2053 1791
2054/* Received a fire command for the player - go and do it. 1792/* Received a fire command for the player - go and do it.
2055 */ 1793 */
2056void 1794bool
2057fire (object *op, int dir) 1795fire (object *op, int dir)
2058{ 1796{
2059 int spellcost = 0; 1797 int spellcost = 0;
2060 1798
2061 /* check for loss of invisiblity/hide */ 1799 /* check for loss of invisiblity/hide */
2062 if (action_makes_visible (op)) 1800 if (action_makes_visible (op))
2063 make_visible (op); 1801 make_visible (op);
2064 1802
2065 switch (op->contr->shoottype) 1803 player *pl = op->contr;
1804
1805 if (pl->golem)
1806 {
1807 control_golem (op->contr->golem, dir);
1808 return false;
2066 { 1809 }
2067 case range_none:
2068 return;
2069 1810
2070 case range_bow: 1811 object *ob = pl->ranged_ob;
1812
1813 if (!ob)
1814 return false;
1815
1816 if (!op->change_weapon (ob))
1817 return false;
1818
1819 if (op->speed_left > 0.f)
1820 --op->speed_left;
1821 else
1822 return false;
1823
1824 switch (ob->type)
1825 {
1826 case BOW:
2071 player_fire_bow (op, dir); 1827 player_fire_bow (op, dir);
2072 return; 1828 break;
2073 1829
2074 case range_magic: /* Casting spells */ 1830 case SPELL:
2075 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1831 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
2076 return; 1832 break;
2077 1833
2078 case range_misc: 1834 case BUILDER:
1835 apply_map_builder (op, dir);
1836 break;
1837
1838 case SKILL:
1839 do_skill (op, op, ob, dir, 0);
1840 break;
1841
1842 default:
2079 fire_misc_object (op, dir); 1843 fire_misc_object (op, dir);
2080 return; 1844 break;
2081
2082 case range_golem: /* Control summoned monsters from scrolls */
2083 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2084 {
2085 op->contr->ranges[range_golem] = 0;
2086 op->contr->shoottype = range_none;
2087 }
2088 else
2089 control_golem (op->contr->ranges[range_golem], dir);
2090 return;
2091
2092 case range_skill:
2093 if (!op->chosen_skill)
2094 {
2095 if (op->type == PLAYER)
2096 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2097 return;
2098 }
2099 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
2100 return;
2101 case range_builder:
2102 apply_map_builder (op, dir);
2103 return;
2104 default:
2105 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2106 return;
2107 } 1845 }
2108}
2109 1846
2110 1847 return true;
1848}
2111 1849
2112/* find_key 1850/* find_key
2113 * We try to find a key for the door as passed. If we find a key 1851 * We try to find a key for the door as passed. If we find a key
2114 * and successfully use it, we return the key, otherwise NULL 1852 * and successfully use it, we return the key, otherwise NULL
2115 * This function merges both normal and locked door, since the logic 1853 * This function merges both normal and locked door, since the logic
… …
2117 * pl is the player, 1855 * pl is the player,
2118 * inv is the objects inventory to searched 1856 * inv is the objects inventory to searched
2119 * door is the door we are trying to match against. 1857 * door is the door we are trying to match against.
2120 * This function can be called recursively to search containers. 1858 * This function can be called recursively to search containers.
2121 */ 1859 */
2122
2123object * 1860object *
2124find_key (object *pl, object *container, object *door) 1861find_key (object *pl, object *container, object *door)
2125{ 1862{
2126 object *tmp, *key; 1863 object *tmp, *key;
2127 1864
2128 /* Should not happen, but sanity checking is never bad */ 1865 /* Should not happen, but sanity checking is never bad */
2129 if (container->inv == NULL) 1866 if (!container->inv)
2130 return NULL; 1867 return 0;
2131 1868
2132 /* First, lets try to find a key in the top level inventory */ 1869 /* First, lets try to find a key in the top level inventory */
2133 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1870 for (tmp = container->inv; tmp; tmp = tmp->below)
2134 { 1871 {
2135 if (door->type == DOOR && tmp->type == KEY) 1872 if (door->type == DOOR && tmp->type == KEY)
2136 break; 1873 break;
2137 /* For sanity, we should really check door type, but other stuff 1874 /* For sanity, we should really check door type, but other stuff
2138 * (like containers) can be locked with special keys 1875 * (like containers) can be locked with special keys
2139 */ 1876 */
2140 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1877 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2141 break; 1878 break;
2142 } 1879 }
1880
2143 /* No key found - lets search inventories now */ 1881 /* No key found - lets search inventories now */
2144 /* If we find and use a key in an inventory, return at that time. 1882 /* If we find and use a key in an inventory, return at that time.
2145 * otherwise, if we search all the inventories and still don't find 1883 * otherwise, if we search all the inventories and still don't find
2146 * a key, return 1884 * a key, return
2147 */ 1885 */
2148 if (!tmp) 1886 if (!tmp)
2149 { 1887 {
2150 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1888 for (tmp = container->inv; tmp; tmp = tmp->below)
2151 { 1889 {
2152 /* No reason to search empty containers */ 1890 /* No reason to search empty containers */
2153 if (tmp->type == CONTAINER && tmp->inv) 1891 if (tmp->type == CONTAINER && tmp->inv)
2154 { 1892 {
2155 if ((key = find_key (pl, tmp, door)) != NULL) 1893 if ((key = find_key (pl, tmp, door)))
2156 return key; 1894 return key;
2157 } 1895 }
2158 } 1896 }
1897
2159 if (!tmp) 1898 if (!tmp)
2160 return NULL; 1899 return NULL;
2161 } 1900 }
1901
2162 /* We get down here if we have found a key. Now if its in a container, 1902 /* We get down here if we have found a key. Now if its in a container,
2163 * see if we actually want to use it 1903 * see if we actually want to use it
2164 */ 1904 */
2165 if (pl != container) 1905 if (pl != container)
2166 { 1906 {
… …
2187 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1927 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2188 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1928 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2189 return NULL; 1929 return NULL;
2190 } 1930 }
2191 } 1931 }
1932
2192 return tmp; 1933 return tmp;
2193} 1934}
2194 1935
2195/* moved door processing out of move_player_attack. 1936/* moved door processing out of move_player_attack.
2196 * returns 1 if player has opened the door with a key 1937 * returns 1 if player has opened the door with a key
… …
2198 * 0 otherwise 1939 * 0 otherwise
2199 */ 1940 */
2200static int 1941static int
2201player_attack_door (object *op, object *door) 1942player_attack_door (object *op, object *door)
2202{ 1943{
2203
2204 /* If its a door, try to find a use a key. If we do destroy the door, 1944 /* If its a door, try to find a key. If we do destroy the door,
2205 * might as well return immediately as there is nothing more to do - 1945 * might as well return immediately as there is nothing more to do -
2206 * otherwise, we fall through to the rest of the code. 1946 * otherwise, we fall through to the rest of the code.
2207 */ 1947 */
2208 object *key = find_key (op, op, door); 1948 object *key = find_key (op, op, door);
2209 1949
2210 /* IF we found a key, do some extra work */ 1950 /* If we found a key, do some extra work */
2211 if (key) 1951 if (key)
2212 { 1952 {
2213 object *container = key->env; 1953 object *container = key->env;
2214 1954
2215 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2216 if (action_makes_visible (op)) 1955 if (action_makes_visible (op))
2217 make_visible (op); 1956 make_visible (op);
1957
2218 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1958 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2219 spring_trap (door->inv, op); 1959 spring_trap (door->inv, op);
1960
2220 if (door->type == DOOR) 1961 if (door->type == DOOR)
2221 {
2222 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1962 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2223 }
2224 else if (door->type == LOCKED_DOOR) 1963 else if (door->type == LOCKED_DOOR)
2225 { 1964 {
2226 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1965 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2227 remove_door2 (door); /* remove door without violence ;-) */ 1966 remove_door2 (door); /* remove door without violence ;-) */
2228 } 1967 }
1968
2229 /* Do this after we print the message */ 1969 /* Do this after we print the message */
2230 decrease_ob (key); /* Use up one of the keys */ 1970 key->decrease (); /* Use up one of the keys */
2231 /* Need to update the weight the container the key was in */ 1971
2232 if (container != op)
2233 esrv_update_item (UPD_WEIGHT, op, container);
2234 return 1; /* Nothing more to do below */ 1972 return 1; /* Nothing more to do below */
2235 } 1973 }
2236 else if (door->type == LOCKED_DOOR) 1974 else if (door->type == LOCKED_DOOR)
2237 { 1975 {
2238 /* Might as well return now - no other way to open this */ 1976 /* Might as well return now - no other way to open this */
2239 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1977 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2240 return 1; 1978 return 1;
2241 } 1979 }
1980
2242 return 0; 1981 return 0;
2243} 1982}
2244 1983
2245/* This function is just part of a breakup from move_player. 1984/* This function is just part of a breakup from move_player.
2246 * It should keep the code cleaner. 1985 * It should keep the code cleaner.
2247 * When this is called, the players direction has been updated 1986 * When this is called, the players direction has been updated
2248 * (taking into account confusion.) The player is also actually 1987 * (taking into account confusion.) The player is also actually
2249 * going to try and move (not fire weapons). 1988 * going to try and move (not fire weapons).
2250 */ 1989 */
2251 1990bool
2252void
2253move_player_attack (object *op, int dir) 1991move_player_attack (object *op, int dir)
2254{ 1992{
2255 object *tmp, *mon;
2256 sint16 nx, ny;
2257 int on_battleground; 1993 int on_battleground;
2258 maptile *m;
2259 1994
2260 nx = freearr_x[dir] + op->x; 1995 sint16 nx = freearr_x[dir] + op->x;
2261 ny = freearr_y[dir] + op->y; 1996 sint16 ny = freearr_y[dir] + op->y;
2262 1997
2263 on_battleground = op_on_battleground (op, NULL, NULL); 1998 on_battleground = op_on_battleground (op, 0, 0);
1999
2000 if (out_of_map (op->map, nx, ny))
2001 return false;
2002
2003 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2004 {
2005 --op->speed_left;
2006 return true;
2007 }
2264 2008
2265 /* If braced, or can't move to the square, and it is not out of the 2009 /* If braced, or can't move to the square, and it is not out of the
2266 * map, attack it. Note order of if statement is important - don't 2010 * map, attack it. Note order of if statement is important - don't
2267 * want to be calling move_ob if braced, because move_ob will move the 2011 * want to be calling move_ob if braced, because move_ob will move the
2268 * player. This is a pretty nasty hack, because if we could 2012 * player. This is a pretty nasty hack, because if we could
2269 * move to some space, it then means that if we are braced, we should 2013 * move to some space, it then means that if we are braced, we should
2270 * do nothing at all. As it is, if we are braced, we go through 2014 * do nothing at all. As it is, if we are braced, we go through
2271 * quite a bit of processing. However, it probably is less than what 2015 * quite a bit of processing. However, it probably is less than what
2272 * move_ob uses. 2016 * move_ob uses.
2273 */ 2017 */
2274 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2018 maptile *m = op->map->xy_find (nx, ny);
2275 {
2276 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2277 {
2278 m = get_map_from_coord (op->map, &nx, &ny);
2279 if (!m)
2280 return; /* Don't think this should happen */
2281 }
2282 else
2283 m = op->map;
2284 2019
2285 if ((tmp = get_map_ob (m, nx, ny)) == NULL)
2286 {
2287 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2288 return;
2289 }
2290
2291 mon = NULL;
2292 /* Go through all the objects, and find ones of interest. Only stop if 2020 /* Go through all the objects, and find ones of interest. Only stop if
2293 * we find a monster - that is something we know we want to attack. 2021 * we find a monster - that is something we know we want to attack.
2294 * if its a door or barrel (can roll) see if there may be monsters 2022 * if its a door or barrel (can roll) see if there may be monsters
2295 * on the space 2023 * on the space
2296 */ 2024 */
2297 while (tmp != NULL) 2025 object *mon;
2298 { 2026 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2299 if (tmp == op) 2027 {
2300 { 2028 if ((mon->flag [FLAG_ALIVE]
2301 tmp = tmp->above; 2029 || mon->type == LOCKED_DOOR
2302 continue; 2030 || mon->flag [FLAG_CAN_ROLL])
2303 }
2304
2305 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2306 {
2307 mon = tmp; 2031 && mon != op)
2308 break; 2032 break;
2309 } 2033 }
2310 2034
2311 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2312 mon = tmp;
2313
2314 tmp = tmp->above;
2315 }
2316
2317 if (mon == NULL) /* This happens anytime the player tries to move */ 2035 if (!mon) /* This happens anytime the player tries to move */
2318 return; /* into a wall */ 2036 return false; /* into a wall */
2319 2037
2320 if (mon->head != NULL)
2321 mon = mon->head; 2038 mon = mon->head_ ();
2322 2039
2323 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2040 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2041 if (op->contr->weapon_sp_left > 0.f)
2324 if (player_attack_door (op, mon)) 2042 if (player_attack_door (op, mon))
2043 {
2044 --op->contr->weapon_sp_left;
2325 return; 2045 return true;
2046 }
2326 2047
2327 /* The following deals with possibly attacking peaceful 2048 /* The following deals with possibly attacking peaceful
2328 * or frienddly creatures. Basically, all players are considered 2049 * or friendly creatures. Basically, all players are considered
2329 * unaggressive. If the moving player has peaceful set, then the 2050 * unaggressive. If the moving player has peaceful set, then the
2330 * object should be pushed instead of attacked. It is assumed that 2051 * object should be pushed instead of attacked. It is assumed that
2331 * if you are braced, you will not attack friends accidently, 2052 * if you are braced, you will not attack friends accidently,
2332 * and thus will not push them. 2053 * and thus will not push them.
2333 */ 2054 */
2334 2055
2335 /* If the creature is a pet, push it even if the player is not 2056 /* If the creature is a pet, push it even if the player is not
2336 * peaceful. Our assumption is the creature is a pet if the 2057 * peaceful. Our assumption is the creature is a pet if the
2337 * player owns it and it is either friendly or unagressive. 2058 * player owns it and it is either friendly or unagressive.
2338 */ 2059 */
2339 if ((op->type == PLAYER) 2060 if (op->type == PLAYER
2340#if COZY_SERVER
2341 &&
2342 ((mon->owner && mon->owner->contr 2061 && ((mon->owner && mon->owner->contr
2343 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2062 && same_party (mon->owner->contr->party, op->contr->party))
2344#else
2345 && mon->owner == op 2063 || mon->owner == op)
2346#endif
2347 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2064 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2348 { 2065 {
2349 /* If we're braced, we don't want to switch places with it */ 2066 /* If we're braced, we don't want to switch places with it */
2350 if (op->contr->braced) 2067 if (op->contr->braced)
2351 return; 2068 return false;
2352 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2069
2070 if (op->speed_left > 0.f)
2071 {
2072 --op->speed_left;
2073
2074 op->play_sound (sound_find ("push_player"));
2353 (void) push_ob (mon, dir, op); 2075 push_ob (mon, dir, op);
2076
2354 if (op->contr->tmp_invis || op->hide) 2077 if (op->contr->tmp_invis || op->hide)
2355 make_visible (op); 2078 make_visible (op);
2079
2356 return; 2080 return true;
2357 } 2081 }
2082 else
2083 return false;
2084 }
2358 2085
2359 /* in certain circumstances, you shouldn't attack friendly 2086 /* in certain circumstances, you shouldn't attack friendly
2360 * creatures. Note that if you are braced, you can't push 2087 * creatures. Note that if you are braced, you can't push
2361 * someone, but put it inside this loop so that you won't 2088 * someone, but put it inside this loop so that you won't
2362 * attack them either. 2089 * attack them either.
2363 */ 2090 */
2364 if ((mon->type == PLAYER || mon->enemy != op) && 2091 if ((mon->type == PLAYER || mon->enemy != op)
2365 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2092 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2366#ifdef PROHIBIT_PLAYERKILL 2093 && ((op->contr->peaceful
2367 (op->contr->peaceful 2094 || (mon->type == PLAYER && mon->contr->peaceful))
2368 || (mon->type == PLAYER 2095 && !on_battleground))
2369 && mon->contr-> 2096 {
2370 peaceful)) && 2097 if (op->speed_left > 0.f)
2371#else
2372 op->contr->peaceful &&
2373#endif
2374 !on_battleground))
2375 { 2098 {
2099 --op->speed_left;
2100
2376 if (!op->contr->braced) 2101 if (!op->contr->braced)
2377 { 2102 {
2378 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2103 op->play_sound (sound_find ("push_player"));
2379 (void) push_ob (mon, dir, op); 2104 push_ob (mon, dir, op);
2380 } 2105 }
2381 else 2106 else
2382 { 2107 op->statusmsg ("You withhold your attack");
2383 new_draw_info (0, 0, op, "You withhold your attack"); 2108
2384 }
2385 if (op->contr->tmp_invis || op->hide) 2109 if (op->contr->tmp_invis || op->hide)
2386 make_visible (op); 2110 make_visible (op);
2387 }
2388 2111
2112 return true;
2113 }
2114 }
2389 /* If the object is a boulder or other rollable object, then 2115 /* If the object is a boulder or other rollable object, then
2390 * roll it if not braced. You can't roll it if you are braced. 2116 * roll it if not braced. You can't roll it if you are braced.
2391 */ 2117 */
2392 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2118 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2119 {
2120 if (op->speed_left > 0.f)
2393 { 2121 {
2122 --op->speed_left;
2123
2394 recursive_roll (mon, dir, op); 2124 recursive_roll (mon, dir, op);
2395 if (action_makes_visible (op)) 2125 if (action_makes_visible (op))
2396 make_visible (op); 2126 make_visible (op);
2397 }
2398 2127
2128 return true;
2129 }
2130 }
2399 /* Any generic living creature. Including things like doors. 2131 /* Any generic living creature. Including things like doors.
2400 * Way it works is like this: First, it must have some hit points 2132 * Way it works is like this: First, it must have some hit points
2401 * and be living. Then, it must be one of the following: 2133 * and be living. Then, it must be one of the following:
2402 * 1) Not a player, 2) A player, but of a different party. Note 2134 * 1) Not a player, 2) A player, but of a different party. Note
2403 * that party_number -1 is no party, so attacks can still happen. 2135 * that party_number -1 is no party, so attacks can still happen.
2404 */ 2136 */
2405
2406 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2137 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2407 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2138 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2408 { 2139 {
2409 2140 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2410 /* If the player hasn't hit something this tick, and does
2411 * so, give them speed boost based on weapon speed. Doing
2412 * it here is better than process_players2, which basically
2413 * incurred a 1 tick offset.
2414 */
2415 if (!op->contr->has_hit)
2416 { 2141 {
2417 op->speed_left += op->speed / op->contr->weapon_sp; 2142 --op->contr->weapon_sp_left;
2418 2143
2419 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2420 }
2421
2422 skill_attack (mon, op, 0, NULL, NULL); 2144 skill_attack (mon, op, 0, 0, 0);
2423 2145
2424 /* If attacking another player, that player gets automatic
2425 * hitback, and doesn't loose luck either.
2426 * Disable hitback on the battleground or if the target is
2427 * the wiz.
2428 */
2429 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2430 {
2431 short luck = mon->stats.luck;
2432
2433 mon->contr->has_hit = 1;
2434 skill_attack (op, mon, 0, NULL, NULL);
2435 mon->stats.luck = luck;
2436 }
2437 if (action_makes_visible (op)) 2146 if (action_makes_visible (op))
2438 make_visible (op); 2147 make_visible (op);
2439 }
2440 } /* if player should attack something */
2441}
2442 2148
2443int 2149 return true;
2150 }
2151 }
2152
2153 return false;
2154}
2155
2156bool
2444move_player (object *op, int dir) 2157move_player (object *op, int dir)
2445{ 2158{
2446 int pick; 2159 int pick;
2447 2160
2448 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2161 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2449 return 0; 2162 return 0;
2450 2163
2451 /* Sanity check: make sure dir is valid */ 2164 /* Sanity check: make sure dir is valid */
2452 if ((dir < 0) || (dir >= 9)) 2165 if ((dir < 0) || (dir >= 9))
2453 { 2166 {
2454 LOG (llevError, "move_player: invalid direction %d\n", dir); 2167 LOG (llevError, "move_player: invalid direction %d\n", dir);
2455 return 0; 2168 return 0;
2456 } 2169 }
2457 2170
2458 /* peterm: added following line */ 2171 /* peterm: added following line */
2459 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2172 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2460 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2173 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2461 2174
2462 op->facing = dir; 2175 op->facing = dir;
2463 2176
2464 if (op->hide) 2177 if (op->hide)
2465 do_hidden_move (op); 2178 do_hidden_move (op);
2466 2179
2180 bool retval;
2181
2467 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2182 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2468 /*nop */ ; 2183 retval = RESULT_INT (0);
2469 else if (op->contr->fire_on) 2184 else if (op->contr->fire_on)
2470 fire (op, dir); 2185 retval = fire (op, dir);
2471 else 2186 else
2472 { 2187 {
2473 move_player_attack (op, dir); 2188 retval = move_player_attack (op, dir);
2474 pick = check_pick (op); 2189 pick = check_pick (op);
2475 } 2190 }
2476 2191
2477 /* Add special check for newcs players and fire on - this way, the 2192 /* Add special check for newcs players and fire on - this way, the
2478 * server can handle repeat firing. 2193 * server can handle repeat firing.
2479 */ 2194 */
2480 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2195 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2481 {
2482 op->direction = dir; 2196 op->direction = dir;
2483 }
2484 else 2197 else
2485 {
2486 op->direction = 0; 2198 op->direction = 0;
2487 } 2199
2488 /* Update how the player looks. Use the facing, so direction may 2200 /* Update how the player looks. Use the facing, so direction may
2489 * get reset to zero. This allows for full animation capabilities 2201 * get reset to zero. This allows for full animation capabilities
2490 * for players. 2202 * for players.
2491 */ 2203 */
2492 animate_object (op, op->facing); 2204 animate_object (op, op->facing);
2493 return 0; 2205
2206 return retval;
2494} 2207}
2495 2208
2496/* This is similar to handle_player, below, but is only used by the 2209/* This is similar to handle_player, below, but is only used by the
2497 * new client/server stuff. 2210 * new client/server stuff.
2498 * This is sort of special, in that the new client/server actually uses 2211 * This is sort of special, in that the new client/server actually uses
2499 * the new speed values for commands. 2212 * the new speed values for commands.
2500 * 2213 *
2501 * Returns true if there are more actions we can do. 2214 * Returns true if there are more actions we can do. Should not do
2215 * many actions in a row, as that would be too unfair to other
2216 * players.
2502 */ 2217 */
2503int 2218bool
2504handle_newcs_player (object *op) 2219handle_newcs_player (object *op)
2505{ 2220{
2506 if (op->contr->hidden)
2507 {
2508 op->invisible = 1000;
2509 /* the socket code flashes the player visible/invisible
2510 * depending on the value of invisible, so we need to
2511 * alternate it here for it to work correctly.
2512 */
2513 if (pticks & 2)
2514 op->invisible--;
2515 }
2516 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2517 {
2518 op->invisible--;
2519 if (!op->invisible)
2520 {
2521 make_visible (op);
2522 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2523 }
2524 }
2525
2526 if (QUERY_FLAG (op, FLAG_SCARED)) 2221 if (QUERY_FLAG (op, FLAG_SCARED))
2527 { 2222 {
2528 flee_player (op); 2223 if (op->speed_left > 0.f)
2529 /* If player is still scared, that is his action for this tick */
2530 if (QUERY_FLAG (op, FLAG_SCARED))
2531 { 2224 {
2532 op->speed_left--; 2225 --op->speed_left;
2226 flee_player (op);
2227
2533 return 0; 2228 return true;
2534 } 2229 }
2230 else
2231 return false;
2535 } 2232 }
2536
2537 /* I've been seeing crashes where the golem has been destroyed, but
2538 * the player object still points to the defunct golem. The code that
2539 * destroys the golem looks correct, and it doesn't always happen, so
2540 * put this in a a workaround to clean up the golem pointer.
2541 */
2542 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2543 op->contr->ranges[range_golem] = 0;
2544 2233
2545 /* call this here - we also will call this in do_ericserver, but 2234 /* call this here - we also will call this in do_ericserver, but
2546 * the players time has been increased when doericserver has been 2235 * the players time has been increased when doericserver has been
2547 * called, so we recheck it here. 2236 * called, so we recheck it here.
2548 */ 2237 */
2549 op->contr->socket->handle_command (); 2238 if (op->contr->ns->handle_command ())
2550 if (op->speed_left < 0)
2551 return 0; 2239 return true;
2552 2240
2553 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2241 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2554 {
2555 /* All move commands take 1 tick, at least for now */
2556 op->speed_left--;
2557
2558 /* Instead of all the stuff below, let move_player take care
2559 * of it. Also, some of the skill stuff is only put in
2560 * there, as well as the confusion stuff.
2561 */
2562 move_player (op, op->direction); 2242 return move_player (op, op->direction);
2563 if (op->speed_left > 0)
2564 return 1;
2565 else
2566 return 0;
2567 }
2568 2243
2569 return 0; 2244 return false;
2570} 2245}
2571 2246
2572int 2247int
2573save_life (object *op) 2248save_life (object *op)
2574{ 2249{
… …
2576 return 0; 2251 return 0;
2577 2252
2578 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2253 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2579 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2254 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2580 { 2255 {
2581 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2256 op->play_sound (sound_find ("ob_evaporate"));
2582 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2257 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2583
2584 if (op->contr)
2585 esrv_del_item (op->contr, tmp->count);
2586 2258
2587 tmp->destroy (); 2259 tmp->destroy ();
2588 CLEAR_FLAG (op, FLAG_LIFESAVE); 2260 CLEAR_FLAG (op, FLAG_LIFESAVE);
2589 2261
2590 if (op->stats.hp < 0) 2262 if (op->stats.hp < 0)
2591 op->stats.hp = op->stats.maxhp; 2263 op->stats.hp = op->stats.maxhp;
2592 2264
2593 if (op->stats.food < 0) 2265 if (op->stats.food < 0)
2594 op->stats.food = 999; 2266 op->stats.food = 999;
2595 2267
2596 fix_player (op); 2268 op->update_stats ();
2597 return 1; 2269 return 1;
2598 } 2270 }
2599 2271
2600 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2272 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2601 CLEAR_FLAG (op, FLAG_LIFESAVE); 2273 CLEAR_FLAG (op, FLAG_LIFESAVE);
… …
2603 return 0; 2275 return 0;
2604} 2276}
2605 2277
2606/* This goes throws the inventory and removes unpaid objects, and puts them 2278/* This goes throws the inventory and removes unpaid objects, and puts them
2607 * back in the map (location and map determined by values of env). This 2279 * back in the map (location and map determined by values of env). This
2608 * function will descend into containers. op is the object to start the search 2280 * function will descend into containers. op is the object to start the search
2609 * from. 2281 * from.
2610 */ 2282 */
2283static void
2284drop_unpaid_items (object *op, object *env)
2285{
2286 while (op)
2287 {
2288 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2289
2290 if (QUERY_FLAG (op, FLAG_UNPAID))
2291 op->insert_at (env);
2292 else if (op->inv)
2293 drop_unpaid_items (op->inv, env);
2294
2295 op = next;
2296 }
2297}
2298
2611void 2299void
2612remove_unpaid_objects (object *op, object *env) 2300object::drop_unpaid_items ()
2613{ 2301{
2614 object *next; 2302 if (!flag [FLAG_REMOVED])
2615 2303 ::drop_unpaid_items (inv, this);
2616 while (op)
2617 {
2618 next = op->below; /* Make sure we have a good value, in case
2619 * we remove object 'op'
2620 */
2621 if (QUERY_FLAG (op, FLAG_UNPAID))
2622 {
2623 op->remove ();
2624 op->x = env->x;
2625 op->y = env->y;
2626 if (env->type == PLAYER)
2627 esrv_del_item (env->contr, op->count);
2628 insert_ob_in_map (op, env->map, NULL, 0);
2629 }
2630 else if (op->inv)
2631 remove_unpaid_objects (op->inv, env);
2632
2633 op = next;
2634 }
2635} 2304}
2636
2637 2305
2638/* 2306/*
2639 * Returns pointer a static string containing gravestone text 2307 * Returns pointer a static string containing gravestone text
2640 * Moved from apply.c to player.c - player.c is what 2308 * Moved from apply.c to player.c - player.c is what
2641 * actually uses this function. player.c may not be quite the 2309 * actually uses this function. player.c may not be quite the
2642 * best, a misc file for object actions is probably better, 2310 * best, a misc file for object actions is probably better,
2643 * but there isn't one in the server directory. 2311 * but there isn't one in the server directory.
2644 */ 2312 */
2645char * 2313const char *
2646gravestone_text (object *op) 2314gravestone_text (object *op)
2647{ 2315{
2648 static char buf2[MAX_BUF]; 2316 static dynbuf_text buf;
2649 char buf[MAX_BUF];
2650 time_t now = time (NULL);
2651 2317
2652 strcpy (buf2, " R.I.P.\n\n"); 2318 buf << "---- R.I.P. ----\n\n";
2319 op->name;
2320
2653 if (op->type == PLAYER) 2321 if (op->type == PLAYER)
2654 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2322 buf << " the " << op->contr->title;
2655 else
2656 sprintf (buf, "%s\n", &op->name);
2657 2323
2658 strncat (buf2, " ", 20 - strlen (buf) / 2); 2324 buf << "\n\n";
2659 strcat (buf2, buf); 2325
2326 buf << "who was level ";
2327 buf << (sint32)op->level << "\n\n" // OO breakdown
2328 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2329
2660 if (op->type == PLAYER) 2330 if (op->type == PLAYER)
2661 sprintf (buf, "who was in level %d when killed\n", op->level); 2331 buf << "by " << op->contr->killer_name () << ".\n\n";
2662 else
2663 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2664 2332
2665 strncat (buf2, " ", 20 - strlen (buf) / 2);
2666 strcat (buf2, buf);
2667 if (op->type == PLAYER)
2668 { 2333 {
2669 sprintf (buf, "by %s.\n\n", op->contr->killer); 2334 static char buf2[128];
2670 strncat (buf2, " ", 21 - strlen (buf) / 2); 2335 time_t now = time (NULL);
2671 strcat (buf2, buf);
2672 }
2673
2674 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2336 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2675 strncat (buf2, " ", 20 - strlen (buf) / 2); 2337 buf << buf2;
2676 strcat (buf2, buf); 2338 }
2677 2339
2678 return buf2; 2340 return buf;
2679} 2341}
2680
2681
2682 2342
2683void 2343void
2684do_some_living (object *op) 2344do_some_living (object *op)
2685{ 2345{
2686 int last_food = op->stats.food; 2346 int last_food = op->stats.food;
… …
2692 int rate_grace = 2000; 2352 int rate_grace = 2000;
2693 const int max_hp = 1; 2353 const int max_hp = 1;
2694 const int max_sp = 1; 2354 const int max_sp = 1;
2695 const int max_grace = 1; 2355 const int max_grace = 1;
2696 2356
2697 if (op->contr->outputs_sync) 2357 if (op->contr->hidden)
2698 {
2699 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2700 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2701 flush_output_element (op, &op->contr->outputs[i]);
2702 } 2358 {
2359 op->invisible = 1000;
2360 /* the socket code flashes the player visible/invisible
2361 * depending on the value of invisible, so we need to
2362 * alternate it here for it to work correctly.
2363 */
2364 if (pticks & 2)
2365 op->invisible--;
2366 }
2367 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2368 {
2369 if (!op->invisible--)
2370 {
2371 make_visible (op);
2372 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2373 }
2374 }
2703 2375
2704 if (op->contr->state == ST_PLAYING) 2376 if (op->contr->ns->state == ST_PLAYING)
2705 { 2377 {
2706
2707 /* these next three if clauses make it possible to SLOW DOWN 2378 /* these next three if clauses make it possible to SLOW DOWN
2708 hp/grace/spellpoint regeneration. */ 2379 hp/grace/spellpoint regeneration. */
2709 if (op->contr->gen_hp >= 0) 2380 if (op->contr->gen_hp >= 0)
2710 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2381 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2711 else 2382 else
2712 { 2383 {
2713 gen_hp = op->stats.maxhp; 2384 gen_hp = op->stats.maxhp;
2714 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2385 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2715 } 2386 }
2387
2716 if (op->contr->gen_sp >= 0) 2388 if (op->contr->gen_sp >= 0)
2717 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2389 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2718 else 2390 else
2719 { 2391 {
2720 gen_sp = op->stats.maxsp; 2392 gen_sp = op->stats.maxsp;
2721 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2393 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2722 } 2394 }
2395
2723 if (op->contr->gen_grace >= 0) 2396 if (op->contr->gen_grace >= 0)
2724 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2397 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2725 else 2398 else
2726 { 2399 {
2727 gen_grace = op->stats.maxgrace; 2400 gen_grace = op->stats.maxgrace;
2728 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2401 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2729 } 2402 }
2730 2403
2731 /* Regenerate Spell Points */
2732 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2733 {
2734 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2735 if (op->stats.sp < op->stats.maxsp)
2736 {
2737 op->stats.sp++;
2738 /* dms do not consume food */
2739 if (!QUERY_FLAG (op, FLAG_WIZ))
2740 {
2741 op->stats.food--;
2742 if (op->contr->digestion < 0)
2743 op->stats.food += op->contr->digestion;
2744 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2745 op->stats.food = last_food;
2746 }
2747 }
2748 if (max_sp > 1)
2749 {
2750 over_sp = (gen_sp + 10) / rate_sp;
2751 if (over_sp > 0)
2752 {
2753 if (op->stats.sp < op->stats.maxsp)
2754 {
2755 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2756 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2757 op->stats.sp--;
2758 if (op->stats.sp > op->stats.maxsp)
2759 op->stats.sp = op->stats.maxsp;
2760 }
2761 op->last_sp = 0;
2762 }
2763 else
2764 {
2765 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2766 }
2767 }
2768 else
2769 {
2770 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2771 }
2772 }
2773
2774 /* Regenerate Grace */ 2404 /* Regenerate Grace */
2775 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2405 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2776 if (--op->last_grace < 0) 2406 if (--op->last_grace < 0)
2777 { 2407 {
2778 if (op->stats.grace < op->stats.maxgrace / 2) 2408 if (op->stats.grace < op->stats.maxgrace / 2)
2779 op->stats.grace++; /* no penalty in food for regaining grace */ 2409 op->stats.grace++; /* no penalty in food for regaining grace */
2410
2780 if (max_grace > 1) 2411 if (max_grace > 1)
2781 { 2412 {
2782 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2413 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2783 if (over_grace > 0) 2414 if (over_grace > 0)
2784 { 2415 {
… …
2796 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2427 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2797 } 2428 }
2798 /* wearing stuff doesn't detract from grace generation. */ 2429 /* wearing stuff doesn't detract from grace generation. */
2799 } 2430 }
2800 2431
2432 if (op->stats.food > 0)
2433 {
2801 /* Regenerate Hit Points */ 2434 /* Regenerate Spell Points */
2802 if (--op->last_heal < 0) 2435 if (!op->contr->golem && --op->last_sp < 0)
2803 {
2804 if (op->stats.hp < op->stats.maxhp)
2805 { 2436 {
2806 op->stats.hp++; 2437 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2807 /* dms do not consume food */ 2438
2808 if (!QUERY_FLAG (op, FLAG_WIZ)) 2439 if (op->stats.sp < op->stats.maxsp)
2809 { 2440 {
2441 op->stats.sp++;
2442
2443 /* dms do not consume food */
2444 if (!QUERY_FLAG (op, FLAG_WIZ))
2445 {
2810 op->stats.food--; 2446 op->stats.food--;
2447
2811 if (op->contr->digestion < 0) 2448 if (op->contr->digestion < 0)
2812 op->stats.food += op->contr->digestion; 2449 op->stats.food += op->contr->digestion;
2813 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2450 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2814 op->stats.food = last_food; 2451 op->stats.food = last_food;
2452 }
2815 } 2453 }
2816 } 2454
2817 if (max_hp > 1) 2455 if (max_sp > 1)
2818 {
2819 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2820 if (over_hp > 0)
2821 { 2456 {
2822 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2457 over_sp = (gen_sp + 10) / rate_sp;
2458 if (over_sp > 0)
2459 {
2460 if (op->stats.sp < op->stats.maxsp)
2461 {
2462 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2463
2464 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2465 op->stats.sp--;
2466
2467 if (op->stats.sp > op->stats.maxsp)
2468 op->stats.sp = op->stats.maxsp;
2469 }
2470
2823 op->last_heal = 0; 2471 op->last_sp = 0;
2472 }
2473 else
2474 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2824 } 2475 }
2825 else 2476 else
2477 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2478 }
2479
2480 /* Regenerate Hit Points */
2481 if (--op->last_heal < 0)
2482 {
2483 if (op->stats.hp < op->stats.maxhp)
2826 { 2484 {
2827 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2485 op->stats.hp++;
2486
2487 /* dms do not consume food */
2488 if (!QUERY_FLAG (op, FLAG_WIZ))
2489 {
2490 op->stats.food--;
2491
2492 if (op->contr->digestion < 0)
2493 op->stats.food += op->contr->digestion;
2494 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2495 op->stats.food = last_food;
2496 }
2828 } 2497 }
2498
2499 if (max_hp > 1)
2500 {
2501 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2502
2503 if (over_hp > 0)
2504 {
2505 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2506 op->last_heal = 0;
2507 }
2508 else
2509 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2829 } 2510 }
2830 else 2511 else
2831 {
2832 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2512 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2833 } 2513 }
2834 } 2514 }
2835 2515
2836 /* Digestion */ 2516 /* Digestion */
2837 if (--op->last_eat < 0) 2517 if (--op->last_eat < 0)
2838 { 2518 {
2839#ifdef COZY_SERVER 2519 int bonus = max (0, op->contr->digestion),
2840 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2520 penalty = max (0, -op->contr->digestion);
2841 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2842#else
2843 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2844#endif
2845 2521
2846 if (op->contr->gen_hp > 0)
2847 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2522 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2848 else 2523
2849 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2850 /* dms do not consume food */ 2524 /* dms do not consume food */
2851 if (!QUERY_FLAG (op, FLAG_WIZ)) 2525 if (!QUERY_FLAG (op, FLAG_WIZ))
2852 op->stats.food--; 2526 op->stats.food--;
2853 } 2527 }
2854 }
2855 2528
2856 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2529 if (op->stats.food < 0 && op->stats.hp >= 0)
2857 { 2530 {
2858 object *tmp, *flesh = NULL; 2531 object *flesh = 0;
2859 2532
2860 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2533 for_inv_removable (op, tmp)
2861 {
2862 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2863 { 2534 {
2535 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2536 continue;
2537
2864 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2538 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2865 { 2539 {
2866 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2540 op->statusmsg ("You blindly grab for a bite of food. "
2541 "H<To prevent you from starving, you ate some random item from your backpack.>");
2867 manual_apply (op, tmp, 0); 2542 manual_apply (op, tmp, 0);
2543
2868 if (op->stats.food >= 0 || op->stats.hp < 0) 2544 if (op->stats.food >= 0 || op->stats.hp < 0)
2869 break; 2545 break;
2870 } 2546 }
2871 else if (tmp->type == FLESH) 2547 else if (tmp->type == FLESH)
2872 flesh = tmp; 2548 flesh = tmp;
2873 } /* End if paid for object */ 2549 }
2874 } /* end of for loop */ 2550
2875 /* If player is still starving, it means they don't have any food, so 2551 /* If player is still starving, it means they don't have any food, so
2876 * eat flesh instead. 2552 * eat flesh instead.
2877 */ 2553 */
2878 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2554 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2879 { 2555 {
2880 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2556 op->statusmsg ("You blindly grab for a bite of food. "
2557 "H<To prevent you from starving, you ate some random item from your backpack.>");
2881 manual_apply (op, flesh, 0); 2558 manual_apply (op, flesh, 0);
2559 }
2560
2561 // If player is still starving, alert him!
2562 if (op->stats.food < 0)
2563 op->failmsg ("You are starving! "
2564 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2565 }
2566
2567 if (op->stats.food < 0)
2882 } 2568 {
2883 } /* end if player is starving */ 2569 op->stats.hp += op->stats.food;
2570 op->stats.food = 0;
2884 2571
2885 while (op->stats.food < 0 && op->stats.hp > 0) 2572 if (op->stats.hp < 0)
2886 op->stats.food++, op->stats.hp--; 2573 {
2574 op->contr->killer = archetype::get ("killer_starvation");
2575 op->contr->killer->destroy ();
2576 }
2577 }
2887 2578
2888 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2579 /* killer should be set here already */
2580 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2889 kill_player (op); 2581 kill_player (op);
2582 }
2890} 2583}
2891
2892
2893 2584
2894/* If the player should die (lack of hp, food, etc), we call this. 2585/* If the player should die (lack of hp, food, etc), we call this.
2895 * op is the player in jeopardy. If the player can not be saved (not 2586 * op is the player in jeopardy. If the player can not be saved (not
2896 * permadeath, no lifesave), this will take care of removing the player 2587 * permadeath, no lifesave), this will take care of removing the player
2897 * file. 2588 * file.
2898 */ 2589 */
2899void 2590void
2900kill_player (object *op) 2591kill_player (object *op)
2901{ 2592{
2593 int x, y;
2902 char buf[MAX_BUF]; 2594 char buf[MAX_BUF];
2903 int x, y;
2904
2905 //int i;
2906 maptile *map; /* this is for resurrection */ 2595 maptile *map; /* this is for resurrection */
2907
2908 /* int z;
2909 int num_stats_lose;
2910 int lost_a_stat;
2911 int lose_this_stat;
2912 int this_stat; */
2913 int will_kill_again; 2596 int will_kill_again;
2914 archetype *at; 2597 archetype *at;
2915 object *tmp; 2598 object *tmp;
2916 2599
2917 if (save_life (op)) 2600 if (save_life (op))
2918 return; 2601 return;
2919
2920 2602
2921 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2603 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2922 * in cities ONLY!!! It is very important that this doesn't get abused. 2604 * in cities ONLY!!! It is very important that this doesn't get abused.
2923 * Look at op_on_battleground() for more info --AndreasV 2605 * Look at op_on_battleground() for more info --AndreasV
2924 */ 2606 */
… …
2927 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2609 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2928 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2610 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2929 2611
2930 /* restore player */ 2612 /* restore player */
2931 at = archetype::find ("poisoning"); 2613 at = archetype::find ("poisoning");
2932 tmp = present_arch_in_ob (at, op); 2614 if (object *tmp = present_arch_in_ob (at, op))
2933 if (tmp)
2934 { 2615 {
2935 tmp->destroy (); 2616 tmp->destroy ();
2936 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2617 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2937 } 2618 }
2938 2619
2939 at = archetype::find ("confusion"); 2620 at = archetype::find ("confusion");
2940 tmp = present_arch_in_ob (at, op); 2621 if (object *tmp = present_arch_in_ob (at, op))
2941 if (tmp)
2942 { 2622 {
2943 tmp->destroy (); 2623 tmp->destroy ();
2944 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2624 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2945 } 2625 }
2946 2626
2947 cure_disease (op, 0); /* remove any disease */ 2627 cure_disease (op, 0, 0); /* remove any disease */
2948 op->stats.hp = op->stats.maxhp; 2628 op->stats.hp = op->stats.maxhp;
2949 if (op->stats.food <= 0) 2629 if (op->stats.food <= 0)
2950 op->stats.food = 999; 2630 op->stats.food = 999;
2951 2631
2952 /* create a bodypart-trophy to make the winner happy */ 2632 /* create a bodypart-trophy to make the winner happy */
2953 tmp = arch_to_object (archetype::find ("finger")); 2633 if (object *tmp = arch_to_object (archetype::find ("finger")))
2954 if (tmp != NULL)
2955 { 2634 {
2956 sprintf (buf, "%s's finger", &op->name); 2635 tmp->name = format ("%s's finger" , &op->name);
2957 tmp->name = buf; 2636 tmp->name_pl = format ("%s's fingers", &op->name);
2958 sprintf (buf, " This finger has been cut off %s\n"
2959 " the %s, when he was defeated at\n level %d by %s.\n",
2960 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2961 tmp->msg = buf; 2637 tmp->msg = format (
2638 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2639 &op->name, op->contr->title,
2640 (int)op->level,
2641 op->contr->killer_name ()
2642 );
2962 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2643 tmp->value = 0, tmp->type = 0;
2963 tmp->materialname = NULL; 2644 tmp->materialname = "organics";
2964 tmp->x = op->x, tmp->y = op->y; 2645 tmp->insert_at (op, tmp);
2965 insert_ob_in_map (tmp, op->map, op, 0);
2966 } 2646 }
2967 2647
2968 /* teleport defeated player to new destination */ 2648 /* teleport defeated player to new destination */
2969 transfer_ob (op, x, y, 0, NULL); 2649 transfer_ob (op, x, y, 0, NULL);
2970 op->contr->braced = 0; 2650 op->contr->braced = 0;
… …
2973 2653
2974 INVOKE_PLAYER (DEATH, op->contr); 2654 INVOKE_PLAYER (DEATH, op->contr);
2975 2655
2976 command_kill_pets (op, 0); 2656 command_kill_pets (op, 0);
2977 2657
2978 if (op->stats.food < 0) 2658 op->contr->play_sound (sound_find ("player_dies"));
2659
2660 /* save the map location for corpse, gravestone */
2661 x = op->x;
2662 y = op->y;
2663 map = op->map;
2664
2665 /* NOT_PERMADEATH code. This basically brings the character back to
2666 * life if they are dead - it takes some exp and a random stat.
2667 * See the config.h file for a little more in depth detail about this.
2668 */
2669
2670 /* Basically two ways to go - remove a stat permanently, or just
2671 * make it depletion. This bunch of code deals with that aspect
2672 * of death.
2673 */
2674#ifndef COZY_SERVER
2675 if (settings.balanced_stat_loss)
2979 { 2676 {
2980 if (op->contr->explore) 2677 /* If stat loss is permanent, lose one stat only. */
2981 { 2678 /* Lower level chars don't lose as many stats because they suffer
2982 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are"); 2679 more if they do. */
2983 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); 2680 /* Higher level characters can afford things such as potions of
2984 op->stats.food = 999; 2681 restoration, or better, stat potions. So we slug them that
2985 return; 2682 little bit harder. */
2986 } 2683 /* GD */
2987 sprintf (buf, "%s starved to death.", &op->name); 2684 if (settings.stat_loss_on_death)
2988 strcpy (op->contr->killer, "starvation"); 2685 num_stats_lose = 1;
2686 else
2687 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2989 } 2688 }
2990 else 2689 else
2991 { 2690 num_stats_lose = 1;
2992 if (op->contr->explore) 2691
2993 { 2692 lost_a_stat = 0;
2994 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are"); 2693
2995 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); 2694 for (z = 0; z < num_stats_lose; z++)
2996 op->stats.hp = op->stats.maxhp;
2997 return;
2998 }
2999 sprintf (buf, "%s died.", &op->name);
3000 } 2695 {
3001 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2696 i = RANDOM () % NUM_STATS;
3002 2697
3003 /* save the map location for corpse, gravestone */
3004 x = op->x;
3005 y = op->y;
3006 map = op->map;
3007
3008
3009 if (settings.not_permadeth == TRUE)
3010 {
3011 /* NOT_PERMADEATH code. This basically brings the character back to
3012 * life if they are dead - it takes some exp and a random stat.
3013 * See the config.h file for a little more in depth detail about this.
3014 */
3015
3016 /* Basically two ways to go - remove a stat permanently, or just
3017 * make it depletion. This bunch of code deals with that aspect
3018 * of death.
3019 */
3020#ifndef COZY_SERVER
3021 if (settings.balanced_stat_loss)
3022 {
3023 /* If stat loss is permanent, lose one stat only. */
3024 /* Lower level chars don't lose as many stats because they suffer
3025 more if they do. */
3026 /* Higher level characters can afford things such as potions of
3027 restoration, or better, stat potions. So we slug them that
3028 little bit harder. */
3029 /* GD */
3030 if (settings.stat_loss_on_death) 2698 if (settings.stat_loss_on_death)
3031 num_stats_lose = 1; 2699 {
3032 else 2700 /* Pick a random stat and take a point off it. Tell the player
3033 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2701 * what he lost.
2702 */
2703 change_attr_value (&(op->stats), i, -1);
2704 check_stat_bounds (&(op->stats));
2705 change_attr_value (&(op->contr->orig_stats), i, -1);
2706 check_stat_bounds (&(op->contr->orig_stats));
2707 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2708 lost_a_stat = 1;
3034 } 2709 }
3035 else 2710 else
3036 { 2711 {
3037 num_stats_lose = 1; 2712 /* deplete a stat */
3038 } 2713 archetype *deparch = archetype::find ("depletion");
3039 lost_a_stat = 0; 2714 object *dep;
3040 2715
3041 for (z = 0; z < num_stats_lose; z++) 2716 dep = present_arch_in_ob (deparch, op);
3042 { 2717 if (!dep)
3043 i = RANDOM () % NUM_STATS;
3044
3045 if (settings.stat_loss_on_death)
3046 { 2718 {
3047 /* Pick a random stat and take a point off it. Tell the player 2719 dep = arch_to_object (deparch);
3048 * what he lost. 2720 insert_ob_in_ob (dep, op);
3049 */
3050 change_attr_value (&(op->stats), i, -1);
3051 check_stat_bounds (&(op->stats));
3052 change_attr_value (&(op->contr->orig_stats), i, -1);
3053 check_stat_bounds (&(op->contr->orig_stats));
3054 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3055 lost_a_stat = 1;
3056 } 2721 }
3057 else 2722 lose_this_stat = 1;
2723 if (settings.balanced_stat_loss)
3058 { 2724 {
3059 /* deplete a stat */ 2725 /* GD */
3060 archetype *deparch = archetype::find ("depletion"); 2726 /* Get the stat that we're about to deplete. */
3061 object *dep; 2727 this_stat = get_attr_value (&(dep->stats), i);
3062 2728 if (this_stat < 0)
3063 dep = present_arch_in_ob (deparch, op);
3064 if (!dep)
3065 { 2729 {
3066 dep = arch_to_object (deparch); 2730 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3067 insert_ob_in_ob (dep, op); 2731 int keep_chance = this_stat * this_stat;
3068 } 2732
3069 lose_this_stat = 1; 2733 /* Yes, I am paranoid. Sue me. */
3070 if (settings.balanced_stat_loss)
3071 {
3072 /* GD */
3073 /* Get the stat that we're about to deplete. */
3074 this_stat = get_attr_value (&(dep->stats), i);
3075 if (this_stat < 0) 2734 if (keep_chance < 1)
2735 keep_chance = 1;
2736
2737 /* There is a maximum depletion total per level. */
2738 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3076 { 2739 {
3077 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3078 int keep_chance = this_stat * this_stat;
3079
3080 /* Yes, I am paranoid. Sue me. */
3081 if (keep_chance < 1)
3082 keep_chance = 1;
3083
3084 /* There is a maximum depletion total per level. */
3085 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3086 {
3087 lose_this_stat = 0; 2740 lose_this_stat = 0;
3088 /* Take loss chance vs keep chance to see if we 2741 /* Take loss chance vs keep chance to see if we
3089 retain the stat. */ 2742 retain the stat. */
3090 }
3091 else
3092 {
3093 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3094 lose_this_stat = 0;
3095 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3096 this_stat, keep_chance, loss_chance,
3097 lose_this_stat?"LOSE":"KEEP"); */
3098 }
3099 } 2743 }
3100 }
3101
3102 if (lose_this_stat)
3103 {
3104 this_stat = get_attr_value (&(dep->stats), i);
3105 /* We could try to do something clever like find another
3106 * stat to reduce if this fails. But chances are, if
3107 * stats have been depleted to -50, all are pretty low
3108 * and should be roughly the same, so it shouldn't make a
3109 * difference.
3110 */ 2744 else
3111 if (this_stat >= -50)
3112 { 2745 {
3113 change_attr_value (&(dep->stats), i, -1); 2746 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3114 SET_FLAG (dep, FLAG_APPLIED);
3115 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3116 fix_player (op);
3117 lost_a_stat = 1; 2747 lose_this_stat = 0;
2748 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2749 this_stat, keep_chance, loss_chance,
2750 lose_this_stat?"LOSE":"KEEP"); */
3118 } 2751 }
3119 } 2752 }
3120 } 2753 }
2754
2755 if (lose_this_stat)
2756 {
2757 this_stat = get_attr_value (&(dep->stats), i);
2758 /* We could try to do something clever like find another
2759 * stat to reduce if this fails. But chances are, if
2760 * stats have been depleted to -50, all are pretty low
2761 * and should be roughly the same, so it shouldn't make a
2762 * difference.
2763 */
2764 if (this_stat >= -50)
2765 {
2766 change_attr_value (&(dep->stats), i, -1);
2767 SET_FLAG (dep, FLAG_APPLIED);
2768 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2769 op->update_stats ();
2770 lost_a_stat = 1;
2771 }
3121 } 2772 }
2773 }
2774 }
2775
3122 /* If no stat lost, tell the player. */ 2776 /* If no stat lost, tell the player. */
3123 if (!lost_a_stat) 2777 if (!lost_a_stat)
3124 { 2778 {
3125 /* determine_god() seems to not work sometimes... why is this? 2779 /* determine_god() seems to not work sometimes... why is this?
3126 Should I be using something else? GD */ 2780 Should I be using something else? GD */
3127 const char *god = determine_god (op); 2781 const char *god = determine_god (op);
3128 2782
3129 if (god && (strcmp (god, "none"))) 2783 if (god && (strcmp (god, "none")))
3130 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2784 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3131 else 2785 else
3132 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2786 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3133 } 2787 }
3134#else 2788#else
3135 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2789 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
3136#endif 2790#endif
3137 2791
3138 /* Put a gravestone up where the character 'almost' died. List the 2792 /* Put a gravestone up where the character 'almost' died. List the
3139 * exp loss on the stone. 2793 * exp loss on the stone.
3140 */ 2794 */
3141 tmp = arch_to_object (archetype::find ("gravestone")); 2795 tmp = arch_to_object (archetype::find ("gravestone"));
3142 sprintf (buf, "%s's gravestone", &op->name); 2796 tmp->name = format ("%s's gravestone", &op->name);
3143 tmp->name = buf; 2797 tmp->name_pl = format ("%s's gravestones", &op->name);
3144 sprintf (buf, "%s's gravestones", &op->name);
3145 tmp->name_pl = buf;
3146 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); 2798 tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
3147 tmp->msg = buf;
3148 tmp->x = op->x, tmp->y = op->y; 2799 tmp->x = op->x, tmp->y = op->y;
3149 insert_ob_in_map (tmp, op->map, NULL, 0); 2800 insert_ob_in_map (tmp, op->map, NULL, 0);
3150 2801
3151 /**************************************/ 2802 /**************************************/
3152 /* */ 2803 /* */
3153 /* Subtract the experience points, */ 2804 /* Subtract the experience points, */
3154 /* if we died cause of food, give us */ 2805 /* if we died cause of food, give us */
3155 /* food, and reset HP's... */ 2806 /* food, and reset HP's... */
3156 /* */ 2807 /* */
3157 /**************************************/ 2808 /**************************************/
3158 2809
3159 /* remove any poisoning and confusion the character may be suffering. */ 2810 /* remove any poisoning and confusion the character may be suffering. */
3160 /* restore player */ 2811 /* restore player */
3161 at = archetype::find ("poisoning"); 2812 at = archetype::find ("poisoning");
3162 tmp = present_arch_in_ob (at, op); 2813 tmp = present_arch_in_ob (at, op);
3163 2814
3164 if (tmp) 2815 if (tmp)
3165 { 2816 {
3166 tmp->destroy (); 2817 tmp->destroy ();
3167 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2818 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3168 } 2819 }
3169 2820
3170 at = archetype::find ("confusion"); 2821 at = archetype::find ("confusion");
3171 tmp = present_arch_in_ob (at, op); 2822 tmp = present_arch_in_ob (at, op);
3172 if (tmp) 2823 if (tmp)
3173 { 2824 {
3174 tmp->destroy (); 2825 tmp->destroy ();
3175 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2826 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3176 } 2827 }
3177 2828
3178 cure_disease (op, 0); /* remove any disease */ 2829 cure_disease (op, 0, 0); /* remove any disease */
3179 2830
2831 // remove all spell effects that are active
2832 // to avoid long-term effects such as word-of-recall
2833 for (object *item = op->inv; item; )
2834 {
2835 object *next = item->below;
2836
2837 if (item->type == SPELL_EFFECT && item->active)
2838 item->destroy ();
2839
2840 item = next;
2841 }
2842
3180 /*add_exp(op, (op->stats.exp * -0.20)); */ 2843 /*add_exp(op, (op->stats.exp * -0.20)); */
3181 apply_death_exp_penalty (op); 2844 apply_death_exp_penalty (op);
2845
3182 if (op->stats.food < 100) 2846 if (op->stats.food < 100)
3183 op->stats.food = 900; 2847 op->stats.food = 900;
2848
3184 op->stats.hp = op->stats.maxhp; 2849 op->stats.hp = op->stats.maxhp;
3185 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2850 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3186 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2851 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3187 2852
3188 /* 2853 /*
3189 * Check to see if the player is in a shop. IF so, then check to see if 2854 * Check to see if the player has any unpaid items. If so, remove them
3190 * the player has any unpaid items. If so, remove them and put them back 2855 * and put them back in the map.
3191 * in the map. 2856 */
3192 */ 2857 op->drop_unpaid_items ();
3193 2858
3194 if (is_in_shop (op))
3195 remove_unpaid_objects (op->inv, op);
3196
3197 /****************************************/ 2859 /****************************************/
3198 /* */ 2860 /* */
3199 /* Move player to his current respawn- */ 2861 /* Move player to his current respawn- */
3200 /* position (usually last savebed) */ 2862 /* position (usually last savebed) */
3201 /* */ 2863 /* */
3202 /****************************************/ 2864 /****************************************/
3203 2865
3204 enter_player_savebed (op); 2866 enter_player_savebed (op);
3205 2867
3206 /* Save the player before inserting the force to reduce
3207 * chance of abuse.
3208 */
3209 op->contr->braced = 0; 2868 op->contr->braced = 0;
3210 save_player (op, 1);
3211 2869
3212 /* it is possible that the player has blown something up 2870 /* it is possible that the player has blown something up
3213 * at his savebed location, and that can have long lasting 2871 * at his savebed location, and that can have long lasting
3214 * spell effects. So first see if there is a spell effect 2872 * spell effects. So first see if there is a spell effect
3215 * on the space that might harm the player. 2873 * on the space that might harm the player.
3216 */ 2874 */
3217 will_kill_again = 0; 2875 will_kill_again = 0;
3218 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2876 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3219 if (tmp->type == SPELL_EFFECT) 2877 if (tmp->type == SPELL_EFFECT)
3220 will_kill_again |= tmp->attacktype; 2878 will_kill_again |= tmp->attacktype;
3221 2879
3222 if (will_kill_again) 2880 if (will_kill_again)
3223 { 2881 {
3224 object *force; 2882 object *force;
3225 int at; 2883 int at;
3226 2884
3227 force = get_archetype (FORCE_NAME); 2885 force = get_archetype (FORCE_NAME);
3228 /* 50 ticks should be enough time for the spell to abate */ 2886 /* 50 ticks should be enough time for the spell to abate */
3229 force->speed = 0.1; 2887 force->speed = 0.1f;
3230 force->speed_left = -5.0; 2888 force->speed_left = -5.f;
3231 SET_FLAG (force, FLAG_APPLIED); 2889 SET_FLAG (force, FLAG_APPLIED);
3232 for (at = 0; at < NROFATTACKS; at++) 2890 for (at = 0; at < NROFATTACKS; at++)
3233 if (will_kill_again & (1 << at)) 2891 if (will_kill_again & (1 << at))
3234 force->resist[at] = 100; 2892 force->resist[at] = 100;
3235 2893
3236 insert_ob_in_ob (force, op); 2894 insert_ob_in_ob (force, op);
3237 fix_player (op); 2895 op->update_stats ();
3238 2896
3239 } 2897 }
3240 2898
3241 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2899 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3242 return;
3243 } /* NOT_PERMADETH */
3244 else
3245 {
3246 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3247 * should probably be embedded in an else statement.
3248 */
3249
3250 op->contr->party = NULL;
3251 if (settings.set_title == TRUE)
3252 op->contr->own_title[0] = '\0';
3253 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3254 check_score (op);
3255
3256 if (op->contr->ranges[range_golem])
3257 {
3258 remove_friendly_object (op->contr->ranges[range_golem]);
3259 op->contr->ranges[range_golem]->destroy ();
3260 op->contr->ranges[range_golem] = 0;
3261 }
3262
3263 loot_object (op); /* Remove some of the items for good */
3264 op->remove ();
3265 op->direction = 0;
3266
3267 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3268 {
3269 delete_character (op->name, 0);
3270 if (settings.resurrection == TRUE)
3271 {
3272 /* save playerfile sans equipment when player dies
3273 ** then save it as player.pl.dead so that future resurrection
3274 ** type spells will work on them nicely
3275 */
3276 delete_character (op->name, 0);
3277 op->stats.hp = op->stats.maxhp;
3278 op->stats.food = 999;
3279
3280 /* set the location of where the person will reappear when */
3281 /* maybe resurrection code should fix map also */
3282 strcpy (op->contr->maplevel, settings.emergency_mapname);
3283 if (op->map != NULL)
3284 op->map = NULL;
3285 op->x = settings.emergency_x;
3286 op->y = settings.emergency_y;
3287 save_player (op, 0);
3288 op->map = map;
3289 /* please see resurrection.c: peterm */
3290 dead_player (op);
3291 }
3292 else
3293 delete_character (op->name, 1);
3294 }
3295
3296 play_again (op);
3297
3298 /* peterm: added to create a corpse at deathsite. */
3299 tmp = arch_to_object (archetype::find ("corpse_pl"));
3300 sprintf (buf, "%s", &op->name);
3301 tmp->name = tmp->name_pl = buf;
3302 tmp->level = op->level;
3303 tmp->x = x;
3304 tmp->y = y;
3305 tmp->msg = gravestone_text (op);
3306 SET_FLAG (tmp, FLAG_UNIQUE);
3307 insert_ob_in_map (tmp, map, NULL, 0);
3308 }
3309} 2900}
3310
3311 2901
3312void 2902void
3313loot_object (object *op) 2903loot_object (object *op)
3314{ /* Grab and destroy some treasure */ 2904{ /* Grab and destroy some treasure */
3315 object *tmp, *tmp2, *next; 2905 object *tmp, *tmp2, *next;
3316 2906
3317 if (op->container) 2907 op->close_container (); /* close open sack first */
3318 { /* close open sack first */
3319 esrv_apply_container (op, op->container);
3320 }
3321 2908
3322 for (tmp = op->inv; tmp != NULL; tmp = next) 2909 for (tmp = op->inv; tmp; tmp = next)
3323 { 2910 {
3324 next = tmp->below; 2911 next = tmp->below;
3325 if (tmp->type == EXPERIENCE || tmp->invisible) 2912
2913 if (tmp->invisible)
3326 continue; 2914 continue;
2915
3327 tmp->remove (); 2916 tmp->remove ();
3328 tmp->x = op->x, tmp->y = op->y; 2917 tmp->x = op->x, tmp->y = op->y;
2918
3329 if (tmp->type == CONTAINER) 2919 if (tmp->type == CONTAINER)
3330 { /* empty container to ground */ 2920 loot_object (tmp); /* empty container to ground */
3331 loot_object (tmp); 2921
3332 }
3333 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2922 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3334 { 2923 {
3335 if (tmp->nrof > 1) 2924 if (tmp->nrof > 1)
3336 { 2925 {
3337 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2926 tmp->decrease (rndm (1, tmp->nrof - 1));
3338 tmp2->destroy ();
3339 insert_ob_in_map (tmp, op->map, NULL, 0); 2927 insert_ob_in_map (tmp, op->map, NULL, 0);
3340 } 2928 }
3341 else 2929 else
3342 tmp->destroy (); 2930 tmp->destroy ();
3343 } 2931 }
… …
3349/* 2937/*
3350 * fix_weight(): Check recursively the weight of all players, and fix 2938 * fix_weight(): Check recursively the weight of all players, and fix
3351 * what needs to be fixed. Refresh windows and fix speed if anything 2939 * what needs to be fixed. Refresh windows and fix speed if anything
3352 * was changed. 2940 * was changed.
3353 */ 2941 */
3354
3355void 2942void
3356fix_weight (void) 2943fix_weight (void)
3357{ 2944{
3358 player *pl; 2945 for_all_players (pl)
3359
3360 for (pl = first_player; pl != NULL; pl = pl->next)
3361 { 2946 {
3362 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2947 sint32 old = pl->ob->carrying;
3363 2948
3364 if (old == sum) 2949 pl->ob->update_weight ();
3365 continue; 2950
3366 fix_player (pl->ob); 2951 if (old != pl->ob->carrying)
2952 {
2953 pl->ob->update_stats ();
3367 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2954 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2955 }
3368 } 2956 }
3369} 2957}
3370 2958
3371void 2959void
3372fix_luck (void) 2960fix_luck (void)
3373{ 2961{
3374 player *pl; 2962 for_all_players (pl)
3375
3376 for (pl = first_player; pl != NULL; pl = pl->next)
3377 if (!pl->ob->contr->state) 2963 if (!pl->ob->contr->ns->state)
3378 change_luck (pl->ob, 0); 2964 pl->ob->change_luck (0);
3379} 2965}
3380
3381 2966
3382/* cast_dust() - handles op throwing objects of type 'DUST'. 2967/* cast_dust() - handles op throwing objects of type 'DUST'.
3383 * This is much simpler in the new spell code - we basically 2968 * This is much simpler in the new spell code - we basically
3384 * just treat this as any other spell casting object. 2969 * just treat this as any other spell casting object.
3385 */ 2970 */
3386
3387void 2971void
3388cast_dust (object *op, object *throw_ob, int dir) 2972cast_dust (object *op, object *throw_ob, int dir)
3389{ 2973{
3390 object *skop, *spob; 2974 object *skop, *spob;
3391 2975
… …
3420void 3004void
3421make_visible (object *op) 3005make_visible (object *op)
3422{ 3006{
3423 op->hide = 0; 3007 op->hide = 0;
3424 op->invisible = 0; 3008 op->invisible = 0;
3009
3425 if (op->type == PLAYER) 3010 if (op->type == PLAYER)
3426 { 3011 {
3427 op->contr->tmp_invis = 0; 3012 op->contr->tmp_invis = 0;
3428 op->contr->invis_race = 0; 3013 op->contr->invis_race = 0;
3429 } 3014 }
3015
3430 update_object (op, UP_OBJ_FACE); 3016 update_object (op, UP_OBJ_CHANGE);
3431} 3017}
3432 3018
3433int 3019int
3434is_true_undead (object *op) 3020is_true_undead (object *op)
3435{ 3021{
3436 object *tmp = NULL;
3437
3438 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3022 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3439 return 1; 3023 return 1;
3440 3024
3441 if (op->type == PLAYER)
3442 for (tmp = op->inv; tmp; tmp = tmp->below)
3443 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3444 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3445 return 1;
3446 return 0; 3025 return 0;
3447} 3026}
3448 3027
3449/* look at the surrounding terrain to determine 3028/* look at the surrounding terrain to determine
3450 * the hideability of this object. Positive levels 3029 * the hideability of this object. Positive levels
3451 * indicate greater hideability. 3030 * indicate greater hideability.
3452 */ 3031 */
3453
3454int 3032int
3455hideability (object *ob) 3033hideability (object *ob)
3456{ 3034{
3457 int i, level = 0, mflag; 3035 int i, level = 0, mflag;
3458 sint16 x, y; 3036 sint16 x, y;
… …
3468 * as bad as carrying a light on a pitch dark map */ 3046 * as bad as carrying a light on a pitch dark map */
3469 if (has_carried_lights (ob)) 3047 if (has_carried_lights (ob))
3470 level = -(10 + (2 * ob->map->darkness)); 3048 level = -(10 + (2 * ob->map->darkness));
3471 3049
3472 /* scan through all nearby squares for terrain to hide in */ 3050 /* scan through all nearby squares for terrain to hide in */
3473 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3051 for (i = 0, x = ob->x, y = ob->y;
3052 i <= SIZEOFFREE1;
3053 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3474 { 3054 {
3475 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3055 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3476 if (mflag & P_OUT_OF_MAP) 3056 if (mflag & P_OUT_OF_MAP)
3477 {
3478 continue; 3057 continue;
3479 } 3058
3480 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3059 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3481 level += 2; 3060 level += 2;
3482 else /* open terrain! */ 3061 else /* open terrain! */
3483 level -= 1; 3062 level -= 1;
3484 } 3063 }
… …
3492/* For Hidden creatures - a chance of becoming 'unhidden' 3071/* For Hidden creatures - a chance of becoming 'unhidden'
3493 * every time they move - as we subtract off 'invisibility' 3072 * every time they move - as we subtract off 'invisibility'
3494 * AND, for players, if they move into a ridiculously unhideable 3073 * AND, for players, if they move into a ridiculously unhideable
3495 * spot (surrounded by clear terrain in broad daylight). -b.t. 3074 * spot (surrounded by clear terrain in broad daylight). -b.t.
3496 */ 3075 */
3497
3498void 3076void
3499do_hidden_move (object *op) 3077do_hidden_move (object *op)
3500{ 3078{
3501 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3079 int hide = 0;
3502 object *skop;
3503 3080
3504 if (!op || !op->map) 3081 if (!op || !op->map)
3505 return; 3082 return;
3506 3083
3507 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3084 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3085 int num = random_roll (0, 19, op, PREFER_LOW);
3508 3086
3509 /* its *extremely* hard to run and sneak/hide at the same time! */ 3087 /* its *extremely* hard to run and sneak/hide at the same time! */
3510 if (op->type == PLAYER && op->contr->run_on) 3088 if (op->type == PLAYER && op->contr->run_on)
3511 {
3512 if (!skop || num >= skop->level) 3089 if (!skop || num >= skop->level)
3513 { 3090 {
3514 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3091 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3515 make_visible (op); 3092 make_visible (op);
3516 return; 3093 return;
3517 } 3094 }
3518 else 3095 else
3519 num += 20; 3096 num += 20;
3520 } 3097
3521 num += op->map->difficulty; 3098 num += op->map->difficulty;
3522 hide = hideability (op); /* modify by terrain hidden level */ 3099 hide = hideability (op); /* modify by terrain hidden level */
3523 num -= hide; 3100 num -= hide;
3101
3524 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3102 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3525 { 3103 {
3526 make_visible (op); 3104 make_visible (op);
3105
3527 if (op->type == PLAYER) 3106 if (op->type == PLAYER)
3528 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3107 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3529 } 3108 }
3530 else if (op->type == PLAYER && skop) 3109 else if (op->type == PLAYER && skop)
3531 {
3532 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3110 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3533 }
3534} 3111}
3535 3112
3536/* determine if who is standing near a hostile creature. */ 3113/* determine if who is standing near a hostile creature. */
3537 3114
3538int 3115int
… …
3565 if (mflags & P_OUT_OF_MAP) 3142 if (mflags & P_OUT_OF_MAP)
3566 continue; 3143 continue;
3567 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3144 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3568 continue; 3145 continue;
3569 3146
3570 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3147 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3571 { 3148 {
3572 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3149 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3573 return 1; 3150 return 1;
3574 else if (tmp->type == PLAYER) 3151 else if (tmp->type == PLAYER)
3575 { 3152 {
… …
3586 * object op. This function works fine for monsters, 3163 * object op. This function works fine for monsters,
3587 * but we dont worry if the object isnt the top one in 3164 * but we dont worry if the object isnt the top one in
3588 * a pile (say a coin under a table would return "viewable" 3165 * a pile (say a coin under a table would return "viewable"
3589 * by this routine). Another question, should we be 3166 * by this routine). Another question, should we be
3590 * concerned with the direction the player is looking 3167 * concerned with the direction the player is looking
3591 * in? Realistically, most of use cant see stuff behind 3168 * in? Realistically, most of us can't see stuff behind
3592 * our backs...on the other hand, does the "facing" direction 3169 * our backs...on the other hand, does the "facing" direction
3593 * imply the way your head, or body is facing? Its possible 3170 * imply the way your head, or body is facing? It's possible
3594 * for them to differ. Sigh, this fctn could get a bit more complex. 3171 * for them to differ. Sigh, this fctn could get a bit more complex.
3595 * -b.t. 3172 * -b.t.
3596 * This function is now map tiling safe. 3173 * This function is now map tiling safe.
3597 */ 3174 */
3598
3599int 3175int
3600player_can_view (object *pl, object *op) 3176player_can_view (object *pl, object *op)
3601{ 3177{
3602 rv_vector rv; 3178 rv_vector rv;
3603 int dx, dy; 3179 int dx, dy;
… …
3605 if (pl->type != PLAYER) 3181 if (pl->type != PLAYER)
3606 { 3182 {
3607 LOG (llevError, "player_can_view() called for non-player object\n"); 3183 LOG (llevError, "player_can_view() called for non-player object\n");
3608 return -1; 3184 return -1;
3609 } 3185 }
3186
3610 if (!pl || !op) 3187 if (!pl || !op)
3611 return 0; 3188 return 0;
3612 3189
3613 if (op->head)
3614 {
3615 op = op->head; 3190 op = op->head_ ();
3616 } 3191
3617 get_rangevector (pl, op, &rv, 0x1); 3192 get_rangevector (pl, op, &rv, 0x1);
3618 3193
3619 /* starting with the 'head' part, lets loop 3194 /* starting with the 'head' part, lets loop
3620 * through the object and find if it has any 3195 * through the object and find if it has any
3621 * part that is in the los array but isnt on 3196 * part that is in the los array but isn't on
3622 * a blocked los square. 3197 * a blocked los square.
3623 * we use the archetype to figure out offsets. 3198 * we use the archetype to figure out offsets.
3624 */ 3199 */
3625 while (op) 3200 while (op)
3626 { 3201 {
3627 dx = rv.distance_x + op->arch->clone.x; 3202 dx = rv.distance_x + op->arch->x;
3628 dy = rv.distance_y + op->arch->clone.y; 3203 dy = rv.distance_y + op->arch->y;
3629 3204
3630 /* only the viewable area the player sees is updated by LOS 3205 /* only the viewable area the player sees is updated by LOS
3631 * code, so we need to restrict ourselves to that range of values 3206 * code, so we need to restrict ourselves to that range of values
3632 * for any meaningful values. 3207 * for any meaningful values.
3633 */ 3208 */
3634 if (FABS (dx) <= (pl->contr->socket->mapx / 2) && 3209 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3635 FABS (dy) <= (pl->contr->socket->mapy / 2) && 3210 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3636 !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)]) 3211 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3637 return 1; 3212 return 1;
3213
3638 op = op->more; 3214 op = op->more;
3639 } 3215 }
3216
3640 return 0; 3217 return 0;
3641} 3218}
3642 3219
3643/* routine for both players and monsters. We call this when 3220/* routine for both players and monsters. We call this when
3644 * there is a possibility for our action distrubing our hiding 3221 * there is a possibility for our action distrubing our hiding
… …
3647 * return 0. 3224 * return 0.
3648 */ 3225 */
3649int 3226int
3650action_makes_visible (object *op) 3227action_makes_visible (object *op)
3651{ 3228{
3652
3653 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3229 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3654 { 3230 {
3655 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3231 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3656 return 0; 3232 return 0;
3657 3233
… …
3663 { 3239 {
3664 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3240 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3665 return 1; 3241 return 1;
3666 } 3242 }
3667 } 3243 }
3244
3668 return 0; 3245 return 0;
3669} 3246}
3670 3247
3671/* op_on_battleground - checks if the given object op (usually 3248/* op_on_battleground - checks if the given object op (usually
3672 * a player) is standing on a valid battleground-tile, 3249 * a player) is standing on a valid battleground-tile,
… …
3677 * Default is to do the same as before, so only people wanting to have different points need worry about this 3254 * Default is to do the same as before, so only people wanting to have different points need worry about this
3678 */ 3255 */
3679int 3256int
3680op_on_battleground (object *op, int *x, int *y) 3257op_on_battleground (object *op, int *x, int *y)
3681{ 3258{
3682 object *tmp;
3683
3684 /* A battleground-tile needs the following attributes to be valid: 3259 /* A battleground-tile needs the following attributes to be valid:
3685 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3260 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3686 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3261 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3687 * and the exit-coordinates sp/hp must both be > 0. 3262 * and the exit-coordinates sp/hp must both be > 0.
3688 * => The intention here is to prevent abuse of the battleground- 3263 * => The intention here is to prevent abuse of the battleground-
3689 * feature (like pickable or hidden battleground tiles). */ 3264 * feature (like pickable or hidden battleground tiles). */
3690 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3265 for (object *tmp = op->below; tmp; tmp = tmp->below)
3691 { 3266 {
3692 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3267 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3693 { 3268 {
3694 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3269 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3695 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3270 && tmp->type == BATTLEGROUND
3271 && tmp->name == shstr_battleground
3272 && EXIT_X (tmp) && EXIT_Y (tmp))
3696 { 3273 {
3697 /*before we assign the exit, check if this is a teambattle */ 3274 /* before we assign the exit, check if this is a teambattle */
3698 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3275 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3699 { 3276 {
3700 object *invtmp;
3701
3702 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3277 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3703 { 3278 {
3704 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3279 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3705 { 3280 {
3706 if (x != NULL && y != NULL) 3281 if (x && y)
3707 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3282 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3283
3708 return 1; 3284 return 1;
3709 } 3285 }
3710 } 3286 }
3711 } 3287 }
3288
3712 if (x != NULL && y != NULL) 3289 if (x && y)
3713 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3290 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3291
3714 return 1; 3292 return 1;
3715 } 3293 }
3716 } 3294 }
3717 } 3295 }
3296
3718 /* If we got here, did not find a battleground */ 3297 /* If we got here, did not find a battleground */
3719 return 0; 3298 return 0;
3720} 3299}
3721 3300
3722/* 3301/*
… …
3738 char buf[MAX_BUF]; /* tmp. string buffer */ 3317 char buf[MAX_BUF]; /* tmp. string buffer */
3739 int i = 0, j = 0; 3318 int i = 0, j = 0;
3740 3319
3741 /* get the appropriate treasurelist */ 3320 /* get the appropriate treasurelist */
3742 if (atnr == ATNR_FIRE) 3321 if (atnr == ATNR_FIRE)
3743 trlist = find_treasurelist ("dragon_ability_fire"); 3322 trlist = treasurelist::find (shstr_dragon_ability_fire);
3744 else if (atnr == ATNR_COLD) 3323 else if (atnr == ATNR_COLD)
3745 trlist = find_treasurelist ("dragon_ability_cold"); 3324 trlist = treasurelist::find (shstr_dragon_ability_cold);
3746 else if (atnr == ATNR_ELECTRICITY) 3325 else if (atnr == ATNR_ELECTRICITY)
3747 trlist = find_treasurelist ("dragon_ability_elec"); 3326 trlist = treasurelist::find (shstr_dragon_ability_elec);
3748 else if (atnr == ATNR_POISON) 3327 else if (atnr == ATNR_POISON)
3749 trlist = find_treasurelist ("dragon_ability_poison"); 3328 trlist = treasurelist::find (shstr_dragon_ability_poison);
3750 3329
3751 if (trlist == NULL || who->type != PLAYER) 3330 if (trlist == NULL || who->type != PLAYER)
3752 return; 3331 return;
3753 3332
3754 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3333 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3755 3334
3756 if (tr == NULL || tr->item == NULL) 3335 if (!tr || !tr->item)
3757 { 3336 {
3758 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3337 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3759 return; 3338 return;
3760 } 3339 }
3761 3340
3762 /* everything seems okay - now bring on the gift: */ 3341 /* everything seems okay - now bring on the gift: */
3763 item = &(tr->item->clone); 3342 item = tr->item;
3764 3343
3765 if (item->type == SPELL) 3344 if (item->type == SPELL)
3766 { 3345 {
3767 if (check_spell_known (who, item->name)) 3346 if (check_spell_known (who, item->name))
3768 return; 3347 return;
… …
3827 { 3406 {
3828 /* forces in the treasurelist can alter the player's stats */ 3407 /* forces in the treasurelist can alter the player's stats */
3829 object *skin; 3408 object *skin;
3830 3409
3831 /* first get the dragon skin force */ 3410 /* first get the dragon skin force */
3832 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3411 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3412 ;
3413
3833 if (skin == NULL) 3414 if (!skin)
3834 return; 3415 return;
3835 3416
3836 /* adding new spellpath attunements */ 3417 /* adding new spellpath attunements */
3837 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3418 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3838 { 3419 {
… …
3870 else 3451 else
3871 { 3452 {
3872 /* generate misc. treasure */ 3453 /* generate misc. treasure */
3873 tmp = arch_to_object (tr->item); 3454 tmp = arch_to_object (tr->item);
3874 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3455 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3875 tmp = insert_ob_in_ob (tmp, who); 3456 who->insert (tmp);
3876 if (who->type == PLAYER)
3877 esrv_send_item (who, tmp);
3878 } 3457 }
3879} 3458}
3880 3459
3881/** 3460/**
3882 * Unready an object for a player. This function does nothing if the object was 3461 * Unready an object for a player. This function does nothing if the object was
3883 * not readied. 3462 * not readied.
3884 */ 3463 */
3885void 3464void
3886player_unready_range_ob (player *pl, object *ob) 3465player_unready_range_ob (player *pl, object *ob)
3887{ 3466{
3888 rangetype i; 3467 if (pl->ob->current_weapon == ob)
3468 pl->ob->current_weapon = 0;
3889 3469
3890 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3470 if (pl->combat_ob == ob)
3891 { 3471 pl->combat_ob = 0;
3472
3892 if (pl->ranges[i] == ob) 3473 if (pl->ranged_ob == ob)
3893 { 3474 pl->ranged_ob = 0;
3894 pl->ranges[i] = NULL;
3895 if (pl->shoottype == i)
3896 {
3897 pl->shoottype = range_none;
3898 }
3899 }
3900 }
3901} 3475}
3476
3477sint8
3478player::visibility_at (maptile *map, int x, int y) const
3479{
3480 if (!ns)
3481 return 0;
3482
3483 int dx, dy;
3484 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3485 return 0;
3486
3487 x += dx - ns->current_x + ns->mapx / 2;
3488 y += dy - ns->current_y + ns->mapy / 2;
3489
3490 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3491 return 0;
3492
3493 return 100 - blocked_los [x][y];
3494}
3495
3496void
3497player::infobox (const char *title, const char *msg, int color)
3498{
3499 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3500}
3501
3502void
3503player::statusmsg (const char *msg, int color)
3504{
3505 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3506}
3507
3508void
3509player::failmsg (const char *msg, int color)
3510{
3511 play_sound (sound_find ("generic_failure"));
3512 statusmsg (msg, color);
3513}
3514

Diff Legend

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