mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-18 15:15:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

JUTConsole is really close now

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-12-01 23:56:18 -08:00
parent 2650487343
commit fb2cb74ad9
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JGadget/linklist.h
+8 -24
View File
@@ -63,9 +63,9 @@ struct TNodeLinkList {
}
iterator begin() { return iterator(ocObject_.getNext()); }
iterator end() { return iterator(ocObject_.getPrev()); }
const_iterator begin() const { return const_iterator(ocObject_.getNext()); }
const_iterator end() const { return const_iterator(ocObject_.getPrev()); }
iterator end() { return iterator(&ocObject_); }
const_iterator end() const { return const_iterator((TLinkListNode*)(&ocObject_)); }
u32 size() { return count; }
iterator erase(JGadget::TNodeLinkList::iterator, JGadget::TNodeLinkList::iterator);
@@ -122,29 +122,13 @@ struct TLinkList : public TNodeLinkList {
/* 0x00 */ TNodeLinkList::const_iterator base;
};
iterator Insert(iterator iter, T* element) {
return TNodeLinkList::Insert(iter.base, Element_toNode(element));
}
iterator Insert(iterator iter, T* element) { return TNodeLinkList::Insert(iter.base, Element_toNode(element)); }
iterator Erase(T* element) { return TNodeLinkList::Erase(Element_toNode(element)); }
iterator Erase(T* element) {
return TNodeLinkList::Erase(Element_toNode(element));
}
iterator begin() {
return iterator(TNodeLinkList::begin());
}
iterator end() {
return iterator(TNodeLinkList::end());
}
const_iterator begin() const {
return const_iterator(TNodeLinkList::begin());
}
const_iterator end() const {
return const_iterator(TNodeLinkList::end());
}
iterator begin() { return iterator(TNodeLinkList::begin()); }
const_iterator begin() const { return const_iterator(TNodeLinkList::begin()); }
iterator end() { return iterator(TNodeLinkList::end()); }
const_iterator end() const { return const_iterator(TNodeLinkList::end()); }
void Push_back(T* element) {
Insert(end(), element);
src/JSystem/JUtility/JUTConsole.cpp
+5 -3
View File
@@ -362,6 +362,10 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
return manager;
}
static void dummy3() {
OSReport("consoleManager != 0 && sManager == consoleManager");
}
/* 802CB380-802CB4C4 .text appendConsole__17JUTConsoleManagerFP10JUTConsole */
void JUTConsoleManager::appendConsole(JUTConsole* console) {
/* Nonmatching */
@@ -403,9 +407,7 @@ void JUTConsoleManager::draw() const {
/* Nonmatching */
// need to figure out how TLinkList works
ConsoleList::const_iterator iter = soLink_.begin();
ConsoleList::const_iterator end = soLink_.end();
for (; iter != end; ++iter) {
for (ConsoleList::const_iterator iter = soLink_.begin(); iter != soLink_.end(); ++iter) {
JUTConsole* pConsole = &(*iter);
if (pConsole != mActiveConsole)
pConsole->doDraw(JUTConsole::INACTIVE);