Skip to content

Merge effect files on game start #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zipperiusz wants to merge 2 commits into
base: main
Choose a base branch
from
+57 −2
Open

Merge effect files on game start #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5644c6
Merge effect files on game start
Zipperiusz Oct 12, 2024
f87cbd2
Move findmodule outside loop
Zipperiusz Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions Script_G3Fixes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,57 @@ gSScriptInit & GetScriptInit()
return s_ScriptInit;
}

void SearchAndMergeEffects(const bCString& directory) {
bTObjArray<bCString> arrFiles;
bTObjArray<bCString> arrDirs;
eCVirtualFileSystem& vfs = eCVirtualFileSystem::GetInstance();

vfs.FindFiles(directory, arrFiles);
vfs.FindDirectories(directory, arrDirs);

auto EffectModule = eCModuleAdmin::GetInstance().FindModule("gCEffectModule");
auto EffectModulePtr = reinterpret_cast<DWORD>(&EffectModule);

if (EffectModulePtr == 0)
return;
DWORD gCEffectSystemPtr = *(DWORD*)EffectModulePtr + 0x14;
if (gCEffectSystemPtr == 0)
return;
gCEffectMap* EffectMap = (gCEffectMap*)(*(DWORD*)gCEffectSystemPtr + 0x4);
if (EffectMap == nullptr)
return;

gCEffectMap NewEM;

for (auto it = arrFiles.Begin(); it != arrFiles.End(); it++) {
bTObjArray< bCString > fileSplitted = SplitString(*it, ".", GEFalse, GEFalse);
bCString fileName = fileSplitted.GetAt(0);
bCString fileExt = fileSplitted.GetAt(1);

// Ignore original g3.efm
if (fileExt != "efm" || fileName == "g3") continue;

bTObjArray< bCString > dirSplitted = SplitString(directory, "/", GEFalse, GEFalse);
dirSplitted.Add(*it);
bCString filePath = JoinString(dirSplitted, 0, "/");
NewEM.Load(filePath);

for (auto iter = NewEM.Begin(); iter != NewEM.End(); iter++) {
std::cout << "EffectName: " << iter.GetKey() << "\n";
EffectMap->RemoveAt(iter.GetKey());
gCEffectCommandSequence* effectCommand = EffectMap->InsertNewAt(iter.GetKey());
*effectCommand = iter.GetNode()->m_Element;
}
std::cout << filePath << " merged!" << "\n";
}

// Recursive search
for (auto it = arrDirs.Begin(); it != arrDirs.End(); it++) {
bCString subDirPath = directory + "/" + *it;
SearchAndMergeEffects(subDirPath);
}
}

void TryFixMist(void)
{
auto Player = Entity::GetPlayer();
Expand Down Expand Up @@ -57,6 +108,9 @@ void GE_STDCALL AfterApplicationProcess(void)
WriteNops(RVA_Game(0xa65bd), 0xa65c6 - 0xa65bd);
}
}

SearchAndMergeEffects("Data");

}

GEBool IsFriendlyCompanion(Entity* Self, Entity* Other)
Expand Down Expand Up @@ -1057,6 +1111,7 @@ void RemoveWaterfallSounds()
}
}


void RenderIcon(CFFGFCWnd* DesktopWindow)
{
if (!gCSession::GetSession().IsValid() || gCSession::GetSession().IsPaused() || !gCSession::GetSession().GetGUIManager())
Expand Down Expand Up @@ -1374,8 +1429,8 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD dwReason, LPVOID)
{
case DLL_PROCESS_ATTACH:
::DisableThreadLibraryCalls(hModule);
//AllocConsole();
//freopen_s((FILE**)stdout, "CONOUT$", "w", stdout);
AllocConsole();
freopen_s((FILE**)stdout, "CONOUT$", "w", stdout);
break;
case DLL_PROCESS_DETACH:
break;
Expand Down