From dc221b4795f415c8500740dd33e2243f91d527a6 Mon Sep 17 00:00:00 2001 From: Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> Date: Tue, 1 Oct 2024 20:24:25 -0400 Subject: Misc Egg (#37) * EGG: Archive, DvdFile, DvdRipper * start eggStream * FrmHeap and AssertHeap OK * progress on EggController * port in WPAD stuff * update WPAD/WUD/KPAD/SC symbols * eggController OK * bytematch more CoreController virtual funcs * eggDecomp/eggStreamDecomp Ok * eggDvdRipper OK * EGG gfx splits * Finished Splitting EGG * create egg Files * eggDecomp.h -> eggStreamDecomp.h * Revert some format changes --- src/egg/core/eggThread.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/egg/core/eggThread.cpp') diff --git a/src/egg/core/eggThread.cpp b/src/egg/core/eggThread.cpp index 36f44d4d..0179359a 100644 --- a/src/egg/core/eggThread.cpp +++ b/src/egg/core/eggThread.cpp @@ -5,7 +5,6 @@ namespace EGG { /* 80673b10 */ nw4r::ut::List Thread::sThreadList; /* 80576770 */ void (*Thread::sOldSwitchThreadCallback)(OSThread *, OSThread *); - /* 80496910 */ Thread::Thread(u32 stackSize, int msgCount, int priority, Heap *heap) { if (heap == nullptr) { heap = Heap::sCurrentHeap; @@ -86,7 +85,7 @@ namespace EGG { /* 80496c70 */ void Thread::switchThreadCallback(OSThread *from, OSThread *to) { Thread *fromThread = from != nullptr ? findThread(from) : nullptr; Thread *toThread = to != nullptr ? findThread(to) : nullptr; - + if (fromThread != nullptr) { fromThread->onExit(); if (fromThread->mCurrentHeap != nullptr) { @@ -95,7 +94,7 @@ namespace EGG { fromThread->mCurrentHeap = curr; } } - + if (toThread != nullptr) { if (toThread->mCurrentHeap != nullptr) { Heap *curr = Heap::sCurrentHeap; @@ -118,7 +117,7 @@ namespace EGG { } /* 80496dc0 */ void *Thread::start(void *arg) { - Thread *thread = static_cast(arg); + Thread *thread = static_cast(arg); return thread->run(); } -- cgit v1.2.3