| version 1.109 | | version 1.110 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.109 2005/10/28 19:08:53 akirschbaum Exp $"; | | * "$Id: object.c,v 1.110 2005/10/28 23:43:30 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED) | | if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED) |
| return 0; | | return 0; |
| | | |
| | | /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that |
| | | * value could not be stored in a sint32 (which unfortunately sometimes is |
| | | * used to store nrof). |
| | | */ |
| | | if (ob1->nrof+ob2->nrof >= 1UL<<31) |
| | | return 0; |
| | | |
| /* This is really a spellbook check - really, we should | | /* This is really a spellbook check - really, we should |
| * check all objects in the inventory. | | * check all objects in the inventory. |
| */ | | */ |