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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.48 by root, Sat May 12 21:56:35 2007 UTC vs.
Revision 1.105 by root, Fri Mar 26 01:04:45 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* 25/*
26 * Routines that is executed from objects based on their speed have been 26 * Routines that is executed from objects based on their speed have been
27 * collected in this file. 27 * collected in this file.
… …
35 * so those will be removed shortly (in a cascade like fashion.) 35 * so those will be removed shortly (in a cascade like fashion.)
36 */ 36 */
37void 37void
38remove_door (object *op) 38remove_door (object *op)
39{ 39{
40 int i; 40 for (int i = 1; i < SIZEOFFREE1 + 1; i += 2)
41 {
41 object *tmp; 42 object *tmp;
42 43 mapxy pos (op);
43 for (i = 1; i < 9; i += 2) 44 pos.move (i);
44 if ((tmp = present (DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i])) != NULL) 45 if (pos.normalise ()
46 && (tmp = present (DOOR, pos.m, pos.x, pos.y)))
45 { 47 {
46 tmp->set_speed (0.1); 48 tmp->set_speed (0.1f);
47 tmp->speed_left = -0.2; 49 tmp->speed_left = -0.2f;
48 } 50 }
51 }
49 52
50 if (op->other_arch) 53 if (op->other_arch)
51 { 54 {
52 tmp = arch_to_object (op->other_arch); 55 object *tmp = op->other_arch->instance ();
53 tmp->x = op->x; 56 tmp->x = op->x;
54 tmp->y = op->y; 57 tmp->y = op->y;
55 tmp->map = op->map; 58 tmp->map = op->map;
56 tmp->level = op->level; 59 tmp->level = op->level;
57 insert_ob_in_map (tmp, op->map, op, 0); 60 insert_ob_in_map (tmp, op->map, op, 0);
58 } 61 }
59 62
60 op->destroy (); 63 op->drop_and_destroy ();
61} 64}
62 65
63void 66void
64remove_door2 (object *op) 67remove_door2 (object *op)
65{ 68{
… …
69 for (i = 1; i < 9; i += 2) 72 for (i = 1; i < 9; i += 2)
70 { 73 {
71 tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]); 74 tmp = present (LOCKED_DOOR, op->map, op->x + freearr_x[i], op->y + freearr_y[i]);
72 if (tmp && tmp->slaying == op->slaying) 75 if (tmp && tmp->slaying == op->slaying)
73 { /* same key both doors */ 76 { /* same key both doors */
74 tmp->set_speed (0.1); 77 tmp->set_speed (0.1f);
75 tmp->speed_left = -0.2; 78 tmp->speed_left = -0.2f;
76 } 79 }
77 } 80 }
78 81
79 if (op->other_arch) 82 if (op->other_arch)
80 { 83 {
81 tmp = arch_to_object (op->other_arch); 84 tmp = op->other_arch->instance ();
82 tmp->x = op->x; 85 tmp->x = op->x;
83 tmp->y = op->y; 86 tmp->y = op->y;
84 tmp->map = op->map; 87 tmp->map = op->map;
85 tmp->level = op->level; 88 tmp->level = op->level;
86 insert_ob_in_map (tmp, op->map, op, 0); 89 insert_ob_in_map (tmp, op->map, op, 0);
87 } 90 }
88 91
89 op->destroy (); 92 op->drop_and_destroy ();
90} 93}
91 94
92void 95static void
93generate_monster (object *gen) 96generate_monster (object *gen)
94{ 97{
95 if (!gen->map) 98 if (!gen->map)
96 return; 99 return;
97 100
98 if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1)) 101 if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
99 return; 102 return;
100 103
104 // sleeping generators won't generate, this will make monsters like
105 // centipedes not generate more centipedes when being asleep.
106 if (gen->flag [FLAG_SLEEP])
107 return;
108
101 object *op; 109 object *op;
110 int dir;
102 111
103 if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN)) 112 if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))
104 { 113 {
105 // either copy one item form the inventory... 114 // either copy one item from the inventory...
106 if (!gen->inv) 115 if (!gen->inv)
107 return; 116 return;
108 117
109 // first select one item from the inventory 118 // first select one item from the inventory
110 int index = 0; 119 int index = 0;
111 for (object *tmp = gen->inv; tmp; tmp = tmp->below) 120 for (object *tmp = gen->inv; tmp; tmp = tmp->below)
112 if (!rndm (++index)) 121 if (!rndm (++index))
113 op = tmp; 122 op = tmp;
114 123
115 op = object_create_clone (op); 124 dir = find_free_spot (op, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
125 if (dir < 0)
126 return;
127
128 op = op->deep_clone ();
116 129
117 CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE); 130 CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);
118 unflag_inv (op, FLAG_IS_A_TEMPLATE); 131 unflag_inv (op, FLAG_IS_A_TEMPLATE);
119 } 132 }
133 else if (gen->other_arch)
134 {
135 // ...or use other_arch
136 dir = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
137 if (dir < 0)
138 return;
139
140 op = gen->other_arch->instance ();
141 }
120 else 142 else
121 {
122 // ...or use other_arch
123 if (archetype *at = gen->other_arch)
124 op = arch_to_object (at);
125 else
126 return; 143 return;
127 }
128 144
129 op->expand_tail (); 145 op->expand_tail ();
130 146
131 int i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9); 147 mapxy pos (gen); pos.move (dir);
132 if (i >= 0) 148
149 if (pos.insert (op, gen))
133 { 150 {
134 if (insert_ob_in_map_at (op, gen->map, gen, 0, gen->x + freearr_x[i], gen->y + freearr_y[i]))
135 {
136 if (rndm (0, 9)) 151 if (rndm (0, 9))
137 generate_artifact (op, gen->map->difficulty); 152 generate_artifact (op, gen->map->difficulty);
138 153
139 if (op->has_random_items ()) 154 if (op->has_random_items ())
140 create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty); 155 create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
141 156
142 return; 157 return;
143 }
144 } 158 }
145 159
146 op->destroy (); 160 op->destroy ();
147} 161}
148 162
149void 163static void
150remove_force (object *op) 164remove_force (object *op)
151{ 165{
152 if (--op->duration > 0) 166 if (--op->duration > 0)
153 return; 167 return;
154 168
… …
166 } 180 }
167 181
168 op->destroy (); 182 op->destroy ();
169} 183}
170 184
171void 185static void
172remove_blindness (object *op) 186remove_blindness (object *op)
173{ 187{
174 if (--op->stats.food > 0) 188 if (--op->stats.food > 0)
175 return; 189 return;
176 190
… …
183 } 197 }
184 198
185 op->destroy (); 199 op->destroy ();
186} 200}
187 201
188void 202static void
189poison_more (object *op) 203poison_more (object *op)
190{ 204{
191 if (op->env == NULL || !QUERY_FLAG (op->env, FLAG_ALIVE) || op->env->stats.hp < 0) 205 if (op->env == NULL || !QUERY_FLAG (op->env, FLAG_ALIVE) || op->env->stats.hp < 0)
192 { 206 {
193 op->destroy (); 207 op->destroy ();
… …
218 232
219 hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1); 233 hit_player (op->env, op->stats.dam, op, AT_INTERNAL, 1);
220} 234}
221 235
222 236
223void 237static void
224move_gate (object *op) 238move_gate (object *op)
225{ /* 1 = going down, 0 = going up */ 239{ /* 1 = going down, 0 = going up */
226 object *tmp; 240 object *tmp;
227 241
228 if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op)) 242 if (op->stats.wc < 0 || (int) op->stats.wc >= NUM_ANIMATIONS (op))
… …
235 if (op->value) 249 if (op->value)
236 { 250 {
237 if (--op->stats.wc <= 0) 251 if (--op->stats.wc <= 0)
238 { /* Reached bottom, let's stop */ 252 { /* Reached bottom, let's stop */
239 op->stats.wc = 0; 253 op->stats.wc = 0;
240 if (op->arch->clone.speed) 254 if (op->arch->has_active_speed ())
241 op->value = 0; 255 op->value = 0;
242 else 256 else
243 op->set_speed (0); 257 op->set_speed (0);
244 } 258 }
245 259
… …
265 * objects are above the gate. If so, we finish closing the gate, 279 * objects are above the gate. If so, we finish closing the gate,
266 * otherwise, we fall through to the code below which should lower 280 * otherwise, we fall through to the code below which should lower
267 * the gate slightly. 281 * the gate slightly.
268 */ 282 */
269 283
270 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 284 for (tmp = op->above; tmp; tmp = tmp->above)
271 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE)) 285 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
272 break; 286 break;
273 287
274 if (tmp == NULL) 288 if (!tmp)
275 { 289 {
276 if (op->arch->clone.speed) 290 if (op->arch->has_active_speed ())
277 op->value = 1; 291 op->value = 1;
278 else 292 else
279 op->set_speed (0); 293 op->set_speed (0);
280 294
281 return; 295 return;
… …
292 } 306 }
293 else 307 else
294 { /* The gate is still going up */ 308 { /* The gate is still going up */
295 op->stats.wc++; 309 op->stats.wc++;
296 310
297 if ((int) op->stats.wc >= (NUM_ANIMATIONS (op))) 311 if (op->stats.wc >= NUM_ANIMATIONS (op))
298 op->stats.wc = (signed char) NUM_ANIMATIONS (op) - 1; 312 op->stats.wc = NUM_ANIMATIONS (op) - 1;
299 313
300 /* If there is something on top of the gate, we try to roll it off. 314 /* If there is something on top of the gate, we try to roll it off.
301 * If a player/monster, we don't roll, we just hit them with damage 315 * If a player/monster, we don't roll, we just hit them with damage
302 */ 316 */
303 if ((int) op->stats.wc >= NUM_ANIMATIONS (op) / 2) 317 if (op->stats.wc >= NUM_ANIMATIONS (op) / 2)
304 { 318 {
305 /* Halfway or further, check blocks */ 319 /* Halfway or further, check blocks */
306 /* First, get the top object on the square. */ 320 /* First, get the top object on the square. */
307 for (tmp = op->above; tmp && tmp->above; tmp = tmp->above) 321 for (tmp = op->above; tmp && tmp->above; tmp = tmp->above)
308 ; 322 ;
… …
310 if (tmp) 324 if (tmp)
311 { 325 {
312 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 326 if (QUERY_FLAG (tmp, FLAG_ALIVE))
313 { 327 {
314 hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1); 328 hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
329 op->play_sound (sound_find ("blocked_gate"));
315 330
316 if (tmp->type == PLAYER) 331 if (tmp->type == PLAYER)
317 new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name); 332 new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name);
318 } 333 }
319 else
320 /* If the object is not alive, and the object either can 334 /* If the object is not alive, and the object either can
321 * be picked up or the object rolls, move the object 335 * be picked up or the object rolls, move the object
322 * off the gate. 336 * off the gate.
323 */ 337 */
324 if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL))) 338 else if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL)))
325 { 339 {
326 /* If it has speed, it should move itself, otherwise: */ 340 /* If it has speed, it should move itself, otherwise: */
327 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 341 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
328 342
329 /* If there is a free spot, move the object someplace */ 343 /* If there is a free spot, move the object someplace */
330 if (i != -1) 344 if (i > 0)
331 { 345 {
346 mapxy pos (tmp);
347 pos.move (i);
348 if (pos.normalise ())
332 tmp->remove (); 349 tmp->move_to (pos);
333 tmp->x += freearr_x[i], tmp->y += freearr_y[i];
334 insert_ob_in_map (tmp, op->map, op, 0);
335 } 350 }
336 } 351 }
337 } 352 }
338 353
339 /* See if there is still anything blocking the gate */ 354 /* See if there is still anything blocking the gate */
340 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 355 for (tmp = op->above; tmp; tmp = tmp->above)
341 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE)) 356 if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
342 break; 357 break;
343 358
344 /* IF there is, start putting the gate down */ 359 /* IF there is, start putting the gate down */
345 if (tmp) 360 if (tmp)
346 {
347 op->stats.food = 1; 361 op->stats.food = 1;
348 }
349 else 362 else
350 { 363 {
351 op->move_block = MOVE_ALL; 364 op->move_block = MOVE_ALL;
365
352 if (!op->arch->clone.stats.ac) 366 if (!op->arch->stats.ac)
353 SET_FLAG (op, FLAG_BLOCKSVIEW); 367 SET_FLAG (op, FLAG_BLOCKSVIEW);
354 update_all_los (op->map, op->x, op->y); 368 update_all_los (op->map, op->x, op->y);
355 } 369 }
356 } /* gate is halfway up */ 370 } /* gate is halfway up */
357 371
… …
362 376
363/* hp : how long door is open/closed 377/* hp : how long door is open/closed
364 * maxhp : initial value for hp 378 * maxhp : initial value for hp
365 * sp : 1 = open, 0 = close 379 * sp : 1 = open, 0 = close
366 */ 380 */
367void 381static void
368move_timed_gate (object *op) 382move_timed_gate (object *op)
369{ 383{
370 int v = op->value; 384 int v = op->value;
371 385
372 if (op->stats.sp) 386 if (op->stats.sp)
373 { 387 {
374 move_gate (op); 388 move_gate (op);
389
375 if (op->value != v) /* change direction ? */ 390 if (op->value != v) /* change direction ? */
376 op->stats.sp = 0; 391 op->stats.sp = 0;
377 return; 392 return;
378 } 393 }
394
379 if (--op->stats.hp <= 0) 395 if (--op->stats.hp <= 0)
380 { /* keep gate down */ 396 { /* keep gate down */
381 move_gate (op); 397 move_gate (op);
398
382 if (op->value != v) 399 if (op->value != v)
383 op->set_speed (0); 400 op->set_speed (0);
384 } 401 }
385} 402}
386 403
… …
388 * speed: frequency of 'glances' 405 * speed: frequency of 'glances'
389 * connected: connected value of detector 406 * connected: connected value of detector
390 * sp: 1 if detection sets buttons 407 * sp: 1 if detection sets buttons
391 * -1 if detection unsets buttons 408 * -1 if detection unsets buttons
392 */ 409 */
393 410static void
394void
395move_detector (object *op) 411move_detector (object *op)
396{ 412{
397 object *tmp; 413 object *tmp;
398 int last = op->value; 414 int last = op->value;
399 int detected; 415 int detected;
400 416
401 detected = 0; 417 detected = 0;
402 418
403 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above) 419 for (tmp = op->ms ().bot; tmp && !detected; tmp = tmp->above)
404 { 420 {
405 object *tmp2; 421 object *tmp2;
406 422
407 if (op->stats.hp) 423 if (op->stats.hp)
408 { 424 {
… …
426 if (op->stats.sp == 1) 442 if (op->stats.sp == 1)
427 { 443 {
428 if (detected && last == 0) 444 if (detected && last == 0)
429 { 445 {
430 op->value = 1; 446 op->value = 1;
431 push_button (op); 447 push_button (op, tmp);
432 } 448 }
449
433 if (!detected && last == 1) 450 if (!detected && last == 1)
434 { 451 {
435 op->value = 0; 452 op->value = 0;
436 push_button (op); 453 push_button (op, tmp);
437 } 454 }
438 } 455 }
439 else 456 else
440 { /* in this case, we unset buttons */ 457 { /* in this case, we unset buttons */
441 if (detected && last == 1) 458 if (detected && last == 1)
442 { 459 {
443 op->value = 0; 460 op->value = 0;
444 push_button (op); 461 push_button (op, tmp);
445 } 462 }
463
446 if (!detected && last == 0) 464 if (!detected && last == 0)
447 { 465 {
448 op->value = 1; 466 op->value = 1;
449 push_button (op); 467 push_button (op, tmp);
450 } 468 }
451 } 469 }
452} 470}
453
454 471
455void 472void
456animate_trigger (object *op) 473animate_trigger (object *op)
457{ 474{
458 if ((unsigned char) ++op->stats.wc >= NUM_ANIMATIONS (op)) 475 if ((unsigned char) ++op->stats.wc >= NUM_ANIMATIONS (op))
… …
465 SET_ANIMATION (op, op->stats.wc); 482 SET_ANIMATION (op, op->stats.wc);
466 update_object (op, UP_OBJ_FACE); 483 update_object (op, UP_OBJ_FACE);
467 } 484 }
468} 485}
469 486
470void 487static void
471move_hole (object *op) 488move_hole (object *op)
472{ /* 1 = opening, 0 = closing */ 489{ /* 1 = opening, 0 = closing */
473 object *next, *tmp;
474
475 if (op->value) 490 if (op->value)
476 { /* We're opening */ 491 { /* We're opening */
477 if (--op->stats.wc <= 0) 492 if (--op->stats.wc <= 0)
478 { /* Opened, let's stop */ 493 { /* Opened, let's stop */
479 op->stats.wc = 0; 494 op->stats.wc = 0;
480 op->set_speed (0); 495 op->set_speed (0);
481 496
482 /* Hard coding this makes sense for holes I suppose */ 497 /* Hard coding this makes sense for holes I suppose */
483 op->move_on = MOVE_WALK; 498 op->move_on = MOVE_WALK;
484 for (tmp = op->above; tmp != NULL; tmp = next) 499 for (object *next, *tmp = op->above; tmp; tmp = next)
485 { 500 {
486 next = tmp->above; 501 next = tmp->above;
487 move_apply (op, tmp, tmp); 502 move_apply (op, tmp, tmp);
488 } 503 }
489 } 504 }
490 505
491 SET_ANIMATION (op, op->stats.wc); 506 SET_ANIMATION (op, op->stats.wc);
492 update_object (op, UP_OBJ_FACE); 507 update_object (op, UP_OBJ_FACE);
493 return; 508 return;
494 } 509 }
510
495 /* We're closing */ 511 /* We're closing */
496 op->move_on = 0; 512 op->move_on = 0;
497 513
498 op->stats.wc++; 514 op->stats.wc++;
499 if ((int) op->stats.wc >= NUM_ANIMATIONS (op)) 515 if ((int) op->stats.wc >= NUM_ANIMATIONS (op))
… …
530 { 546 {
531 object *payload = op->inv; 547 object *payload = op->inv;
532 548
533 if (payload == NULL) 549 if (payload == NULL)
534 return NULL; 550 return NULL;
551
535 payload->remove (); 552 payload->remove ();
536 op->destroy (); 553 op->destroy ();
537 return payload; 554 return payload;
538 } 555 }
539 556
… …
582 599
583 // restore original wc, dam, attacktype and slaying 600 // restore original wc, dam, attacktype and slaying
584 op->stats.wc = op->stats.sp; 601 op->stats.wc = op->stats.sp;
585 op->stats.dam = op->stats.hp; 602 op->stats.dam = op->stats.hp;
586 op->attacktype = op->stats.grace; 603 op->attacktype = op->stats.grace;
604 op->slaying = op->custom_name;
587 605
588 if (op->spellarg)
589 {
590 op->slaying = op->spellarg;
591 free (op->spellarg);
592 op->spellarg = 0;
593 }
594 else
595 op->slaying = 0;
596
597 /* Reset these to zero, so that object::can_merge will work properly */ 606 /* Reset these to defaults, so that object::can_merge will work properly */
598 op->spellarg = NULL; 607 op->custom_name = 0;
599 op->stats.sp = 0; 608 op->stats.sp = 0;
600 op->stats.hp = 0; 609 op->stats.hp = 0;
601 op->stats.grace = 0; 610 op->stats.grace = 0;
602 op->level = 0; 611 op->level = 0;
603 op->face = op->arch->clone.face; 612 op->face = op->arch->face;
604 op->owner = NULL; /* So that stopped arrows will be saved */ 613 op->owner = 0;
614
605 update_object (op, UP_OBJ_CHANGE); 615 update_object (op, UP_OBJ_CHANGE);
616
606 return op; 617 return op;
607} 618}
608 619
609/* stop_arrow() - what to do when a non-living flying object 620/* stop_arrow() - what to do when a non-living flying object
610 * has to stop. Sept 96 - I added in thrown object code in 621 * has to stop. Sept 96 - I added in thrown object code in
… …
619 if (INVOKE_OBJECT (STOP, op)) 630 if (INVOKE_OBJECT (STOP, op))
620 return; 631 return;
621 632
622 if (op->inv) 633 if (op->inv)
623 { 634 {
635 // replace this by straightforward drop to ground?
624 object *payload = op->inv; 636 object *payload = op->inv;
625 637
626 payload->remove ();
627 payload->owner = 0; 638 payload->owner = 0;
628 insert_ob_in_map (payload, op->map, payload, 0); 639 insert_ob_in_map (payload, op->map, payload, 0);
629 op->destroy (); 640 op->destroy ();
630 } 641 }
631 else 642 else
… …
640/* Move an arrow along its course. op is the arrow or thrown object. 651/* Move an arrow along its course. op is the arrow or thrown object.
641 */ 652 */
642void 653void
643move_arrow (object *op) 654move_arrow (object *op)
644{ 655{
645 object *tmp;
646 sint16 new_x, new_y;
647 int was_reflected, mflags; 656 int was_reflected;
648 maptile *m;
649 657
650 if (op->map == NULL) 658 if (!op->map)
651 { 659 {
652 LOG (llevError, "BUG: Arrow had no map.\n"); 660 LOG (llevError, "BUG: Arrow had no map.\n");
653 op->destroy (); 661 op->destroy ();
654 return; 662 return;
655 } 663 }
… …
663 * is if the player throws a bomb - the bomb explodes on its own, 671 * is if the player throws a bomb - the bomb explodes on its own,
664 * but this object sticks around. We could handle the cleanup in the 672 * but this object sticks around. We could handle the cleanup in the
665 * bomb code, but there are potential other cases where that could happen, 673 * bomb code, but there are potential other cases where that could happen,
666 * and it is easy enough to clean it up here. 674 * and it is easy enough to clean it up here.
667 */ 675 */
668 if (op->inv == NULL) 676 if (!op->inv)
669 { 677 {
670 op->destroy (); 678 op->destroy ();
671 return; 679 return;
672 } 680 }
673 681
… …
685 stop_arrow (op); 693 stop_arrow (op);
686 return; 694 return;
687 } 695 }
688 696
689 /* Calculate target map square */ 697 /* Calculate target map square */
690 new_x = op->x + DIRX (op);
691 new_y = op->y + DIRY (op);
692 was_reflected = 0; 698 was_reflected = 0;
693 699
694 m = op->map; 700 mapxy pos (op); pos.move (op->direction);
695 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
696 701
697 if (mflags & P_OUT_OF_MAP) 702 if (!pos.normalise ())
698 { 703 {
699 stop_arrow (op); 704 stop_arrow (op);
700 return; 705 return;
701 } 706 }
702 707
703 /* only need to look for living creatures if this flag is set */ 708 /* only need to look for living creatures if this flag is set */
704 if (mflags & P_IS_ALIVE) 709 if (pos->flags () & P_IS_ALIVE)
705 { 710 {
706 for (tmp = GET_MAP_OB (m, new_x, new_y); tmp != NULL; tmp = tmp->above) 711 object *tmp;
712
713 for (tmp = pos->bot; tmp; tmp = tmp->above)
707 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 714 if (QUERY_FLAG (tmp, FLAG_ALIVE))
708 break; 715 break;
709 716
710 /* Not really fair, but don't let monsters hit themselves with 717 /* Not really fair, but don't let monsters hit themselves with
711 * their own arrow - this can be because they fire it then 718 * their own arrow - this can be because they fire it then
… …
734 return; 741 return;
735 } 742 }
736 } /* if this is not hitting its owner */ 743 } /* if this is not hitting its owner */
737 } /* if there is something alive on this space */ 744 } /* if there is something alive on this space */
738 745
739 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 746 if (OB_TYPE_MOVE_BLOCK (op, pos->move_block))
740 { 747 {
741 int retry = 0; 748 int retry = 0;
742 749
743 /* if the object doesn't reflect, stop the arrow from moving 750 /* if the object doesn't reflect, stop the arrow from moving
744 * note that this code will now catch cases where a monster is 751 * note that this code will now catch cases where a monster is
… …
757 if (op->direction & 1) 764 if (op->direction & 1)
758 { 765 {
759 op->direction = absdir (op->direction + 4); 766 op->direction = absdir (op->direction + 4);
760 retry = 1; 767 retry = 1;
761 } 768 }
769
762 /* There were two blocks with identical code - 770 /* There were two blocks with identical code -
763 * use this retry here to make this one block 771 * use this retry here to make this one block
764 * that did the same thing. 772 * that did the same thing.
765 */ 773 */
766 while (retry < 2) 774 while (retry < 2)
767 { 775 {
768 int left, right, mflags;
769 maptile *m1;
770 sint16 x1, y1;
771
772 retry++; 776 retry++;
773 777
774 /* Need to check for P_OUT_OF_MAP: if the arrow is tavelling 778 /* Need to check for P_OUT_OF_MAP: if the arrow is travelling
775 * over a corner in a tiled map, it is possible that 779 * over a corner in a tiled map, it is possible that
776 * op->direction is within an adjacent map but either 780 * op->direction is within an adjacent map but either
777 * op->direction-1 or op->direction+1 does not exist. 781 * op->direction-1 or op->direction+1 does not exist.
778 */ 782 */
779 mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction - 1)], 783 mapxy pos1 (pos); pos1.move (absdir (op->direction - 1));
780 op->y + freearr_y[absdir (op->direction - 1)], &x1, &y1); 784 bool left = pos1.normalise () && OB_TYPE_MOVE_BLOCK (op, pos1->move_block);
781 left = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
782 785
783 mflags = get_map_flags (op->map, &m1, op->x + freearr_x[absdir (op->direction + 1)], 786 mapxy pos2 (pos); pos2.move (absdir (op->direction + 1));
784 op->y + freearr_y[absdir (op->direction + 1)], &x1, &y1); 787 bool right = pos2.normalise () && OB_TYPE_MOVE_BLOCK (op, pos2->move_block);
785 right = (mflags & P_OUT_OF_MAP) ? 0 : OB_TYPE_MOVE_BLOCK (op, (GET_MAP_MOVE_BLOCK (m1, x1, y1)));
786 788
787 if (left == right) 789 if (left == right)
788 op->direction = absdir (op->direction + 4); 790 op->direction = absdir (op->direction + 4);
789 else if (left) 791 else if (left)
790 op->direction = absdir (op->direction + 2); 792 op->direction = absdir (op->direction + 2);
791 else if (right) 793 else if (right)
792 op->direction = absdir (op->direction - 2); 794 op->direction = absdir (op->direction - 2);
793 795
794 mflags = get_map_flags (op->map, &m1, op->x + DIRX (op), op->y + DIRY (op), &x1, &y1);
795
796 /* If this space is not out of the map and not blocked, valid space - 796 /* If this space is not out of the map and not blocked, valid space -
797 * don't need to retry again. 797 * don't need to retry again.
798 */ 798 */
799 if (!(mflags & P_OUT_OF_MAP) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m1, x1, y1))) 799 mapxy pos3 (pos); pos3.move (op->direction);
800 if (pos3.normalise () && !OB_TYPE_MOVE_BLOCK (op, pos3->move_block))
800 break; 801 break;
801
802 } 802 }
803
803 /* Couldn't find a direction to move the arrow to - just 804 /* Couldn't find a direction to move the arrow to - just
804 * top it from moving. 805 * stop it from moving.
805 */ 806 */
806 if (retry == 2) 807 if (retry == 2)
807 { 808 {
808 stop_arrow (op); 809 stop_arrow (op);
809 return; 810 return;
810 } 811 }
812
811 /* update object image for new facing */ 813 /* update object image for new facing */
812 /* many thrown objects *don't* have more than one face */ 814 /* many thrown objects *don't* have more than one face */
813 if (GET_ANIM_ID (op)) 815 if (op->has_anim ())
814 SET_ANIMATION (op, op->direction); 816 op->set_anim_frame (op->direction);
815 } /* object is reflected */ 817 } /* object is reflected */
816 } /* object ran into a wall */ 818 } /* object ran into a wall */
817
818 /* Move the arrow. */
819 op->remove ();
820 op->x = new_x;
821 op->y = new_y;
822 819
823 /* decrease the speed as it flies. 0.05 means a standard bow will shoot 820 /* decrease the speed as it flies. 0.05 means a standard bow will shoot
824 * about 17 squares. Tune as needed. 821 * about 17 squares. Tune as needed.
825 */ 822 */
826 op->speed -= 0.05; 823 op->speed -= 0.05;
827 insert_ob_in_map (op, m, op, 0);
828}
829 824
830/* This routine doesnt seem to work for "inanimate" objects that 825 /* Move the arrow. */
831 * are being carried, ie a held torch leaps from your hands!. 826 op->move_to (pos);
832 * Modified this routine to allow held objects. b.t. */ 827}
833 828
834void 829static void
835change_object (object *op) 830change_object (object *op)
836{ /* Doesn`t handle linked objs yet */ 831{ /* Doesn`t handle linked objs yet */
837 int i, j;
838
839 if (op->other_arch == NULL) 832 if (!op->other_arch)
840 { 833 {
841 LOG (llevError, "Change object (%s) without other_arch error.\n", &op->name); 834 LOG (llevError, "Change object (%s) without other_arch error.\n", op->debug_desc ());
842 return; 835 return;
843 } 836 }
844 837
845 /* In non-living items only change when food value is 0 */ 838 /* In non-living items only change when food value is 0 */
846 if (!QUERY_FLAG (op, FLAG_ALIVE)) 839 if (!QUERY_FLAG (op, FLAG_ALIVE))
847 { 840 {
848 if (op->stats.food-- > 0) 841 if (op->stats.food-- > 0)
849 return; 842 return;
843
844 op->stats.food = 1; /* so 1 other_arch is made */
845 }
846
847 object *env = op->env;
848
849 op->remove ();
850 for (int i = 0; i < op->stats.food; i++)
851 {
852 object *tmp = op->other_arch->instance ();
853
854 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
855
856 if (env)
857 env->insert (tmp);
850 else 858 else
851 op->stats.food = 1; /* so 1 other_arch is made */
852 }
853
854 object *pl = op->in_player ();
855 object *env = op->env;
856
857 op->remove ();
858 for (i = 0; i < NROFNEWOBJS (op); i++)
859 {
860 object *tmp = arch_to_object (op->other_arch);
861
862 if (op->type == LAMP)
863 tmp->stats.food = op->stats.food - 1;
864
865 tmp->stats.hp = op->stats.hp; /* The only variable it keeps. */
866 if (env)
867 {
868 tmp->x = env->x, tmp->y = env->y;
869 tmp = insert_ob_in_ob (tmp, env);
870
871 /* If this object is the players inventory, we need to tell the
872 * client of the change. Insert_ob_in_map takes care of the
873 * updating the client, so we don't need to do that below.
874 */
875 if (pl)
876 {
877 esrv_del_item (pl->contr, op->count);
878 esrv_send_item (pl, tmp);
879 }
880 } 859 {
881 else
882 {
883 j = find_first_free_spot (tmp, op->map, op->x, op->y); 860 int j = find_first_free_spot (tmp, op->map, op->x, op->y);
861
884 if (j == -1) /* No free spot */ 862 if (j < 0) /* No free spot */
885 tmp->destroy (); 863 tmp->destroy ();
886 else 864 else
887 { 865 {
888 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j]; 866 mapxy pos (op); pos.move (j);
889 insert_ob_in_map (tmp, op->map, op, 0); 867
868 if (pos.normalise ())
869 pos.insert (tmp, op);
890 } 870 }
891 } 871 }
892 } 872 }
893 873
894 op->destroy (); 874 op->destroy ();
… …
910 move_teleporter (op->more); 890 move_teleporter (op->more);
911 891
912 if (op->head) 892 if (op->head)
913 head = op->head; 893 head = op->head;
914 894
915 for (tmp = op->above; tmp != NULL; tmp = tmp->above) 895 for (tmp = op->above; tmp; tmp = tmp->above)
916 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 896 if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR))
917 break; 897 break;
918 898
919 /* If nothing above us to move, nothing to do */ 899 /* If nothing above us to move, nothing to do */
920 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS)) 900 if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS))
… …
950 else 930 else
951 { 931 {
952 /* Random teleporter */ 932 /* Random teleporter */
953 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp))) 933 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
954 return; 934 return;
935
955 teleport (head, TELEPORTER, tmp); 936 teleport (head, TELEPORTER, tmp);
956 } 937 }
957} 938}
958
959 939
960/* This object will teleport someone to a different map 940/* This object will teleport someone to a different map
961 and will also apply changes to the player from its inventory. 941 and will also apply changes to the player from its inventory.
962 This was invented for giving classes, but there's no reason it 942 This was invented for giving classes, but there's no reason it
963 can't be generalized. 943 can't be generalized.
964*/ 944*/
965void 945static void
966move_player_changer (object *op) 946move_player_changer (object *op)
967{ 947{
968 object *player;
969 object *walk;
970
971 if (!op->above || !EXIT_PATH (op)) 948 if (!op->above || !EXIT_PATH (op))
972 return; 949 return;
973 950
974 /* This isn't all that great - means that the player_mover 951 /* This isn't all that great - means that the player_mover
975 * needs to be on top. 952 * needs to be on top.
976 */ 953 */
977 if (op->above->type == PLAYER) 954 if (op->above->type == PLAYER)
978 { 955 {
956 object *player = op->above;
957
979 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player))) 958 if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (player)))
980 return; 959 return;
981 960
982 player = op->above;
983
984 for (walk = op->inv; walk; walk = walk->below) 961 for (object *walk = op->inv; walk; walk = walk->below)
985 apply_changes_to_player (player, walk); 962 apply_changes_to_player (player, walk);
986 963
987 player->update_stats (); 964 player->update_stats ();
988 965
989 esrv_send_inventory (op->above, op->above); 966 esrv_send_inventory (op->above, op->above);
… …
1016 return; /* dm has created a firewall in his inventory */ 993 return; /* dm has created a firewall in his inventory */
1017 994
1018 spell = op->inv; 995 spell = op->inv;
1019 996
1020 if (!spell || spell->type != SPELL) 997 if (!spell || spell->type != SPELL)
1021 spell = &op->other_arch->clone; 998 spell = op->other_arch;
1022 999
1023 if (!spell) 1000 if (!spell)
1024 { 1001 {
1025 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y); 1002 LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);
1026 return; 1003 return;
… …
1036 * moves them in the op->stats.sp direction. speed is how often it'll move. 1013 * moves them in the op->stats.sp direction. speed is how often it'll move.
1037 * If attacktype is nonzero it will paralyze the player. If lifesave is set, 1014 * If attacktype is nonzero it will paralyze the player. If lifesave is set,
1038 * it'll dissapear after hp+1 moves. If hp is set and attacktype is set, 1015 * it'll dissapear after hp+1 moves. If hp is set and attacktype is set,
1039 * it'll paralyze the victim for hp*his speed/op->speed 1016 * it'll paralyze the victim for hp*his speed/op->speed
1040 */ 1017 */
1041void 1018static void
1042move_player_mover (object *op) 1019move_player_mover (object *op)
1043{ 1020{
1044 object *victim, *nextmover;
1045 int dir = op->stats.sp; 1021 int dir = op->stats.sp;
1046 sint16 nx, ny; 1022 sint16 nx, ny;
1047 maptile *m; 1023 maptile *m;
1048 1024
1049 /* Determine direction now for random movers so we do the right thing */ 1025 /* Determine direction now for random movers so we do the right thing */
1050 if (!dir) 1026 if (!dir)
1051 dir = rndm (1, 8); 1027 dir = rndm (1, 8);
1052 1028
1053 for (victim = GET_MAP_OB (op->map, op->x, op->y); victim != NULL; victim = victim->above) 1029 for (object *victim = op->ms ().bot; victim; victim = victim->above)
1054 { 1030 {
1055 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) && 1031 if (QUERY_FLAG (victim, FLAG_ALIVE) && !QUERY_FLAG (victim, FLAG_WIZPASS) &&
1056 (victim->move_type & op->move_type || !victim->move_type)) 1032 (victim->move_type & op->move_type || !victim->move_type))
1057 { 1033 {
1058 1034
… …
1075 } 1051 }
1076 1052
1077 if (should_director_abort (op, victim)) 1053 if (should_director_abort (op, victim))
1078 return; 1054 return;
1079 1055
1080 for (nextmover = GET_MAP_OB (m, nx, ny); nextmover != NULL; nextmover = nextmover->above) 1056 for (object *nextmover = m->at (nx, ny).bot; nextmover; nextmover = nextmover->above)
1081 { 1057 {
1082 if (nextmover->type == PLAYERMOVER) 1058 if (nextmover->type == PLAYERMOVER)
1083 nextmover->speed_left = -.99; 1059 nextmover->speed_left = -.99f;
1060
1084 if (QUERY_FLAG (nextmover, FLAG_ALIVE)) 1061 if (QUERY_FLAG (nextmover, FLAG_ALIVE))
1085 {
1086 op->speed_left = -1.1; /* wait until the next thing gets out of the way */ 1062 op->speed_left = -1.1f; /* wait until the next thing gets out of the way */
1087 }
1088 } 1063 }
1089 1064
1090 if (victim->type == PLAYER) 1065 if (victim->type == PLAYER)
1091 { 1066 {
1092 /* only level >=1 movers move people */ 1067 /* only level >=1 movers move people */
1093 if (op->level) 1068 if (op->level)
1094 { 1069 {
1095 /* Following is a bit of hack. We need to make sure it 1070 /* Following is a bit of hack. We need to make sure it
1096 * is cleared, otherwise the player will get stuck in 1071 * is cleared, otherwise the player will get stuck in
1097 * place. This can happen if the player used a spell to 1072 * place. This can happen if the player used a spell to
1098 * get to this space. 1073 * get to this space.
1099 */ 1074 */
1100 victim->contr->fire_on = 0; 1075 victim->contr->fire_on = 0;
1101 victim->speed_left = -FABS (victim->speed); 1076 victim->speed_left = 1.f;
1102 move_player (victim, dir); 1077 move_player (victim, dir);
1103 } 1078 }
1104 else 1079 else
1105 return; 1080 return;
1106 } 1081 }
1107 else 1082 else
1108 move_object (victim, dir); 1083 victim->move (dir);
1109 1084
1110 if (!op->stats.maxsp && op->attacktype) 1085 if (!op->stats.maxsp && op->attacktype)
1111 op->stats.maxsp = 2; 1086 op->stats.maxsp = 2;
1112 1087
1113 if (op->attacktype) 1088 if (op->attacktype)
1114 { /* flag to paralyze the player */ 1089 { /* flag to paralyze the player */
1115
1116 victim->speed_left = -FABS (op->stats.maxsp * victim->speed / op->speed); 1090 victim->speed_left = max (-5.f, -op->stats.maxsp * victim->speed / op->speed);
1117 /* Not sure why, but for some chars on metalforge, they
1118 * would sometimes get -inf speed_left, and from the
1119 * description, it could only happen here, so just put
1120 * a lower sanity limit. My only guess is that the
1121 * mover has 0 speed.
1122 */
1123 if (victim->speed_left < -5.0)
1124 victim->speed_left = -5.0;
1125 } 1091 }
1126 } 1092 }
1127 } 1093 }
1128} 1094}
1129 1095
… …
1148 if (op->above == NULL) 1114 if (op->above == NULL)
1149 return; 1115 return;
1150 1116
1151 for (tmp = op->above; tmp; tmp = tmp->above) 1117 for (tmp = op->above; tmp; tmp = tmp->above)
1152 { 1118 {
1153 if (op->other_arch->name == tmp->arch->name) 1119 if (op->other_arch->archname == tmp->arch->archname)
1154 { 1120 {
1155 if (op->level <= 0) 1121 if (op->level <= 0)
1156 tmp->destroy (); 1122 tmp->destroy ();
1157 else 1123 else
1158 { 1124 {
… …
1180 * has to make sure that there is in fact space for the object. 1146 * has to make sure that there is in fact space for the object.
1181 * It should really do this for small objects also, but there is 1147 * It should really do this for small objects also, but there is
1182 * more concern with large objects, most notably a part being placed 1148 * more concern with large objects, most notably a part being placed
1183 * outside of the map which would cause the server to crash 1149 * outside of the map which would cause the server to crash
1184*/ 1150*/
1185
1186void 1151void
1187move_creator (object *creator) 1152move_creator (object *creator)
1188{ 1153{
1189 object *new_ob; 1154 object *new_ob;
1190 1155
… …
1192 { 1157 {
1193 creator->stats.hp = -1; 1158 creator->stats.hp = -1;
1194 return; 1159 return;
1195 } 1160 }
1196 1161
1197 if (creator->inv != NULL) 1162 if (creator->inv)
1198 { 1163 {
1199 object *ob; 1164 object *ob;
1200 int i; 1165 int i;
1201 object *ob_to_copy; 1166 object *ob_to_copy;
1202 1167
… …
1207 if (rndm (0, i) == 0) 1172 if (rndm (0, i) == 0)
1208 { 1173 {
1209 ob_to_copy = ob; 1174 ob_to_copy = ob;
1210 } 1175 }
1211 } 1176 }
1212 new_ob = object_create_clone (ob_to_copy); 1177 new_ob = ob_to_copy->deep_clone ();
1213 CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE); 1178 CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE);
1214 unflag_inv (new_ob, FLAG_IS_A_TEMPLATE); 1179 unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);
1215 } 1180 }
1216 else 1181 else
1217 { 1182 {
1218 if (creator->other_arch == NULL) 1183 if (!creator->other_arch)
1219 { 1184 {
1220 LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n", 1185 LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n",
1221 &creator->name, &creator->map->path, creator->x, creator->y); 1186 &creator->name, &creator->map->path, creator->x, creator->y);
1222 return; 1187 return;
1223 } 1188 }
… …
1225 new_ob = object_create_arch (creator->other_arch); 1190 new_ob = object_create_arch (creator->other_arch);
1226 fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL); 1191 fix_generated_item (new_ob, creator, 0, 0, GT_MINIMAL);
1227 } 1192 }
1228 1193
1229 /* Make sure this multipart object fits */ 1194 /* Make sure this multipart object fits */
1230 if (new_ob->arch->more && ob_blocked (new_ob, creator->map, creator->x, creator->y)) 1195 if (new_ob->arch->more && new_ob->blocked (creator->map, creator->x, creator->y))
1231 { 1196 {
1232 new_ob->destroy (); 1197 new_ob->destroy ();
1233 return; 1198 return;
1234 } 1199 }
1200
1201 // for now lets try to identify everything generated here, it mostly
1202 // happens automated, so this will at least fix many identify-experience holes
1203 SET_FLAG (new_ob, FLAG_IDENTIFIED);
1235 1204
1236 insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y); 1205 insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
1237 if (QUERY_FLAG (new_ob, FLAG_FREED)) 1206 if (QUERY_FLAG (new_ob, FLAG_FREED))
1238 return; 1207 return;
1239 1208
1240 if (creator->slaying) 1209 if (creator->slaying)
1241 {
1242 new_ob->name = new_ob->title = creator->slaying; 1210 new_ob->name = new_ob->title = creator->slaying;
1243 }
1244} 1211}
1245 1212
1246/* move_marker --peterm@soda.csua.berkeley.edu 1213/* move_marker --peterm@soda.csua.berkeley.edu
1247 when moved, a marker will search for a player sitting above 1214 when moved, a marker will search for a player sitting above
1248 it, and insert an invisible, weightless force into him 1215 it, and insert an invisible, weightless force into him
… …
1254void 1221void
1255move_marker (object *op) 1222move_marker (object *op)
1256{ 1223{
1257 if (object *tmp = op->ms ().player ()) 1224 if (object *tmp = op->ms ().player ())
1258 { 1225 {
1259 object *tmp2;
1260
1261 /* remove an old force with a slaying field == op->name */ 1226 /* remove an old force with a slaying field == op->name */
1262 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below) 1227 if (object *force = tmp->force_find (op->name))
1263 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->name) 1228 force->destroy ();
1229
1230 if (op->slaying && !tmp->force_find (op->slaying))
1264 { 1231 {
1265 tmp2->destroy (); 1232 tmp->force_add (op->slaying, op->stats.food);
1266 break;
1267 }
1268 1233
1269 /* cycle through his inventory to look for the MARK we want to
1270 * place
1271 */
1272 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
1273 if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
1274 break;
1275
1276 /* if we didn't find our own MARK */
1277 if (!tmp2)
1278 {
1279 object *force = get_archetype (FORCE_NAME);
1280
1281 if (op->stats.food)
1282 {
1283 force->set_speed (0.01);
1284 force->speed_left = -op->stats.food;
1285 }
1286 else
1287 force->set_speed (0);
1288
1289 /* put in the lock code */
1290 force->slaying = op->slaying;
1291
1292 if (op->lore)
1293 force->lore = op->lore;
1294
1295 insert_ob_in_ob (force, tmp);
1296 if (op->msg) 1234 if (op->msg)
1297 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg); 1235 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
1298 1236
1299 if (op->stats.hp > 0) 1237 if (op->stats.hp > 0)
1300 { 1238 {
1301 op->stats.hp--; 1239 op->stats.hp--;
1240
1302 if (op->stats.hp == 0) 1241 if (op->stats.hp == 0)
1303 { 1242 {
1304 /* marker expires--granted mark number limit */ 1243 /* marker expires--granted mark number limit */
1305 op->destroy (); 1244 op->destroy ();
1306 return; 1245 return;
… …
1308 } 1247 }
1309 } 1248 }
1310 } 1249 }
1311} 1250}
1312 1251
1313int 1252// mapscript objects activate themselves (only) then their timer fires
1253// TODO: maybe they should simply trigger the link like any other object?
1254static void
1255move_mapscript (object *op)
1256{
1257 op->set_speed (0);
1258 cfperl_mapscript_activate (op, true, op, 0);
1259}
1260
1261static void
1262move_lamp (object *op)
1263{
1264 // if the lamp/torch is off, we should disable it.
1265 if (!op->glow_radius)
1266 {
1267 op->set_speed (0);
1268 return;
1269 }
1270 else
1271 {
1272 // check whether the face might need to be updated
1273 // (currently this is needed to have already switched on torches
1274 // on maps, as they just set the glow_radius in the archetype)
1275 if (op->other_arch
1276 && (
1277 (op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
1278 || (op->flag [FLAG_ANIMATE]
1279 ? (op->animation_id != op->other_arch->animation_id)
1280 : (op->face != op->other_arch->face))
1281 ))
1282 get_animation_from_arch (op, op->other_arch);
1283 }
1284
1285 // lamps and torches on maps don't use up their fuel
1286 if (op->is_on_map ())
1287 return;
1288
1289 if (op->stats.food > 0)
1290 {
1291 op->stats.food--;
1292 return;
1293 }
1294
1295 apply_lamp (op, false);
1296}
1297
1298void
1314process_object (object *op) 1299process_object (object *op)
1315{ 1300{
1316 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1301 if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
1317 return 0; 1302 return;
1318 1303
1319 if (INVOKE_OBJECT (TICK, op)) 1304 if (expect_false (INVOKE_OBJECT (TICK, op)))
1320 return 0; 1305 return;
1321 1306
1322 if (QUERY_FLAG (op, FLAG_MONSTER)) 1307 if (QUERY_FLAG (op, FLAG_MONSTER))
1323 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1308 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1324 return 1; 1309 return;
1325 1310
1326 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0) 1311 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0)
1327 { 1312 {
1328 animate_object (op, op->contr ? op->facing : op->direction); 1313 animate_object (op, op->contr ? op->facing : op->direction);
1329 1314
1330 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1315 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1331 make_sure_seen (op); 1316 make_sure_seen (op);
1332 } 1317 }
1333 1318
1319 if (expect_false (
1320 op->flag [FLAG_GENERATOR]
1321 || op->flag [FLAG_CHANGING]
1322 || op->flag [FLAG_IS_USED_UP]
1323 ))
1324 {
1334 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state) 1325 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
1335 { 1326 {
1336 change_object (op); 1327 change_object (op);
1337 return 1; 1328 return;
1338 } 1329 }
1339 1330
1340 if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY)) 1331 if (QUERY_FLAG (op, FLAG_GENERATOR) && !QUERY_FLAG (op, FLAG_FRIENDLY))
1341 generate_monster (op); 1332 generate_monster (op);
1342 1333
1343 if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0) 1334 if (QUERY_FLAG (op, FLAG_IS_USED_UP) && --op->stats.food <= 0)
1344 { 1335 {
1345 if (QUERY_FLAG (op, FLAG_APPLIED)) 1336 if (QUERY_FLAG (op, FLAG_APPLIED))
1346 remove_force (op); 1337 remove_force (op);
1347 else 1338 else
1348 { 1339 {
1349 /* If necessary, delete the item from the players inventory */ 1340 op->remove (); // TODO: really necessary?
1350 object *pl = op->in_player ();
1351 1341
1352 if (pl)
1353 esrv_del_item (pl->contr, op->count);
1354
1355 op->remove ();
1356
1357 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1342 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1358 make_sure_not_seen (op); 1343 make_sure_not_seen (op);
1359 1344
1360 op->destroy (); 1345 op->drop_and_destroy ();
1361 } 1346 }
1362 1347
1363 return 1; 1348 return;
1349 }
1364 } 1350 }
1365 1351
1366 switch (op->type) 1352 switch (op->type)
1367 { 1353 {
1368 case SPELL_EFFECT: 1354 case SPELL_EFFECT:
1369 move_spell_effect (op); 1355 move_spell_effect (op);
1370 return 1; 1356 break;
1371 1357
1372 case ROD: 1358 case ROD:
1373 case HORN: 1359 case HORN:
1374 regenerate_rod (op); 1360 regenerate_rod (op);
1375 return 1; 1361 break;
1376 1362
1377 case FORCE: 1363 case FORCE:
1378 case POTION_EFFECT: 1364 case POTION_EFFECT:
1379 remove_force (op); 1365 remove_force (op);
1380 return 1; 1366 break;
1381 1367
1382 case BLINDNESS: 1368 case BLINDNESS:
1383 remove_blindness (op); 1369 remove_blindness (op);
1384 return 0; 1370 break;
1385 1371
1386 case POISONING: 1372 case POISONING:
1387 poison_more (op); 1373 poison_more (op);
1388 return 0; 1374 break;
1389 1375
1390 case DISEASE: 1376 case DISEASE:
1391 move_disease (op); 1377 move_disease (op);
1392 return 0; 1378 break;
1393 1379
1394 case SYMPTOM: 1380 case SYMPTOM:
1395 move_symptom (op); 1381 move_symptom (op);
1396 return 0; 1382 break;
1397 1383
1398 case THROWN_OBJ: 1384 case THROWN_OBJ:
1399 case ARROW: 1385 case ARROW:
1400 move_arrow (op); 1386 move_arrow (op);
1401 return 0; 1387 break;
1402 1388
1403 case DOOR: 1389 case DOOR:
1404 remove_door (op); 1390 remove_door (op);
1405 return 0; 1391 break;
1406 1392
1407 case LOCKED_DOOR: 1393 case LOCKED_DOOR:
1408 remove_door2 (op); 1394 remove_door2 (op);
1409 return 0; 1395 break;
1410 1396
1411 case TELEPORTER: 1397 case TELEPORTER:
1412 move_teleporter (op); 1398 move_teleporter (op);
1413 return 0; 1399 break;
1414 1400
1415 case GOLEM: 1401 case GOLEM:
1416 move_golem (op); 1402 move_golem (op);
1417 return 0; 1403 break;
1418 1404
1419 case EARTHWALL: 1405 case EARTHWALL:
1420 hit_player (op, 2, op, AT_PHYSICAL, 1); 1406 hit_player (op, 2, op, AT_PHYSICAL, 1);
1421 return 0; 1407 break;
1422 1408
1423 case FIREWALL: 1409 case FIREWALL:
1424 move_firewall (op); 1410 move_firewall (op);
1425 if (op->stats.maxsp) 1411 if (op->stats.maxsp)
1426 animate_turning (op); 1412 animate_turning (op);
1427 return 0; 1413 break;
1428 1414
1429 case MOOD_FLOOR: 1415 case MOOD_FLOOR:
1430 do_mood_floor (op); 1416 do_mood_floor (op);
1431 return 0; 1417 break;
1432 1418
1433 case GATE: 1419 case GATE:
1434 move_gate (op); 1420 move_gate (op);
1435 return 0; 1421 break;
1436 1422
1437 case TIMED_GATE: 1423 case TIMED_GATE:
1438 move_timed_gate (op); 1424 move_timed_gate (op);
1439 return 0; 1425 break;
1440 1426
1441 case TRIGGER: 1427 case TRIGGER:
1442 case TRIGGER_BUTTON: 1428 case TRIGGER_BUTTON:
1443 case TRIGGER_PEDESTAL: 1429 case TRIGGER_PEDESTAL:
1444 case TRIGGER_ALTAR: 1430 case TRIGGER_ALTAR:
1445 animate_trigger (op); 1431 animate_trigger (op);
1446 return 0; 1432 break;
1447 1433
1448 case DETECTOR: 1434 case DETECTOR:
1449 move_detector (op); 1435 move_detector (op);
1450 1436
1451 case DIRECTOR: 1437 case DIRECTOR:
1452 if (op->stats.maxsp) 1438 if (op->stats.maxsp)
1453 animate_turning (op); 1439 animate_turning (op);
1454 return 0; 1440 break;
1455 1441
1456 case HOLE: 1442 case HOLE:
1457 move_hole (op); 1443 move_hole (op);
1458 return 0; 1444 break;
1459 1445
1460 case DEEP_SWAMP: 1446 case DEEP_SWAMP:
1461 move_deep_swamp (op); 1447 move_deep_swamp (op);
1462 return 0; 1448 break;
1463 1449
1464 case RUNE: 1450 case RUNE:
1465 case TRAP: 1451 case TRAP:
1466 move_rune (op); 1452 move_rune (op);
1467 return 0; 1453 break;
1468 1454
1469 case PLAYERMOVER: 1455 case PLAYERMOVER:
1470 move_player_mover (op); 1456 move_player_mover (op);
1471 return 0; 1457 break;
1472 1458
1473 case CREATOR: 1459 case CREATOR:
1474 move_creator (op); 1460 move_creator (op);
1475 return 0; 1461 break;
1476 1462
1477 case MARKER: 1463 case MARKER:
1478 move_marker (op); 1464 move_marker (op);
1479 return 0; 1465 break;
1480 1466
1481 case PLAYER_CHANGER: 1467 case PLAYER_CHANGER:
1482 move_player_changer (op); 1468 move_player_changer (op);
1483 return 0; 1469 break;
1484 1470
1485 case PEACEMAKER: 1471 case PEACEMAKER:
1486 move_peacemaker (op); 1472 move_peacemaker (op);
1487 return 0; 1473 break;
1488 }
1489 1474
1490 return 0; 1475 case PLAYER:
1491} 1476 // players have their own speed-management, so undo the --speed_left
1477 ++op->speed_left;
1478 break;
1492 1479
1480 case MAPSCRIPT:
1481 move_mapscript (op);
1482 break;
1483
1484 case LAMP:
1485 case TORCH:
1486 move_lamp (op);
1487 break;
1488 }
1489}
1490

Diff Legend

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