etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 20:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug with whirlpools

Browse source
This commit is contained in:
MysterD 2020-10-02 23:35:06 -07:00
parent 327c735dba
commit fb775165ce
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/object_fields.h
View file

@ -1130,6 +1130,7 @@
/* Whirlpool */ /* Whirlpool */
#define /*0x0F4*/ oWhirlpoolInitFacePitch OBJECT_FIELD_S32(0x1B) #define /*0x0F4*/ oWhirlpoolInitFacePitch OBJECT_FIELD_S32(0x1B)
#define /*0x0F8*/ oWhirlpoolInitFaceRoll OBJECT_FIELD_S32(0x1C) #define /*0x0F8*/ oWhirlpoolInitFaceRoll OBJECT_FIELD_S32(0x1C)
#define /*0x0FC*/ oWhirlpoolTimeout OBJECT_FIELD_S32(0x1D)
/* White Puff Explode */ /* White Puff Explode */
#define /*0x0F4*/ oWhitePuffUnkF4 OBJECT_FIELD_F32(0x1B) #define /*0x0F4*/ oWhitePuffUnkF4 OBJECT_FIELD_F32(0x1B)

9
src/game/behaviors/whirlpool.inc.c
View file

@ -35,6 +35,15 @@ void whirpool_orient_graph(void) {
} }
void bhv_whirlpool_loop(void) { void bhv_whirlpool_loop(void) {
if (o->oWhirlpoolTimeout > 0) {
o->oWhirlpoolTimeout--;
if (o->oWhirlpoolTimeout <= 0) {
o->oInteractStatus = 0;
}
} else if (o->oInteractStatus == INT_STATUS_INTERACTED) {
o->oWhirlpoolTimeout = 30;
}
#ifndef NODRAWINGDISTANCE #ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 5000.0f) { if (o->oDistanceToMario < 5000.0f) {
#endif #endif