ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.9 by root, Tue Aug 29 07:34:00 2006 UTC vs.
Revision 1.82 by elmex, Wed Jan 3 02:30:52 2007 UTC

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

Diff Legend

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