diff --git a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db index 80d1890..1e30c5e 100644 Binary files a/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db and b/.vs/Speedy-Eggbert-2-Source-Code-Decomp/v17/Browse.VC.db differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 622918f..3333330 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/decor.cpp b/decor.cpp index 277c047..a47eb03 100644 --- a/decor.cpp +++ b/decor.cpp @@ -5523,6 +5523,43 @@ int CDecor::IsWorld(POINT pos) return -1; } +BOOL CDecor::IsLave(POINT pos) +{ + pos.x += 30; + return pos.x >= 0 && pos.x < 6400 && pos.y >= 0 && pos.y < 6400 && m_decor[pos.x / 64, pos.y / 64]->icon == 68; +} + +BOOL CDecor::IsPiege(POINT pos) +{ + pos.x += 30; + pos.y += 60; + return pos.x % 64 >= 15 && pos.x % 64 <= 49 && pos.x >= 0 && pos.x < 6400 && pos.y >= 0 && pos.y < 6400 && m_decor[pos.x / 64, pos.y / 64]->icon == 373; +} + +BOOL CDecor::IsGoutte(POINT pos, BOOL bAlways) +{ + pos.x += 30; + if (pos.x % 64 < 15 || pos.x % 64 > 49) + { + return FALSE; + } + if (pos.x < 0 || pos.x >= 6400 || pos.y < 0 || pos.y >= 6400) + { + return FALSE; + } + int icon = m_decor[pos.x / 64, pos.y / 64]->icon; + if (bAlways) + { + return icon == 404 || icon == 410; + } + return icon == 404; +} + +BOOL CDecor::IsScie(POINT pos) +{ + +} + BOOL CDecor::SearchDoor(int n, POINT cel, POINT blupi) { for (int i = 0; i < 100; i++) diff --git a/decor.h b/decor.h index 75d58e5..eceecbf 100644 --- a/decor.h +++ b/decor.h @@ -568,6 +568,11 @@ public: void MoveObjectTiplouf(POINT pos); void MoveObjectBlup(POINT pos); void ActiveSwitch(BOOL bState, POINT cel); + BOOL IsLave(POINT pos); + BOOL IsPiege(POINT pos); + BOOL IsGoutte(POINT pos, BOOL bAlways); + BOOL IsScie(POINT pos); + BOOL IsSwitch(POINT pos, POINT celSwitch); void BlupiStep(); BOOL DecorDetect(RECT rect); BOOL DecorDetect(RECT rect, BOOL bCaisse);