Further refactoring + optimizations

Author: Decane

gamedata/configs/misc/script_sound.ltx

@@ -630,7 +630,7 @@ idle = 1,1
 type = actor
 path = vehicles\helicopter\hit_
 shuffle = rnd
-idle = 3,4
+idle = 4,8 ; SRP: increased from 3,4 -> 4,8 to obsolete the timer in heli_binder:on_hit()
 
 [alarm]
 type = 3d

gamedata/scripts/actor_reaction.script

@@ -33,11 +33,11 @@ function action_actor_reaction:execute()
 				db.actor:run_talk_dialog(npc, true)
 			end
 			self.comed = true
-		else
-			if self.scene_manager.stand_still then
-				npc:set_dest_level_vertex_id(db.actor:level_vertex_id())
-				state_mgr.set_state(npc, "raid", nil, nil, {look_position = actor_pos}, {animation = true}) -- vanilla uses {look_object = db.actor}, sometimes causes jerky NPC head movement
-			end
+		elseif self.scene_manager.actor_enemy then
+			state_mgr.set_state(npc, "threat_fire", nil, nil, {look_position = actor_pos})
+		elseif self.scene_manager.stand_still then
+			npc:set_dest_level_vertex_id(db.actor:level_vertex_id())
+			state_mgr.set_state(npc, "raid", nil, nil, {look_position = actor_pos}, {animation = true}) -- vanilla uses {look_object = db.actor}, sometimes causes jerky NPC head movement
 		end
 	end
 end

gamedata/scripts/bind_heli.script

@@ -12,7 +12,6 @@ function heli_binder:__init(obj) super(obj) -- called 2nd
 	self.heli_fire            = heli_fire.get_heli_firer(obj)
 	self.heliObject           = obj:get_helicopter()
 	self.st                   = {combat = heli_combat.heli_combat(obj, self.heliObject)}
-	self.last_hit_snd_timeout = 0
 	self.flame_start_health	  = utils.cfg_get_number(system_ini(), "helicopter", "flame_start_health", obj, true)
 end
 
@@ -112,12 +111,7 @@ function heli_binder:on_hit(power, impulse, hit_type, enemy_id)
 		end
 	end
 
-	local global_time = time_global()
-
-	if self.last_hit_snd_timeout < global_time then
-		xr_sound.set_sound_play(self.object:id(), "heli_hit")
-		self.last_hit_snd_timeout = global_time + math.random(4000, 8000)
-	end
+	xr_sound.set_sound_play(self.object:id(), "heli_hit")
 end
 
 function heli_binder:on_point(distance, position, path_idx)

gamedata/scripts/pda.script

@@ -201,9 +201,9 @@ function dialog_wnd_showed()
 			if npc_st.meet and npc_st.robbery_zone_id == nil then
 				db.actor:allow_break_talk_dialog(npc_st.meet.allow_break)
 			end
-			local sound_theme = xr_sound.sound_table[npc_id]
-			if sound_theme and sound_theme.reset then
-				sound_theme:reset(npc_id)
+			local sound = xr_sound.sound_table[npc_id]
+			if sound then
+				sound:reset(npc_id)
 			end
 			break
 		end

gamedata/scripts/sim_board.script

@@ -195,8 +195,6 @@ function sim_board:__init()
 	self.squads = {}
 	self.id_generator = object_collection.object_collection()
 	self.spawn_smarts = {}
---	self.tmp_assigned_squad = {}
---	self.tmp_entered_squad = {}
 end
 
 function sim_board:start_sim()
@@ -262,27 +260,7 @@ function sim_board:register_smart(smart)
 		self.spawn_smarts[smart_id] = smart.respawn_sector
 	end
 end
---[[
-function sim_board:init_smart(smart) -- called (only) from smart_terrain.on_register()
-	local smart_id = smart.id
-	local temp_squad_table = self.tmp_assigned_squad[smart_id]
-	if temp_squad_table ~= nil then
-		for _, squad in pairs (temp_squad_table) do
---			dbglog("Delay-assigning %s squad with ID '%s' to smart '%s'", game.translate_string(squad.player_id), tostring(squad.squad_id), smart_names.get_smart_terrain_name(smart))
-			self:assign_squad_to_smart(squad, smart_id) -- delay-assigns squads from early instances of assign_squad_to_smart(squad, smart) where self.smarts[smart.id] was still nil
-		end
-		self.tmp_assigned_squad[smart_id] = nil
-	end
-	temp_squad_table = self.tmp_entered_squad[smart_id]
-	if temp_squad_table ~= nil then
-		for _, squad in pairs (temp_squad_table) do
---			dbglog("Delay-entering %s squad with ID '%s' to smart '%s'", game.translate_string(squad.player_id), tostring(squad.squad_id), smart_names.get_smart_terrain_name(smart))
-			self:enter_smart(squad, smart_id) -- delay-enters squads from early instances of enter_smart(squad, smart_id) where self.smarts[smart_id] was still nil
-		end
-		self.tmp_entered_squad[smart_id] = nil
-	end
-end
-]]
+
 function sim_board:unregister_smart(smart)
 	if self.smarts[smart.id] == nil then
 		abort("[sim_board:unregister_smart]: Tried to unregister a smart not registered: '%s'.", smart:name())
