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.2 by elmex, Tue Aug 15 16:19:55 2006 UTC vs.
Revision 1.96 by root, Mon Jan 8 19:25:53 2007 UTC

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

Diff Legend

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