[VM] Apply VM_TEMPLATE:: to upstream 2018-10-05/

diff --git a/source/src/common.cpp b/source/src/common.cpp
index 6eeaa8b..4c5c76a 100644 (file)
--- a/source/src/common.cpp
+++ b/source/src/common.cpp
@@ -869,7 +869,7 @@ uint8_t DLL_PREFIX B_OF_COLOR(scrntype_t c)
 
 uint8_t DLL_PREFIX A_OF_COLOR(scrntype_t c)
 {
-       return 0;
+       return 0xff; //
 }
 #elif defined(_RGB565)
 scrntype_t DLL_PREFIX RGB_COLOR(uint32_t r, uint32_t g, uint32_t b)
@@ -908,7 +908,7 @@ uint8_t DLL_PREFIX B_OF_COLOR(scrntype_t c)
 
 uint8_t DLL_PREFIX A_OF_COLOR(scrntype_t c)
 {
-       return 0;
+       return 0xff; // Alpha = 255
 }
 #endif
 

diff --git a/source/src/vm/vm_template.h b/source/src/vm/vm_template.h
index 87b067a..87faadb 100644 (file)
--- a/source/src/vm/vm_template.h
+++ b/source/src/vm/vm_template.h
@@ -129,9 +129,7 @@ public:
        virtual void push_apss_rewind(int drv) { }
 
        virtual void update_config() { }
-       virtual void save_state(FILEIO* state_fio) { }
-       virtual bool load_state(FILEIO* state_fio) { return true; }
-       virtual void decl_state(void) { }
+       virtual bool process_state(FILEIO* state_fio, bool loading) { return true; }
        
        // devices
        virtual void set_cpu_clock(DEVICE *cpu, uint32_t clocks) { }