aboutsummaryrefslogtreecommitdiff
path: root/core/bind
diff options
context:
space:
mode:
authorKyle Luce2016-03-12 19:13:57 -0700
committerKyle Luce2016-03-13 15:27:39 -0700
commitfeef563f3f2ad7f1cb5aa2e788e3ea4adfee3c56 (patch)
treecb86c17f85513a4a4174d6628802d0059edb47f4 /core/bind
parentbe4d58e1203ae35dab97b14f08098f50998d4201 (diff)
downloadgodot-feef563f3f2ad7f1cb5aa2e788e3ea4adfee3c56.tar.gz
godot-feef563f3f2ad7f1cb5aa2e788e3ea4adfee3c56.tar.zst
godot-feef563f3f2ad7f1cb5aa2e788e3ea4adfee3c56.zip
Fixes the month consistency issue in enums and get_date etc
- Also updated the docs to reflect this. - Added some vim temp files to gitignore - Changed NaCL to be consistent with the other OS_Unix::get_date implementation (added 1 to month to map to 1-12) Ticket: https://github.com/godotengine/godot/issues/4025
Diffstat (limited to 'core/bind')
-rw-r--r--core/bind/core_bind.cpp7
-rw-r--r--core/bind/core_bind.h4
2 files changed, 7 insertions, 4 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index bf611f89c..915cbc057 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -508,11 +508,11 @@ Dictionary _OS::get_time(bool utc) const {
}
/**
- * Get a dictionary of time values when given epoc time
+ * Get a dictionary of time values when given epoch time
*
* Dictionary Time values will be a union if values from #get_time
* and #get_date dictionaries (with the exception of dst =
- * day light standard time, as it cannot be determined from epoc)
+ * day light standard time, as it cannot be determined from epoch)
*/
Dictionary _OS::get_time_from_unix_time( uint64_t unix_time_val) const {
@@ -552,7 +552,8 @@ Dictionary _OS::get_time_from_unix_time( uint64_t unix_time_val) const {
imonth++;
}
- date.month = static_cast<OS::Month>(imonth);
+ /// Add 1 to month to make sure months are indexed starting at 1
+ date.month = static_cast<OS::Month>(imonth+1);
date.day = dayno + 1;
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index ab11c4804..db5ff42cf 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -81,7 +81,9 @@ public:
};
enum Month {
- MONTH_JANUARY,
+ /// Start at 1 to follow Windows SYSTEMTIME structure
+ /// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724950(v=vs.85).aspx
+ MONTH_JANUARY = 1,
MONTH_FEBRUARY,
MONTH_MARCH,
MONTH_APRIL,