- fixed the merge

This commit is contained in:
Christoph Oelckers 2020-01-26 21:01:22 +01:00
parent 1ba5eaa281
commit d73f0c7b8f
2 changed files with 4 additions and 2 deletions

View file

@ -1995,4 +1995,5 @@ bool genDudePrepare(spritetype* pSprite, int propId) {
return true;
}
#endifEND_BLD_NS
#endif
END_BLD_NS

View file

@ -221,4 +221,5 @@ bool genDudePrepare(spritetype* pSprite, int propId = kGenDudePropertyAll);
void genDudeUpdate(spritetype* pSprite);
void genDudeProcess(spritetype* pSprite, XSPRITE* pXSprite);
bool genDudeAdjustSlope(spritetype* pSprite, XSPRITE* pXSprite, int dist, int weaponType, int by = 64);
#endifEND_BLD_NS
#endif
END_BLD_NS