Removed unused parameter from several functions in FStateDefinitions …

…class src/p_states.cpp:724:54: warning: parameter ‘actor’ set but not used [-Wunused-but-set-parameter] https://forum.zdoom.org/viewtopic.php?t=58364
ZDoom · Nov 5, 2017 · 2749518 · 2749518
1 parent bd08568
commit 2749518
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/src/info.cpp b/src/info.cpp
@@ -322,18 +322,16 @@ bool PClassActor::SetReplacement(FName replaceName)
 
 void AActor::Finalize(FStateDefinitions &statedef)
 {
-	AActor *defaults = this;
-
 	try
 	{
-		statedef.FinishStates(GetClass(), defaults);
+		statedef.FinishStates(GetClass());
 	}
 	catch (CRecoverableError &)
 	{
 		statedef.MakeStateDefines(nullptr);
 		throw;
 	}
-	statedef.InstallStates(GetClass(), defaults);
+	statedef.InstallStates(GetClass(), this);
 	statedef.MakeStateDefines(nullptr);
 }
 

diff --git a/src/p_states.cpp b/src/p_states.cpp
@@ -721,7 +721,7 @@ void FStateDefinitions::RetargetStates (intptr_t count, const char *target)
 //
 //==========================================================================
 
-FState *FStateDefinitions::ResolveGotoLabel (AActor *actor, PClassActor *mytype, char *name)
+FState *FStateDefinitions::ResolveGotoLabel (PClassActor *mytype, char *name)
 {
 	PClassActor *type = mytype;
 	FState *state;
@@ -741,7 +741,6 @@ FState *FStateDefinitions::ResolveGotoLabel (AActor *actor, PClassActor *mytype,
 		if (stricmp (classname, "Super") == 0)
 		{
 			type = ValidateActor(type->ParentClass);
-			actor = GetDefaultByType(type);
 		}
 		else
 		{
@@ -763,7 +762,6 @@ FState *FStateDefinitions::ResolveGotoLabel (AActor *actor, PClassActor *mytype,
 			if (type != stype)
 			{
 				type = static_cast<PClassActor *>(stype);
-				actor = GetDefaultByType (type);
 			}
 		}
 	}
@@ -836,16 +834,16 @@ void FStateDefinitions::FixStatePointers (PClassActor *actor, TArray<FStateDefin
 //
 //==========================================================================
 
-void FStateDefinitions::ResolveGotoLabels (PClassActor *actor, AActor *defaults, TArray<FStateDefine> & list)
+void FStateDefinitions::ResolveGotoLabels (PClassActor *actor, TArray<FStateDefine> & list)
 {
 	for (unsigned i = 0; i < list.Size(); i++)
 	{
 		if (list[i].State != NULL && list[i].DefineFlags == SDF_LABEL)
 		{ // It's not a valid state, so it must be a label string. Resolve it.
-			list[i].State = ResolveGotoLabel (defaults, actor, (char *)list[i].State);
+			list[i].State = ResolveGotoLabel (actor, (char *)list[i].State);
 			list[i].DefineFlags = SDF_STATE;
 		}
-		if (list[i].Children.Size() > 0) ResolveGotoLabels(actor, defaults, list[i].Children);
+		if (list[i].Children.Size() > 0) ResolveGotoLabels(actor, list[i].Children);
 	}
 }
 
@@ -1004,7 +1002,7 @@ int FStateDefinitions::AddStates(FState *state, const char *framechars, const FS
 //
 //==========================================================================
 
-int FStateDefinitions::FinishStates(PClassActor *actor, AActor *defaults)
+int FStateDefinitions::FinishStates(PClassActor *actor)
 {
 	int count = StateArray.Size();
 
@@ -1023,7 +1021,7 @@ int FStateDefinitions::FinishStates(PClassActor *actor, AActor *defaults)
 		FixStatePointers(actor, StateLabels);
 
 		// Fix state pointers that are gotos
-		ResolveGotoLabels(actor, defaults, StateLabels);
+		ResolveGotoLabels(actor, StateLabels);
 
 		for (i = 0; i < count; i++)
 		{
@@ -1047,15 +1045,15 @@ int FStateDefinitions::FinishStates(PClassActor *actor, AActor *defaults)
 				break;
 
 			case SDF_LABEL:
-				realstates[i].NextState = ResolveGotoLabel(defaults, actor, (char *)realstates[i].NextState);
+				realstates[i].NextState = ResolveGotoLabel(actor, (char *)realstates[i].NextState);
 				break;
 			}
 		}
 	}
 	else
 	{
 		// Fix state pointers that are gotos
-		ResolveGotoLabels(actor, defaults, StateLabels);
+		ResolveGotoLabels(actor, StateLabels);
 	}
 	return count;
 }

diff --git a/src/scripting/thingdef.h b/src/scripting/thingdef.h
@@ -113,9 +113,9 @@ class FStateDefinitions
 	FStateDefine *FindStateAddress(const char *name);
 	FState *FindState(const char *name);
 
-	FState *ResolveGotoLabel(AActor *actor, PClassActor *mytype, char *name);
+	FState *ResolveGotoLabel(PClassActor *mytype, char *name);
 	static void FixStatePointers(PClassActor *actor, TArray<FStateDefine> & list);
-	void ResolveGotoLabels(PClassActor *actor, AActor *defaults, TArray<FStateDefine> & list);
+	void ResolveGotoLabels(PClassActor *actor, TArray<FStateDefine> & list);
 public:
 
 	FStateDefinitions()
@@ -129,7 +129,7 @@ class FStateDefinitions
 	void AddStateLabel(const char *statename);
 	int GetStateLabelIndex (FName statename);
 	void InstallStates(PClassActor *info, AActor *defaults);
-	int FinishStates(PClassActor *actor, AActor *defaults);
+	int FinishStates(PClassActor *actor);
 
 	void MakeStateDefines(const PClassActor *cls);
 	void AddStateDefines(const FStateLabels *list);