deps/ox/src/ox/claw/read.cpp

@@ -74,10 +74,7 @@ Result<Buffer> stripClawHeader(const ox::Buffer &buff) noexcept {
 
 Result<ModelObject> readClaw(TypeStore &ts, const char *buff, std::size_t buffSz) noexcept {
 	oxRequire(header, readClawHeader(buff, buffSz));
-	auto const [t, tdErr] = ts.getLoad(header.typeName, header.typeVersion, header.typeParams);
-	if (tdErr) {
-		return OxError(3, "Could not load type descriptor");
-	}
+	oxRequire(t, ts.getLoad(header.typeName, header.typeVersion, header.typeParams));
 	ModelObject obj;
 	oxReturnError(obj.setType(t));
 	switch (header.fmt) {

scripts/pkg-gba.py

@@ -20,8 +20,6 @@ host_env = f'{os}-{arch}'
 # get current build type
 with open(".current_build","r") as f:
     current_build = f.readlines()[0]
-if current_build[len(current_build) - 1] == '\n':
-    current_build = current_build[:len(current_build) - 1]
 
 project_dir = sys.argv[1]
 project_name = sys.argv[2]

src/olympic/keel/include/keel/pack.hpp

@@ -125,11 +125,7 @@ ox::Error preloadDir(
 			auto const dir = ox::sfmt("{}{}/", path, name);
 			oxReturnError(preloadDir(ts, romFs, pl, dir));
 		} else {
-			auto const err = preloadObj(ts, romFs, pl, filePath);
-			if (err) {
-				oxErrf("\033[31;1;1mCould not preload {}:\n\t{}\n", filePath, toStr(err));
-				return err;
-			}
+			oxReturnError(preloadObj(ts, romFs, pl, filePath));
 		}
 	}
 	return {};

src/olympic/keel/src/pack.cpp

@@ -120,11 +120,7 @@ static ox::Error transformClaw(
 			auto const dir = ox::sfmt("{}{}/", path, name);
 			oxReturnError(transformClaw(ctx, ts, dest, dir));
 		} else {
-			auto const err = doTransformations(ctx, ts, dest, filePath);
-			if (err) {
-				oxErrf("\033[31;1;1mCould not do transformations for {}:\n\t{}\n", filePath, toStr(err));
-				return err;
-			}
+			oxReturnError(doTransformations(ctx, ts, dest, filePath));
 		}
 	}
 	return {};