src: always use the identifier unit when referring to a UnitId

src/lua/lua_stack.h

@@ -304,7 +304,7 @@ struct LuaStack
 	void push_animation_state_machine(AnimationStateMachine* sm);
 
 	///
-	void push_unit(UnitId id);
+	void push_unit(UnitId unit);
 
 	///
 	void push_camera(CameraInstance i);

src/lua/lua_stack.inl

@@ -247,9 +247,9 @@ inline UnitId LuaStack::get_unit(int i)
 		CE_UNREACHABLE();
 	}
 #endif // CROWN_DEBUG
-	UnitId id;
-	id._idx = u32((enc & LIGHTDATA_UNIT_ID_MASK) >> LIGHTDATA_UNIT_ID_SHIFT);
-	return id;
+	UnitId unit;
+	unit._idx = u32((enc & LIGHTDATA_UNIT_ID_MASK) >> LIGHTDATA_UNIT_ID_SHIFT);
+	return unit;
 }
 
 inline CameraInstance LuaStack::get_camera(int i)
@@ -531,9 +531,9 @@ inline void LuaStack::push_animation_state_machine(AnimationStateMachine* sm)
 	push_pointer(sm);
 }
 
-inline void LuaStack::push_unit(UnitId id)
+inline void LuaStack::push_unit(UnitId unit)
 {
-	uintptr_t enc = (uintptr_t(id._idx) << LIGHTDATA_UNIT_ID_SHIFT) | LIGHTDATA_UNIT_MARKER;
+	uintptr_t enc = (uintptr_t(unit._idx) << LIGHTDATA_UNIT_ID_SHIFT) | LIGHTDATA_UNIT_MARKER;
 	push_pointer((void*)enc);
 }
 

src/world/animation_state_machine.cpp

@@ -19,9 +19,9 @@
 
 namespace crown
 {
-static void unit_destroyed_callback_bridge(UnitId id, void* user_ptr)
+static void unit_destroyed_callback_bridge(UnitId unit, void* user_ptr)
 {
-	((AnimationStateMachine*)user_ptr)->unit_destroyed_callback(id);
+	((AnimationStateMachine*)user_ptr)->unit_destroyed_callback(unit);
 }
 
 static StateMachineInstance make_instance(u32 i)

src/world/unit_manager.cpp

@@ -22,8 +22,8 @@ UnitManager::UnitManager(Allocator& a)
 
 UnitId UnitManager::make_unit(u32 idx, u8 gen)
 {
-	UnitId id = { 0 | idx | u32(gen) << UNIT_INDEX_BITS };
-	return id;
+	UnitId unit = { 0 | idx | u32(gen) << UNIT_INDEX_BITS };
+	return unit;
 }
 
 UnitId UnitManager::create()
@@ -50,18 +50,18 @@ UnitId UnitManager::create(World& world)
 	return world.spawn_empty_unit();
 }
 
-bool UnitManager::alive(UnitId id) const
+bool UnitManager::alive(UnitId unit) const
 {
-	return _generation[id.index()] == id.id();
+	return _generation[unit.index()] == unit.id();
 }
 
-void UnitManager::destroy(UnitId id)
+void UnitManager::destroy(UnitId unit)
 {
-	const u32 idx = id.index();
+	const u32 idx = unit.index();
 	++_generation[idx];
 	queue::push_back(_free_indices, idx);
 
-	trigger_destroy_callbacks(id);
+	trigger_destroy_callbacks(unit);
 }
 
 void UnitManager::register_destroy_callback(UnitDestroyCallback* udc)
@@ -74,13 +74,13 @@ void UnitManager::unregister_destroy_callback(UnitDestroyCallback* udc)
 	list::remove(udc->node);
 }
 
-void UnitManager::trigger_destroy_callbacks(UnitId id)
+void UnitManager::trigger_destroy_callbacks(UnitId unit)
 {
 	ListNode* cur;
 	list_for_each(cur, &_callbacks.node)
 	{
 		UnitDestroyCallback* udc = (UnitDestroyCallback*)container_of(cur, UnitDestroyCallback, node);
-		udc->destroy(id, udc->user_data);
+		udc->destroy(unit, udc->user_data);
 	}
 }
 

