• R/O
  • SSH
  • HTTPS

oswan: Commit


Commit MetaInfo

Revision83 (tree)
Time2010-05-11 20:57:11
Authorbird_may_nike

Log Message

(empty log message)

Change Summary

Incremental Difference

--- oswanj/trunk/src/WSInput.cpp (revision 82)
+++ oswanj/trunk/src/WSInput.cpp (revision 83)
@@ -298,7 +298,7 @@
298298 }
299299 hRet = lpJoyDevice->GetDeviceState(sizeof(DIJOYSTATE2), &js);
300300 if (hRet == DI_OK){
301- flag = WsInputCheckJoy(WsJoypad[12]);
301+ flag |= WsInputCheckJoy(WsJoypad[12]);
302302 }
303303 }
304304 return flag;
--- oswanj/trunk/src/WSDialog.cpp (revision 82)
+++ oswanj/trunk/src/WSDialog.cpp (revision 83)
@@ -132,10 +132,10 @@
132132 switch (LOWORD(wParam))
133133 {
134134 case IDOK:
135- memcpy(WsKeyboardH, TmpKeyboardH, sizeof(int) * 12);
136- memcpy(WsKeyboardV, TmpKeyboardV, sizeof(int) * 12);
137- memcpy(WsJoypadH, TmpJoypadH, sizeof(int) * 12);
138- memcpy(WsJoypadV, TmpJoypadV, sizeof(int) * 12);
135+ memcpy(WsKeyboardH, TmpKeyboardH, sizeof(int) * 13);
136+ memcpy(WsKeyboardV, TmpKeyboardV, sizeof(int) * 13);
137+ memcpy(WsJoypadH, TmpJoypadH, sizeof(int) * 13);
138+ memcpy(WsJoypadV, TmpJoypadV, sizeof(int) * 13);
139139 EndDialog(hDlg, LOWORD(wParam));
140140 return TRUE;
141141 case IDCANCEL:
--- oswanj/trunk/src/WSConfig.cpp (revision 82)
+++ oswanj/trunk/src/WSConfig.cpp (revision 83)
@@ -51,7 +51,7 @@
5151 WsJoypadH[0] = 1; // B
5252 WsJoypadH[1] = 2; // A
5353 WsJoypadH[2] = 8; // START
54- WsJoypadH[3] = 7; // OPTION
54+ WsJoypadH[3] = 0; // OPTION
5555 WsJoypadH[4] = WS_JOY_AXIS_X_M; // X4
5656 WsJoypadH[5] = WS_JOY_AXIS_Y_P; // X3
5757 WsJoypadH[6] = WS_JOY_AXIS_X_P; // X2
@@ -65,7 +65,7 @@
6565 WsJoypadV[0] = 5; // B
6666 WsJoypadV[1] = 6; // A
6767 WsJoypadV[2] = 8; // START
68- WsJoypadV[3] = 7; // OPTION
68+ WsJoypadV[3] = 0; // OPTION
6969 WsJoypadV[4] = 1; // X4
7070 WsJoypadV[5] = 2; // X3
7171 WsJoypadV[6] = 4; // X2
--- oswanj/trunk/resource.h (revision 82)
+++ oswanj/trunk/resource.h (revision 83)
@@ -10,12 +10,10 @@
1010 #define IDD_CONFIG_TAB1 106
1111 #define IDD_CONFIG_TAB2 107
1212 #define IDD_DIALOG_ABOUT 108
13-#define IDC_EDIT_B 1001
13+#define IDC_EDIT_B 1001 //以下のエディットボックスIDは連続すること
1414 #define IDC_EDIT_A 1002
1515 #define IDC_EDIT_START 1003
1616 #define IDC_EDIT_OPTION 1004
17-#define IDC_EDIT_A2 1004
18-#define IDC_EDIT_NOWAIT 1004
1917 #define IDC_EDIT_X4 1005
2018 #define IDC_EDIT_X3 1006
2119 #define IDC_EDIT_X2 1007
@@ -24,8 +22,9 @@
2422 #define IDC_EDIT_Y3 1010
2523 #define IDC_EDIT_Y2 1011
2624 #define IDC_EDIT_Y1 1012
27-#define IDC_TAB1 1013
28-#define IDC_TEXT_VERSION 1014
25+#define IDC_EDIT_NOWAIT 1013
26+#define IDC_TAB1 1014
27+#define IDC_TEXT_VERSION 1015
2928 #define ID_PDATA_SET 40001
3029 #define ID_FILE_OPENROM 40002
3130 #define ID_SIZE_1 40003
@@ -56,7 +55,7 @@
5655 #ifndef APSTUDIO_READONLY_SYMBOLS
5756 #define _APS_NEXT_RESOURCE_VALUE 109
5857 #define _APS_NEXT_COMMAND_VALUE 40033
59-#define _APS_NEXT_CONTROL_VALUE 1015
58+#define _APS_NEXT_CONTROL_VALUE 1016
6059 #define _APS_NEXT_SYMED_VALUE 101
6160 #endif
6261 #endif
Show on old repository browser