Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start decompiling zNPCGoalVillager #331

Merged
merged 3 commits into from
Jul 21, 2024
Merged

Start decompiling zNPCGoalVillager #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce12ea9
Start decompiling zNPCGoalVillager
tgsm Jul 18, 2024
ac31c86
More work on zNPCGoalVillager
tgsm Jul 20, 2024
0be82f8
Finish decompiling zNPCGoalVillager... for now
tgsm Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
Object(Matching, "SB/Game/zNPCTypeTest.cpp"),
Object(NonMatching, "SB/Game/zNPCTypeSubBoss.cpp"),
Object(NonMatching, "SB/Game/zNPCTypeBoss.cpp"),
Object(NonMatching, "SB/Game/zNPCGoalVillager.cpp"),
Object(NonMatching, "SB/Game/zNPCGoalVillager.cpp", extra_cflags=["-sym on"]),
Object(Matching, "SB/Game/zNPCGoalSubBoss.cpp", extra_cflags=["-sym on"]),
Object(NonMatching, "SB/Core/x/xShadowSimple.cpp"),
Object(NonMatching, "SB/Core/x/xUpdateCull.cpp"),
Expand Down
1 change: 1 addition & 0 deletions src/SB/Game/zEntPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ void zEntPlayer_ShadowModelDisable();
void zEntPlayerJumpStart(class xEnt* ent, class zJumpParam* jump);

void zEntPlayer_setBoulderMode(U32 mode);
void zEntPlayer_GiveHealth(S32);
void zEntPlayer_GiveSpatula(S32);
void zEntPlayer_GivePatsSocksCurrentLevel(S32 quantity);

Expand Down
18 changes: 15 additions & 3 deletions src/SB/Game/zNPCGoalStd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,15 @@ struct zNPCGoalLoopAnim : zNPCGoalCommon
U32 origAnimFlags;
U32 animWeMolested;

// void* __ct(S32 myType);
zNPCGoalLoopAnim(S32 myType) : zNPCGoalCommon(myType)
{
SetFlags(1 << 1);
}

void LoopCountSet(S32 unk); // return type might be wrong

virtual S32 Enter(F32 dt, void* updCtxt);
virtual S32 Process(en_trantype* trantype, F32 dt, void* updCtxt, xScene* scene);
};

struct zNPCGoalTaunt : zNPCGoalLoopAnim
Expand Down Expand Up @@ -194,8 +201,13 @@ struct zNPCGoalPushAnim : zNPCGoalCommon
S32 flg_pushanim;
F32 lastAnimTime;

// void* __ct(S32 myType);
S32 Enter(F32 dt, void* updCtxt);
zNPCGoalPushAnim(S32 myType) : zNPCGoalCommon(myType)
{
SetFlags((1 << 2) | (1 << 1));
}

virtual S32 Enter(F32 dt, void* updCtxt);
virtual S32 Process(en_trantype* trantype, F32 dt, void* updCtxt, xScene* scene);
};

struct zNPCGoalAttackFodder;
Expand Down
Loading