[STATE][FILEIO] Change StateValue(scrntype_t&) to StateValueScrnType_t(&) due to...

diff --git a/source/src/fileio.cpp b/source/src/fileio.cpp
index ac86acf..76e4bba 100644 (file)
--- a/source/src/fileio.cpp
+++ b/source/src/fileio.cpp
@@ -1087,9 +1087,9 @@ void FILEIO::StateValue(int64_t &val)
 void FILEIO::StateValue(pair16_t &val)
 {
        if(open_mode == FILEIO_READ_BINARY) {
-               val.w = FgetUint16_LE();
+               val.u16 = FgetUint16_LE();
        } else {
-               FputUint16_LE(val.w);
+               FputUint16_LE(val.u16);
        }
 }
 
@@ -1140,7 +1140,7 @@ void FILEIO::StateValue(_TCHAR &val)
 
 // 20181025 K.O
 // Note: scrntype_t is variable size type.2 bytes@15/16bpp, 4bytes@24/32bpp.
-void FILEIO::StateValue(scrntype_t &val)
+void FILEIO::StateValueScrnType_t(scrntype_t &val)
 {
        uint8_t r, g, b;
        if(open_mode == FILEIO_READ_BINARY) {
@@ -1266,7 +1266,7 @@ void FILEIO::StateArray(_TCHAR *buffer, size_t size, size_t count)
 
 // 20181025 K.O
 // Note: scrntype_t is variable size type.2 bytes@15/16bpp, 4bytes@24/32bpp.
-void FILEIO::StateArray(scrntype_t *buffer, size_t size, size_t count)
+void FILEIO::StateArrayScrnType_t(scrntype_t *buffer, size_t size, size_t count)
 {
        for(unsigned int i = 0; i < size / sizeof(buffer[0]) * count; i++) {
                StateValue(buffer[i]);

diff --git a/source/src/fileio.h b/source/src/fileio.h
index 0ad6e94..0d7012c 100644 (file)
--- a/source/src/fileio.h
+++ b/source/src/fileio.h
@@ -167,7 +167,7 @@ public:
        void StateValue(float &val);
        void StateValue(double &val);
        void StateValue(_TCHAR &val);
-       void StateValue(scrntype_t &val);
+       void StateValueScrnType_t(scrntype_t &val);
        
        void StateArray(bool *buffer, size_t size, size_t count);
        void StateArray(uint8_t *buffer, size_t size, size_t count);
@@ -184,7 +184,7 @@ public:
        void StateArray(float *buffer, size_t size, size_t count);
        void StateArray(double *buffer, size_t size, size_t count);
        void StateArray(_TCHAR *buffer, size_t size, size_t count);
-       void StateArray(scrntype_t *buffer, size_t size, size_t count);
+       void StateArrayScrnType_t(scrntype_t *buffer, size_t size, size_t count);
        
        // obsolete function
        void StateBuffer(void *buffer, size_t size, size_t count);