Fix refactor bug (#5001)

BMagnu · web-flow · commit 385478824e7d · 2022-12-13T20:56:48.000Z
diff --git a/freespace2/freespace.cpp b/freespace2/freespace.cpp
@@ -5569,8 +5569,10 @@ void game_enter_state( int old_state, int new_state )
 		scripting::hook_param("NewState", 'o', l_GameState.Set(gamestate_h(new_state))));
 
 	if(scripting::hooks::OnStateStart->isActive()) {
-		if(scripting::hooks::OnStateStart->isOverride(script_param_list))
+		if (scripting::hooks::OnStateStart->isOverride(script_param_list)) {
+			scripting::hooks::OnStateStart->run(script_param_list);
 			return;
+		}
 	}
 
 	switch (new_state) {
@@ -6097,8 +6099,7 @@ void mouse_force_pos(int x, int y);
 
 	//WMC - now do user scripting stuff
 	if (scripting::hooks::OnStateStart->isActive()) {
-		if (scripting::hooks::OnStateStart->run(script_param_list))
-			return;
+		scripting::hooks::OnStateStart->run(script_param_list);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5569,8 +5569,10 @@ void game_enter_state( int old_state, int new_state )`
`5569`	`5569`	`scripting::hook_param("NewState", 'o', l_GameState.Set(gamestate_h(new_state))));`
`5570`	`5570`
`5571`	`5571`	`if(scripting::hooks::OnStateStart->isActive()) {`
`5572`		`- if(scripting::hooks::OnStateStart->isOverride(script_param_list))`
	`5572`	`+ if (scripting::hooks::OnStateStart->isOverride(script_param_list)) {`
	`5573`	`+ scripting::hooks::OnStateStart->run(script_param_list);`
`5573`	`5574`	`return;`
	`5575`	`+ }`
`5574`	`5576`	`}`
`5575`	`5577`
`5576`	`5578`	`switch (new_state) {`
`@@ -6097,8 +6099,7 @@ void mouse_force_pos(int x, int y);`
`6097`	`6099`
`6098`	`6100`	`//WMC - now do user scripting stuff`
`6099`	`6101`	`if (scripting::hooks::OnStateStart->isActive()) {`
`6100`		`- if (scripting::hooks::OnStateStart->run(script_param_list))`
`6101`		`- return;`
	`6102`	`+ scripting::hooks::OnStateStart->run(script_param_list);`
`6102`	`6103`	`}`
`6103`	`6104`	`}`
`6104`	`6105`