@@ -413,14 +391,6 @@ function sim_board:assign_squad_to_smart(squad, new_smart_id) -- first unassigns
 	local new_smart_info = self.smarts[new_smart_id]
 
 	if new_smart_info == nil then
---[[
-		local tmp_assigned_tbl = self.tmp_assigned_squad
-		if tmp_assigned_tbl[new_smart_id] == nil then
-			tmp_assigned_tbl[new_smart_id] = {}
-		end
-		table.insert(tmp_assigned_tbl[new_smart_id], squad)
-		return
-]]
 		abort("[sim_board:assign_squad_to_smart]: Tried to assign squad with ID '%s' to unregistered smart with ID '%s'.", tostring(squad.squad_id), tostring(new_smart_id))
 	end
 
@@ -518,14 +488,6 @@ function sim_board:enter_smart(squad, smart_id, after_load)
 	local smart_info = self.smarts[smart_id]
 
 	if smart_info == nil then
---[[
-		local tmp_entered_tbl = self.tmp_entered_squad
-		if tmp_entered_tbl[smart_id] == nil then
-			tmp_entered_tbl[smart_id] = {}
-		end
-		table.insert(tmp_entered_tbl[smart_id], squad)
-		return
-]]
 		abort("[sim_board:enter_smart]: Squad with ID '%s' tried to enter unregistered smart with ID '%s'.", tostring(squad.squad_id), tostring(smart_id))
 	end
 

gamedata/scripts/smart_terrain.script

@@ -11,9 +11,7 @@ local table_sort = table.sort
 class "se_smart_terrain" (cse_alife_smart_zone)
 
 function se_smart_terrain:__init(section) super(section)
---	self.b_registred = false
 	self.need_init_npc = false
---	self.npc_to_register = {}
 	self.npc_by_job_section = {}
 	self.dead_time = {}
 	self.npc_info = {}
@@ -70,18 +68,12 @@ function se_smart_terrain:on_register()
 		end
 	end
 
---	self.b_registred = true
-
 	self:load_jobs()
 
---	self.board:init_smart(self)
-
 	if self.need_init_npc then
 		self.need_init_npc = false
 		self:init_npc_after_load()
 	end
-
---	self:register_delayed_npc()
 --[[
 	Every faction's squads should be initialized before any faction's targets,
 	else a squad's relative power may be wrong after load (due to enemy squads
@@ -183,12 +175,7 @@ local function fill_npc_info(se_npc)
 end
 
 function se_smart_terrain:register_npc(se_npc)
---[[
-	if self.b_registred == false then
-		self.npc_to_register[#self.npc_to_register + 1] = se_npc
-		return
-	end
-]]
+
 	self.npc_info[se_npc.id] = fill_npc_info(se_npc)
 
 	se_npc.m_smart_terrain_id = self.id
@@ -197,14 +184,7 @@ function se_smart_terrain:register_npc(se_npc)
 
 	self:update_jobs(se_npc)
 end
---[[
-function se_smart_terrain:register_delayed_npc()
-	for i = 1, #self.npc_to_register do
-		self:register_npc(self.npc_to_register[i])
-	end
-	self.npc_to_register = {}
-end
-]]
+
 function se_smart_terrain:unregister_npc(se_npc)
 
 	local npc_info = self.npc_info[se_npc.id]

gamedata/scripts/sound_theme.script

@@ -35,6 +35,7 @@ end
 
 function npc_sound:reset(npc_id)
 	self.stop_time = nil
+	self.idle_time = nil
 	self.played_id = nil
 	self.can_play_group_sound = true
 	self.can_play_sound[npc_id] = true
@@ -43,10 +44,7 @@ function npc_sound:reset(npc_id)
 		npc:set_sound_mask(-1)
 		npc:set_sound_mask(0)
 	end
-	if self.pda_snd_obj ~= nil then
-		self.pda_snd_obj:stop()
-		self.pda_snd_obj = nil
-	end
+	self:stop()
 end
 
 function npc_sound:is_playing(npc_id)
@@ -260,7 +258,7 @@ function npc_sound:select_next_sound(npc_data) -- TODO: Replace with local func
 end
 
 function npc_sound:stop()
-	if self.pda_snd_obj ~= nil and self.pda_snd_obj:playing() then
+	if self.pda_snd_obj ~= nil then
 		self.pda_snd_obj:stop()
 		self.pda_snd_obj = nil
 	end
@@ -380,6 +378,14 @@ function actor_sound:__init(ini, section)
 	end
 end
 
+function actor_sound:reset()
+	self.stop_time = nil
+	self.idle_time = nil
+	self.played_id = nil
+	self.can_play_sound = true
+	self:stop()
+end
+
 function actor_sound:callback(obj_id) -- executed on first obj binder update() after sound stops playing
 
 	self.stop_time      = time_global()
@@ -443,6 +449,7 @@ end
 function actor_sound:stop()
 	if self.snd_obj ~= nil then
 		self.snd_obj:stop()
+		self.snd_obj = nil
 	end
 end
 
@@ -466,6 +473,7 @@ function object_sound:__init(ini, section)
 
 	self.class_id       = "object_sound"
 	self.shuffle        = utils.cfg_get_string(ini, section, "shuffle", nil, false, "", "rnd")
+	self.play_always    = utils.cfg_get_bool(ini, section, "play_always", nil, false, false)
 	self.section        = section
 	self.played_id      = nil
 	self.stop_time      = nil
@@ -502,11 +510,20 @@ function object_sound:__init(ini, section)
 	end
 end
 
+function object_sound:reset()
+	self.stop_time = nil
+	self.idle_time = nil
+	self.played_id = nil
+	self.can_play_sound = true
+	self:stop()
+end
+
 function object_sound:callback(obj_id) -- executed on first obj binder update() after sound stops playing
 
 	self.stop_time      = time_global()
 	self.idle_time      = math.random(self.min_idle, self.max_idle) * 1000
 	self.snd_obj        = nil
+	self.pda_snd_obj    = nil
 	self.can_play_sound = true
 
 	local obj_st = db.storage[obj_id]
@@ -529,6 +546,7 @@ end
 
 function object_sound:is_playing()
 	return self.snd_obj ~= nil and self.snd_obj:playing()
+	or self.pda_snd_obj ~= nil and self.pda_snd_obj:playing()
 end
 
 function object_sound:play(obj_id, faction, point)
@@ -576,8 +594,9 @@ end
 function object_sound:stop()
 	if self.snd_obj ~= nil then
 		self.snd_obj:stop()
+		self.snd_obj = nil
 	end
-	if self.pda_snd_obj ~= nil and self.pda_snd_obj:playing() then
+	if self.pda_snd_obj ~= nil then
 		self.pda_snd_obj:stop()
 		self.pda_snd_obj = nil
 	end
@@ -611,18 +630,17 @@ function looped_sound:__init(ini, section)
 	end
 end
 
-function looped_sound:is_playing()
-	return self.snd_obj ~= nil and self.snd_obj:playing()
-end
-
 function looped_sound:stop()
 	if self.snd_obj ~= nil then
 		self.snd_obj:stop()
+		self.snd_obj = nil
 	end
 end
 
 function looped_sound:set_volume(level)
-	self.snd_obj.volume = level
+	if self.snd_obj ~= nil then
+		self.snd_obj.volume = level
+	end
 end
 
 function looped_sound:play(obj_id)

gamedata/scripts/sr_bloodsucker.script

@@ -125,7 +125,8 @@ function bloodsucker_attack:update(delta)
 				self.snd_obj:stop()
 			end
 		else
-			self.snd_obj = xr_sound.set_sound_play(restr_id, st.snd_obj)
+			local active_snd = xr_sound.set_sound_play(restr_id, st.snd_obj)
+			self.snd_obj = active_snd and active_snd.snd_obj
 			if self.snd_obj and self.snd_obj:playing() then
 				self.snd_obj:set_position(self.current)
 			end

gamedata/scripts/sr_monster.script

@@ -68,7 +68,8 @@ function fake_monster:update(delta)
 		else
 			self.current = vector():set(target_pos)
 		end
-		self.snd_obj = xr_sound.set_sound_play(self.object:id(), self.st.snd_obj)
+		local active_snd = xr_sound.set_sound_play(self.object:id(), self.st.snd_obj)
+		self.snd_obj = active_snd and active_snd.snd_obj
 		if self.snd_obj and self.snd_obj:playing() then
 			self.snd_obj:set_position(self.current)
 		end