mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match LegoPhonemePresenter::EndAction (#816)

Browse Source
This commit is contained in:
Christian Semmler
2024-04-17 11:03:17 -04:00
committed by GitHub
parent 97b502362d
commit e7aec124a2
5 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LEGO1/lego/sources/misc/legocontainer.cpp
View File

@@ -14,7 +14,7 @@ LegoTextureContainer::~LegoTextureContainer()
}
// FUNCTION: LEGO1 0x100998e0
LegoTextureInfo* LegoTextureContainer::AddToList(LegoTextureInfo* p_textureInfo)
LegoTextureInfo* LegoTextureContainer::GetCached(LegoTextureInfo* p_textureInfo)
{
DDSURFACEDESC desc, newDesc;
DWORD width, height;
@@ -27,7 +27,7 @@ LegoTextureInfo* LegoTextureContainer::AddToList(LegoTextureInfo* p_textureInfo)
p_textureInfo->m_surface->Unlock(desc.lpSurface);
}
for (LegoTextureList::iterator it = m_list.begin(); it != m_list.end(); it++) {
for (LegoCachedTextureList::iterator it = m_cached.begin(); it != m_cached.end(); it++) {
if ((*it).second == FALSE && (*it).first->m_texture->AddRef() != 0 && (*it).first->m_texture->Release() == 1) {
if (!strcmp((*it).first->m_name, p_textureInfo->m_name)) {
LPDIRECTDRAWSURFACE surface = (*it).first->m_surface;
@@ -92,7 +92,7 @@ LegoTextureInfo* LegoTextureContainer::AddToList(LegoTextureInfo* p_textureInfo)
}
else {
textureInfo->m_texture->SetAppData((DWORD) textureInfo);
m_list.push_back(LegoTextureListElement(textureInfo, TRUE));
m_cached.push_back(LegoCachedTexture(textureInfo, TRUE));
textureInfo->m_texture->AddRef();
@@ -111,24 +111,24 @@ LegoTextureInfo* LegoTextureContainer::AddToList(LegoTextureInfo* p_textureInfo)
}
// FUNCTION: LEGO1 0x10099cc0
void LegoTextureContainer::EraseFromList(LegoTextureInfo* p_textureInfo)
void LegoTextureContainer::EraseCached(LegoTextureInfo* p_textureInfo)
{
if (p_textureInfo == NULL) {
return;
}
#ifdef COMPAT_MODE
LegoTextureList::iterator it;
for (it = m_list.begin(); it != m_list.end(); it++) {
LegoCachedTextureList::iterator it;
for (it = m_cached.begin(); it != m_cached.end(); it++) {
#else
for (LegoTextureList::iterator it = m_list.begin(); it != m_list.end(); it++) {
for (LegoCachedTextureList::iterator it = m_cached.begin(); it != m_cached.end(); it++) {
#endif
if ((*it).first == p_textureInfo) {
(*it).second = FALSE;
if (p_textureInfo->m_texture->Release() == TRUE) {
delete p_textureInfo;
m_list.erase(it);
m_cached.erase(it);
}
return;

10
LEGO1/lego/sources/misc/legocontainer.h
View File

@@ -98,8 +98,8 @@ protected:
// VTABLE: LEGO1 0x100d86d4
// class LegoContainer<LegoTextureInfo>
typedef pair<LegoTextureInfo*, BOOL> LegoTextureListElement;
typedef list<LegoTextureListElement> LegoTextureList;
typedef pair<LegoTextureInfo*, BOOL> LegoCachedTexture;
typedef list<LegoCachedTexture> LegoCachedTextureList;
// VTABLE: LEGO1 0x100d86fc
// SIZE 0x24
@@ -108,11 +108,11 @@ public:
LegoTextureContainer() { m_ownership = TRUE; }
~LegoTextureContainer() override;
LegoTextureInfo* AddToList(LegoTextureInfo* p_textureInfo);
void EraseFromList(LegoTextureInfo* p_textureInfo);
LegoTextureInfo* GetCached(LegoTextureInfo* p_textureInfo);
void EraseCached(LegoTextureInfo* p_textureInfo);
protected:
LegoTextureList m_list; // 0x18
LegoCachedTextureList m_cached; // 0x18
};
// TEMPLATE: LEGO1 0x10059c50