src/world/unit_manager.h

@@ -34,10 +34,10 @@ struct UnitManager
 	UnitId create(World& world);
 
 	/// Returns whether the unit @id is alive.
-	bool alive(UnitId id) const;
+	bool alive(UnitId unit) const;
 
 	/// Destroys the unit @a id.
-	void destroy(UnitId id);
+	void destroy(UnitId unit);
 
 	///
 	void register_destroy_callback(UnitDestroyCallback* udc);
@@ -46,7 +46,7 @@ struct UnitManager
 	void unregister_destroy_callback(UnitDestroyCallback* udc);
 
 	///
-	void trigger_destroy_callbacks(UnitId id);
+	void trigger_destroy_callbacks(UnitId unit);
 };
 
 } // namespace crown

src/world/world.cpp

@@ -98,32 +98,32 @@ World::~World()
 UnitId World::spawn_unit(StringId64 name, const Vector3& pos, const Quaternion& rot, const Vector3& scl)
 {
 	const UnitResource* ur = (const UnitResource*)_resource_manager->get(RESOURCE_TYPE_UNIT, name);
-	UnitId id = _unit_manager->create();
-	spawn_units(*this, *ur, pos, rot, scl, &id);
-	return id;
+	UnitId unit = _unit_manager->create();
+	spawn_units(*this, *ur, pos, rot, scl, &unit);
+	return unit;
 }
 
 UnitId World::spawn_empty_unit()
 {
-	UnitId id = _unit_manager->create();
-	array::push_back(_units, id);
-	post_unit_spawned_event(id);
-	return id;
+	UnitId unit = _unit_manager->create();
+	array::push_back(_units, unit);
+	post_unit_spawned_event(unit);
+	return unit;
 }
 
-void World::destroy_unit(UnitId id)
+void World::destroy_unit(UnitId unit)
 {
-	_unit_manager->destroy(id);
+	_unit_manager->destroy(unit);
 	for (u32 i = 0, n = array::size(_units); i < n; ++i)
 	{
-		if (_units[i] == id)
+		if (_units[i] == unit)
 		{
 			_units[i] = _units[n - 1];
 			array::pop_back(_units);
 			break;
 		}
 	}
-	post_unit_destroyed_event(id);
+	post_unit_destroyed_event(unit);
 }
 
 u32 World::num_units() const
@@ -550,17 +550,17 @@ Level* World::load_level(StringId64 name, const Vector3& pos, const Quaternion&
 	return level;
 }
 
-void World::post_unit_spawned_event(UnitId id)
+void World::post_unit_spawned_event(UnitId unit)
 {
 	UnitSpawnedEvent ev;
-	ev.unit = id;
+	ev.unit = unit;
 	event_stream::write(_events, EventType::UNIT_SPAWNED, ev);
 }
 
-void World::post_unit_destroyed_event(UnitId id)
+void World::post_unit_destroyed_event(UnitId unit)
 {
 	UnitDestroyedEvent ev;
-	ev.unit = id;
+	ev.unit = unit;
 	event_stream::write(_events, EventType::UNIT_DESTROYED, ev);
 }
 

src/world/world.h

@@ -86,7 +86,7 @@ struct World
 	UnitId spawn_empty_unit();
 
 	/// Destroys the unit with the given @a id.
-	void destroy_unit(UnitId id);
+	void destroy_unit(UnitId unit);
 
 	/// Returns the number of units in the world.
 	u32 num_units() const;
@@ -206,8 +206,8 @@ struct World
 	/// Loads the level @a name into the world.
 	Level* load_level(StringId64 name, const Vector3& pos, const Quaternion& rot);
 
-	void post_unit_spawned_event(UnitId id);
-	void post_unit_destroyed_event(UnitId id);
+	void post_unit_spawned_event(UnitId unit);
+	void post_unit_destroyed_event(UnitId unit);
 	void post_level_loaded_event();
 };