Merge branch 'development'

billforsternz · Nov 20, 2015 · cbb809e · cbb809e
2 parents 384dd24 + ce913df
commit cbb809e
Show file tree

Hide file tree

Showing 22 changed files with 793 additions and 17,223 deletions.
diff --git a/TarraschVS2010.vcxproj b/TarraschVS2010.vcxproj
@@ -1069,6 +1069,7 @@
     <ClInclude Include="src\t3\PopupControl.h" />
     <ClInclude Include="src\t3\Portability.h" />
     <ClInclude Include="src\t3\PositionDialog.h" />
+    <ClInclude Include="src\t3\ProgressBar.h" />
     <ClInclude Include="src\t3\Repository.h" />
     <ClInclude Include="src\t3\Rybka.h" />
     <ClInclude Include="src\t3\Session.h" />

diff --git a/src/t3/Appdefs.h b/src/t3/Appdefs.h
@@ -11,10 +11,7 @@
 
 #define MASTER_VERSION "V3 minus"
 #define DEFAULT_ENGINE "Rybka v2.3.2a.mp.w32.exe"
-// #define MASTER_VERSION "V2.01ar"
-// #define DEFAULT_ENGINE "Rybka v2.3.2a.mp.w32.exe"
-// #define MASTER_VERSION "V2.01ak"         // for Komodo version
-// #define DEFAULT_ENGINE "komodo3-32.exe"  // for Komodo version
+#define DATABASE_VERSION_NUMBER_SUPPORTED 1
 
 // Misc
 #define NBR_KIBITZ_LINES 4

diff --git a/src/t3/Canvas.cpp b/src/t3/Canvas.cpp
@@ -573,7 +573,7 @@ Canvas::Canvas
     objs.log        = new Log;
     objs.book       = new Book;
     objs.cws        = new CentralWorkSaver;
-    objs.db         = new Database;
+    objs.db         = new Database( objs.repository->database.m_file.c_str() );
     objs.tabs       = new Tabs;
     objs.gl         = NULL;
     GameLogic *gl   = new GameLogic( this, lb );