Marshall exception solved by using specific struct as type which is t…

…he real element instead of parsing to a sub-struct element. ¯\_(ツ)_/¯
GothicKit · Sep 22, 2023 · bfc14a2 · bfc14a2
1 parent fd7dd10
commit bfc14a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/include/phoenix/cffi/World.h b/include/phoenix/cffi/World.h
@@ -303,14 +303,14 @@ PXC_API PxBool pxVobGetDecalIgnoreDaylight(PxVob const* vob);
 // TODO Vob - Camera
 
 // Light Preset
-PXC_API char const* pxLightPresetGetPreset(PxVobLightPreset const* lightPreset);
+PXC_API char const* pxLightPresetGetPreset(PxVobLight const* light);
 PXC_API PxVobLightMode pxLightPresetGetLightType(PxVobLightPreset const* lightPreset);
 PXC_API float pxLightPresetGetRange(PxVobLightPreset const* lightPreset);
 PXC_API PxColor pxLightPresetGetColor(PxVobLightPreset const* lightPreset);
 PXC_API float pxLightPresetGetConeAngle(PxVobLightPreset const* lightPreset);
 PXC_API PxBool pxLightPresetGetIsStatic(PxVobLightPreset const* lightPreset);
 PXC_API PxVobLightQuality pxLightPresetGetQuality(PxVobLightPreset const* lightPreset);
-PXC_API char const* pxLightPresetGetLensFlareFx(PxVobLightPreset const* lightPreset);
+PXC_API char const* pxLightPresetGetLensFlareFx(PxVobLight const* light);
 PXC_API PxBool pxLightPresetGetOn(PxVobLightPreset const* lightPreset);
 PXC_API uint32_t pxLightPresetGetRangeAnimationScaleCount(PxVobLightPreset const* lightPreset);
 PXC_API float pxLightPresetGetRangeAnimationScale(PxVobLightPreset const* lightPreset, uint32_t i);

diff --git a/src/World.cc b/src/World.cc
@@ -224,8 +224,8 @@ PxBool pxVobGetDecalIgnoreDaylight(PxVob const* vob) {
 }
 
 // Vob - Light Preset
-char const* pxLightPresetGetPreset(PxVobLightPreset const* lightPreset) {
-	return lightPreset->preset.c_str();
+char const* pxLightPresetGetPreset(PxVobLight const* light) {
+	return light->preset.c_str();
 }
 
 PxVobLightMode pxLightPresetGetLightType(PxVobLightPreset const* lightPreset) {
@@ -257,8 +257,8 @@ PxVobLightQuality pxLightPresetGetQuality(PxVobLightPreset const* lightPreset) {
 	return static_cast<PxVobLightQuality>(lightPreset->quality);
 }
 
-char const* pxLightPresetGetLensFlareFx(PxVobLightPreset const* lightPreset) {
-	return lightPreset->lensflare_fx.c_str();
+char const* pxLightPresetGetLensFlareFx(PxVobLight const* light) {
+	return light->lensflare_fx.c_str();
 }
 
 PxBool pxLightPresetGetOn(PxVobLightPreset const* lightPreset) {