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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.9 by root, Tue Aug 29 07:34:00 2006 UTC vs.
Revision 1.60 by root, Sat Dec 23 09:41:55 2006 UTC

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

Diff Legend

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