From fed080430def1ad9b96e0ad27e5c6924693ae873 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 7 Jun 2011 00:19:48 +1000 Subject: [PATCH] CMS50 16bit char cleanup --- Projects/CodeBlocks/SleepyHead.depend | 62 +++++++++---------- Projects/CodeBlocks/SleepyHead.layout | 6 +- .../sleeplib/loader_plugins/cms50_loader.cpp | 10 +-- src/version.h | 14 ++--- 4 files changed, 47 insertions(+), 45 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 4fd9f299..8be524e7 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8201,12 +8201,12 @@ "wx/treebase.h" "wx/hashmap.h" -1307332633 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp "wx/wxprec.h" "GUIFrame.h" -1307245704 /home/mark/projects/git/sleepyhead/src/GUIFrame.h +1307358939 /home/mark/projects/git/sleepyhead/src/GUIFrame.h @@ -8231,7 +8231,7 @@ -1307335666 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp "wx_pch.h" @@ -8246,10 +8246,10 @@ "sleeplib/loader_plugins/zeo_loader.h" "sleeplib/profiles.h" -1307245704 /home/mark/projects/git/sleepyhead/src/SleepyHeadApp.h +1307358939 /home/mark/projects/git/sleepyhead/src/SleepyHeadApp.h -1307291151 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h +1307358939 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h "SleepyHeadApp.h" @@ -8257,7 +8257,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1307289735 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.h @@ -8270,7 +8270,7 @@ "tinyxml/tinyxml.h" "preferences.h" -1307245704 /home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxml.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxml.h @@ -8281,38 +8281,38 @@ "tinystr.h" -1307245704 /home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinystr.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinystr.h -1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/preferences.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/preferences.h "tinyxml/tinyxml.h" -1307354721 /home/mark/projects/git/sleepyhead/src/graphs/graph.h +1307358939 /home/mark/projects/git/sleepyhead/src/graphs/graph.h -1307354721 /home/mark/projects/git/sleepyhead/src/version.h +1307369887 /home/mark/projects/git/sleepyhead/src/version.h -1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" "machine_loader.h" "profiles.h" -1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.h "profiles.h" -1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.h "machine.h" "preferences.h" "tinyxml/tinyxml.h" -1307354717 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8332,22 +8332,22 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307354731 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp "graph.h" "sleeplib/profiles.h" -1307336656 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/binary_file.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/binary_file.cpp "binary_file.h" -1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/binary_file.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/binary_file.h -1307336464 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp @@ -8357,10 +8357,10 @@ "profiles.h" -1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.cpp "machine_loader.h" -1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/preferences.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/preferences.cpp @@ -8368,7 +8368,7 @@ "preferences.h" -1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp @@ -8380,7 +8380,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307336462 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp @@ -8392,37 +8392,37 @@ "prs1_loader.h" -1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinystr.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinystr.cpp "tinystr.h" -1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxml.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxml.cpp "tinyxml.h" -1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxmlerror.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxmlerror.cpp "tinyxml.h" -1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxmlparser.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxmlparser.cpp "tinyxml.h" -1307287644 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.h "sleeplib/machine_loader.h" -1307336371 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp +1307369881 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp "cms50_loader.h" "sleeplib/machine.h" -1307275207 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/zeo_loader.h +1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/zeo_loader.h "sleeplib/machine_loader.h" -1307275410 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/zeo_loader.cpp +1307358939 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/zeo_loader.cpp "zeo_loader.h" "sleeplib/machine.h" diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index c9af2028..cb11fd2f 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -4,14 +4,14 @@ - + - - + + diff --git a/src/libs/sleeplib/loader_plugins/cms50_loader.cpp b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp index 9840611f..0a5c2f62 100644 --- a/src/libs/sleeplib/loader_plugins/cms50_loader.cpp +++ b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp @@ -113,13 +113,15 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile) f.Read(tmp,16); - wxString datestr; - for (int i=0;i<16;i+=2) { - datestr=datestr+(char)tmp[i]; + for (int i=0;i<8;i++) { + tmp[i]=tmp[i << 1]; } + tmp[8]=0; + wxString datestr((char *)tmp,wxConvUTF8); + wxDateTime date; date.ParseFormat(datestr,wxT("%m/%d/%y")); - + wxLogMessage(datestr); f.Seek(data_starts,wxFromStart); buffer=new char [num_records*2]; diff --git a/src/version.h b/src/version.h index 441d35dd..39eaf889 100644 --- a/src/version.h +++ b/src/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "06"; + static const char DATE[] = "07"; static const char MONTH[] = "06"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.06"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 3279; - static const long REVISION = 1025; + static const long BUILD = 3282; + static const long REVISION = 1040; //Miscellaneous Version Types - static const long BUILDS_COUNT = 369; - #define RC_FILEVERSION 0,7,3279,1025 - #define RC_FILEVERSION_STRING "0, 7, 3279, 1025\0" - static const char FULLVERSION_STRING[] = "0.7.3279.1025"; + 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"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;