From 746e475d5dc5961f7a543f39d7dc939feead089a Mon Sep 17 00:00:00 2001 From: Stephen Taylor Date: Mon, 1 Dec 2014 18:52:59 -0500 Subject: [PATCH] Fixed Get*Option --- FabricSplice.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/FabricSplice.h b/FabricSplice.h index 003861d..057b803 100644 --- a/FabricSplice.h +++ b/FabricSplice.h @@ -3850,7 +3850,7 @@ namespace FabricSplice { FabricCore::Variant option = getOption(name); if(!option.isBoolean()) - return defaultValue; + return getIntegerOption(name, defaultValue) != 0; return option.getBoolean(); } @@ -3861,19 +3861,19 @@ namespace FabricSplice if(option.isSInt8()) return (int)option.getSInt8(); if(option.isSInt16()) - return (int)option.getSInt8(); + return (int)option.getSInt16(); if(option.isSInt32()) - return (int)option.getSInt8(); + return (int)option.getSInt32(); if(option.isSInt64()) - return (int)option.getSInt8(); + return (int)option.getSInt64(); if(option.isUInt8()) return (int)option.getUInt8(); if(option.isUInt16()) - return (int)option.getUInt8(); + return (int)option.getUInt16(); if(option.isUInt32()) - return (int)option.getUInt8(); + return (int)option.getUInt32(); if(option.isUInt64()) - return (int)option.getUInt8(); + return (int)option.getUInt64(); if(option.isFloat32()) return (int)option.getFloat32(); if(option.isFloat64()) @@ -3888,19 +3888,19 @@ namespace FabricSplice if(option.isSInt8()) return (float)option.getSInt8(); if(option.isSInt16()) - return (float)option.getSInt8(); + return (float)option.getSInt64(); if(option.isSInt32()) - return (float)option.getSInt8(); + return (float)option.getSInt32(); if(option.isSInt64()) - return (float)option.getSInt8(); + return (float)option.getSInt64(); if(option.isUInt8()) return (float)option.getUInt8(); if(option.isUInt16()) - return (float)option.getUInt8(); + return (float)option.getUInt16(); if(option.isUInt32()) - return (float)option.getUInt8(); + return (float)option.getUInt32(); if(option.isUInt64()) - return (float)option.getUInt8(); + return (float)option.getUInt64(); if(option.isFloat32()) return (float)option.getFloat32(); if(option.isFloat64())