chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-08 20:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take the CMS50's useless time field as well instead of ignoring it

Browse Source
This commit is contained in:
Mark Watkins 2011-06-07 00:29:50 +10:00
parent fed080430d
commit 21034ae004
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8295,7 +8295,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8413,7 +8413,7 @@
1307358939 /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" "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
<wx/log.h> <wx/log.h>
<wx/progdlg.h> <wx/progdlg.h>
"cms50_loader.h" "cms50_loader.h"

8
src/libs/sleeplib/loader_plugins/cms50_loader.cpp
View File

@ -111,16 +111,16 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile)
f.Read(tmp,2); f.Read(tmp,2);
some_more_code=tmp[0] | (tmp[1] << 8); // == 512 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[i]=tmp[i << 1];
} }
tmp[8]=0; tmp[17]=0;
wxString datestr((char *)tmp,wxConvUTF8); wxString datestr((char *)tmp,wxConvUTF8);
wxDateTime date; wxDateTime date;
date.ParseFormat(datestr,wxT("%m/%d/%y")); date.ParseFormat(datestr,wxT("%m/%d/%y %H:%M:%S"));
wxLogMessage(datestr); wxLogMessage(datestr);
f.Seek(data_starts,wxFromStart); f.Seek(data_starts,wxFromStart);

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 3282; static const long BUILD = 3286;
static const long REVISION = 1040; static const long REVISION = 1070;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 371; static const long BUILDS_COUNT = 379;
#define RC_FILEVERSION 0,7,3282,1040 #define RC_FILEVERSION 0,7,3286,1070
#define RC_FILEVERSION_STRING "0, 7, 3282, 1040\0" #define RC_FILEVERSION_STRING "0, 7, 3286, 1070\0"
static const char FULLVERSION_STRING[] = "0.7.3282.1040"; static const char FULLVERSION_STRING[] = "0.7.3286.1070";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;