Skip to content
This repository was archived by the owner on Sep 21, 2024. It is now read-only.

Commit 4342974

Browse files
Fix being able to stay ducked while on Yoshi/Shoes.
Fix P-Switch to Star music transition happening when music is disabled.
1 parent 7ec2611 commit 4342974

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

objects/obj_kuriboshoe.object.gmx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ if instance_exists(obj_mario)
213213
//Force him to spin jump
214214
obj_mario.stompstyle = 1
215215

216+
//Force unduck if ducking
217+
if obj_mario.isduck = 1
218+
and not collision_rectangle(obj_mario.bbox_left,obj_mario.bbox_top-16,obj_mario.bbox_right,obj_mario.bbox_top,obj_solid,1,0)
219+
obj_mario.isduck = 0
220+
216221
//If Mario is standing, use first image index
217222
if obj_mario.state = 0
218223
image_index = 0

objects/obj_levelmanager.object.gmx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ if switchon = 1
164164

165165
//Restart the starman music if it was stopped due to overlap
166166
if instance_exists(obj_invincibility)
167+
and musicdisabled = 0
167168
audio_play_sound(snd_starman,99,1)
168169

169170
//Otherwise, restart the music

objects/obj_yoshi.object.gmx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,11 @@ if instance_exists(obj_mario)
248248
//Force him to hold Yoshi
249249
obj_mario.holding = 3
250250

251+
//Force unduck if ducking
252+
if obj_mario.isduck = 1
253+
and not collision_rectangle(obj_mario.bbox_left,obj_mario.bbox_top-16,obj_mario.bbox_right,obj_mario.bbox_top,obj_solid,1,0)
254+
obj_mario.isduck = 0
255+
251256
//If Yoshi is not licking anything
252257
if licking = 0
253258
{

0 commit comments

Comments
 (0)