Merge pull request #13 from SeriousAlexej/dev

Numerous modeler and some editor improvements

.gitignore

@@ -72,6 +72,7 @@ Temp/*.tmp
 *.vis
 *.moc
 *.qrc.h
+*.ui.h
 Data/*.pri
 Data/*.bin
 Scripts/PersistentSymbols.ini

Licenses/TangoIconLibrary

@@ -0,0 +1,2 @@
+This project uses Tango Icon Library, which was released to the Public Domain
+http://tango.freedesktop.org/Tango_Icon_Library

Sources/All.sln

@@ -23,8 +23,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ecc", "Ecc\Ecc.vcxproj", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Engine", "Engine\Engine.vcxproj", "{4B6F587C-7C59-4481-FBB9-CA44380D0CBF}"
 	ProjectSection(ProjectDependencies) = postProject
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282} = {1DC0126D-1959-365F-B01A-DC4F5E16C282}
 		{1F46FD81-1A15-7E2C-7C68-84AB43BC0B05} = {1F46FD81-1A15-7E2C-7C68-84AB43BC0B05}
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC} = {3E820CCA-6CA6-319F-A712-EAD200D540CC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EngineGUI", "EngineGUI\EngineGUI.vcxproj", "{870758F3-5C2F-D196-2A89-CC336EBE7779}"
@@ -58,6 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MakeFONT", "MakeFONT\MakeFO
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modeler", "Modeler\Modeler.vcxproj", "{9E0BA4A5-61AD-9CF5-AC0D-50DAB6639605}"
 	ProjectSection(ProjectDependencies) = postProject
+		{451266C3-5842-38E5-ADEC-05D7B338AD11} = {451266C3-5842-38E5-ADEC-05D7B338AD11}
 		{870758F3-5C2F-D196-2A89-CC336EBE7779} = {870758F3-5C2F-D196-2A89-CC336EBE7779}
 	EndProjectSection
 EndProject
@@ -89,7 +90,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorldEditor", "WorldEditor\
 	ProjectSection(ProjectDependencies) = postProject
 		{3EC2357F-FA36-9DF7-FFC4-AF9C03777DBE} = {3EC2357F-FA36-9DF7-FFC4-AF9C03777DBE}
 		{AC040397-6FEA-E9B2-2B28-5BB08E1607A1} = {AC040397-6FEA-E9B2-2B28-5BB08E1607A1}
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0} = {EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}
+		{451266C3-5842-38E5-ADEC-05D7B338AD11} = {451266C3-5842-38E5-ADEC-05D7B338AD11}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg\libogg_dynamic.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
@@ -101,13 +102,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "libvorbis\libv
 		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assimp", "assimpBuild\code\assimp.vcxproj", "{3E820CCA-6CA6-319F-A712-EAD200D540CC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assimp", "assimpBuild\code\assimp.vcxproj", "{1DC0126D-1959-365F-B01A-DC4F5E16C282}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstatic", "assimpBuild\contrib\zlib\zlibstatic.vcxproj", "{600F35A0-2A88-35BA-962E-816B9EEC2553}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstatic", "assimpBuild\contrib\zlib\zlibstatic.vcxproj", "{1C5F3422-1673-307C-9612-A7F5E93898B4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IrrXML", "assimpBuild\contrib\irrXML\IrrXML.vcxproj", "{2CB35133-8518-3946-8615-BA97404088CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IrrXML", "assimpBuild\contrib\irrXML\IrrXML.vcxproj", "{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtSolutions_MFCMigrationFramework", "qtwinmigrateBuild\QtSolutions_MFCMigrationFramework.vcxproj", "{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtSolutions_MFCMigrationFramework", "qtwinmigrateBuild\QtSolutions_MFCMigrationFramework.vcxproj", "{451266C3-5842-38E5-ADEC-05D7B338AD11}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -472,70 +473,70 @@ Global
 		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Template|Win32.Build.0 = Release|Win32
 		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Template|x64.ActiveCfg = Debug|x64
 		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Template|x64.Build.0 = Debug|x64
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Debug|Win32.Build.0 = Debug|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Debug|x64.ActiveCfg = Debug|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Release|Win32.ActiveCfg = Release|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Release|Win32.Build.0 = Release|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Release|x64.ActiveCfg = Release|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.RelWithDebInfo|Win32.Build.0 = Release|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Template|Win32.ActiveCfg = Release|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Template|Win32.Build.0 = Release|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Template|x64.ActiveCfg = RelWithDebInfo|Win32
-		{3E820CCA-6CA6-319F-A712-EAD200D540CC}.Template|x64.Build.0 = RelWithDebInfo|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Debug|Win32.ActiveCfg = Debug|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Debug|Win32.Build.0 = Debug|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Debug|x64.ActiveCfg = Debug|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Release|Win32.ActiveCfg = Release|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Release|Win32.Build.0 = Release|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Release|x64.ActiveCfg = Release|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.RelWithDebInfo|Win32.Build.0 = Release|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Template|Win32.ActiveCfg = Release|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Template|Win32.Build.0 = Release|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Template|x64.ActiveCfg = RelWithDebInfo|Win32
-		{600F35A0-2A88-35BA-962E-816B9EEC2553}.Template|x64.Build.0 = RelWithDebInfo|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Debug|Win32.Build.0 = Debug|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Debug|x64.ActiveCfg = Debug|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Release|Win32.ActiveCfg = Release|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Release|Win32.Build.0 = Release|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Release|x64.ActiveCfg = Release|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.RelWithDebInfo|Win32.Build.0 = Release|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Template|Win32.ActiveCfg = Debug|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Template|Win32.Build.0 = Debug|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Template|x64.ActiveCfg = RelWithDebInfo|Win32
-		{2CB35133-8518-3946-8615-BA97404088CE}.Template|x64.Build.0 = RelWithDebInfo|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Debug|Win32.Build.0 = Debug|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Debug|x64.ActiveCfg = Debug|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Release|Win32.ActiveCfg = Release|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Release|Win32.Build.0 = Release|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Release|x64.ActiveCfg = Release|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Template|Win32.ActiveCfg = Debug|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Template|Win32.Build.0 = Debug|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Template|x64.ActiveCfg = Debug|Win32
-		{EFC7CFBF-5C26-3642-A3E2-DAB7819299D0}.Template|x64.Build.0 = Debug|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Debug|Win32.Build.0 = Debug|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Debug|x64.ActiveCfg = Debug|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Release|Win32.ActiveCfg = Release|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Release|Win32.Build.0 = Release|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Release|x64.ActiveCfg = Release|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Template|Win32.ActiveCfg = Release|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Template|Win32.Build.0 = Release|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Template|x64.ActiveCfg = RelWithDebInfo|Win32
+		{1DC0126D-1959-365F-B01A-DC4F5E16C282}.Template|x64.Build.0 = RelWithDebInfo|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Debug|Win32.Build.0 = Debug|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Debug|x64.ActiveCfg = Debug|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Release|Win32.ActiveCfg = Release|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Release|Win32.Build.0 = Release|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Release|x64.ActiveCfg = Release|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Template|Win32.ActiveCfg = Release|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Template|Win32.Build.0 = Release|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Template|x64.ActiveCfg = RelWithDebInfo|Win32
+		{1C5F3422-1673-307C-9612-A7F5E93898B4}.Template|x64.Build.0 = RelWithDebInfo|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Debug|Win32.Build.0 = Debug|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Debug|x64.ActiveCfg = Debug|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Release|Win32.ActiveCfg = Release|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Release|Win32.Build.0 = Release|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Release|x64.ActiveCfg = Release|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Template|Win32.ActiveCfg = Debug|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Template|Win32.Build.0 = Debug|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Template|x64.ActiveCfg = RelWithDebInfo|Win32
+		{01F46A5C-9E86-3BEC-B0F2-9CAF1F64222D}.Template|x64.Build.0 = RelWithDebInfo|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Debug|Win32.Build.0 = Debug|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Debug|x64.ActiveCfg = Debug|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.MinSizeRel|x64.ActiveCfg = MinSizeRel|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Release|Win32.ActiveCfg = Release|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Release|Win32.Build.0 = Release|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Release|x64.ActiveCfg = Release|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Template|Win32.ActiveCfg = Debug|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Template|Win32.Build.0 = Debug|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Template|x64.ActiveCfg = Debug|Win32
+		{451266C3-5842-38E5-ADEC-05D7B338AD11}.Template|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Sources/Engine/Base/Anim.cpp

@@ -426,21 +426,6 @@ void CAnimData::Write_t( CTStream *ostrFile)  // throw char *
 	}
 };
 
-// print #define <animation name> lines for all animations into given file
-void CAnimData::ExportAnimationNames_t( CTStream *ostrFile, CTString strAnimationPrefix) // throw char *
-{
-  char chrLine[ 256];
-  // for each animation
-  for( INDEX iAnimation=0; iAnimation<ad_NumberOfAnims; iAnimation++)
-  {
-    // prepare one #define line (add prefix)
-    sprintf( chrLine, "#define %s%s %d", strAnimationPrefix, ad_Anims[ iAnimation].oa_Name,
-             iAnimation);
-    // put it into file
-    ostrFile->PutLine_t( chrLine);
-  }
-}
-
 // Get info about some animation
 void CAnimData::GetAnimInfo(INDEX iAnimNo, CAnimInfo &aiInfo) const
 {

Sources/Engine/Base/Anim.h

@@ -31,7 +31,7 @@ typedef char FILE_NAME[PATH_MAX];
 /*
  * An object used for obtaining animation's information
  */
