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.15 by root, Mon Sep 4 11:08:00 2006 UTC vs.
Revision 1.202 by root, Fri Aug 29 02:07:09 2008 UTC

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

Diff Legend

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