mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 14:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_dr2 matching for demo

Browse Source
This commit is contained in:
LagoLunatic
2025-09-19 18:44:06 -04:00
parent 5dbb7e875e
commit 0e9059b633
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1385,7 +1385,7 @@ config.libs = [
ActorRel(Matching, "d_a_demo_kmm"),
ActorRel(Matching, "d_a_door10"),
ActorRel(Matching, "d_a_dr"),
ActorRel(Equivalent, "d_a_dr2"),
ActorRel(MatchingFor("D44J01"), "d_a_dr2"),
ActorRel(Matching, "d_a_ep"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_floor"),
ActorRel(Matching, "d_a_grass"),
include/JSystem/JSupport/JSUList.h
+6 -6
View File
@@ -36,13 +36,13 @@ class JSULink : public JSUPtrLink {
public:
JSULink(T* object) : JSUPtrLink((void*)object) {}
T* getObject() const { return (T*)getObjectPtr(); }
T* getObject() const { return (T*)mObject; }
JSUList<T>* getSupervisor() const { return (JSUList<T>*)this->getList(); }
JSUList<T>* getSupervisor() const { return (JSUList<T>*)mList; }
JSULink<T>* getNext() const { return (JSULink<T>*)this->JSUPtrLink::getNext(); }
JSULink<T>* getNext() const { return (JSULink<T>*)mNext; }
JSULink<T>* getPrev() const { return (JSULink<T>*)this->JSUPtrLink::getPrev(); }
JSULink<T>* getPrev() const { return (JSULink<T>*)mPrev; }
};
//
@@ -69,7 +69,7 @@ public:
u32 getNumLinks() const { return mLength; }
private:
protected:
JSUPtrLink* mHead;
JSUPtrLink* mTail;
u32 mLength;
@@ -99,7 +99,7 @@ public:
JSULink<T>* getEnd() const { return NULL; }
u32 getNumLinks() const { return this->JSUPtrList::getNumLinks(); }
u32 getNumLinks() const { return mLength; }
};
template <typename T>
include/d/actor/d_a_dr2.h
-3
View File
@@ -11,9 +11,6 @@ class mDoExt_brkAnm;
class btd_class;
struct iwa_hahen_s {
iwa_hahen_s() {}
~iwa_hahen_s() {}
/* 0x00 */ J3DModel* mpModel;
/* 0x04 */ bool unk_04;
/* 0x08 */ cXyz unk_08;
src/d/actor/d_a_dr2.cpp
+2 -3
View File
@@ -223,6 +223,7 @@ void hahen_move(dr2_class* i_this) {
/* 00000884-0000130C .text iwa_move__FP9dr2_class */
void iwa_move(dr2_class* i_this) {
/* Nonmatching - retail-only regalloc */
fopAc_ac_c* a_this = &i_this->actor;
cXyz sp58;
cXyz sp4C;
@@ -429,9 +430,7 @@ void iwa_move(dr2_class* i_this) {
while (link != list->getEnd()) {
JGeometry::TVec3<f32> tvec;
link->getObject()->getGlobalPosition(tvec);
sp40.x = tvec.x;
sp40.y = tvec.y;
sp40.z = tvec.z;
sp40 = tvec;
dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8062, &sp40, 0xB9);
link = link->getNext();
}