mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

More demo work, cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-06-01 16:05:42 -04:00
parent 63a92eaa88
commit cdfaa05635
31 changed files with 277 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+8
View File
@@ -340,7 +340,15 @@ public:
virtual cCcD_GStts* GetGStts();
void Init(int, int, void*, fpc_ProcID);
virtual void Ct();
#if VERSION == VERSION_DEMO
void PlusCcMove(f32 x, f32 y, f32 z) {
m_cc_move.x += x;
m_cc_move.y += y;
m_cc_move.z += z;
}
#else
void PlusCcMove(f32, f32, f32);
#endif
void ClrCcMove() {
m_cc_move.x = m_cc_move.y = m_cc_move.z = 0.0f;
}
include/SSystem/SComponent/c_cc_s.h
+6 -6
View File
@@ -51,15 +51,15 @@ public:
void Move();
void DrawClear();
virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*,
cCcD_GStts*, cCcD_GStts*);
cCcD_GStts*, cCcD_GStts*) {}
virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*, cCcD_GObjInf*,
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*);
virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, cCcD_GStts*);
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*) {}
virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, cCcD_GStts*) { return false; }
virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*,
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*) { return false; }
virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*) { return false; }
virtual ~cCcS() {}
virtual void MoveAfterCheck();
virtual void MoveAfterCheck() {}
virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
}; // Size = 0x2850
include/d/d_com_inf_game.h
+1 -1
View File
@@ -1618,7 +1618,7 @@ inline void dComIfGs_onVisitedRoom(int i_no) {
g_dComIfG_gameInfo.save.getMemory().getBit().onVisitedRoom(i_no);
}
inline bool dComIfGs_isVisitedRoom(int i_no) {
inline BOOL dComIfGs_isVisitedRoom(int i_no) {
return g_dComIfG_gameInfo.save.getMemory().getBit().isVisitedRoom(i_no);
}
include/f_op/f_op_actor_mng.h
+6 -1
View File
@@ -401,18 +401,23 @@ inline BOOL fopAcM_isItem(fopAc_ac_c* item, int bitNo) {
return dComIfGs_isItem(bitNo, fopAcM_GetHomeRoomNo(item));
}
inline BOOL dComIfGs_isVisitedRoom(int i_no);
inline BOOL dComIfGs_isSaveSwitch(int i_stageNo, int i_no);
inline BOOL fopAcM_isItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) {
if (itemNo == dItem_BLUE_JELLY_e) {
#if VERSION == VERSION_DEMO
return dComIfGs_isVisitedRoom(itemBitNo);
#else
// Blue Chu Jelly uses itemBitNo as if it was a switch in stageNo 0xE.
return dComIfGs_isSaveSwitch(dSv_save_c::STAGE_BLUE_CHU_JELLY, itemBitNo);
#endif
} else {
return dComIfGs_isItem(itemBitNo, roomNo);
}
}
inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no);
inline void dComIfGs_onVisitedRoom(int i_no);
inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no);
inline void fopAcM_onItemForIb(int itemBitNo, u8 itemNo, s8 roomNo) {
if (itemNo == dItem_BLUE_JELLY_e) {
#if VERSION == VERSION_DEMO
include/f_op/f_op_overlap.h
+5
View File
@@ -3,7 +3,12 @@
#define F_F_OP_OVERLAP_H_
#include "f_pc/f_pc_leaf.h"
#include "f_pc/f_pc_manager.h"
extern leafdraw_method_class g_fopOvlp_Method;
inline s16 fopOvlpM_GetName(void* ovlp) {
return fpcM_GetName(ovlp);
}
#endif