mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-04 11:19:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into tphd

Browse Source 
# Conflicts:
#	extern/aurora
This commit is contained in:
MelonSpeedruns
2026-05-15 12:35:59 -04:00
parent 89b8debe51 af8300a77c
commit fd204062f7
19 changed files with 99 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_drop.cpp
+2 -1
View File
@@ -303,7 +303,8 @@ int daObjDrop_c::modeParentWait() {
#if TARGET_PC
static inline BOOL checkGetCargoRide() {
if ((daPy_getPlayerActorClass()->checkCargoCarry() && strcmp(dComIfGp_getStartStageName(), "F_SP112") == 0) ||
if (daPy_getPlayerActorClass()->checkCargoCarry() &&
strcmp(dComIfGp_getStartStageName(), "F_SP112") == 0 &&
dComIfGs_isLightDropGetFlag(dComIfGp_getStartStageDarkArea()))
{
return true;