mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-31 08:51:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename flag

Browse Source
This commit is contained in:
Cuyler36
2024-01-17 13:26:54 -05:00
parent 193133e4f5
commit 38ee5a96f0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_event.h
+1 -1
View File
@@ -364,7 +364,7 @@ typedef struct ghost_spirit_block_data_s {
} mEv_gst_hitodama_block_c;
#define mEv_GHOST_FLAG_ACTIVE 0x4000 // TODO: do these live in the ghost actor itself?
#define mEv_GHOST_FLAG_HITODAMA_EXIST 0x8000
#define mEv_GHOST_FLAG_RETURNED_SPIRITS 0x8000
typedef struct ghost_common_s {
mEv_gst_hitodama_block_c hitodama_block_data;
u16 flags;
src/ac_ev_ghost.c
+1 -1
View File
@@ -148,7 +148,7 @@ static void aEGH_actor_ct(ACTOR* actorx, GAME* game) {
mTM_set_renew_time(&ghost_save->renew_time, rtc_time);
}
if ((ghost_save->flags & mEv_GHOST_FLAG_HITODAMA_EXIST) != 0) {
if ((ghost_save->flags & mEv_GHOST_FLAG_RETURNED_SPIRITS) != 0) {
Actor_delete(actorx);
}
}
src/ac_ev_ghost_talk.c_inc
+1 -1
View File
@@ -375,7 +375,7 @@ static void aEGH_select_wait(EV_GHOST_ACTOR* ghost, GAME_PLAY* play) {
if (order == 1 && mMsg_Check_MainNormalContinue(mMsg_Get_base_window_p())) {
ghost->after_talk_think_act = 1;
ghost_data->flags |= 0x8000;
ghost_data->flags |= mEv_GHOST_FLAG_RETURNED_SPIRITS;
mDemo_Set_OrderValue(mDemo_ORDER_NPC0, 9, 0);
switch (mChoice_Get_ChoseNum(mChoice_Get_base_window_p())) {