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.12 by elmex, Tue Aug 29 10:51:43 2006 UTC vs.
Revision 1.24 by root, Thu Sep 14 23:13:49 2006 UTC

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

Diff Legend

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