mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
Use GiveItemEntryFromActorWithFixedRange in item00
This commit is contained in:
parent
d0d567697b
commit
64965ee926
@ -512,8 +512,11 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
|
|||||||
if ((gSaveContext.n64ddFlag || getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
|
if ((gSaveContext.n64ddFlag || getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
|
||||||
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
|
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
|
||||||
getItemId = getItem.getItemId;
|
getItemId = getItem.getItemId;
|
||||||
func_8002F554(&this->actor, globalCtx, getItemId);
|
if (!gSaveContext.n64ddFlag) {
|
||||||
GET_PLAYER(globalCtx)->getItemEntry = getItem;
|
func_8002F554(&this->actor, globalCtx, getItemId);
|
||||||
|
} else {
|
||||||
|
GiveItemEntryFromActorWithFixedRange(&this->actor, globalCtx, getItem);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EnItem00_SetupAction(this, func_8001E5C8);
|
EnItem00_SetupAction(this, func_8001E5C8);
|
||||||
@ -884,12 +887,13 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
|
|||||||
params = &this->actor.params;
|
params = &this->actor.params;
|
||||||
|
|
||||||
if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
|
if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
|
||||||
if (gSaveContext.n64ddFlag) {
|
if (!gSaveContext.n64ddFlag) {
|
||||||
|
func_8002F554(&this->actor, globalCtx, getItemId);
|
||||||
|
} else {
|
||||||
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
|
getItem = Randomizer_GetRandomizedItem(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
|
||||||
GET_PLAYER(globalCtx)->getItemEntry = getItem;
|
|
||||||
getItemId = getItem.getItemId;
|
getItemId = getItem.getItemId;
|
||||||
|
GiveItemEntryFromActorWithFixedRange(&this->actor, globalCtx, getItem);
|
||||||
}
|
}
|
||||||
func_8002F554(&this->actor, globalCtx, getItemId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (*params) {
|
switch (*params) {
|
||||||
|
Loading…
Reference in New Issue
Block a user