diff --git a/PJ64.rc b/PJ64.rc
index 1b0e765..a29bde8 100644
--- a/PJ64.rc
+++ b/PJ64.rc
@@ -802,7 +802,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "Current Save S&tate", GRAYED
BEGIN
- MENUITEM "Default\t~", ID_CURRENTSAVE_DEFAULT
+ MENUITEM "Default\t0", ID_CURRENTSAVE_DEFAULT
MENUITEM SEPARATOR
MENUITEM "Slot 1\t1", ID_CURRENTSAVE_1
MENUITEM "Slot 2\t2", ID_CURRENTSAVE_2
@@ -813,7 +813,8 @@ BEGIN
MENUITEM "Slot 7\t7", ID_CURRENTSAVE_7
MENUITEM "Slot 8\t8", ID_CURRENTSAVE_8
MENUITEM "Slot 9\t9", ID_CURRENTSAVE_9
- MENUITEM "Slot 10\t0", ID_CURRENTSAVE_0
+ // Removed this as we now have 0 to 9 - Gent
+ // MENUITEM "Slot 10\t0", ID_CURRENTSAVE_0
END
MENUITEM SEPARATOR
MENUITEM "Cheats...\tCtrl+C", ID_OPTIONS_CHEATS, GRAYED
@@ -980,7 +981,8 @@ BEGIN
VK_F1, ID_CPU_RESET, VIRTKEY, NOINVERT
VK_F7, ID_CPU_RESTORE, VIRTKEY, NOINVERT
VK_F5, ID_CPU_SAVE, VIRTKEY, NOINVERT
- "0", ID_CURRENTSAVE_0, VIRTKEY, NOINVERT
+ // Removed this as we now have 0 to 9 - Gent
+ // "0", ID_CURRENTSAVE_0, VIRTKEY, NOINVERT
"1", ID_CURRENTSAVE_1, VIRTKEY, NOINVERT
"2", ID_CURRENTSAVE_2, VIRTKEY, NOINVERT
"3", ID_CURRENTSAVE_3, VIRTKEY, NOINVERT
@@ -990,7 +992,7 @@ BEGIN
"7", ID_CURRENTSAVE_7, VIRTKEY, NOINVERT
"8", ID_CURRENTSAVE_8, VIRTKEY, NOINVERT
"9", ID_CURRENTSAVE_9, VIRTKEY, NOINVERT
- "`", ID_CURRENTSAVE_DEFAULT, ASCII, NOINVERT
+ "0", ID_CURRENTSAVE_DEFAULT, ASCII, NOINVERT
VK_F12, ID_FILE_ENDEMULATION, VIRTKEY, NOINVERT
"C", ID_OPTIONS_CHEATS, VIRTKEY, CONTROL, NOINVERT
VK_ESCAPE, ID_OPTIONS_FULLSCREEN, VIRTKEY, NOINVERT
diff --git a/Plugin.h b/Plugin.h
index 785aa50..0f51b61 100644
--- a/Plugin.h
+++ b/Plugin.h
@@ -29,7 +29,8 @@
#define DefaultGFXDll "Jabo_Direct3D8.dll"
#define DefaultRSPDll "RSP.dll"
#define DefaultAudioDll "AziAudio_Legacy.dll"
-#define DefaultControllerDll "Jabo_DInput.dll"
+// Added NRage inout as defualt
+#define DefaultControllerDll "NRage_Legacy_Input.dll"
#define PLUGIN_TYPE_RSP 1
#define PLUGIN_TYPE_GFX 2
diff --git a/Project64.sln b/Project64.sln
index aa918da..ac48c4c 100644
--- a/Project64.sln
+++ b/Project64.sln
@@ -8,15 +8,12 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
- Release External|Win32 = Release External|Win32
Release for XP|Win32 = Release for XP|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AC366B6C-F277-056E-0EE8-B3ED4CCDFDA5}.Debug|Win32.ActiveCfg = Debug|Win32
{AC366B6C-F277-056E-0EE8-B3ED4CCDFDA5}.Debug|Win32.Build.0 = Debug|Win32
- {AC366B6C-F277-056E-0EE8-B3ED4CCDFDA5}.Release External|Win32.ActiveCfg = Release External|Win32
- {AC366B6C-F277-056E-0EE8-B3ED4CCDFDA5}.Release External|Win32.Build.0 = Release External|Win32
{AC366B6C-F277-056E-0EE8-B3ED4CCDFDA5}.Release for XP|Win32.ActiveCfg = Release for XP|Win32
{AC366B6C-F277-056E-0EE8-B3ED4CCDFDA5}.Release for XP|Win32.Build.0 = Release for XP|Win32
{AC366B6C-F277-056E-0EE8-B3ED4CCDFDA5}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/Project64.vcxproj b/Project64.vcxproj
index 479795c..b5892d2 100644
--- a/Project64.vcxproj
+++ b/Project64.vcxproj
@@ -5,18 +5,14 @@
Debug
Win32
-
- Release External
+
+ Release
Win32
Release for XP
Win32
-
- Release
- Win32
-
Svn
@@ -29,12 +25,6 @@
- Application
- false
- MultiByte
- v142
-
-
Application
false
MultiByte
@@ -46,7 +36,7 @@
false
MultiByte
false
- v140_xp
+ v141_xp
Application
@@ -61,10 +51,6 @@
-
-
-
-
@@ -75,14 +61,14 @@
- ..\PJ64_1.6.1\
+ ..\PJ64_1.6.2
.\Debug\
true
$(ProjectName)_Debug
false
-
- ..\PJ64_1.6.1\
+
+ ..\PJ64_1.6.2
.\Release_External\
false
$(ProjectName)_1.6.2
@@ -90,7 +76,7 @@
false
- ..\PJ64_1.6.1\
+ ..\PJ64_1.6.2
.\Release_External\
false
$(ProjectName)_1.6.2_XP
@@ -98,13 +84,6 @@
false
true
-
- .\Release\
- false
- ..\PJ64_1.6.1\
- $(ProjectName)_Release
- false
-
MultiThreadedDebug
@@ -149,7 +128,7 @@
true
Windows
libc;%(IgnoreSpecificDefaultLibraries)
- ..\PJ64_1.6.1\Project64_Debug.exe
+ ..\PJ64_1.6.2\Project64_Debug.exe
C:\Development\PJ64 Source C++ 6.0;%(AdditionalLibraryDirectories)
Compression/zlibstat.lib;htmlhelp.lib;winmm.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
false
@@ -160,7 +139,7 @@
-
+
MaxSpeed
true
@@ -202,7 +181,7 @@
true
Windows
LIBC;%(IgnoreSpecificDefaultLibraries)
- ..\PJ64_1.6.1\Project64_1.6.2.exe
+ ..\PJ64_1.6.2\Project64_1.6.2.exe
C:\Development\PJ64 Source C++ 6.0;%(AdditionalLibraryDirectories)
Compression/zlibstat.lib;htmlhelp.lib;winmm.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
/NXCOMPAT:NO %(AdditionalOptions)
@@ -258,7 +237,7 @@
true
Windows
LIBC;%(IgnoreSpecificDefaultLibraries)
- ..\PJ64_1.6.1\Project64_1.6.2_XP.exe
+ ..\PJ64_1.6.2\Project64_1.6.2_XP.exe
C:\Development\PJ64 Source C++ 6.0;%(AdditionalLibraryDirectories)
Compression/zlibstat.lib;htmlhelp.lib;winmm.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
/NXCOMPAT:NO %(AdditionalOptions)
@@ -273,51 +252,6 @@
true
-
-
- MultiThreaded
- OnlyExplicitInline
- true
- true
- MaxSpeed
- true
- Level4
- C:\Development\PJ64 Source C++ 6.0;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
- .\Release\
- true
- .\Release\Project64.pch
- .\Release\
- .\Release\
- false
- true
-
-
- true
- NDEBUG;%(PreprocessorDefinitions)
- .\Release\Project64.tlb
- true
- Win32
-
-
- 0x0c09
- NDEBUG;%(PreprocessorDefinitions)
-
-
- true
- .\Release\Project64.bsc
-
-
- true
- Windows
- ..\PJ64_1.6.1\Project64_Release.exe
- C:\Development\PJ64 Source C++ 6.0;%(AdditionalLibraryDirectories)
- Compression/zlibstat.lib;htmlhelp.lib;winmm.lib;comctl32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
- false
- libc;%(IgnoreSpecificDefaultLibraries)
- true
-
-
@@ -475,21 +409,22 @@
-
true
- true
- true
true
+ true
+
+
+
diff --git a/Project64.vcxproj.filters b/Project64.vcxproj.filters
index 7e65959..a9911ce 100644
--- a/Project64.vcxproj.filters
+++ b/Project64.vcxproj.filters
@@ -521,9 +521,6 @@
Resource Files
-
- Resource Files
-
@@ -536,4 +533,7 @@
Resource Files
+
+
+
\ No newline at end of file
diff --git a/Rom.c b/Rom.c
index 82318e3..c55423b 100644
--- a/Rom.c
+++ b/Rom.c
@@ -316,7 +316,10 @@ void CreateRecentDirList(HMENU hMenu) {
for (count = 0; count < RomDirsToRemember; count++) {
if (strlen(LastDirs[count]) == 0) { break; }
menuinfo.wID = ID_FILE_RECENT_DIR + count;
- sprintf(String, "&%d %s", (count + 1) % 10, LastDirs[count]);
+
+ // Changed (count + 1) % 10, to (count + 1), So it no longer forces Rom 10 to Rom 0 position in Recent List, because that makes more sense right? - Icepir8
+
+ sprintf(String, "&%d %s", (count + 1), LastDirs[count]);
InsertMenuItem(hSubMenu, count, TRUE, &menuinfo);
}
ModifyMenu(GetSubMenu(hMenu, 0), MenuLocOfUsedDirs, MF_POPUP | MF_BYPOSITION, (DWORD)hSubMenu, GS(MENU_RECENT_DIR));
@@ -359,7 +362,10 @@ void CreateRecentFileList(HMENU hMenu) {
for (count = 0; count < RomsToRemember; count++) {
if (strlen(LastRoms[count]) == 0) { break; }
menuinfo.wID = ID_FILE_RECENT_FILE + count;
- sprintf(String, "&%d %s", (count + 1) % 10, LastRoms[count]);
+
+ // Changed (count + 1) % 10, to (count + 1), So it no longer forces Rom 10 to Rom 0 position in Recent List, because that makes more sense right? - Icepir8
+
+ sprintf(String, "&%d %s", (count + 1), LastRoms[count]);
InsertMenuItem(hSubMenu, MenuLocOfUsedFiles + count, TRUE, &menuinfo);
}
}
@@ -390,7 +396,10 @@ void CreateRecentFileList(HMENU hMenu) {
for (count = 0; count < RomsToRemember; count++) {
if (strlen(LastRoms[count]) == 0) { break; }
menuinfo.wID = ID_FILE_RECENT_FILE + count;
- sprintf(String, "&%d %s", (count + 1) % 10, LastRoms[count]);
+
+ // Changed (count + 1) % 10, to (count + 1), So it no longer forces Rom 10 to Rom 0 position in Recent List, because that makes more sense right? - Icepir8
+
+ sprintf(String, "&%d %s", (count + 1), LastRoms[count]);
InsertMenuItem(hSubMenu, count, TRUE, &menuinfo);
}
ModifyMenu(GetSubMenu(hMenu, 0), MenuLocOfUsedFiles, MF_POPUP | MF_BYPOSITION, (DWORD)hSubMenu, GS(MENU_RECENT_ROM));
diff --git a/resource.h b/resource.h
index a04c181..834aaab 100644
--- a/resource.h
+++ b/resource.h
@@ -297,7 +297,8 @@
#define ID_CPU_SAVE 40109
#define ID_CPU_RESTORE 40110
#define ID_CURRENTSAVE_DEFAULT 40112
-#define ID_CURRENTSAVE_0 40113
+// Removed this as we now have 0 to 9 - Gent
+//#define ID_CURRENTSAVE_0 40113
#define ID_CURRENTSAVE_1 40114
#define ID_CURRENTSAVE_2 40115
#define ID_CURRENTSAVE_3 40116