Skip to content

Commit e8f83f2

Browse files
authored
[OOT] restore latest decomp support (HarbourMasters#54)
1 parent a1aa1f7 commit e8f83f2

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

fast64_internal/z64/model_classes.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343

4444
# read included asset data
45-
def ootGetIncludedAssetData(basePaths: list[str], currentPaths: list[str], data: str) -> str:
45+
def ootGetIncludedAssetData(basePath: str, currentPaths: list[str], data: str) -> str:
4646
includeData = ""
4747
searchedPaths = currentPaths[:]
4848

@@ -51,15 +51,7 @@ def ootGetIncludedAssetData(basePaths: list[str], currentPaths: list[str], data:
5151

5252
# search assets
5353
for includeMatch in re.finditer(r"\#include\s*\"(assets/objects/(.*?)\.h)\"", data):
54-
h_p = None
55-
for basePath in basePaths:
56-
candidate_h_p = Path(basePath) / includeMatch.group(1)
57-
if candidate_h_p.exists():
58-
h_p = candidate_h_p
59-
break
60-
if h_p is None:
61-
print("Could not find included file:", includeMatch.group(1))
62-
continue
54+
h_p = Path(basePath) / includeMatch.group(1)
6355
print("", str(h_p))
6456
includeData += getImportData([str(h_p)]) + "\n"
6557
for path_p in h_p.parent.glob("*.c"):

0 commit comments

Comments
 (0)