Skip to content

Commit

Permalink
Build Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xwerswoodx committed Apr 2, 2024
1 parent d7f7614 commit f7c948a
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/game/chars/CChar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2822,7 +2822,7 @@ bool CChar::r_WriteVal( lpctstr ptcKey, CSString & sVal, CTextConsole * pSrc, bo
sVal.FormatULLHex( UINT64_MAX );
else
{
uint64 uiBlockFlags = 0Ui64;
uint64 uiBlockFlags = 0;
CWorldMap::GetHeightPoint2(ptDst, uiBlockFlags, true);
sVal.FormatULLHex(uiBlockFlags);
}
Expand Down
2 changes: 1 addition & 1 deletion src/game/chars/CChar.h
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public: void StatFlag_Clear(uint64 uiStatFlag) noexcept;
//protected: void _StatFlag_Mod(uint64 uiStatFlag, bool fMod) noexcept;
public: void StatFlag_Mod(uint64 uiStatFlag, bool fMod) noexcept;

char GetFixZ(const CPointMap& pt, uint64 uiBlockFlags = 0Ui64);
char GetFixZ(const CPointMap& pt, uint64 uiBlockFlags = 0);
bool IsPriv( word flag ) const;
virtual PLEVEL_TYPE GetPrivLevel() const override;

Expand Down
2 changes: 1 addition & 1 deletion src/game/chars/CCharAct.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3401,7 +3401,7 @@ CRegion * CChar::CanMoveWalkTo( CPointMap & ptDst, bool fCheckChars, bool fCheck
}

// ok to go here ? physical blocking objects ?
uint64 uiBlockFlags = 0Ui64;
uint64 uiBlockFlags = 0;
height_t ClimbHeight = 0;
CRegion *pArea = nullptr;

Expand Down
4 changes: 2 additions & 2 deletions src/game/chars/CCharSpell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2162,7 +2162,7 @@ void CChar::Spell_Field(CPointMap pntTarg, ITEMID_TYPE idEW, ITEMID_TYPE idNS, u
ptg.m_y += (short)(iy);
}

uint64 uiBlockFlags = 0Ui64;
uint64 uiBlockFlags = 0;
CWorldMap::GetHeightPoint2(ptg, uiBlockFlags, true);
if (uiBlockFlags & (CAN_I_BLOCK|CAN_I_DOOR))
{
Expand Down Expand Up @@ -2589,7 +2589,7 @@ CChar * CChar::Spell_Summon_Try(SPELL_TYPE spell, CPointMap ptTarg, CREID_TYPE i
if (IsSetMagicFlags(MAGICF_SUMMONWALKCHECK)) // check if the target location is valid
{
const uint64 uiCan = pChar->GetCanFlags() & CAN_C_MOVEMASK;
uint64 uiBlockFlags = 0Ui64;
uint64 uiBlockFlags = 0;
CWorldMap::GetHeightPoint2(ptTarg, uiBlockFlags, true);

if (uiBlockFlags & ~uiCan)
Expand Down
2 changes: 1 addition & 1 deletion src/game/items/CItem.h
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ class CItem : public CObjBase
void SetAnim( ITEMID_TYPE id, int64 iTicksTimeout); // time in ticks

virtual int IsWeird() const override;
char GetFixZ(CPointMap pt, uint64 uiBlockFlags = 0Ui64);
char GetFixZ(CPointMap pt, uint64 uiBlockFlags = 0);

CCFaction* GetSlayer() const;
byte GetSpeed() const;
Expand Down
2 changes: 1 addition & 1 deletion src/game/items/CItemBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ void CItemBase::GetItemTiledataFlags( uint64 *uiCanFlags, ITEMID_TYPE id ) // st
CUOItemTypeRec_HS tiledata{};
if ( ! CItemBase::GetItemData( id, &tiledata ))
{
*uiCanFlags = 0Ui64;
*uiCanFlags = 0;
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/items/CItemMultiCustom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ void CItemMultiCustom::EndCustomize(bool fForce)
CPointMap ptDest = Multi_GetSign()->GetTopPoint();

// find ground height, since the signpost is usually raised
uint64 uiBlockFlags = 0Ui64;
uint64 uiBlockFlags = 0;
ptDest.m_z = CWorldMap::GetHeightPoint2(ptDest, uiBlockFlags, true);

pChar->MoveToChar(ptDest);
Expand Down

0 comments on commit f7c948a

Please sign in to comment.