[VM][STATE] Use namespace {VMNAME} to separate per VMs.

[csp-qt/common_source_project-fm7.git] / source / src / vm / pasopia / kanjipac2.cpp

diff --git a/source/src/vm/pasopia/kanjipac2.cpp b/source/src/vm/pasopia/kanjipac2.cpp
index 1cf24ad..b788f57 100644 (file)
--- a/source/src/vm/pasopia/kanjipac2.cpp
+++ b/source/src/vm/pasopia/kanjipac2.cpp
@@ -10,10 +10,12 @@
 
 #include "kanjipac2.h"
 
+namespace PASOPIA {
+
 void KANJIPAC2::initialize(int id)
 {
        FILEIO* fio = new FILEIO();
-       if(fio->Fopen(emu->bios_path(_T("KANJI.ROM")), FILEIO_READ_BINARY)) {
+       if(fio->Fopen(create_local_path(_T("KANJI.ROM")), FILEIO_READ_BINARY)) {
                fio->Fread(rom, sizeof(rom), 1);
                fio->Fclose();
        }
@@ -22,7 +24,7 @@ void KANJIPAC2::initialize(int id)
        ptr = 0;
 }
 
-void KANJIPAC2::write_io8(uint32 addr, uint32 data)
+void KANJIPAC2::write_io8(uint32_t addr, uint32_t data)
 {
        switch(addr & 0xff) {
        case 0x18:
@@ -37,26 +39,20 @@ void KANJIPAC2::write_io8(uint32 addr, uint32 data)
        }
 }
 
-uint32 KANJIPAC2::read_io8(uint32 addr)
+uint32_t KANJIPAC2::read_io8(uint32_t addr)
 {
        return rom[ptr & 0x1ffff];
 }
 
 #define STATE_VERSION  1
 
-void KANJIPAC2::save_state(FILEIO* state_fio)
-{
-       state_fio->FputUint32(STATE_VERSION);
-       
-       state_fio->FputUint32(ptr);
-}
-
-bool KANJIPAC2::load_state(FILEIO* state_fio)
+bool KANJIPAC2::process_state(FILEIO* state_fio, bool loading)
 {
-       if(state_fio->FgetUint32() != STATE_VERSION) {
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;
        }
-       ptr = state_fio->FgetUint32();
+       state_fio->StateUint32(ptr);
        return true;
 }
 
+}