Fixes from merge

This commit is contained in:
Dylan Ascencio
2023-10-04 00:46:20 -04:00
parent e160dd05c2
commit 851e4cf3dd
7 changed files with 9 additions and 19 deletions
+2 -2
View File
@@ -214,8 +214,8 @@ public:
void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, XLU_BUFFER); }
void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); }
void setOpaList() { setOpaDrawList(mpBufInvisibleModelOpa); }
void setXluList() { setXluDrawList(mpBufInvisibleModelXlu); }
void setOpaList() { setOpaDrawList(mpBufWorldOpa); }
void setXluList() { setXluDrawList(mpBufWorldXlu); }
void setOpaListInvisible() { setOpaDrawList(field_0x00030); }
void setXluListInvisible() { setXluDrawList(field_0x00034); }
void setOpaListMaskOff() { setOpaDrawList(mpBufInvisibleModelMaskOffOpa); }
-2
View File
@@ -46,8 +46,6 @@ public:
virtual void draw(JPABaseEmitter*);
virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
virtual void end();
void setRateOff(u8 i_rate) { field_0x11 = i_rate; }
JPABaseEmitter* getEmitter() { return mpEmitter; }
void setRateOff(u8 param_0) { field_0x11 = param_0; }