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.33 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC

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

Diff Legend

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