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.2 by root, Tue Aug 29 08:01:35 2006 UTC vs.
Revision 1.37 by root, Tue Jul 31 17:33:14 2007 UTC

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

Diff Legend

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