mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-28 23:26:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

daNpc_Cb1_c Almost OK (#822)

Browse Source 
* daNpc_Cb1_c Almost OK

Down to regswaps/minor instruction issues

* Oops

That inline was fake

* Some Cleanup

- Fill in more inlines
- Reorganize daNpc_Cb1_c inlines
- Use inlines more
- Some naming and typing consistency

* Naming, Consistency Tweaks

- TRUE/FALSE macros for all cases of BOOL, use int -> BOOL sometimes
- Rename HIO to be consistent with other NPCs
- Animation enum

* Some HIO Names

* Clarity Tweaks

- NULL in more asserts
- Squared constants
This commit is contained in:
SuperDude88
2025-07-29 21:04:42 -04:00
committed by GitHub
parent a211d2fd07
commit 4adfd27155
9 changed files with 2998 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_cb1.cpp
+2666 -189
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_os.cpp
+2 -2
View File
@@ -2239,7 +2239,7 @@ BOOL daNpc_Os_c::execute() {
m4E8 = 0;
}
else {
daPy_getPlayerLinkActorClass()->startRestartRoom(5, 0xC9, -1.0f, 0);
daPy_getPlayerLinkActorClass()->npcStartRestartRoom();
}
}
else {
@@ -2247,7 +2247,7 @@ BOOL daNpc_Os_c::execute() {
}
if(mAcch.ChkWaterIn()) {
daPy_getPlayerLinkActorClass()->startRestartRoom(5, 0xC9, -1.0f, 0);
daPy_getPlayerLinkActorClass()->npcStartRestartRoom();
if(!isWaterHit()) {
onWaterHit();