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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.6 by root, Sun Sep 3 00:18:39 2006 UTC vs.
Revision 1.59 by root, Wed Oct 21 00:44:39 2009 UTC

1/* 1/*
2 * static char *rcsid_button_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: button.C,v 1.6 2006/09/03 00:18:39 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 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
13 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
14 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
15 (at your option) any later version. 11 * option) any later version.
16 12 *
17 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,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 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
23 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
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
25 21 *
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <support@deliantra.net>
27*/ 23 */
28 24
29#include <global.h> 25#include <global.h>
30#include <funcpoint.h>
31 26
32/* 27/*
33 * This code is no longer highly inefficient 8) 28 * This code is no longer highly inefficient 8)
34 */ 29 */
35 30
36/* 31/*
37 * elmex: 32 * elmex:
38 * This function takes a objectlink list with all the objects are going to be activated. 33 * This function takes a objectlink list with all the objects are going to be activated.
39 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set. 34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
40 * The source argument can be 0 or the source object for this activation. 35 * The activator argument can be 0 or the source object for this activation.
36 * the originator is the player or monster who did something.
41 */ 37 */
42void activate_connection_link (objectlink *ol, bool state, object *source = 0) 38static void
39activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
43{ 40{
44 object *tmp = 0;
45
46 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
47 { 42 {
48 if (!ol->ob || ol->ob->count != ol->id) 43 if (!ol->ob)
49 { 44 {
50 LOG (llevError, "Internal error in activate_connection_link (%ld).\n", ol->id); 45 LOG (llevError, "Internal error in activate_connection_link.\n");
51 continue; 46 continue;
52 } 47 }
48
53 /* a button link object can become freed when the map is saving. As 49 /* a button link object can become freed when the map is saving. As
54 * a map is saved, objects are removed and freed, and if an object is 50 * a map is saved, objects are removed and freed, and if an object is
55 * on top of a button, this function is eventually called. If a map 51 * on top of a button, this function is eventually called. If a map
56 * is getting moved out of memory, the status of buttons and levers 52 * is getting moved out of memory, the status of buttons and levers
57 * probably isn't important - it will get sorted out when the map is 53 * probably isn't important - it will get sorted out when the map is
58 * re-loaded. As such, just exit this function if that is the case. 54 * re-loaded. As such, just exit this function if that is the case.
59 */ 55 */
60 56
61 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 57 if (QUERY_FLAG (ol->ob, FLAG_FREED))
62 return; 58 return;
59
63 tmp = ol->ob; 60 object *tmp = ol->ob;
64 61
65 /* if the criteria isn't appropriate, don't do anything */ 62 /* if the criteria isn't appropriate, don't do anything */
66 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
67 continue; 64 continue;
65
68 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 66 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
69 continue; 67 continue;
70 68
71 switch (tmp->type) 69 switch (tmp->type)
72 { 70 {
73 case GATE: 71 case GATE:
74 case HOLE: 72 case HOLE:
73 if (!tmp->active)
74 tmp->play_sound (tmp->sound
75 ? tmp->sound
76 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
75 tmp->value = tmp->stats.maxsp ? !state : state; 77 tmp->value = tmp->stats.maxsp ? !state : state;
76 tmp->speed = 0.5; 78 tmp->set_speed (0.5);
77 update_ob_speed (tmp);
78 break; 79 break;
79 80
80 case CF_HANDLE: 81 case T_HANDLE:
81 SET_ANIMATION (tmp, 82 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
82 (tmp->value =
83 tmp->stats.maxsp ? !state : state));
84 update_object (tmp, UP_OBJ_FACE); 83 update_object (tmp, UP_OBJ_FACE);
85 break; 84 break;
86 85
87 case SIGN: 86 case SIGN:
88 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 87 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
89 { 88 {
89 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
90 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 90 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
91 if (tmp->stats.food) 91 if (tmp->stats.food)
92 tmp->last_eat++; 92 tmp->last_eat++;
93 } 93 }
94 break; 94 break;
95 95
96 case ALTAR: 96 case ALTAR:
97 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
97 tmp->value = 1; 98 tmp->value = 1;
98 SET_ANIMATION (tmp, tmp->value); 99 SET_ANIMATION (tmp, tmp->value);
99 update_object (tmp, UP_OBJ_FACE); 100 update_object (tmp, UP_OBJ_FACE);
100 break; 101 break;
101 102
102 case BUTTON: 103 case BUTTON:
103 case PEDESTAL: 104 case PEDESTAL:
105 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
104 tmp->value = state; 106 tmp->value = state;
105 SET_ANIMATION (tmp, tmp->value); 107 SET_ANIMATION (tmp, tmp->value);
106 update_object (tmp, UP_OBJ_FACE); 108 update_object (tmp, UP_OBJ_FACE);
107 break; 109 break;
108 110
109 case MOOD_FLOOR: 111 case MOOD_FLOOR:
110 do_mood_floor (tmp, source); 112 do_mood_floor (tmp, activator);
111 break; 113 break;
112 114
113 case TIMED_GATE: 115 case TIMED_GATE:
116 if (!tmp->active)
117 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
118
114 tmp->speed = tmp->arch->clone.speed; 119 tmp->set_speed (tmp->arch->speed);
115 update_ob_speed (tmp); /* original values */
116 tmp->value = tmp->arch->clone.value; 120 tmp->value = tmp->arch->value;
117 tmp->stats.sp = 1; 121 tmp->stats.sp = 1;
118 tmp->stats.hp = tmp->stats.maxhp; 122 tmp->stats.hp = tmp->stats.maxhp;
119 /* Handle multipart gates. We copy the value for the other parts 123 /* Handle multipart gates. We copy the value for the other parts
120 * from the head - this ensures that the data will consistent 124 * from the head - this ensures that the data will consistent
121 */ 125 */
122 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 126 for (object *part = tmp->more; part; part = part->more)
123 { 127 {
124 tmp->speed = tmp->head->speed; 128 part->value = tmp->value;
125 tmp->value = tmp->head->value; 129 part->stats.sp = tmp->stats.sp;
126 tmp->stats.sp = tmp->head->stats.sp; 130 part->stats.hp = tmp->stats.hp;
127 tmp->stats.hp = tmp->head->stats.hp;
128 update_ob_speed (tmp); 131 part->set_speed (tmp->speed);
129 } 132 }
130 break; 133 break;
131 134
132 case DIRECTOR: 135 case DIRECTOR:
133 case FIREWALL: 136 case FIREWALL:
134 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 137 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
135 move_firewall (tmp); 138 move_firewall (tmp);
136 else 139 else
137 { 140 {
138 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 141 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
139 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
140 animate_turning (tmp); 142 animate_turning (tmp);
141 } 143 }
142 break; 144 break;
143 145
144 case TELEPORTER: 146 case TELEPORTER:
145 move_teleporter (tmp); 147 move_teleporter (tmp);
146 break; 148 break;
147 149
148 case CREATOR: 150 case CREATOR:
149 move_creator (tmp); 151 move_creator (tmp);
150 break; 152 break;
151 153
152 case TRIGGER_MARKER: 154 case TRIGGER_MARKER:
155 //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
153 move_marker (tmp); 156 move_marker (tmp);
154 break; 157 break;
155 158
156 case DUPLICATOR: 159 case DUPLICATOR:
157 move_duplicator (tmp); 160 move_duplicator (tmp);
158 break; 161 break;
162
163 case MAPSCRIPT:
164 cfperl_mapscript_activate (tmp, state, activator, originator);
165 break;
159 } 166 }
160 } 167 }
161} 168}
162 169
163/* 170/*
170 * altars/pedestals/holes in the whole map. 177 * altars/pedestals/holes in the whole map.
171 * Changed the routine to loop through _all_ objects. 178 * Changed the routine to loop through _all_ objects.
172 * Better hurry with that linked list... 179 * Better hurry with that linked list...
173 * 180 *
174 */ 181 */
175void push_button (object *op) 182void
183push_button (object *op, object *originator)
176{ 184{
177 oblinkpt *obp = get_button_links (op); 185 if (oblinkpt *obp = op->find_link ())
178 186 {
179 if (!obp) 187 if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
180 return; 188 return;
181 189
182 if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64(obp->value), ARG_INT(op->value)))
183 return;
184
185 activate_connection_link (obp->link, op->value, op); 190 activate_connection_link (obp->link, op->value, op, originator);
191 }
186} 192}
187 193
188/* 194/*
189 * elmex: 195 * elmex:
190 * This activates a connection, similar to push_button (object *op) but it takes 196 * This activates a connection, similar to push_button (object *op) but it takes
191 * only a map, a connection value and a true or false flag that indicated whether 197 * only a map, a connection value and a true or false flag that indicated whether
192 * the connection was 'state' or 'released'. So that you can activate objects 198 * the connection was 'state' or 'released'. So that you can activate objects
193 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 199 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
194 * 200 *
195 */ 201 */
196void activate_connection (mapstruct *map, long connection, bool state) 202void
203maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
197{ 204{
198 if (INVOKE_MAP (TRIGGER, map, ARG_INT64(connection), ARG_INT(state))) 205 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
199 return; 206 return;
200 207
201 oblinkpt *obp = get_connection_links (map, connection); 208 if (oblinkpt *obp = find_link (id))
202 if (obp)
203 activate_connection_link (obp->link, state); 209 activate_connection_link (obp->link, state, activator, originator);
204} 210}
205 211
206/* 212/*
207 * Updates everything connected with the button op. 213 * Updates everything connected with the button op.
208 * After changing the state of a button, this function must be called 214 * After changing the state of a button, this function must be called
209 * to make sure that all gates and other buttons connected to the 215 * to make sure that all gates and other buttons connected to the
210 * button reacts to the (eventual) change of state. 216 * button reacts to the (eventual) change of state.
211 */ 217 */
212 218void
213void update_button(object *op) { 219update_button (object *op, object *originator)
214 object *ab,*tmp,*head; 220{
215 int tot,any_down=0, old_value=op->value; 221 int any_down = 0, old_value = op->value;
216 oblinkpt *obp = 0;
217 objectlink *ol;
218 222
219 obp = get_button_links (op); 223 if (oblinkpt *obp = op->find_link ())
220 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
221 if (obp)
222 for (ol = obp->link; ol; ol = ol->next) { 224 for (objectlink *ol = obp->link; ol; ol = ol->next)
223 if (!ol->ob || ol->ob->count != ol->id) { 225 {
226 if (!ol->ob)
227 {
224 LOG(llevDebug, "Internal error in update_button (%s).\n", &op->name); 228 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
225 continue; 229 continue;
226 } 230 }
231
227 tmp = ol->ob; 232 object *tmp = ol->ob;
233
228 if (tmp->type==BUTTON) { 234 if (tmp->type == BUTTON)
235 {
236 sint32 total = 0;
237
229 for(ab=tmp->above,tot=0;ab!=NULL;ab=ab->above) 238 for (object *ab = tmp->above; ab; ab = ab->above)
230 /* Bug? The pedestal code below looks for the head of
231 * the object, this bit doesn't. I'd think we should check
232 * for head here also. Maybe it also makese sense to
233 * make the for ab=tmp->above loop common, and alter
234 * behaviour based on object within that loop?
235 */
236
237 /* Basically, if the move_type matches that on what the 239 /* Basically, if the move_type matches that on what the
238 * button wants, we count it. The second check is so that 240 * button wants, we count it. The second check is so that
239 * objects don't move (swords, etc) will count. Note that 241 * objects who don't move (swords, etc) will count. Note that
240 * this means that more work is needed to make buttons 242 * this means that more work is needed to make buttons
241 * that are only triggered by flying objects. 243 * that are only triggered by flying objects.
242 */ 244 */
243 if ((ab->move_type & tmp->move_on) || ab->move_type==0 ) 245 if ((ab->move_type & tmp->move_on) || ab->move_type == 0)
244 tot+=ab->weight*(ab->nrof?ab->nrof:1)+ab->carrying; 246 total += ab->head_ ()->total_weight ();
245 247
246 tmp->value=(tot>=tmp->weight)?1:0; 248 tmp->value = total >= tmp->weight;
247 if(tmp->value) 249
248 any_down=1; 250 any_down = any_down || tmp->value;
251 }
249 } else if (tmp->type == PEDESTAL) { 252 else if (tmp->type == PEDESTAL)
253 {
254 bool is_match = is_match_expr (tmp->slaying);
250 tmp->value = 0; 255 tmp->value = 0;
256
251 for(ab=tmp->above; ab!=NULL; ab=ab->above) { 257 for (object *ab = tmp->above; ab; ab = ab->above)
252 head = ab->head ? ab->head : ab; 258 {
259 object *head = ab->head_ ();
260
253 /* Same note regarding move_type for buttons above apply here. */ 261 /* Same note regarding move_type for buttons above apply here. */
254 if ( ((head->move_type & tmp->move_on) || ab->move_type==0) && 262 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
263 if (is_match
264 ? match (tmp->slaying, head, tmp, originator)
255 (head->race==tmp->slaying || 265 : (head->race == tmp->slaying
256 ((head->type==SPECIAL_KEY) && (head->slaying==tmp->slaying)) || 266 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
257 (!strcmp (tmp->slaying, "player") && 267 || (tmp->slaying == shstr_player && head->type == PLAYER)))
258 head->type == PLAYER))) 268 {
259 tmp->value = 1; 269 tmp->value = 1;
270 break;
271 }
272 }
273
274 any_down = any_down || tmp->value;
275 }
276 else if (tmp->type == T_MATCH)
277 {
278 tmp->value = 0;
279
280 for (object *ab = tmp->above; ab; ab = ab->above)
260 } 281 {
261 if(tmp->value) 282 object *head = ab->head_ ();
262 any_down=1; 283
284 /* Same note regarding move_type for buttons above apply here. */
285 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
286 if (match (tmp->slaying, head, tmp, originator))
287 {
288 tmp->value = 1;
289 break;
290 }
291 }
292
293 any_down = any_down || tmp->value;
263 } 294 }
264 } 295 }
296
265 if(any_down) /* If any other buttons were down, force this to remain down */ 297 if (any_down) /* If any other buttons were down, force this to remain down */
266 op->value=1; 298 op->value = 1;
267 299
300 //LOG(llevDebug, "update_button: %s (%d, %d=%d)\n", &op->name, op->count, op->value, old_value);
301
268 /* If this button hasn't changed, don't do anything */ 302 /* If this button hasn't changed, don't do anything */
269 if (op->value != old_value) { 303 if (op->value != old_value)
304 {
270 SET_ANIMATION(op, op->value); 305 SET_ANIMATION (op, op->value);
271 update_object(op, UP_OBJ_FACE); 306 update_object (op, UP_OBJ_FACE);
272 push_button(op); /* Make all other buttons the same */ 307 push_button (op, originator); /* Make all other buttons the same */
273 }
274}
275
276/*
277 * Updates every button on the map (by calling update_button() for them).
278 */
279
280void update_buttons(mapstruct *m) {
281 objectlink *ol;
282 oblinkpt *obp;
283 for (obp = m->buttons; obp; obp = obp->next)
284 for (ol = obp->link; ol; ol = ol->next) {
285 if (!ol->ob || ol->ob->count != ol->id) {
286 LOG(llevError, "Internal error in update_button (%s (%dx%d):%d, connected %ld).\n",
287 ol->ob?(const char *)ol->ob->name:"null",
288 ol->ob?ol->ob->x:-1,
289 ol->ob?ol->ob->y:-1,
290 ol->id,
291 obp->value);
292 continue;
293 } 308 }
294 if (ol->ob->type==BUTTON || ol->ob->type==PEDESTAL)
295 {
296 update_button(ol->ob);
297 break;
298 }
299 }
300} 309}
301 310
302void use_trigger(object *op) 311void
312use_trigger (object *op, object *originator)
303{ 313{
304
305 /* Toggle value */ 314 /* Toggle value */
306 op->value = !op->value; 315 op->value = !op->value;
307 push_button(op); 316
317 push_button (op, originator);
308} 318}
309 319
310/* 320/*
311 * Note: animate_object should be used instead of this, 321 * Note: animate_object should be used instead of this,
312 * but it can't handle animations in the 8 directions 322 * but it can't handle animations in the 8 directions
313 */ 323 */
314 324void
315void animate_turning(object *op) /* only one part objects */ 325animate_turning (object *op) /* only one part objects */
316{ 326{
317 if (++op->state >= NUM_ANIMATIONS(op)/8) 327 if (++op->state >= NUM_ANIMATIONS (op) / 8)
318 op->state=0; 328 op->state = 0;
319 SET_ANIMATION(op, (op->stats.sp-1) * NUM_ANIMATIONS(op) / 8 + 329 SET_ANIMATION (op, (op->stats.sp - 1) * NUM_ANIMATIONS (op) / 8 + op->state);
320 op->state);
321 update_object(op,UP_OBJ_FACE); 330 update_object (op, UP_OBJ_FACE);
322} 331}
323 332
324#define ARCH_SACRIFICE(xyz) ((xyz)->slaying) 333#define ARCH_SACRIFICE(xyz) ((xyz)->slaying)
325#define NROF_SACRIFICE(xyz) ((uint32)(xyz)->stats.food) 334#define NROF_SACRIFICE(xyz) ((uint32)(xyz)->stats.food)
326 335
332 * 341 *
333 * 0.93.4: Linked objects (ie, objects that are connected) can not be 342 * 0.93.4: Linked objects (ie, objects that are connected) can not be
334 * sacrificed. This fixes a bug of trying to put multiple altars/related 343 * sacrificed. This fixes a bug of trying to put multiple altars/related
335 * objects on the same space that take the same sacrifice. 344 * objects on the same space that take the same sacrifice.
336 */ 345 */
337 346
347int
338int check_altar_sacrifice (const object *altar, const object *sacrifice) 348check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
339{ 349{
350 if (sacrifice->flag [FLAG_UNPAID])
351 return 0;
352
353 if (is_match_expr (ARCH_SACRIFICE (altar)))
354 return match (ARCH_SACRIFICE (altar), altar, originator);
355
340 if ( ! QUERY_FLAG (sacrifice, FLAG_ALIVE) 356 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
341 && ! QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 357 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
342 && sacrifice->type != PLAYER) 358 && sacrifice->type != PLAYER)
343 { 359 {
344 if ((ARCH_SACRIFICE(altar) == sacrifice->arch->name || 360 if (ARCH_SACRIFICE (altar) == shstr_money
345 ARCH_SACRIFICE(altar) == sacrifice->name ||
346 ARCH_SACRIFICE(altar) == sacrifice->slaying ||
347 (!strcmp(ARCH_SACRIFICE(altar),query_base_name(sacrifice,0))))
348 && NROF_SACRIFICE(altar) <= (sacrifice->nrof?sacrifice->nrof:1))
349 return 1;
350 if (strcmp (ARCH_SACRIFICE(altar), "money") == 0
351 && sacrifice->type == MONEY 361 && sacrifice->type == MONEY
352 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE(altar)) 362 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
353 return 1; 363 return 1;
364
365 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
366 || ARCH_SACRIFICE (altar) == sacrifice->name
367 || ARCH_SACRIFICE (altar) == sacrifice->slaying
368 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
369 && NROF_SACRIFICE (altar) <= sacrifice->number_of ())
370 return 1;
354 } 371 }
372
355 return 0; 373 return 0;
356} 374}
357
358 375
359/* 376/*
360 * operate_altar checks if sacrifice was accepted and removes sacrificed 377 * operate_altar checks if sacrifice was accepted and removes sacrificed
361 * objects. If sacrifice was succeed return 1 else 0. Might be better to 378 * objects. If sacrifice was succeed return 1 else 0. Might be better to
362 * call check_altar_sacrifice (above) than depend on the return value, 379 * call check_altar_sacrifice (above) than depend on the return value,
363 * since operate_altar will remove the sacrifice also. 380 * since operate_altar will remove the sacrifice also.
364 * 381 *
365 * If this function returns 1, '*sacrifice' is modified to point to the 382 * If this function returns 1, '*sacrifice' is modified to point to the
366 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 383 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
367 */ 384 */
368 385int
369int operate_altar (object *altar, object **sacrifice) 386operate_altar (object *altar, object **sacrifice, object *originator)
370{ 387{
371
372 if ( ! altar->map) { 388 if (!altar->map)
389 {
373 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 390 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
374 return 0; 391 return 0;
375 } 392 }
376 393
377 if (!altar->slaying || altar->value) 394 if (!altar->slaying || altar->value)
378 return 0; 395 return 0;
379 396
380 if ( ! check_altar_sacrifice (altar, *sacrifice)) 397 if (!check_altar_sacrifice (altar, *sacrifice, originator))
381 return 0; 398 return 0;
382 399
383 /* check_altar_sacrifice should have already verified that enough money 400 /* check_altar_sacrifice should have already verified that enough money
384 * has been dropped. 401 * has been dropped.
385 */ 402 */
386 if (!strcmp(ARCH_SACRIFICE(altar), "money")) { 403 if (ARCH_SACRIFICE (altar) == shstr_money)
404 {
387 int number=NROF_SACRIFICE(altar) / (*sacrifice)->value; 405 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
388 406
389 /* Round up any sacrifices. Altars don't make change either */ 407 /* Round up any sacrifices. Altars don't make change either */
390 if (NROF_SACRIFICE(altar) % (*sacrifice)->value) number++; 408 if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
391 *sacrifice = decrease_ob_nr (*sacrifice, number); 409 number++;
410
411 if (!(*sacrifice)->decrease (number))
412 *sacrifice = 0;
392 } 413 }
393 else 414 else
394 *sacrifice = decrease_ob_nr (*sacrifice, NROF_SACRIFICE(altar)); 415 if (!(*sacrifice)->decrease (NROF_SACRIFICE (altar)))
395 416 *sacrifice = 0;
417
396 if (altar->msg) 418 if (altar->msg)
397 new_info_map(NDI_BLACK, altar->map, altar->msg); 419 new_info_map (NDI_BLACK, altar->map, altar->msg);
420
398 return 1; 421 return 1;
399} 422}
400 423
424void
401void trigger_move (object *op, int state) /* 1 down and 0 up */ 425trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */
402{ 426{
403 op->stats.wc = state; 427 op->stats.wc = state;
428
404 if (state) { 429 if (state)
405 use_trigger(op); 430 {
406 if (op->stats.exp > 0) /* check sanity */ 431 use_trigger (op, originator);
407 op->speed = 1.0 / op->stats.exp; 432 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
408 else
409 op->speed = 1.0;
410 update_ob_speed(op);
411 op->speed_left = -1; 433 op->speed_left = -1;
412 } else { 434 }
413 use_trigger(op); 435 else
436 {
437 use_trigger (op, originator);
414 op->speed = 0; 438 op->set_speed (0);
415 update_ob_speed(op);
416 } 439 }
417} 440}
418 441
419 442
420/* 443/*
427 * 450 *
428 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 451 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
429 * 452 *
430 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 453 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
431 */ 454 */
455int
432int check_trigger (object *op, object *cause) 456check_trigger (object *op, object *cause, object *originator)
433{ 457{
434 object *tmp; 458 object *tmp;
435 int push = 0, tot = 0; 459 int push = 0, tot = 0;
436 int in_movement = op->stats.wc || op->speed; 460 int in_movement = op->stats.wc || op->speed;
437 461
438 switch (op->type) { 462 switch (op->type)
463 {
439 case TRIGGER_BUTTON: 464 case TRIGGER_BUTTON:
440 if (op->weight > 0) { 465 if (op->weight > 0)
441 if (cause) {
442 for (tmp = op->above; tmp; tmp = tmp->above)
443 /* Comment reproduced from update_buttons(): */
444 /* Basically, if the move_type matches that on what the
445 * button wants, we count it. The second check is so that
446 * objects that don't move (swords, etc) will count. Note that
447 * this means that more work is needed to make buttons
448 * that are only triggered by flying objects.
449 */
450
451 if ((tmp->move_type & op->move_on) || tmp->move_type==0) {
452 tot += tmp->weight * (tmp->nrof ? tmp->nrof : 1)
453 + tmp->carrying;
454 }
455 if (tot >= op->weight)
456 push = 1;
457 if (op->stats.ac == push)
458 return 0;
459 op->stats.ac = push;
460 if (NUM_ANIMATIONS(op) > 1) {
461 SET_ANIMATION (op, push);
462 update_object (op, UP_OBJ_FACE);
463 }
464 if (in_movement || ! push)
465 return 0;
466 }
467 trigger_move (op, push);
468 } 466 {
469 return 0;
470
471 case TRIGGER_PEDESTAL:
472 if (cause) { 467 if (cause)
468 {
473 for (tmp = op->above; tmp; tmp = tmp->above) { 469 for (tmp = op->above; tmp; tmp = tmp->above)
474 object *head = tmp->head ? tmp->head : tmp; 470 /* Comment reproduced from update_buttons(): */
475 471 /* Basically, if the move_type matches that on what the
476 /* See comment in TRIGGER_BUTTON about move_types */ 472 * button wants, we count it. The second check is so that
477 if (((head->move_type & op->move_on) || head->move_type==0) 473 * objects that don't move (swords, etc) will count. Note that
478 && (head->race==op->slaying || 474 * this means that more work is needed to make buttons
479 (!strcmp (op->slaying, "player") && head->type == PLAYER))) { 475 * that are only triggered by flying objects.
480 push = 1;
481 break;
482 } 476 */
483 } 477 if ((tmp->move_type & op->move_on) || tmp->move_type == 0)
478 tot += tmp->head_ ()->total_weight ();
479
480 if (tot >= op->weight)
481 push = 1;
482
484 if (op->stats.ac == push) 483 if (op->stats.ac == push)
485 return 0; 484 return 0;
485
486 op->stats.ac = push; 486 op->stats.ac = push;
487 if (NUM_ANIMATIONS(op) > 1) { 487 if (NUM_ANIMATIONS (op) > 1)
488 {
488 SET_ANIMATION (op, push); 489 SET_ANIMATION (op, push);
489 update_object (op, UP_OBJ_FACE); 490 update_object (op, UP_OBJ_FACE);
490 } 491 }
491 update_object(op,UP_OBJ_FACE); 492
492 if (in_movement || ! push) 493 if (in_movement || !push)
493 return 0; 494 return 0;
494 } 495 }
496
495 trigger_move (op, push); 497 trigger_move (op, push, cause);
498 }
499
500 return 0;
501
502 case TRIGGER_PEDESTAL:
503 if (cause)
504 {
505 for (tmp = op->above; tmp; tmp = tmp->above)
506 {
507 object *head = tmp->head_ ();
508
509 /* See comment in TRIGGER_BUTTON about move_types */
510 if (((head->move_type & op->move_on) || head->move_type == 0)
511 && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
512 {
513 push = 1;
514 break;
515 }
516 }
517
518 if (op->stats.ac == push)
496 return 0; 519 return 0;
497 520
521 op->stats.ac = push;
522
523 if (NUM_ANIMATIONS (op) > 1)
524 {
525 SET_ANIMATION (op, push);
526 update_object (op, UP_OBJ_FACE);
527 }
528
529 update_object (op, UP_OBJ_FACE);
530
531 if (in_movement || !push)
532 return 0;
533 }
534
535 trigger_move (op, push, cause);
536 return 0;
537
498 case TRIGGER_ALTAR: 538 case TRIGGER_ALTAR:
499 if (cause) { 539 if (cause)
540 {
500 if (in_movement) 541 if (in_movement)
501 return 0; 542 return 0;
543
502 if (operate_altar (op, &cause)) { 544 if (operate_altar (op, &cause)) /* TODO: originator? */
503 if (NUM_ANIMATIONS(op) > 1) {
504 SET_ANIMATION (op, 1);
505 update_object(op, UP_OBJ_FACE);
506 }
507 if (op->last_sp >= 0) {
508 trigger_move (op, 1);
509 if (op->last_sp > 0)
510 op->last_sp = -op->last_sp;
511 }
512 else {
513 /* for trigger altar with last_sp, the ON/OFF
514 * status (-> +/- value) is "simulated":
515 */
516 op->value = !op->value;
517 trigger_move (op, 1);
518 op->last_sp = -op->last_sp;
519 op->value = !op->value;
520 }
521 return cause == NULL;
522 } else {
523 return 0;
524 } 545 {
525 } else {
526 if (NUM_ANIMATIONS(op) > 1) { 546 if (NUM_ANIMATIONS (op) > 1)
547 {
527 SET_ANIMATION (op, 0); 548 SET_ANIMATION (op, 1);
528 update_object(op, UP_OBJ_FACE); 549 update_object (op, UP_OBJ_FACE);
529 } 550 }
530 551
531 /* If trigger_altar has "last_sp > 0" set on the map,
532 * it will push the connected value only once per sacrifice.
533 * Otherwise (default), the connected value will be
534 * pushed twice: First by sacrifice, second by reset! -AV
535 */
536 if (!op->last_sp) 552 if (op->last_sp >= 0)
553 {
537 trigger_move (op, 0); 554 trigger_move (op, 1, cause);
555
556 if (op->last_sp > 0)
557 op->last_sp = -op->last_sp;
558 }
538 else { 559 else
539 op->stats.wc = 0; 560 {
561 /* for trigger altar with last_sp, the ON/OFF
562 * status (-> +/- value) is "simulated":
563 */
540 op->value = !op->value; 564 op->value = !op->value;
541 op->speed = 0; 565 trigger_move (op, 1, cause);
542 update_ob_speed(op); 566 op->last_sp = -op->last_sp;
567 op->value = !op->value;
543 } 568 }
569
570 return cause == NULL;
544 } 571 }
572 else
545 return 0; 573 return 0;
546
547 case TRIGGER:
548 if (cause) {
549 if (in_movement)
550 return 0;
551 push = 1;
552 } 574 }
575 else
576 {
553 if (NUM_ANIMATIONS(op) > 1) { 577 if (NUM_ANIMATIONS (op) > 1)
578 {
554 SET_ANIMATION (op, push); 579 SET_ANIMATION (op, 0);
555 update_object(op, UP_OBJ_FACE); 580 update_object (op, UP_OBJ_FACE);
556 } 581 }
582
583 /* If trigger_altar has "last_sp > 0" set on the map,
584 * it will push the connected value only once per sacrifice.
585 * Otherwise (default), the connected value will be
586 * pushed twice: First by sacrifice, second by reset! -AV
587 */
588 if (!op->last_sp)
557 trigger_move (op, push); 589 trigger_move (op, 0, cause);
590 else
591 {
592 op->stats.wc = 0;
593 op->value = !op->value;
594 op->set_speed (0);
595 }
596 }
597 return 0;
598
599 case TRIGGER:
600 if (cause)
601 {
602 if (in_movement)
558 return 1; 603 return 0;
559 604
605 push = 1;
606 }
607
608 if (NUM_ANIMATIONS (op) > 1)
609 {
610 SET_ANIMATION (op, push);
611 update_object (op, UP_OBJ_FACE);
612 }
613
614 trigger_move (op, push, cause);
615 return 1;
616
560 default: 617 default:
561 LOG(llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 618 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
562 return 0; 619 return 0;
620 }
621}
622
623void
624object::add_link (maptile *map, shstr_tmp id)
625{
626 if (!map)
563 } 627 {
564} 628 LOG (llevError, "Tried to add button-link without map.\n");
629 return;
630 }
565 631
566void add_button_link(object *button, mapstruct *map, int connected) { 632 flag [FLAG_IS_LINKED] = true;
567 oblinkpt *obp; 633
568 objectlink *ol = get_objectlink(); 634 objectlink *ol = get_objectlink ();
569
570 if (!map) {
571 LOG(llevError, "Tried to add button-link without map.\n");
572 return;
573 }
574 if (!editor) button->path_attuned = connected; /* peterm: I need this so I can rebuild
575 a connected map from a template map. */
576/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
577
578 SET_FLAG(button,FLAG_IS_LINKED);
579
580 ol->ob = button; 635 ol->ob = this;
581 ol->id = button->count;
582 636
583 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 637 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
584 638 if (obp->id == id)
585 if (obp) { 639 {
586 ol->next = obp->link; 640 ol->next = obp->link;
587 obp->link = ol; 641 obp->link = ol;
588 } else { 642 return;
643 }
644
589 obp = get_objectlinkpt(); 645 oblinkpt *obp = get_objectlinkpt ();
590 obp->value = connected; 646 obp->id = id;
591 647
592 obp->next = map->buttons; 648 obp->next = map->buttons;
593 map->buttons = obp; 649 map->buttons = obp;
594 obp->link = ol; 650 obp->link = ol;
595 }
596} 651}
597 652
598/* 653/*
599 * Remove the object from the linked lists of buttons in the map. 654 * Remove the object from the linked lists of buttons in the map.
600 * This is only needed by editors. 655 * This is only needed by editors.
601 */ 656 */
602 657void
603void remove_button_link(object *op) { 658object::remove_link ()
604 oblinkpt *obp; 659{
605 objectlink **olp, *ol; 660 if (!map)
606 661 {
607 if (op->map == NULL) {
608 LOG(llevError, "remove_button_link() in object without map.\n"); 662 LOG (llevError, "remove_button_link() in object without map.\n");
609 return; 663 return;
610 } 664 }
611 if (!QUERY_FLAG(op,FLAG_IS_LINKED)) { 665
666 if (!flag [FLAG_IS_LINKED])
667 {
612 LOG(llevError, "remove_button_linked() in unlinked object.\n"); 668 LOG (llevError, "remove_button_linked() in unlinked object.\n");
613 return; 669 return;
614 } 670 }
671
672 flag [FLAG_IS_LINKED] = false;
673
615 for (obp = op->map->buttons; obp; obp = obp->next) 674 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
616 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 675 for (objectlink **olp = &obp->link; *olp; olp = &(*olp)->next)
617 if (ol->ob == op) { 676 if ((*olp)->ob == this)
618/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n", 677 {
619 obp->value, op->name, op->map->path); 678 objectlink *ol = *olp;
620*/
621 *olp = ol->next; 679 *olp = ol->next;
622 free(ol); 680 delete ol;
623 return; 681 return;
682 }
683
684 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
685}
686
687/*
688 * Updates every button on the map (by calling update_button() for them).
689 */
690void
691maptile::update_buttons ()
692{
693 for (oblinkpt *obp = buttons; obp; obp = obp->next)
694 for (objectlink *ol = obp->link; ol; ol = ol->next)
695 {
696 if (!ol->ob)
697 {
698 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
699 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, &obp->id);
700 continue;
701 }
702
703 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
704 {
705 update_button (ol->ob, 0);
706 break;
707 }
624 } 708 }
625 LOG(llevError, "remove_button_linked(): couldn't find object.\n");
626 CLEAR_FLAG(op,FLAG_IS_LINKED);
627} 709}
628 710
629/* 711/*
630 * Gets the objectlink for this connection from the map. 712 * Gets the objectlink for this connection from the map.
631 */ 713 */
632oblinkpt *get_connection_links (mapstruct *map, long connection) 714oblinkpt *
715maptile::find_link (shstr_tmp id)
633{ 716{
634 for (oblinkpt *obp = map->buttons; obp; obp = obp->next) 717 for (oblinkpt *obp = buttons; obp; obp = obp->next)
635 if (obp->value == connection) 718 if (obp->id == id)
636 return obp; 719 return obp;
720
637 return 0; 721 return 0;
638} 722}
639 723
640/* 724/*
641 * Return the first objectlink in the objects linked to this one 725 * Return the first objectlink in the objects linked to this one
642 */ 726 */
643
644oblinkpt *get_button_links(const object *button) {
645 oblinkpt *obp; 727oblinkpt *
646 objectlink *ol; 728object::find_link () const
647 729{
648 if (!button->map) 730 if (map)
649 return NULL;
650 for (obp = button->map->buttons; obp; obp = obp->next) 731 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
651 for (ol = obp->link; ol; ol = ol->next) 732 for (objectlink *ol = obp->link; ol; ol = ol->next)
652 if (ol->ob == button && ol->id == button->count) 733 if (ol->ob == this)
653 return obp; 734 return obp;
654 return NULL;
655}
656 735
657/*
658 * Made as a separate function to increase efficiency
659 */
660
661int get_button_value(const object *button) {
662 oblinkpt *obp;
663 objectlink *ol;
664
665 if (!button->map)
666 return 0;
667 for (obp = button->map->buttons; obp; obp = obp->next)
668 for (ol = obp->link; ol; ol = ol->next)
669 if (ol->ob == button && ol->id == button->count)
670 return obp->value;
671 return 0; 736 return 0;
672} 737}
673 738
674/* This routine makes monsters who are 739/* This routine makes monsters who are
675 * standing on the 'mood floor' change their 740 * standing on the 'mood floor' change their
677 * If floor is to be triggered must have 742 * If floor is to be triggered must have
678 * a speed of zero (default is 1 for all 743 * a speed of zero (default is 1 for all
679 * but the charm floor type). 744 * but the charm floor type).
680 * by b.t. thomas@nomad.astro.psu.edu 745 * by b.t. thomas@nomad.astro.psu.edu
681 */ 746 */
682 747void
683void do_mood_floor(object *op, object *source) { 748do_mood_floor (object *op, object *source)
684 object *tmp; 749{
685 object *tmp2;
686
687 if (!source) 750 if (!source)
688 source = op; 751 source = op;
689 752
690 for (tmp = GET_MAP_OB(op->map, op->x, op->y); tmp; tmp=tmp->above) 753 mapspace &ms = op->ms ();
754
755 if (!(ms.flags () & P_IS_ALIVE))
756 return;
757
758 object *tmp;
759
760 for (tmp = ms.top; tmp; tmp = tmp->below)
691 if (QUERY_FLAG(tmp, FLAG_MONSTER)) break; 761 if (QUERY_FLAG (tmp, FLAG_MONSTER))
762 break;
692 763
693 /* doesn't effect players, and if there is a player on this space, won't also 764 /* doesn't effect players, and if there is a player on this space, won't also
694 * be a monster here. 765 * be a monster here.
695 */ 766 */
767 //TODO: have players really FLAG_MONSTER? kept it for safety
696 if (!tmp || tmp->type == PLAYER) return; 768 if (!tmp || tmp->type == PLAYER)
769 return;
697 770
698 switch(op->last_sp) { 771 switch (op->last_sp)
772 {
699 case 0: /* furious--make all monsters mad */ 773 case 0: /* furious--make all monsters mad */
700 if(QUERY_FLAG(tmp, FLAG_UNAGGRESSIVE))
701 CLEAR_FLAG(tmp, FLAG_UNAGGRESSIVE);
702 if(QUERY_FLAG(tmp, FLAG_FRIENDLY)) {
703 CLEAR_FLAG(tmp, FLAG_FRIENDLY);
704 remove_friendly_object(tmp);
705 tmp->attack_movement = 0;
706 /* lots of checks here, but want to make sure we don't
707 * dereference a null value
708 */
709 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type==PLAYER &&
710 tmp->owner->contr->ranges[range_golem]==tmp) {
711 tmp->owner->contr->ranges[range_golem]=NULL;
712 tmp->owner->contr->golem_count = 0;
713 }
714 tmp->owner = 0;
715 }
716 break;
717 case 1: /* angry -- get neutral monsters mad */
718 if(QUERY_FLAG(tmp, FLAG_UNAGGRESSIVE)&&
719 !QUERY_FLAG(tmp, FLAG_FRIENDLY))
720 CLEAR_FLAG(tmp, FLAG_UNAGGRESSIVE);
721 break;
722 case 2: /* calm -- pacify unfriendly monsters */
723 if(!QUERY_FLAG(tmp, FLAG_UNAGGRESSIVE)) 774 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
775 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
776
777 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
778 {
779 tmp->attack_movement = 0;
780 /* lots of checks here, but want to make sure we don't
781 * dereference a null value
782 */
783 if (tmp->type == GOLEM
784 && tmp->owner
785 && tmp->owner->type == PLAYER
786 && tmp->owner->contr->golem == tmp)
787 tmp->owner->contr->golem = 0;
788
789 tmp->owner = 0;
790
791 remove_friendly_object (tmp);
792 }
793 break;
794
795 case 1: /* angry -- get neutral monsters mad */
796 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
797 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
798 break;
799
800 case 2: /* calm -- pacify unfriendly monsters */
724 SET_FLAG(tmp, FLAG_UNAGGRESSIVE); 801 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
725 break; 802 break;
803
726 case 3: /* make all monsters fall asleep */ 804 case 3: /* make all monsters fall asleep */
727 if(!QUERY_FLAG(tmp, FLAG_SLEEP))
728 SET_FLAG(tmp, FLAG_SLEEP); 805 SET_FLAG (tmp, FLAG_SLEEP);
729 break; 806 break;
807
730 case 4: /* charm all monsters */ 808 case 4: /* charm all monsters */
731 if (op == source) break; /* only if 'connected' */ 809 if (op == source)
810 break; /* only if 'connected' */
732 811
733 for(tmp2=get_map_ob(source->map,source->x,source->y); /* finding an owner */ 812 if (object *pl = source->ms ().player ())
734 tmp2->type!=PLAYER;tmp2=tmp2->above) 813 {
735 if(tmp2->above==NULL) break; 814 tmp->set_owner (pl);
736
737 if (tmp2->type != PLAYER)
738 break;
739 set_owner(tmp,tmp2);
740 SET_FLAG(tmp,FLAG_MONSTER); 815 SET_FLAG (tmp, FLAG_MONSTER);
816
741 tmp->stats.exp = 0; 817 tmp->stats.exp = 0;
742 SET_FLAG(tmp, FLAG_FRIENDLY); 818
743 add_friendly_object (tmp); 819 add_friendly_object (tmp);
744 tmp->attack_movement = PETMOVE; 820 tmp->attack_movement = PETMOVE;
821 }
822 break;
823
824 case 6: // kill monsters
825 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
745 break; 826 break;
746 827
828 // FALL THROUGH
829 case 5: // kill all alives
830 if (!tmp->flag [FLAG_PRECIOUS])
831 {
832 archetype::get (shstr_burnout)->insert_at (tmp, source);
833 tmp->destroy ();
834 }
835 break;
836
747 default: 837 default:
748 break; 838 break;
749
750 } 839 }
751} 840}
752 841
753/* this function returns the object it matches, or NULL if non. 842/* this function returns the object it matches, or NULL if non.
754 * It will descend through containers to find the object. 843 * It will descend through containers to find the object.
755 * slaying = match object slaying flag 844 * slaying = match object slaying flag
756 * race = match object archetype name flag 845 * race = match object archetype name flag
757 * hp = match object type (excpt type '0'== PLAYER) 846 * hp = match object type (excpt type '0'== PLAYER)
758 */ 847 */
759 848object *
760object * check_inv_recursive(object *op, const object *trig) 849check_inv_recursive (object *op, const object *trig)
761{ 850{
762 object *tmp,*ret=NULL; 851 object *tmp, *ret = NULL;
763 852
764 /* First check the object itself. */ 853 /* First check the object itself. */
765 if((trig->stats.hp && (op->type == trig->stats.hp)) 854 if ((trig->stats.hp && (op->type == trig->stats.hp))
766 || (trig->slaying && (op->slaying == trig->slaying)) 855 || (trig->slaying && (op->slaying == trig->slaying))
767 || (trig->race && (op->arch->name == trig->race))) 856 || (trig->race && (op->arch->archname == trig->race)))
768 return op; 857 return op;
769 858
770 for(tmp=op->inv; tmp; tmp=tmp->below) { 859 for (tmp = op->inv; tmp; tmp = tmp->below)
860 {
771 if (tmp->inv) { 861 if (tmp->inv)
862 {
772 ret=check_inv_recursive(tmp, trig); 863 ret = check_inv_recursive (tmp, trig);
864 if (ret)
773 if (ret) return ret; 865 return ret;
774 } 866 }
775 else if((trig->stats.hp && (tmp->type == trig->stats.hp)) 867 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
776 || (trig->slaying && (tmp->slaying == trig->slaying)) 868 || (trig->slaying && (tmp->slaying == trig->slaying))
777 || (trig->race && (tmp->arch->name == trig->race))) 869 || (trig->race && (tmp->arch->archname == trig->race)))
778 return tmp; 870 return tmp;
779 } 871 }
780 return NULL; 872 return NULL;
781} 873}
782 874
783/* check_inv(), a function to search the inventory, 875/* check_inv(), a function to search the inventory,
784 * of a player and then based on a set of conditions, 876 * of a player and then based on a set of conditions,
785 * the square will activate connected items. 877 * the square will activate connected items.
786 * Monsters can't trigger this square (for now) 878 * Monsters can't trigger this square (for now)
787 * Values are: last_sp = 1/0 obj/no obj triggers 879 * Values are: last_sp = 1/0 obj/no obj triggers
788 * last_heal = 1/0 remove/dont remove obj if triggered 880 * last_heal = 1/0 remove/dont remove obj if triggered
789 * -b.t. (thomas@nomad.astro.psu.edu 881 * -b.t. (thomas@nomad.astro.psu.edu
790 */ 882 *
791 883 * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
884 * because the check-inventory semantic essentially only applies when
885 * something is above the inventory checker.
886 * The semantic prior this change was: trigger if something has moved on or off
887 * and has a matching item. Imagine what happens if someone steps on the inventory
888 * checker with a matching item, has it, activates the connection, throws the item
889 * away, and then leaves the inventory checker. That would've caused an always-enabled
890 * state in the inventory checker. This won't happen anymore now.
891 *
892 * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
893 * whether op is on this mapspace or not, because the value (1|0) depends
894 * on this information. also make sure to only push_button if op has
895 * a matching item (because when we do a push_button with value=0 timed gates
896 * will still open)! (i hope i got the semantics right this time)
897 *
898 */
899void
792void check_inv (object *op, object *trig) { 900check_inv (object *op, object *trig)
793object *match; 901{
902 trig->value = 0; // deactivate if none of the following conditions apply
794 903
795 if(op->type != PLAYER) return; 904 object *pl = trig->ms ().player ();
796 match = check_inv_recursive(op,trig); 905 object *match = check_inv_recursive (op, trig);
797 if (match && trig->last_sp) { 906
907 // elmex: a note about (pl == op):
908 // if pl == 0 then the player has left this space
909 // if pl != 0 then a player is on this mapspace, but then
910 // we still have to check whether it's the player that triggered
911 // this inv-checker, because if not, then the op left this inv-checker
912 // and we have to set the value to 0
913
914 if (match && trig->last_sp) // match == having
915 {
798 if(trig->last_heal) 916 if (trig->last_heal)
799 decrease_ob(match); 917 match->decrease ();
800 use_trigger(trig); 918
919 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
920 push_button (trig, op);
921 }
922 else if (!match && !trig->last_sp) // match == not having
801 } 923 {
802 else if (!match && !trig->last_sp) 924 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
803 use_trigger(trig); 925 push_button (trig, op);
804}
805
806
807/* This does a minimal check of the button link consistency for object
808 * map. All it really does it much sure the object id link that is set
809 * matches what the object has.
810 */
811void verify_button_links(const mapstruct *map) {
812 oblinkpt *obp;
813 objectlink *ol;
814
815 if (!map) return;
816
817 for (obp = map->buttons; obp; obp = obp->next) {
818 for (ol=obp->link; ol; ol=ol->next) {
819 if (ol->id!=ol->ob->count)
820 LOG(llevError,"verify_button_links: object %s on list is corrupt (%d!=%d)\n", &ol->ob->name, ol->id, ol->ob->count);
821 }
822 } 926 }
823} 927}
928

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines