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.12 by elmex, Tue Aug 29 10:51:43 2006 UTC vs.
Revision 1.143 by root, Fri May 18 21:12:40 2007 UTC

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

Diff Legend

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