mirror of
https://github.com/zeldaret/ss
synced 2026-07-09 06:13:17 -04:00
Revert copyFrom change for now
This commit is contained in:
@@ -62,7 +62,7 @@ public:
|
||||
void transposeTo(Matrix34f &to) const;
|
||||
void copyFrom(const Matrix34f &other) {
|
||||
for (int i = 0; i < 12; i++) {
|
||||
arr[i] = other.arr[i];
|
||||
(*this)(i) = other(i);
|
||||
}
|
||||
}
|
||||
void setBase(int idx, const Vector3f &b) {
|
||||
|
||||
@@ -21,7 +21,7 @@ extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_394_;
|
||||
|
||||
void dAcOInsect_c::kill() {
|
||||
dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_394_, position, nullptr, nullptr, nullptr, nullptr, 0, 0);
|
||||
playSound(SE_Insect_DISAPPEAR); // TODO (Sound ID)
|
||||
playSound(SE_Insect_DISAPPEAR);
|
||||
deleteRequest();
|
||||
}
|
||||
|
||||
|
||||
@@ -127,6 +127,7 @@ void dShpProc1_c::draw() {
|
||||
mtx.copyFrom(*pTransforms);
|
||||
MTXConcat(viewMtx, mtx, mtx);
|
||||
mMtx_c mtx2;
|
||||
// Regswaps that can be fixed with a copy inline that uses array indexing...
|
||||
mtx2.copyFrom(mtx);
|
||||
mtx2.fn_802F1C40(0, 1);
|
||||
nw4r::math::MTX33 mtx3;
|
||||
|
||||
Reference in New Issue
Block a user