[Scummvm-git-logs] scummvm master -> d71bc64e8331fcb69030851b8183af7f063461dc

Mon Aug 2 16:34:51 UTC 2021

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
11ed99bd62 DEVTOOLS: XEEN: Fix compilation on some platforms
d71bc64e83 DEVTOOLS: XEEN: Fix warnings


Commit: 11ed99bd625502b23d60e023b34fe4da5252b896
    https://github.com/scummvm/scummvm/commit/11ed99bd625502b23d60e023b34fe4da5252b896
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-02T18:34:36+02:00

Commit Message:
DEVTOOLS: XEEN: Fix compilation on some platforms

Changed paths:
    devtools/create_xeen/constants.cpp

diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 5db1a62674..5e4fbf4235 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -581,7 +581,7 @@ void LangConstants::writeConstants(Common::String num, CCArchive &cc) {
 
 void writeConstants(CCArchive &cc) {
 	EN eng;
-	eng.writeConstants(Common::String::format("_%i", Common::Language::EN_ANY), cc);
+	eng.writeConstants(Common::String::format("_%i", Common::EN_ANY), cc);
 	RU ru;
-	ru.writeConstants(Common::String::format("_%i", Common::Language::RU_RUS), cc);
+	ru.writeConstants(Common::String::format("_%i", Common::RU_RUS), cc);
 }


Commit: d71bc64e8331fcb69030851b8183af7f063461dc
    https://github.com/scummvm/scummvm/commit/d71bc64e8331fcb69030851b8183af7f063461dc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-02T18:34:36+02:00

Commit Message:
DEVTOOLS: XEEN: Fix warnings

Changed paths:
    devtools/create_xeen/constants.h
    devtools/create_xeen/en_constants.h
    devtools/create_xeen/ru_constants.h


diff --git a/devtools/create_xeen/constants.h b/devtools/create_xeen/constants.h
index f6c4cfa2dd..bd52b258a5 100644
--- a/devtools/create_xeen/constants.h
+++ b/devtools/create_xeen/constants.h
@@ -160,6 +160,7 @@ protected:
 	const int   *_newCharSkillsOffset = NULL;
 
 public:
+	virtual ~LangConstants() {}
 	virtual const char  *CLOUDS_CREDITS() = 0;
 	virtual const char  *DARK_SIDE_CREDITS() = 0;
 	virtual const char  *SWORDS_CREDITS1() = 0;
@@ -1255,6 +1256,7 @@ public:
 			virtual int KEY_ITEM() = 0;
 			virtual int KEY_QUICK() = 0;
 			virtual int KEY_EXCHANGE() = 0;
+			virtual ~DialogsCharInfo() {}
 		};
 		virtual DialogsCharInfo *dialogsCharInfo() = 0;
 
@@ -1266,6 +1268,7 @@ public:
 			virtual int KEY_SAVE() = 0;
 			virtual int KEY_QUIT() = 0;
 			virtual int KEY_MRWIZARD() = 0;
+			virtual ~DialogsControlPanel() {}
 		};
 		virtual DialogsControlPanel *dialogsControlPanel() = 0;
 
@@ -1280,6 +1283,7 @@ public:
 			virtual int KEY_SPD() = 0;
 			virtual int KEY_ACY() = 0;
 			virtual int KEY_LCK() = 0;
+			virtual ~DialogsCreateChar() {}
 		};
 		virtual DialogsCreateChar *dialogsCreateChar() = 0;
 
@@ -1287,6 +1291,7 @@ public:
 		public:
 			virtual int KEY_ADVENTURER() = 0;
 			virtual int KEY_WARRIOR() = 0;
+			virtual ~DialogsDifficulty() {}
 		};
 		virtual DialogsDifficulty *dialogsDifficulty() = 0;
 
@@ -1308,6 +1313,7 @@ public:
 			virtual int KEY_QUEST() = 0;
 			virtual int KEY_RECHRG() = 0;
 			virtual int KEY_GOLD() = 0;
+			virtual ~DialogsItems() {}
 		};
 		virtual DialogsItems *dialogsItems() = 0;
 
@@ -1317,6 +1323,7 @@ public:
 			virtual int KEY_REMOVE() = 0;
 			virtual int KEY_CREATE() = 0;
 			virtual int KEY_EXIT() = 0;
+			virtual ~DialogsParty() {}
 		};
 		virtual DialogsParty *dialogsParty() = 0;
 
@@ -1325,12 +1332,14 @@ public:
 			virtual int KEY_QUEST_ITEMS() = 0;
 			virtual int KEY_CURRENT_QUESTS() = 0;
 			virtual int KEY_AUTO_NOTES() = 0;
+			virtual ~DialogsQuests() {}
 		};
 		virtual DialogsQuests *dialogsQuests() = 0;
 
 		class DialogsQuickFight {
 		public:
 			virtual int KEY_NEXT() = 0;
+			virtual ~DialogsQuickFight() {}
 		};
 		virtual DialogsQuickFight *dialogsQuickFight() = 0;
 
@@ -1344,6 +1353,7 @@ public:
 			virtual int KEY_ACID() = 0;
 			virtual int KEY_SET() = 0;
 			virtual int KEY_RETURN() = 0;
