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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.50 by root, Thu Apr 19 16:23:46 2007 UTC vs.
Revision 1.55 by root, Sat Apr 21 22:05:52 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
230 * start with equipment, but only their abilities). 230 * start with equipment, but only their abilities).
231 */ 231 */
232static void 232static void
233put_treasure (object *op, object *creator, int flags) 233put_treasure (object *op, object *creator, int flags)
234{ 234{
235 object *tmp;
236
237 /* Bit of a hack - spells should never be put onto the map. The entire 235 /* Bit of a hack - spells should never be put onto the map. The entire
238 * treasure stuff is a problem - there is no clear idea of knowing 236 * treasure stuff is a problem - there is no clear idea of knowing
239 * this is the original object, or if this is an object that should be created 237 * this is the original object, or if this is an object that should be created
240 * by another object. 238 * by another object.
241 */ 239 */
242 if (flags & GT_ENVIRONMENT && op->type != SPELL) 240 if (flags & GT_ENVIRONMENT && op->type != SPELL)
243 { 241 {
242 op->expand_tail ();
243
244 if (ob_blocked (op, creator->map, creator->x, creator->y))
245 op->destroy ();
246 else
247 {
244 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 248 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
245 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 249 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
250 }
246 } 251 }
247 else 252 else
248 { 253 {
249 op = creator->insert (op); 254 op = creator->insert (op);
250 255
251 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 256 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
252 monster_check_apply (creator, op); 257 monster_check_apply (creator, op);
253 258
254 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 259 if (flags & GT_UPDATE_INV)
260 if (object *tmp = creator->in_player ())
255 esrv_send_item (tmp, op); 261 esrv_send_item (tmp, op);
256 } 262 }
257} 263}
258 264
259/* if there are change_xxx commands in the treasure, we include the changes 265/* if there are change_xxx commands in the treasure, we include the changes
260 * in the generated object 266 * in the generated object
1566 if (change->msg) 1572 if (change->msg)
1567 op->msg = change->msg; 1573 op->msg = change->msg;
1568} 1574}
1569 1575
1570static int 1576static int
1571legal_artifact_combination (object *op, artifact * art) 1577legal_artifact_combination (object *op, artifact *art)
1572{ 1578{
1573 int neg, success = 0; 1579 int neg, success = 0;
1574 linked_char *tmp; 1580 linked_char *tmp;
1575 const char *name; 1581 const char *name;
1576 1582
1577 if (art->allowed == (linked_char *) NULL) 1583 if (!art->allowed)
1578 return 1; /* Ie, "all" */ 1584 return 1; /* Ie, "all" */
1585
1579 for (tmp = art->allowed; tmp; tmp = tmp->next) 1586 for (tmp = art->allowed; tmp; tmp = tmp->next)
1580 { 1587 {
1581#ifdef TREASURE_VERBOSE 1588#ifdef TREASURE_VERBOSE
1582 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1589 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1583#endif 1590#endif
1594 * everything is allowed except what we match 1601 * everything is allowed except what we match
1595 */ 1602 */
1596 else if (neg) 1603 else if (neg)
1597 success = 1; 1604 success = 1;
1598 } 1605 }
1606
1599 return success; 1607 return success;
1600} 1608}
1601 1609
1602/* 1610/*
1603 * Fixes the given object, giving it the abilities and titles 1611 * Fixes the given object, giving it the abilities and titles

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines