Fix camera:get_offset() in CSM

sfan5 · sfan5 · commit 682b9de8246c · 2019-11-11T14:06:48.000+01:00
diff --git a/src/script/lua_api/l_camera.cpp b/src/script/lua_api/l_camera.cpp
@@ -108,11 +108,10 @@ int LuaCamera::l_get_pos(lua_State *L)
 
 int LuaCamera::l_get_offset(lua_State *L)
 {
-	Camera *camera = getobject(L, 1);
-	if (!camera)
-		return 0;
+	LocalPlayer *player = getClient(L)->getEnv().getLocalPlayer();
+	sanity_check(player);
 
-	push_v3s16(L, camera->getOffset());
+	push_v3f(L, player->getEyeOffset() / BS);
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,10 @@ int LuaCamera::l_get_pos(lua_State *L)`
`108`	`108`
`109`	`109`	`int LuaCamera::l_get_offset(lua_State *L)`
`110`	`110`	`{`
`111`		`- Camera *camera = getobject(L, 1);`
`112`		`- if (!camera)`
`113`		`- return 0;`
	`111`	`+ LocalPlayer *player = getClient(L)->getEnv().getLocalPlayer();`
	`112`	`+ sanity_check(player);`
`114`	`113`
`115`		`- push_v3s16(L, camera->getOffset());`
	`114`	`+ push_v3f(L, player->getEyeOffset() / BS);`
`116`	`115`	`return 1;`
`117`	`116`	`}`
`118`	`117`