summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-12-23 23:09:47 +0000
committerrubidium <rubidium@openttd.org>2009-12-23 23:09:47 +0000
commit60082980fd12b645150655a29c9b68e3aa0f92ef (patch)
tree0377bfd4ddc8f9bc13474df798cb08cac2760b85 /src
parent5aea707be06ce318065a7209251579f817d032c6 (diff)
downloadopenttd-60082980fd12b645150655a29c9b68e3aa0f92ef.tar.xz
(svn r18622) -Merge: release changes
Diffstat (limited to 'src')
-rw-r--r--src/ai/ai_info.cpp2
-rw-r--r--src/ai/api/ai_changelog.hpp8
-rw-r--r--src/ai/api/ai_info_docs.hpp2
-rw-r--r--src/os/windows/ottdres.rc.in4
-rw-r--r--src/rev.cpp.in2
5 files changed, 11 insertions, 7 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index be16a4966..b753424e1 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -53,7 +53,7 @@ AILibrary::~AILibrary()
static bool CheckAPIVersion(const char *api_version)
{
- return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "0.8") == 0;
+ return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0;
}
/* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)
diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp
index 78721ed0c..0ff70f9b1 100644
--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -14,9 +14,9 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
- * \b 0.8.0
+ * \b 1.0.0
*
- * 0.8.0 is not yet released. The following changes are not set in stone yet.
+ * 1.0.0 is not yet released. The following changes are not set in stone yet.
*
* API additions:
* \li AIBaseStation
@@ -82,6 +82,10 @@
* \li AIIndustryType::GetConstructionCost() now returns -1 if the industry is
* neither buildable nor prospectable.
*
+ * \b 0.7.5
+ *
+ * No changes
+ *
* \b 0.7.4
*
* No changes
diff --git a/src/ai/api/ai_info_docs.hpp b/src/ai/api/ai_info_docs.hpp
index 3774c005e..e93ef1e94 100644
--- a/src/ai/api/ai_info_docs.hpp
+++ b/src/ai/api/ai_info_docs.hpp
@@ -148,7 +148,7 @@ public:
*
* Valid return values are:
* - "0.7"
- * - "0.8"
+ * - "1.0"
*
* @return The version this AI is compatible with.
* @note This function is optional.
diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in
index b67270454..48c2e97a9 100644
--- a/src/os/windows/ottdres.rc.in
+++ b/src/os/windows/ottdres.rc.in
@@ -79,8 +79,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,0,!!REVISION!!
- PRODUCTVERSION 0,8,0,!!REVISION!!
+ FILEVERSION 1,0,0,!!REVISION!!
+ PRODUCTVERSION 1,0,0,!!REVISION!!
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 21e084709..6e33a64f3 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -60,7 +60,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
* final release will always have a lower version number than the released
* version, thus making comparisions on specific revisions easy.
*/
-const uint32 _openttd_newgrf_version = 0 << 28 | 8 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 0 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
#ifdef __MORPHOS__
/**