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.8 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.54 by root, Sun Oct 11 18:18:03 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines