Merge commit 'b66cef7127e97269fc6072a6f66ccc08990f6d2e'
This commit is contained in:
		| @@ -94,7 +94,7 @@ ox::Error preloadObj( | |||||||
| 		oxOutf("preloading {} as a {}\n", path, obj.type()->typeName); | 		oxOutf("preloading {} as a {}\n", path, obj.type()->typeName); | ||||||
| 		// preload | 		// preload | ||||||
| 		oxRequire(a, pl.startAlloc(ox::sizeOf<GbaPlatSpec>(&obj), ox::alignOf<GbaPlatSpec>(obj))); | 		oxRequire(a, pl.startAlloc(ox::sizeOf<GbaPlatSpec>(&obj), ox::alignOf<GbaPlatSpec>(obj))); | ||||||
| 		auto const err = ox::preload<GbaPlatSpec, decltype(obj)>(&pl, &obj); | 		auto const err = ox::preload<GbaPlatSpec, ox::ModelObject>(&pl, &obj); | ||||||
| 		oxReturnError(pl.endAlloc()); | 		oxReturnError(pl.endAlloc()); | ||||||
| 		oxReturnError(err); | 		oxReturnError(err); | ||||||
| 		keel::PreloadPtr const p{.preloadAddr = static_cast<uint32_t>(a)}; | 		keel::PreloadPtr const p{.preloadAddr = static_cast<uint32_t>(a)}; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user