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.24 by root, Thu Sep 14 23:13:49 2006 UTC vs.
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC

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

Diff Legend

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