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.7 by root, Sun Aug 27 16:15:13 2006 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC

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

Diff Legend

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