mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-24 13:49:01 -04:00
Fix compilation errors after decomp/main merge
- Fix <string> -> <cstring> across all source files (upstream fix) - Add <cstring> to JASGadget.h, <cstdarg> to JUTDbPrint.cpp - Fix <string> -> <cstring> in JUTFont.h, d_save.h, f_ap_game.h - Fix std::isnan usage in c_cc_d.cpp - Fix cCcD_Src types: s32 -> u32 for bitmask fields (upstream fix) - Fix AT_TYPE_WOLF_ATTACK/AT_TYPE_UNK unsigned literals (upstream fix) - Remove (s32) casts on hex literals in collision data (upstream fix) - Fix 0xFFFFFFFF literal in d_a_obj_wood_statue.cpp (upstream fix) - Add braces to case 0 in d_a_e_gb.cpp to fix jump-over-init - Fix Z2AudioCS.h include path (Z2AudioLib -> Z2AudioCS) - Forward-declare Z2AudioCS in stubs.cpp to avoid revolution conflicts - Guard JASGlobalInstance specializations with __MWERKS__ in m_Do_main - Remove duplicate inline functions from d_com_inf_game.h - Mark dummy() functions as static (upstream fix) - Add JAUSectionHeap.h include to m_Do_main.cpp
This commit is contained in:
@@ -394,7 +394,7 @@ static void e_gb_damage(e_gb_class* i_this) {
|
||||
|
||||
i_this->invulnerabilityTimer = 35;
|
||||
switch (i_this->mode) {
|
||||
case 0:
|
||||
case 0: {
|
||||
i_this->mode = 1;
|
||||
s16 angleDiff = i_this->angleYTarget - actor->current.angle.y;
|
||||
if (angleDiff < 0) {
|
||||
@@ -413,6 +413,7 @@ static void e_gb_damage(e_gb_class* i_this) {
|
||||
actor->speed.y = fabsf(actor->current.pos.y - i_this->currentPosTarget.y) * 0.2f;
|
||||
actor->speed.z = fabsf(actor->current.pos.z - i_this->currentPosTarget.z) * 0.2f;
|
||||
i_this->timer[0] = KREG_S(7) + 15;
|
||||
}
|
||||
// fallthrough
|
||||
case 1:
|
||||
if (i_this->timer[0] == 0) {
|
||||
|
||||
Reference in New Issue
Block a user