Selaa lähdekoodia

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

Daniele Bartolini 10 vuotta sitten
vanhempi
sitoutus
d7867b75a6
3 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 2 2
      src/device.cpp
  2. 1 1
      src/device.h
  3. 1 1
      src/lua/lua_device.cpp

+ 2 - 2
src/device.cpp

@@ -165,9 +165,9 @@ void Device::update()
 	_lua_environment->clear_temporaries();
 }
 
-void Device::render_world(World* world, Camera* camera)
+void Device::render_world(World& world, Camera* camera)
 {
-	world->render(camera);
+	world.render(camera);
 }
 
 World* Device::create_world()

+ 1 - 1
src/device.h

@@ -81,7 +81,7 @@ struct Device
 	void update();
 
 	/// Renders the given @a world from the point of view of @a camera.
-	void render_world(World* world, Camera* camera);
+	void render_world(World& world, Camera* camera);
 
 	/// Creates a new world.
 	World* create_world();

+ 1 - 1
src/lua/lua_device.cpp

@@ -78,7 +78,7 @@ static int device_destroy_world(lua_State* L)
 static int device_render_world(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->render_world(stack.get_world(1), stack.get_camera(2));
+	device()->render_world(*stack.get_world(1), stack.get_camera(2));
 	return 0;
 }