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.9 by root, Wed Sep 13 23:42:23 2006 UTC

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

Diff Legend

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