-class CAnimInfo {
+class ENGINE_API CAnimInfo {
 public:
   NAME ai_AnimName;
   TIME ai_SecsPerFrame;	    // speed of this animation
@@ -41,7 +41,7 @@ class CAnimInfo {
 /*
  * One animation of an animateable object
  */
-class COneAnim {
+class ENGINE_API COneAnim {
 public:
   COneAnim();
   ~COneAnim();
@@ -140,8 +140,6 @@ class CAnimData : public CSerial {
   ENGINE_API INDEX GetAnimsCt(void) const;
 	// load list of frames from script file
   ENGINE_API void LoadFromScript_t( CTStream *File, CListHead *FrameFileList); // throw char *
-  // print #define <animation name> lines for all animations into given file
-  void ExportAnimationNames_t( CTStream *ostrFile, CTString strAnimationPrefix);  // throw char *
 	void Read_t( CTStream *istrFile); // throw char *
 	void Write_t( CTStream *ostrFile); // throw char *
 };

Sources/Engine/Base/ErrorReporting.h

@@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 
 /* Throw an exception of formatted string. */
-ENGINE_API extern void ThrowF_t(char *strFormat, ...); // throws char *
+ENGINE_API extern void ThrowF_t [[noreturn]] (char *strFormat, ...); // throws char *
 /* Report error and terminate program. */
-ENGINE_API extern void FatalError(const char *strFormat, ...);
+ENGINE_API extern void FatalError [[noreturn]] (const char *strFormat, ...);
 /* Report warning without terminating program (stops program until user responds). */
 ENGINE_API extern void WarningMessage(const char *strFormat, ...);
 /* Report information message to user (stops program until user responds). */

Sources/Engine/Engine.h

@@ -122,7 +122,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <Engine/Models/ModelObject.h>
 #include <Engine/Models/ModelData.h>
 #include <Engine/Models/Model_internal.h>
-#include <Engine/Models/EditModel.h>
 #include <Engine/Models/RenderModel.h>
 
 #include <Engine/Ska/ModelInstance.h>