metin-server/m2dev-client-src
3
0
Fork 1
Code Issues 1 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #39 from MindRapist/mr-2

Browse Source 
MR-2: Macro leftovers removed
This commit is contained in:
d1str4ught
2025-12-25 02:50:56 +01:00
committed by GitHub
parent 8df71d0bb2 b344e5505e
commit 45fdb49d63
6 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/EffectLib/EffectInstance.cpp
View File

@@ -269,9 +269,7 @@ void CEffectInstance::Clear()
void CEffectInstance::__Initialize() void CEffectInstance::__Initialize()
{ {
#ifdef __ENABLE_STEALTH_FIX__
ReleaseAlwaysHidden(); ReleaseAlwaysHidden();
#endif
m_isAlive = FALSE; m_isAlive = FALSE;
m_dwFrame = 0; m_dwFrame = 0;
m_pSoundInstanceVector = NULL; m_pSoundInstanceVector = NULL;

2
src/EffectLib/EffectInstance.h
View File

@@ -43,13 +43,11 @@ class CEffectInstance : public CGraphicObjectInstance
void SetEffectDataPointer(CEffectData * pEffectData); void SetEffectDataPointer(CEffectData * pEffectData);
#ifdef __ENABLE_STEALTH_FIX__ //EXP
// Returns the pointer to the effect data associated with this instance. // Returns the pointer to the effect data associated with this instance.
CEffectData* GetEffectDataPointer() const CEffectData* GetEffectDataPointer() const
{ {
return m_pkEftData; return m_pkEftData;
} }
#endif
void Clear(); void Clear();
BOOL isAlive(); BOOL isAlive();

4
src/EffectLib/EffectManager.cpp
View File

@@ -351,7 +351,6 @@ void CEffectManager::HideEffect()
m_pSelectedEffectInstance->Hide(); m_pSelectedEffectInstance->Hide();
} }
#ifdef __ENABLE_STEALTH_FIX__
void CEffectManager::ApplyAlwaysHidden() void CEffectManager::ApplyAlwaysHidden()
{ {
if (!m_pSelectedEffectInstance) if (!m_pSelectedEffectInstance)
@@ -367,7 +366,6 @@ void CEffectManager::ReleaseAlwaysHidden()
m_pSelectedEffectInstance->ReleaseAlwaysHidden(); m_pSelectedEffectInstance->ReleaseAlwaysHidden();
} }
#endif
bool CEffectManager::GetEffectData(DWORD dwID, CEffectData ** ppEffect) bool CEffectManager::GetEffectData(DWORD dwID, CEffectData ** ppEffect)
{ {
@@ -480,7 +478,6 @@ CEffectManager::~CEffectManager()
Destroy(); Destroy();
} }
#ifdef __ENABLE_STEALTH_FIX__ //EXP
DWORD CEffectManager::GetSelectedEffectDataCRC() const DWORD CEffectManager::GetSelectedEffectDataCRC() const
{ {
if (!m_pSelectedEffectInstance) if (!m_pSelectedEffectInstance)
@@ -498,7 +495,6 @@ DWORD CEffectManager::GetSelectedEffectDataCRC() const
StringPath(cszFile, str); StringPath(cszFile, str);
return GetCaseCRC32(str.c_str(), (int)str.length()); return GetCaseCRC32(str.c_str(), (int)str.length());
} }
#endif
// just for map effect // just for map effect

4
src/EffectLib/EffectManager.h
View File

@@ -57,10 +57,8 @@ class CEffectManager : public CScreen, public CSingleton<CEffectManager>
void ShowEffect(); void ShowEffect();
void HideEffect(); void HideEffect();
#ifdef __ENABLE_STEALTH_FIX__
void ApplyAlwaysHidden(); void ApplyAlwaysHidden();
void ReleaseAlwaysHidden(); void ReleaseAlwaysHidden();
#endif
// Temporary function // Temporary function
DWORD GetRandomEffect(); DWORD GetRandomEffect();
@@ -75,10 +73,8 @@ class CEffectManager : public CScreen, public CSingleton<CEffectManager>
int GetRenderingEffectCount(); int GetRenderingEffectCount();
#ifdef __ENABLE_STEALTH_FIX__ //EXP
// Return the CRC of the effect-data for the selected effect instance. // Return the CRC of the effect-data for the selected effect instance.
DWORD GetSelectedEffectDataCRC() const; DWORD GetSelectedEffectDataCRC() const;
#endif
protected: protected:
void __Initialize(); void __Initialize();

8
src/EterLib/GrpObjectInstance.cpp
View File

@@ -201,7 +201,6 @@ void CGraphicObjectInstance::Hide()
m_isVisible = false; m_isVisible = false;
} }
#ifdef __ENABLE_STEALTH_FIX__
void CGraphicObjectInstance::ApplyAlwaysHidden() { void CGraphicObjectInstance::ApplyAlwaysHidden() {
m_isAlwaysHidden = true; m_isAlwaysHidden = true;
} }
@@ -209,15 +208,10 @@ void CGraphicObjectInstance::ApplyAlwaysHidden() {
void CGraphicObjectInstance::ReleaseAlwaysHidden() { void CGraphicObjectInstance::ReleaseAlwaysHidden() {
m_isAlwaysHidden = false; m_isAlwaysHidden = false;
} }
#endif
bool CGraphicObjectInstance::isShow() bool CGraphicObjectInstance::isShow()
{ {
#ifdef __ENABLE_STEALTH_FIX__
return m_isVisible && !m_isAlwaysHidden; return m_isVisible && !m_isAlwaysHidden;
#else
return m_isVisible;
#endif
} }
// //
@@ -292,9 +286,7 @@ void CGraphicObjectInstance::Initialize()
m_BlockCamera = false; m_BlockCamera = false;
#ifdef __ENABLE_STEALTH_FIX__
m_isAlwaysHidden = false; m_isAlwaysHidden = false;
#endif
m_v3Position.x = m_v3Position.y = m_v3Position.z = 0.0f; m_v3Position.x = m_v3Position.y = m_v3Position.z = 0.0f;

4
src/EterLib/GrpObjectInstance.h
View File

@@ -57,10 +57,8 @@ class CGraphicObjectInstance : public CGraphicCollisionObject
void Hide(); void Hide();
bool isShow(); bool isShow();
#ifdef __ENABLE_STEALTH_FIX__
void ApplyAlwaysHidden(); void ApplyAlwaysHidden();
void ReleaseAlwaysHidden(); void ReleaseAlwaysHidden();
#endif
// Camera Block // Camera Block
@@ -115,9 +113,7 @@ class CGraphicObjectInstance : public CGraphicCollisionObject
D3DXMATRIX m_mRotation; D3DXMATRIX m_mRotation;
bool m_isVisible; bool m_isVisible;
#ifdef __ENABLE_STEALTH_FIX__
bool m_isAlwaysHidden; bool m_isAlwaysHidden;
#endif
D3DXMATRIX m_worldMatrix; D3DXMATRIX m_worldMatrix;