From 21034ae004b1cce12a66eafb47d959fdd0e0f3fb Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 7 Jun 2011 00:29:50 +1000 Subject: [PATCH] Take the CMS50's useless time field as well instead of ignoring it --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- src/libs/sleeplib/loader_plugins/cms50_loader.cpp | 8 ++++---- src/version.h | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 8be524e7..3f123f8b 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -1307369887 /home/mark/projects/git/sleepyhead/src/version.h +1307370363 /home/mark/projects/git/sleepyhead/src/version.h 1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8413,7 +8413,7 @@ 1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.h "sleeplib/machine_loader.h" -1307369881 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp +1307370285 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp "cms50_loader.h" diff --git a/src/libs/sleeplib/loader_plugins/cms50_loader.cpp b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp index 0a5c2f62..7b95b117 100644 --- a/src/libs/sleeplib/loader_plugins/cms50_loader.cpp +++ b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp @@ -111,16 +111,16 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile) f.Read(tmp,2); some_more_code=tmp[0] | (tmp[1] << 8); // == 512 - f.Read(tmp,16); + f.Read(tmp,34); - for (int i=0;i<8;i++) { + for (int i=0;i<17;i++) { tmp[i]=tmp[i << 1]; } - tmp[8]=0; + tmp[17]=0; wxString datestr((char *)tmp,wxConvUTF8); wxDateTime date; - date.ParseFormat(datestr,wxT("%m/%d/%y")); + date.ParseFormat(datestr,wxT("%m/%d/%y %H:%M:%S")); wxLogMessage(datestr); f.Seek(data_starts,wxFromStart); diff --git a/src/version.h b/src/version.h index 39eaf889..407b8798 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 3282; - static const long REVISION = 1040; + static const long BUILD = 3286; + static const long REVISION = 1070; //Miscellaneous Version Types - static const long BUILDS_COUNT = 371; - #define RC_FILEVERSION 0,7,3282,1040 - #define RC_FILEVERSION_STRING "0, 7, 3282, 1040\0" - static const char FULLVERSION_STRING[] = "0.7.3282.1040"; + static const long BUILDS_COUNT = 379; + #define RC_FILEVERSION 0,7,3286,1070 + #define RC_FILEVERSION_STRING "0, 7, 3286, 1070\0" + static const char FULLVERSION_STRING[] = "0.7.3286.1070"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;