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