Merge branch 'master' of github.com:taylor001/crown

README.md

@@ -82,7 +82,7 @@ Docutils/reStructuredText (http://docutils.sourceforge.net)
 	
 ##Samples
 
-When running a sample your current directory has to be `<install-path>/bin/<platform[32|64]>`.
+When running a sample your current directory has to be `.build/<platform[32|64]>/bin`.
 To run a sample on 64-bit linux debug mode:
 
 	$ ./linux-debug-64 --source-dir <full/sample/path> --bundle-dir <full/destination/path> --compile --platform linux --continue

engine/world/world.cpp

@@ -180,7 +180,7 @@ SoundInstanceId World::play_sound(const SoundResource* sr, const bool loop, cons
 SoundInstanceId World::play_sound(StringId64 name, const bool loop, const float volume, const Vector3& pos, const float range)
 {
 	const SoundResource* sr = (const SoundResource*)_resource_manager->get(SOUND_TYPE, name);
-	play_sound(sr, loop, volume, pos, range);
+	return play_sound(sr, loop, volume, pos, range);
 }
 
 void World::stop_sound(SoundInstanceId id)

genie/toolchain.lua

@@ -62,7 +62,7 @@ function toolchain(build_dir, lib_dir)
 		end
 	end
 
-	if _ACTION == "vs2012" or _ACTION == "vs2013" then
+	if _ACTION == "vs2013" then
 
 		if not os.is("windows") then print("Action not valid in current OS.") end
 
@@ -73,7 +73,7 @@ function toolchain(build_dir, lib_dir)
 			print("Set DXSDK_DIR environment variable.")
 		end
 
-		location(build_dir .. "projects/" .. "windows")
+		location(build_dir .. "projects/" .. _ACTION)
 	end
 
 	flags {