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

Diff Legend

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