AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Lots of bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-09 21:25:26 -10:00
parent b58ebc1af5
commit 12430610f1
23 changed files with 129 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/CSortedLists.cpp
View File

@@ -1,5 +1,7 @@
#include "CSortedLists.hpp"
#include "World/CActor.hpp"
#include "Weapon/CEnergyProjectile.hpp"
#include "TCastTo.hpp"
namespace urde
{
@@ -75,8 +77,10 @@ void CSortedListManager::MoveInList(ESortedList list, s16 idx)
if (AccessElement(x0_nodes, AccessElement(sl.x0_ids, idx + 1)).x4_box[int(list)] >=
AccessElement(x0_nodes, AccessElement(sl.x0_ids, idx)).x4_box[int(list)])
return;
AccessElement(x0_nodes, AccessElement(sl.x0_ids, idx + 1)).x1c_selfIdxs[int(list)] = idx + 1;
AccessElement(x0_nodes, AccessElement(sl.x0_ids, idx + 1)).x1c_selfIdxs[int(list)] = idx;
AccessElement(x0_nodes, AccessElement(sl.x0_ids, idx)).x1c_selfIdxs[int(list)] = idx + 1;
std::swap(AccessElement(sl.x0_ids, idx), AccessElement(sl.x0_ids, idx + 1));
++idx;
}
}
}
@@ -110,7 +114,7 @@ void CSortedListManager::InsertInList(ESortedList list, SNode& node)
/* Do insert */
AccessElement(sl.x0_ids, insIdx) = node.x0_actor->GetUniqueId().Value();
node.x1c_selfIdxs[int(list)] = insIdx;
node.x1c_selfIdxs[int(list)] = s16(insIdx);
++sl.x800_size;
}