Mercurial > mm7
diff Actor.cpp @ 1026:6afa77761a00
Слияние
author | Ritor1 |
---|---|
date | Tue, 21 May 2013 12:43:08 +0600 |
parents | 9ac94d00012e |
children | 3a5c8df8381d |
line wrap: on
line diff
--- a/Actor.cpp Tue May 21 12:42:57 2013 +0600 +++ b/Actor.cpp Tue May 21 12:43:08 2013 +0600 @@ -1,9 +1,15 @@ #include <assert.h> + +#include "VideoPlayer.h" +#include "DecalBuilder.h" + +#include "Sprites.h" +#include "stru6.h" + + #include "Actor.h" -#include "SpriteObject.h" #include "Math.h" -#include "Party.h" #include "Outdoor.h" #include "AudioPlayer.h" #include "Game.h" @@ -22,6 +28,7 @@ #include "GUIFont.h" #include "MM7.h" +#include "SpriteObject.h" @@ -3145,6 +3152,7 @@ actor->pActorBuffs[i].Reset(); ItemGen drop; + drop.Reset(); switch (actor->pMonsterInfo.uID) { case MONSTER_HARPY_1: case MONSTER_HARPY_2: case MONSTER_HARPY_3: