only pass client to exec(). it contains the controller anyways

Desour · Dec 17, 2024 · c5eafd1 · c5eafd1
1 parent 7995006
commit c5eafd1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/script/sscsm_controller.cpp b/src/script/sscsm_controller.cpp
@@ -41,7 +41,7 @@ SSCSMController::~SSCSMController()
 
 SerializedSSCSMAnswer SSCSMController::handleRequest(Client *client, ISSCSMRequest *req)
 {
-	return req->exec(this, client);
+	return req->exec(client);
 }
 
 void SSCSMController::runEvent(Client *client, std::unique_ptr<ISSCSMEvent> event)

diff --git a/src/script/sscsm_irequest.h b/src/script/sscsm_irequest.h
@@ -24,7 +24,7 @@ struct ISSCSMRequest
 {
 	virtual ~ISSCSMRequest() = default;
 
-	virtual SerializedSSCSMAnswer exec(SSCSMController *cntrl, Client *client) = 0;
+	virtual SerializedSSCSMAnswer exec(Client *client) = 0;
 };
 
 // FIXME: actually serialize, and replace this with a string

diff --git a/src/script/sscsm_requests.h b/src/script/sscsm_requests.h
@@ -22,7 +22,7 @@ struct SSCSMAnswerPollNextEvent : public ISSCSMAnswer
 
 struct SSCSMRequestPollNextEvent : public ISSCSMRequest
 {
-	SerializedSSCSMAnswer exec(SSCSMController *cntrl, Client *client) override
+	SerializedSSCSMAnswer exec(Client *client) override
 	{
 		FATAL_ERROR("SSCSMRequestPollNextEvent needs to be handled by SSCSMControler::runEvent()");
 	}
@@ -41,7 +41,7 @@ struct SSCSMRequestGetNode : public ISSCSMRequest
 
 	SSCSMRequestGetNode(v3s16 pos_) : pos(pos_) {}
 
-	SerializedSSCSMAnswer exec(SSCSMController *cntrl, Client *client) override
+	SerializedSSCSMAnswer exec(Client *client) override
 	{
 		MapNode node = client->getEnv().getMap().getNode(pos);