[VM][FMTOWNS][JOYSTICK][MOUSE] Re-Implement mouse.Still not working.

[csp-qt/common_source_project-fm7.git] / source / src / vm / fmtowns / joystick.cpp

diff --git a/source/src/vm/fmtowns/joystick.cpp b/source/src/vm/fmtowns/joystick.cpp
index dae1536..9d3bea2 100644 (file)
--- a/source/src/vm/fmtowns/joystick.cpp
+++ b/source/src/vm/fmtowns/joystick.cpp
@@ -176,7 +176,7 @@ void JOYSTICK::update_config(void)
        // 4: Analog Pad (reserved)
        // 5: Libble Rabble stick (reserved)
        bool change_jsport[2] = {false, false};
-       const int js_limit = 2;
+       const int js_limit = 3;
        for(int i = 0; i < 2; i++) {
                // Remove connected device if changed.
                if((port_using[i] >= 0) && ((port_using[i] + 1) != config.machine_features[i])) {
@@ -189,8 +189,8 @@ void JOYSTICK::update_config(void)
                                }
                        }
                        // Temporally mark "Not Connected".
-                       port_using[i] = -1;
                }
+               port_using[i] = -1;
        }
        // Correct DATA REGISTERS.
        for(int i = 0; i < 2; i++) {
@@ -201,7 +201,10 @@ void JOYSTICK::update_config(void)
        }
        
        // Plug a device if changed (and usable).
-       for(int i = 0; i < 2; i++) {
+       out_debug_log(_T("update_config() : PORT1=%d PORT2=%d"),
+                                 config.machine_features[0] - 1,
+                                 config.machine_features[1] - 1);
+       for(int i = 0; i < 2; i++) { 
                if((config.machine_features[i] > 0) && (config.machine_features[i] <= js_limit)) {
                        JSDEV_TEMPLATE* p = d_port[i][config.machine_features[i] - 1];
                        if(p != nullptr) {