ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/project64/project64 into develop

This commit is contained in:
zilmar 2021-05-18 21:22:12 +09:30
parent ee864797ab 09e4a6d211
commit 24fe16e9cf
3 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Config/Project64.rdb
View File

@ -1,13 +1,13 @@
// ============ RDB for PJ64 v2.4. GoodN64 v327 =====================================
// PJ64 v2.4 Official RDB
// ============ RDB for PJ64 v3.0. GoodN64 v327 =====================================
// PJ64 v3.0 Official RDB
// Not for use with previous versions of PJ64
//---- START OF RDB FILE HEADER ---------------------------------------------------------
[Meta]
Author=Project64 Team
Date=2020/06/21
Date=2021/05/12
Homepage=www.pj64-emu.com
Version=2.4.0
Version=3.0.0
[Microcode Identifiers]
//38221D7F=0 //SD Hiryuu no Ken Densetsu (J), near start (Smiff)
@ -4114,6 +4114,11 @@ Status=Compatible
32bit=Yes
Counter Factor=1
Culling=1
SMM-Cache=0
SMM-FUNC=0
SMM-PI DMA=0
SMM-Protect=1
SMM-TLB=0
//================ N ================
[6D452016-713C09EE-C:50]
@ -4764,7 +4769,13 @@ Internal Name=Pilot Wings64
Status=Compatible
32bit=Yes
Counter Factor=3
Linking=Off
RDRAM Size=4
SMM-Cache=0
SMM-FUNC=0
SMM-PI DMA=0
SMM-TLB=0
Use TLB=No
[09CC4801-E42EE491-C:4A]
Good Name=Pilotwings 64 (J)
@ -4772,7 +4783,13 @@ Internal Name=Pilot Wings64
Status=Compatible
32bit=Yes
Counter Factor=3
Linking=Off
RDRAM Size=4
SMM-Cache=0
SMM-FUNC=0
SMM-PI DMA=0
SMM-TLB=0
Use TLB=No
[C851961C-78FCAAFA-C:45]
Good Name=Pilotwings 64 (U)
@ -4781,7 +4798,13 @@ Status=Compatible
32bit=Yes
Counter Factor=3
Culling=1
Linking=Off
RDRAM Size=4
SMM-Cache=0
SMM-FUNC=0
SMM-PI DMA=0
SMM-TLB=0
Use TLB=No
[4A1CD153-D830AEF8-C:50]
Good Name=Pokemon Puzzle League (E)
@ -5871,7 +5894,14 @@ Status=Compatible
32bit=Yes
[BFE23884-EF48EAAF-C:45]
Good Name=Space Station Silicon Valley (U)
Good Name=Space Station Silicon Valley (U) (V1.0)
Internal Name=Silicon Valley
Status=Compatible
32bit=Yes
Culling=1
[FC70E272-08FFE7AA-C:45]
Good Name=Space Station Silicon Valley (U) (V1.1)
Internal Name=Silicon Valley
Status=Compatible
32bit=Yes

10
Lang/Bosnian.pj.Lang
View File

@ -5,7 +5,7 @@
# 1 # "Bosanski" // ID JEZIKA
# 2 # "Alen Alic" // Autor
# 3 # "2.3" // Verzija
# 4 # "February, 2021" // Datum
# 4 # "April, 2021" // Datum
// O DLL dijalogu
# 5 # "Trenutni jezik"
@ -131,7 +131,7 @@
# 263 # "Učitavanje spremljenog stanja sustava"
# 264 # "Odaberite sačuvanu datoteku stanja sistema za učitavanje"
# 265 # "Omogući / onemogući GameShark cheats"
# 266 # "Gumb GameShark koristi se sa određenim varalicama."
# 266 # "GameShark koristi se sa određenim varalicama."
# 267 # "Promjena emulacije iz prozora u režim preko cijelog ekrana."
# 268 # "Neka prozori ostanu iznad svih ostalih prozora"
# 269 # "Promjena postavki unutar grafičkog dodatka"
@ -214,7 +214,7 @@
# 424 # "Ulazni (regulator) dodatak:"
# 425 # "Grafika HLE"
# 426 # "Audio HLE"
# 427 # "** Koristite sistemski dodatak **"
# 427 # "** Koristite Sistemski Dodatak **"
// Dijalog direktorija
# 440 # "Imenik dodataka:"
@ -264,8 +264,8 @@
//Napredne opcije
# 500 # "Većina ovih promjena neće stupiti na snagu dok se ne otvori novi ROM ili ne resetira trenutni ROM."
# 501 # "Osnovne zadane postavke"
# 502 # "Jezgra CPU jezgre:"
# 503 # "Self mod metode"
# 502 # "CPU jezgra stil:"
# 503 # "Sebe mod metode"
# 504 # "Zadana veličina memorije:"
# 505 # "Napredno povezivanje blokova"
# 506 # "Pokrenite emulaciju kada se otvori ROM"

28
Source/nragev20/XInputController.cpp
View File

@ -163,11 +163,12 @@ void AxisDeadzone( SHORT &AxisValue, long lDeadZoneValue, float fDeadZoneRelati
void GetXInputControllerKeys( const int indexController, LPDWORD Keys )
{
if (fnXInputGetState == NULL)
if (fnXInputGetState == NULL)
{
return;
}
using namespace N64_BUTTONS;
LPCONTROLLER pcController = &g_pcControllers[indexController];
@ -178,22 +179,25 @@ void GetXInputControllerKeys( const int indexController, LPDWORD Keys )
if ( !gController->bConfigured )
return;
ULONGLONG time = GetTickCount() / 1000;
if (g_pcControllers[indexController].XcheckTime != NULL && (time - g_pcControllers[indexController].XcheckTime) < 3)
return;
DWORD result;
XINPUT_STATE state;
ULONGLONG time = GetTickCount() / 1000;
if (g_pcControllers[indexController].XcheckTime != NULL && (time - g_pcControllers[indexController].XcheckTime) < 3)
return;
result = fnXInputGetState(gController->nControl, &state);
if (result == ERROR_DEVICE_NOT_CONNECTED) {
g_pcControllers[indexController].XcheckTime = time;
}
else {
g_pcControllers[indexController].XcheckTime = NULL;
}
if (result == ERROR_DEVICE_NOT_CONNECTED) {
g_pcControllers[indexController].XcheckTime = time;
}
else {
g_pcControllers[indexController].XcheckTime = NULL;
}
if( result != ERROR_SUCCESS )
return;
DWORD wButtons = state.Gamepad.wButtons;
if( pcController->bPadDeadZone > 0 )