diff --git a/Code/GameLogic/Object.cpp b/Code/GameLogic/Object.cpp
index 965af90e..33679058 100644
--- a/Code/GameLogic/Object.cpp
+++ b/Code/GameLogic/Object.cpp
@@ -16,7 +16,7 @@ Object::Object(void)
{
model = new Model();
- model = Oyster::Graphics::API::CreateModel(L"bth.obj");
+ model = Oyster::Graphics::API::CreateModel(L"orca");
API::SimpleBodyDescription sbDesc;
//sbDesc.centerPosition =
diff --git a/Code/Misc/Resource/OResourceHandler.cpp b/Code/Misc/Resource/OResourceHandler.cpp
index 36154d09..f86c434c 100644
--- a/Code/Misc/Resource/OResourceHandler.cpp
+++ b/Code/Misc/Resource/OResourceHandler.cpp
@@ -88,7 +88,10 @@ OHRESOURCE OysterResource::LoadResource(const wchar_t filename[], CustomLoadFunc
resourcePrivate.SaveResource(resourceData);
}
}
-
+ if(!resourceData)
+ {
+ return 0;
+ }
return (OHRESOURCE)resourceData->GetResourceHandle();
}
diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj b/Code/OysterGraphics/OysterGraphics.vcxproj
index c5592230..0df3d45b 100644
--- a/Code/OysterGraphics/OysterGraphics.vcxproj
+++ b/Code/OysterGraphics/OysterGraphics.vcxproj
@@ -30,20 +30,20 @@
MultiByte
- StaticLibrary
+ DynamicLibrary
true
v110
MultiByte
- StaticLibrary
+ DynamicLibrary
false
v110
true
MultiByte
- StaticLibrary
+ DynamicLibrary
false
v110
true
diff --git a/Code/Tester/Tester.vcxproj b/Code/Tester/Tester.vcxproj
index 27fc7682..3f48d244 100644
--- a/Code/Tester/Tester.vcxproj
+++ b/Code/Tester/Tester.vcxproj
@@ -113,7 +113,7 @@
true
OysterGraphics_$(PlatformShortName)D.lib;%(AdditionalDependencies)
$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)
- OysterGraphics_x86D.dll;%(DelayLoadDLLs)
+ OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)
@@ -136,6 +136,7 @@
OysterGraphics_$(PlatformShortName)D.lib;%(AdditionalDependencies)
$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)
true
+ OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)
@@ -158,6 +159,7 @@
OysterGraphics_$(PlatformShortName).lib;%(AdditionalDependencies)
$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)
true
+ OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)
@@ -180,6 +182,7 @@
OysterGraphics_$(PlatformShortName).lib;%(AdditionalDependencies)
$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)
true
+ OysterGraphics_$(PlatformShortName)D.dll;%(DelayLoadDLLs)