mirror of
https://github.com/ZDoom/Raze.git
synced 2025-03-13 20:42:11 +00:00
- fixed the merge
This commit is contained in:
parent
1ba5eaa281
commit
d73f0c7b8f
2 changed files with 4 additions and 2 deletions
|
@ -1995,4 +1995,5 @@ bool genDudePrepare(spritetype* pSprite, int propId) {
|
|||
return true;
|
||||
}
|
||||
|
||||
#endifEND_BLD_NS
|
||||
#endif
|
||||
END_BLD_NS
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue