diff --git a/include/VersionInfo.h b/include/VersionInfo.h
index 5835b25..697e969 100755
--- a/include/VersionInfo.h
+++ b/include/VersionInfo.h
@@ -14,7 +14,7 @@
Definition file for VersinInfo class, simple class for containing and comparing
version numbers.
-
$Id: VersionInfo.h,v 1.1 2003/06/10 23:15:31 cozman Exp $
+
$Id: VersionInfo.h,v 1.2 2003/06/10 23:24:47 cozman Exp $
\author James Turk
**/
@@ -40,6 +40,17 @@ class VersionInfo
//! String Description of release. (Often blank.)
string extra;
+ /*!
+ \brief Constructor for VersionInfo.
+
+ Simple constructor for version info, with a parameter for each member.
+ \param maj Major version number.
+ \param min Minor version number.
+ \param rel Version release number.
+ \param ext Extra info string, optional (defaults to empty string).
+ **/
+ VersionInfo(unsigned int maj, unsigned int min, unsigned int rel, string ext="");
+
/*!
\brief Get string representing version number.
diff --git a/include/ZE_ZEngine.h b/include/ZE_ZEngine.h
index 621242a..1485a5c 100644
--- a/include/ZE_ZEngine.h
+++ b/include/ZE_ZEngine.h
@@ -13,7 +13,7 @@
\brief Definition file for core ZEngine class.
ZEngine Game Engine core Engine definition.
-
$Id: ZE_ZEngine.h,v 1.38 2003/06/09 02:46:22 cozman Exp $
+
$Id: ZE_ZEngine.h,v 1.39 2003/06/10 23:24:47 cozman Exp $
\author James Turk
**/
@@ -26,6 +26,7 @@
#include "ZE_Utility.h"
#include "ZE_Includes.h"
#include "ZE_ZError.h"
+#include "VersionInfo.h"
/*!
\brief ZEngine Namespace.
@@ -43,16 +44,11 @@ namespace ZE
**/
class ZEngine
{
+ public:
+ //! Static version information.
+ static VersionInfo Version;
- private:
- //! Major version number.
- static const int VersionMajor = 0;
- //! Minor version number, changes upon signifigant releases.
- static const int VersionMinor = 8;
- //! Version release number, changes on every release.
- static const int VersionRelease = 3;
- //! Version string.
- static const char* VersionStr;
+ private:
//! Static Pointer to Instance of ZEngine for Singleton.
static ZEngine *sInstance;
//! Width of Display
@@ -146,14 +142,6 @@ class ZEngine
**/
static void ReleaseInstance();
- /*!
- \brief Get Current Version.
-
- Get Version Number of ZEngine. (Major.Minor.Extension#)
- \return string containing version number
- **/
- static string GetVersion();
-
//////////////////
//Initialization//
//////////////////
diff --git a/src/VersionInfo.cpp b/src/VersionInfo.cpp
index 9222621..5bd374e 100755
--- a/src/VersionInfo.cpp
+++ b/src/VersionInfo.cpp
@@ -6,10 +6,16 @@
Implementation file for VersinInfo class, simple class for containing and comparing
version numbers.
-
$Id: VersionInfo.cpp,v 1.1 2003/06/10 23:15:32 cozman Exp $
+
$Id: VersionInfo.cpp,v 1.2 2003/06/10 23:24:47 cozman Exp $
\author James Turk
**/
+VersionInfo::VersionInfo(unsigned int maj, unsigned int min, unsigned int rel, string ext) :
+ major(maj), minor(min), release(rel), extra(ext)
+{
+}
+
+
string VersionInfo::GetString() const
{
if(extra.length())
diff --git a/src/ZE_ZEngine.cpp b/src/ZE_ZEngine.cpp
index 8acfde2..0f6f7d4 100644
--- a/src/ZE_ZEngine.cpp
+++ b/src/ZE_ZEngine.cpp
@@ -13,7 +13,7 @@
\brief Central source file for ZEngine.
Actual implementation of ZEngine singleton class, the core of ZEngine.
-
$Id: ZE_ZEngine.cpp,v 1.43 2003/06/09 02:46:22 cozman Exp $
+
$Id: ZE_ZEngine.cpp,v 1.44 2003/06/10 23:24:47 cozman Exp $
\author James Turk
**/
@@ -22,7 +22,7 @@
namespace ZE
{
-const char* ZEngine::VersionStr = "0.8.3";
+VersionInfo ZEngine::Version(0,8,3);
ZEngine *ZEngine::sInstance=NULL;
ZEngine::ZEngine()
@@ -81,11 +81,6 @@ void ZEngine::ReleaseInstance()
sInstance = NULL;
}
-string ZEngine::GetVersion()
-{
- return VersionStr;
-}
-
void ZEngine::SetupDisplay(int width, int height, int bpp, bool fullscreen)
{
mWidth = width;