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