little patch

Lord-Turmoil · Dec 22, 2022 · 2a6d728 · 2a6d728
1 parent 4b90423
commit 2a6d728
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 8 deletions.
diff --git a/Dungeon/Dungeon.rc b/Dungeon/Dungeon.rc
@@ -71,8 +71,8 @@ IDI_ICON1               ICON                    "Dungeon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,5
- PRODUCTVERSION 1,1,1,5
+ FILEVERSION 1,1,1,6
+ PRODUCTVERSION 1,1,1,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -89,12 +89,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "New Desire Studios"
             VALUE "FileDescription", "Main executable for Dungeon"
-            VALUE "FileVersion", "1.1.1.5"
+            VALUE "FileVersion", "1.1.1.6"
             VALUE "InternalName", "Dungeon Canon.exe"
             VALUE "LegalCopyright", "Copyright (C) New Desire Studios 2022 - 2023"
             VALUE "OriginalFilename", "Dungeon.exe"
             VALUE "ProductName", "Dungeon"
-            VALUE "ProductVersion", "1.1.1.5"
+            VALUE "ProductVersion", "1.1.1.6"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Dungeon/src/object/EnemyLibrary.cpp b/Dungeon/src/object/EnemyLibrary.cpp
@@ -169,5 +169,6 @@ const std::vector<Enemy*>& EnemyLibrary::GetEnemyByLevel(int level)
 	LOG_EXTRA_WARNING("Missing enemy of level %d", level);
 
 	static std::vector<Enemy*> dummy;
+
 	return dummy;
 }
diff --git a/Dungeon/src/ui/CreditsInterface.cpp b/Dungeon/src/ui/CreditsInterface.cpp
@@ -37,6 +37,8 @@ bool CreditsInterface::Load(XMLElement* node)
 	_RETURN_IF_ERROR();
 
 	TimeInterface::Load(node);
+	_RETURN_IF_ERROR();
+
 	_LoadCredits(node);
 
 	_RETURN_STATE();

diff --git a/Dungeon/src/ui/Interface.cpp b/Dungeon/src/ui/Interface.cpp
@@ -53,6 +53,7 @@ bool PlainInterface::Load(XMLElement* node)
 	const char* attr;
 
 	AbstractInterface::Load(node);
+	_RETURN_IF_ERROR();
 
 	_PARSE("in-time", m_inTime, name, 0L);
 	_PARSE("out-time", m_outTime, name, 0L);
@@ -212,6 +213,7 @@ bool TimeInterface::Load(XMLElement* node)
 	const char* attr;
 
 	PlainInterface::Load(node);
+	_RETURN_IF_ERROR();
 
 	_PARSE("duration", m_duration, name, 0L);
 
@@ -346,7 +348,7 @@ AbstractInterface* LoadInterface(XMLElement* node)
 
 	if (intf)
 	{
-		intf->SetWidgetManager(new WidgetManager());
+		// intf->SetWidgetManager(new WidgetManager());
 		if (!intf->Load(node))
 		{
 			delete intf;

diff --git a/Dungeon/src/ui/MenuInterface.cpp b/Dungeon/src/ui/MenuInterface.cpp
@@ -150,6 +150,7 @@ bool SettingInterface::Load(XMLElement* node)
 	_RETURN_IF_ERROR();
 
 	PlainInterface::Load(node);
+	_RETURN_IF_ERROR();
 
 	_LoadSettings();
 
@@ -555,6 +556,7 @@ bool VictoryInterface::Load(XMLElement* node)
 	_RETURN_IF_ERROR();
 
 	TimeInterface::Load(node);
+	_RETURN_IF_ERROR();
 
 	_PARSE("victory", m_isVictory, name, false);
 

diff --git a/Dungeon/src/ui/VersionInterface.cpp b/Dungeon/src/ui/VersionInterface.cpp
@@ -47,6 +47,7 @@ bool VersionInterface::Load(XMLElement* node)
 	_RETURN_IF_ERROR();
 
 	PlainInterface::Load(node);
+	_RETURN_IF_ERROR();
 
 	WidgetManager* mgr;
 	XMLElement* page = node->FirstChildElement("Page");

diff --git a/Dungine/inc/ui/AbstractWidget.h b/Dungine/inc/ui/AbstractWidget.h
@@ -9,7 +9,7 @@
  *                                                                            *
  *                     Start Date : July 17, 2022                             *
  *                                                                            *
- *                    Last Update : November 25, 2022                         *
+ *                    Last Update : December 22, 2022                         *
  *                                                                            *
  * -------------------------------------------------------------------------- *
  * Over View:                                                                 *

diff --git a/Dungine/inc/ui/Transition.h b/Dungine/inc/ui/Transition.h
@@ -9,7 +9,7 @@
  *                                                                            *
  *                     Start Date : April 7, 2022                             *
  *                                                                            *
- *                    Last Update : November 25, 2022                         *
+ *                    Last Update : November 29, 2022                         *
  *                                                                            *
  * -------------------------------------------------------------------------- *
  * Over View:                                                                 *

diff --git a/Dungine/src/ui/Drawer.cpp b/Dungine/src/ui/Drawer.cpp
@@ -9,7 +9,7 @@
  *                                                                            *
  *                     Start Date : March 9, 2022                             *
  *                                                                            *
- *                    Last Update : November 29, 2022                         *
+ *                    Last Update : December 22, 2022                         *
  *                                                                            *
  * -------------------------------------------------------------------------- *
  * Over View:                                                                 *
@@ -945,6 +945,15 @@ bool AnimDrawer::Load(XMLElement* node)
 	}
 	m_anim.Initialize(m_pResource->GetResource());
 
+	/*
+	** 2022/12/22 TS:
+	** Whether random beginning.
+	*/
+	bool isRandom = true;
+	_PARSE("random", isRandom, name, true);
+	if (isRandom)
+		m_anim.SetFrame(Random(m_anim.GetTotalFrameNum()));
+
 	float aspectRatio = dmin(1.0f * m_width / m_anim.GetFrameWidth(), 1.0f * m_height / m_anim.GetFrameHeight());
 	float k = (aspectRatio - 1.0f) / 2.0f;
 	// Compensate the effect of symbol scale.