+			virtual ~DialogsSpells() {}
 		};
 		virtual DialogsSpells *dialogsSpells() = 0;
 
@@ -1365,6 +1375,7 @@ public:
 			virtual int KEY_DONATION() = 0;
 			virtual int KEY_UNCURSE() = 0;
 			virtual int KEY_TRAIN() = 0;
+			virtual ~Locations() {}
 		};
 		virtual Locations *locations() = 0;
 
@@ -1374,8 +1385,10 @@ public:
 			virtual int KEY_LOAD_GAME() = 0;
 			virtual int KEY_SHOW_CREDITS() = 0;
 			virtual int KEY_VIEW_ENDGAME() = 0;
+			virtual ~CloudsOfXeenMenu() {}
 		};
 		virtual CloudsOfXeenMenu *cloudsOfXeenMenu() = 0;
+		virtual ~KeyConstants() {}
 	};
 	virtual KeyConstants *keyConstants() = 0;
 };
diff --git a/devtools/create_xeen/en_constants.h b/devtools/create_xeen/en_constants.h
index 93245c4f0c..c79f51fd1f 100644
--- a/devtools/create_xeen/en_constants.h
+++ b/devtools/create_xeen/en_constants.h
@@ -27,6 +27,7 @@
 
 class EN : public LangConstants {
 public:
+	virtual ~EN() {}
 	const char *CLOUDS_CREDITS() {
 		return "\v012\t000\x3"
 			   "c\f35Designed and Directed By:\n"
@@ -1801,7 +1802,7 @@ public:
 
 	const char **UNABLE_TO_PICK_FORM() {
 		delete[] _unableToPickForm;
-		_unableToPickForm = new const char *[2] { "unable to pick", "" }; 
+		_unableToPickForm = new const char *[2] { "unable to pick", "" };
 		return _unableToPickForm;
 	}
 
@@ -2183,5 +2184,3 @@ public:
 private:
 	EN_KeyConstants *_kc = NULL;
 };
-
-
diff --git a/devtools/create_xeen/ru_constants.h b/devtools/create_xeen/ru_constants.h
index f515966f70..f9effd4426 100644
--- a/devtools/create_xeen/ru_constants.h
+++ b/devtools/create_xeen/ru_constants.h
@@ -26,8 +26,9 @@
 
 class RU : public LangConstants {
 public:
+	virtual ~RU() {}
 	const char *CLOUDS_CREDITS() {
-		return "\v012\t000\x3"																								 // "\v012\t000\x3"  
+		return "\v012\t000\x3"																								 // "\v012\t000\x3"
 			   "c\f35\x88\xA4\xA5\xEF \xA8 \xE0\xE3\xAA\xAE\xA2\xAE\xA4\xE1\xE2\xA2\xAE \xAF\xE0\xAE\xA5\xAA\xE2\xAE\xAC:\n" // "c\f35Ð˜Ð´ÐµÑ Ð¸ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð¾Ð¼:\n"
 			   "\f17\x84\xA6\xAE\xAD \x82\xA0\xAD \x8A\xA0\xAD\xA5\xA3\xA5\xAC\x3"                                           // "\f17Ð”Ð¶Ð¾Ð½ Ð’Ð°Ð½ ÐšÐ°Ð½ÐµÐ³ÐµÐ¼\x3"
 			   "l\n"                                                                                                         // "l\n"
@@ -1728,7 +1729,7 @@ public:
 			   "c\n"																		 // "\n"
 			   "\n"																			 // "Ð’ ÐºÐ°ÐºÐ¾Ð¹ Ð³Ð¾Ñ€Ð¾Ð´ (1-5)\n"
 			   "\x82 \xAA\xA0\xAA\xAE\xA9 \xA3\xAE\xE0\xAE\xA4 (1-5)\n"						 // "\n";
-			   "\n";																		 // 
+			   "\n";																		 //
 	}
 
 	const char *TOWN_PORTAL_SWORDS() {
@@ -2129,7 +2130,7 @@ public:
 			"\xE0\xA0\xA7\xA1\xAE\xA9\xAD\xA8\xAA\xA0",                     //Ñ€Ð°Ð·Ð±Ð¾Ð¹Ð½Ð¸ÐºÐ°
 			"\xA3\xE0\xA0\xA1\xA8\xE2\xA5\xAB\xEF",                         //Ð³Ñ€Ð°Ð±Ð¸Ñ‚ÐµÐ»Ñ
 			"\xAF\xE0\xA5\xE1\xE2\xE3\xAF\xAD\xA8\xAA\xA0",                 //Ð¿Ñ€ÐµÑÑ‚ÑƒÐ¿Ð½Ð¸ÐºÐ°
-			"\xAF\xA8\xE0\xA0\xE2\xA0"                                      //Ð¿Ð¸Ñ€Ð°Ñ‚Ð° 
+			"\xAF\xA8\xE0\xA0\xE2\xA0"                                      //Ð¿Ð¸Ñ€Ð°Ñ‚Ð°
 		};
 		return _maeNames;
 	}


