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

Diff Legend

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