Mercurial > mm7
comparison Actor.cpp @ 1018:9ac94d00012e
Merge
author | Grumpy7 |
---|---|
date | Tue, 21 May 2013 02:24:31 +0200 |
parents | c45d51b3f4f4 9e823ad5eaa6 |
children | 3a5c8df8381d |
comparison
equal
deleted
inserted
replaced
1017:af20650a052f | 1018:9ac94d00012e |
---|---|
3150 | 3150 |
3151 for (uint i = 0; i < 22; ++i) | 3151 for (uint i = 0; i < 22; ++i) |
3152 actor->pActorBuffs[i].Reset(); | 3152 actor->pActorBuffs[i].Reset(); |
3153 | 3153 |
3154 ItemGen drop; | 3154 ItemGen drop; |
3155 drop.Reset(); | |
3155 switch (actor->pMonsterInfo.uID) | 3156 switch (actor->pMonsterInfo.uID) |
3156 { | 3157 { |
3157 case MONSTER_HARPY_1: case MONSTER_HARPY_2: case MONSTER_HARPY_3: | 3158 case MONSTER_HARPY_1: case MONSTER_HARPY_2: case MONSTER_HARPY_3: |
3158 drop.uItemID = ITEM_HARPY_FEATHER; | 3159 drop.uItemID = ITEM_HARPY_FEATHER; |
3159 break; | 3160 break; |