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.9 by root, Tue Aug 29 07:34:00 2006 UTC vs.
Revision 1.119 by root, Tue May 1 05:48:20 2007 UTC

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

Diff Legend

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