thcrap_tasofro: pl: fix child versions of parseCommand not being called

Commit 068829b changed a parameter for AText::parseCommand from an int to a
size_t. But it didn't apply the same changes to StoryText::parseCommand and
Th155StoryText::parseCommand, which were overriding that function.
Because of that, the 2 functions from the child classes were no longer
overriding the one from the parent class.

Fixes an issue in th145 where only the last line of dialog balloons was
displayed, and may fix #286

Author: brliron

thcrap_tasofro/src/pl.cpp

@@ -493,7 +493,7 @@ bool TasofroPl::AText::parseCommand(json_t *patch, size_t json_line_num)
 	return false;
 }
 
-bool TasofroPl::StoryText::parseCommand(json_t *patch, int json_line_num)
+bool TasofroPl::StoryText::parseCommand(json_t *patch, size_t json_line_num)
 {
 	bool ret = this->AText::parseCommand(patch, json_line_num);
 	if (ret == false) {
@@ -504,7 +504,7 @@ bool TasofroPl::StoryText::parseCommand(json_t *patch, int json_line_num)
 	return ret;
 }
 
-bool TasofroPl::Th155StoryText::parseCommand(json_t *patch, int json_line_num)
+bool TasofroPl::Th155StoryText::parseCommand(json_t *patch, size_t json_line_num)
 {
 	// Overwrite the StoryText overwrite and go back to the standard behavior
 	return this->AText::parseCommand(patch, json_line_num);

thcrap_tasofro/src/pl.h

@@ -131,11 +131,11 @@ namespace TasofroPl
 	class StoryText : public AText
 	{
 	protected:
-		void _patchInit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it);
-		bool parseCommand(json_t *patch, int json_line_num);
-		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
-		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
-		void _patchExit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it);
+		void _patchInit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it) override;
+		bool parseCommand(json_t *patch, size_t json_line_num) override;
+		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
+		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
+		void _patchExit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it) override;
 
 	public:
 		StoryText(const std::vector<std::string>& fields, const std::string& comment = "");
@@ -145,9 +145,9 @@ namespace TasofroPl
 	class Th155StoryText : public StoryText
 	{
 	protected:
-		bool parseCommand(json_t *patch, int json_line_num);
-		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
-		void _patchExit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it);
+		bool parseCommand(json_t *patch, size_t json_line_num) override;
+		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
+		void _patchExit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it) override;
 
 	public:
 		Th155StoryText(const std::vector<std::string>& fields, const std::string& comment = "");
@@ -157,7 +157,7 @@ namespace TasofroPl
 	class Th155_110StoryText : public Th155StoryText
 	{
 	protected:
-		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
+		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
 
 	public:
 		Th155_110StoryText(const std::vector<std::string>& fields, const std::string& comment = "");
@@ -170,11 +170,11 @@ namespace TasofroPl
 		bool is_staffroll;
 
 	protected:
-		void _patchInit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it);
-		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
-		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
-		void endLine();
-		void _patchExit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it);
+		void _patchInit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it) override;
+		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
+		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
+		void endLine() override;
+		void _patchExit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it) override;
 
 	public:
 		EndingText(const std::vector<std::string>& fields, const std::string& comment = "");
@@ -184,9 +184,9 @@ namespace TasofroPl
 	class WinText : public AText
 	{
 	protected:
-		void _patchInit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it);
-		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
-		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it);
+		void _patchInit(std::list<ALine*>& file, std::list<ALine*>::iterator& file_it) override;
+		void beginLine(std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
+		void _patchLine(std::string& text, std::list<ALine*>& file, const std::list<ALine*>::iterator& it) override;
 
 	public:
 		WinText(const std::vector<std::string>& fields, const std::string& comment = "");