isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-23 16:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Streamer changes

Browse Source
This commit is contained in:
disinvite 2024-09-05 15:40:54 -04:00
parent 30efa5882b
commit 6812cb2308
2 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
LEGO1/omni/include/mxatom.h
View File

@ -74,6 +74,13 @@ class MxAtomId {
MxBool operator!=(const MxAtomId& p_atomId) const { return this->m_internal != p_atomId.m_internal; }
#endif
// TODO:
// BETA10 0x1007dc20 operator==
// BETA10 0x10096970 operator!=
// FUNCTION: BETA10 0x10146dd0
MxBool operator==(const char* p_internal) const { return p_internal && !strcmp(m_internal, p_internal); }
// FUNCTION: BETA10 0x10025d40
MxAtomId() { this->m_internal = 0; }

69
LEGO1/omni/src/stream/mxstreamer.cpp
View File

@ -102,7 +102,7 @@ MxLong MxStreamer::Close(const char* p_name)
for (list<MxStreamController*>::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) {
MxStreamController* c = *it;
if (!p_name || !strcmp(p_name, c->GetAtom().GetInternal())) {
if (!p_name || c->GetAtom() == p_name) {
m_openStreams.erase(it);
if (c->IsStoped(&ds)) {
@ -120,6 +120,7 @@ MxLong MxStreamer::Close(const char* p_name)
}
// FUNCTION: LEGO1 0x100b9700
// FUNCTION: BETA10 0x10146ed0
MxNotificationParam* MxStreamerNotification::Clone() const
{
return new MxStreamerNotification(m_type, m_sender, m_controller);
@ -130,12 +131,8 @@ MxNotificationParam* MxStreamerNotification::Clone() const
MxStreamController* MxStreamer::GetOpenStream(const char* p_name)
{
for (list<MxStreamController*>::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) {
MxStreamController* c = *it;
MxAtomId& atom = c->GetAtom();
if (p_name) {
if (!strcmp(atom.GetInternal(), p_name)) {
return *it;
}
if ((*it)->GetAtom() == p_name) {
return *it;
}
}
@ -152,9 +149,14 @@ void MxStreamer::FUN_100b98f0(MxDSAction* p_action)
}
// FUNCTION: LEGO1 0x100b9930
// FUNCTION: BETA10 0x101458e5
MxResult MxStreamer::AddStreamControllerToOpenList(MxStreamController* p_stream)
{
if (find(m_openStreams.begin(), m_openStreams.end(), p_stream) == m_openStreams.end()) {
list<MxStreamController*>::iterator it = find(m_openStreams.begin(), m_openStreams.end(), p_stream);
assert(it == m_openStreams.end());
if (it == m_openStreams.end()) {
m_openStreams.push_back(p_stream);
return SUCCESS;
}
@ -163,37 +165,41 @@ MxResult MxStreamer::AddStreamControllerToOpenList(MxStreamController* p_stream)
}
// FUNCTION: LEGO1 0x100b99b0
// FUNCTION: BETA10 0x101459ad
MxResult MxStreamer::FUN_100b99b0(MxDSAction* p_action)
{
MxStreamController* controller;
if (p_action != NULL && p_action->GetAtomId().GetInternal() != NULL && p_action->GetObjectId() != -1) {
controller = GetOpenStream(p_action->GetAtomId().GetInternal());
if (controller == NULL) {
return FAILURE;
}
return controller->VTable0x20(p_action);
// TODO: MxAtomId operator== used here for NULL test. BETA10 0x1007dc20
if (p_action == NULL || p_action->GetAtomId().GetInternal() == NULL || p_action->GetObjectId() == -1) {
return FAILURE;
}
return FAILURE;
MxStreamController* controller = GetOpenStream(p_action->GetAtomId().GetInternal());
if (controller == NULL) {
return FAILURE;
}
return controller->VTable0x20(p_action);
}
// FUNCTION: LEGO1 0x100b99f0
// FUNCTION: BETA10 0x10145a54
MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction)
{
MxDSAction tempAction;
if (p_dsAction == NULL) {
tempAction.SetUnknown24(-2);
}
else {
if (p_dsAction) {
tempAction.SetObjectId(p_dsAction->GetObjectId());
tempAction.SetAtomId(p_dsAction->GetAtomId());
tempAction.SetUnknown24(p_dsAction->GetUnknown24());
}
else {
tempAction.SetUnknown24(-2);
}
MxResult result = FAILURE;
for (list<MxStreamController*>::iterator it = m_openStreams.begin(); it != m_openStreams.end(); it++) {
const char* id = p_dsAction->GetAtomId().GetInternal();
if (!id || id == (*it)->GetAtom().GetInternal()) {
// TODO: MxAtomId operator== used here for NULL test. BETA10 0x1007dc20
if (p_dsAction->GetAtomId().GetInternal() != NULL || p_dsAction->GetAtomId() == (*it)->GetAtom()) {
tempAction.SetAtomId((*it)->GetAtom());
result = (*it)->VTable0x24(&tempAction);
}
@ -203,6 +209,7 @@ MxResult MxStreamer::DeleteObject(MxDSAction* p_dsAction)
}
// FUNCTION: LEGO1 0x100b9b30
// FUNCTION: BETA10 0x10145d01
MxBool MxStreamer::FUN_100b9b30(MxDSObject& p_dsObject)
{
MxStreamController* controller = GetOpenStream(p_dsObject.GetAtomId().GetInternal());
@ -213,21 +220,31 @@ MxBool MxStreamer::FUN_100b9b30(MxDSObject& p_dsObject)
}
// FUNCTION: LEGO1 0x100b9b60
// FUNCTION: BETA10 0x10145d51
MxLong MxStreamer::Notify(MxParam& p_param)
{
if (((MxNotificationParam&) p_param).GetNotification() == c_notificationStreamer) {
MxStreamerNotification& s = static_cast<MxStreamerNotification&>(p_param);
switch (s.GetNotification()) {
case c_notificationStreamer: {
// DECOMP: Beta does not use a variable, but this matches retail better.
MxStreamController* c = s.GetController();
MxDSAction ds;
ds.SetUnknown24(-2);
MxStreamController* c = static_cast<MxStreamerNotification&>(p_param).GetController();
if (c->IsStoped(&ds)) {
delete c;
}
else {
NotificationManager()->Send(this, MxStreamerNotification(c_notificationStreamer, NULL, c));
}
break;
}
default:
assert(0);
break;
}
return 0;