Merge remote-tracking branch 'origin/master' into glide64-cleanup
This commit is contained in:
zilmar
commit
734ea5c659
|
|
@ -171,6 +171,7 @@ Status=Compatible
|
|||
Plugin Note=[Glide64] framebuffer:screen
|
||||
Culling=1
|
||||
Emulate Clear=1
|
||||
Linking=Off
|
||||
|
||||
[1FBAF161-2C1C54F1-C:41]
|
||||
Good Name=1080 Snowboarding (JU) (M2)
|
||||
|
|
@ -182,6 +183,7 @@ SMM-Cache=0
|
|||
SMM-PI DMA=0
|
||||
SMM-TLB=0
|
||||
Self Texture=1
|
||||
Linking=Off
|
||||
|
||||
[ABA51D09-C668BAD9-C:58]
|
||||
Good Name=40 Winks (E) (M3) (Beta)
|
||||
|
|
|
|||
|
|
@ -517,3 +517,45 @@
|
|||
#2055# "Les graphismes LLE ne sont pas à utiliser par tout le monde !!!\nIl est recommandé d’utiliser seulement ceci à des fins de test et non pour jouer.\n\nChanger pour les graphismes en mode LLE ?"
|
||||
#2056# "Émulation audio haut niveau (HLE)"
|
||||
#2057# "L’audio HLE nécessite un plugin tiers !!!\nSi vous n’utilisez pas un plugin audio tiers qui supporte le HLE, vous n’entendrez aucun son.\n\nChanger pour l’audio en mode HLE ?"
|
||||
|
||||
|
||||
/*********************************************************************************
|
||||
* Android *
|
||||
*********************************************************************************/
|
||||
#3000# "Paramètres"
|
||||
#3001# "Aide/Forum"
|
||||
#3002# "Rapporter un Problème"
|
||||
#3003# "A Propos De"
|
||||
#3004# "Jeu Récemment Joué"
|
||||
#3005# "Jeux"
|
||||
#3006# "Répertoire du Jeu"
|
||||
#3007# "Choisir un dossier à scanner"
|
||||
#3008# "Inclure les sous répertoires"
|
||||
#3009# "Dossier Parent"
|
||||
#3010# "Répertoires"
|
||||
#3011# "Mémoire Interne"
|
||||
#3012# "Scan..."
|
||||
#3013# "OK"
|
||||
#3014# "Annuler"
|
||||
#3015# "Information"
|
||||
#3016# "Project64 pour Android"
|
||||
#3017# "Licence"
|
||||
#3018# "Révision"
|
||||
#3019# "Project64 pour Android\u2122 est un port de la version Windows de project64. La version Android\u2122 peut lancer la plupart des jeux N64."
|
||||
#3020# "Auteurs de Project64."
|
||||
|
||||
//In game menu
|
||||
#3100# "Paramètres"
|
||||
#3101# "Sauvegarder un Etat"
|
||||
#3102# "Charger un Etat"
|
||||
#3103# "Fin de l'Emulation"
|
||||
#3104# "Pause"
|
||||
#3105# "Résumer"
|
||||
#3106# "Vitesse du Jeu"
|
||||
#3107# "Sauvegarde d'Etat en Cours..."
|
||||
#3108# "Auto"
|
||||
#3109# "Emplacement"
|
||||
#3110# "Redémarrer"
|
||||
#3111# "Options de Débuguage"
|
||||
#3112# "Temps de la Fonction Redémarrer"
|
||||
#3113# "Temps de la Fonction de Copie"
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
* Meta Information *
|
||||
*********************************************************************************/
|
||||
//About DLL
|
||||
#1 # "Deutsch" // LANGUAGE ID
|
||||
#2 # "daarky" // Author
|
||||
#3 # "2.3" // Version
|
||||
#1 # "Deutsch" // LANGUAGE ID
|
||||
#2 # "daarky" // Author
|
||||
#3 # "2.3" // Version
|
||||
#4 # "02. Januar 2017" // Date
|
||||
|
||||
//About DLL Dialog
|
||||
|
|
|
|||
|
|
@ -36,6 +36,9 @@
|
|||
<PrecompiledHeader />
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DisableSpecificWarnings>4100;4127;4131;4189;4244;4701;4703;4996</DisableSpecificWarnings>
|
||||
|
||||
<!-- Fix for later VC versions on XP: 45KB + 436 -->
|
||||
<PreprocessorDefinitions>Z_BUFSIZE=46516;$(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -30,4 +30,5 @@ private:
|
|||
uint8_t m_Mempaks[4][128 * 256]; /* [CONTROLLERS][PAGES][BYTES_PER_PAGE] */
|
||||
CFile m_MempakHandle[4];
|
||||
bool m_Formatted[4];
|
||||
bool m_SaveExists[4];
|
||||
};
|
||||
|
|
@ -19,7 +19,8 @@ CMempak::CMempak()
|
|||
for (uint32_t i = 0; i < sizeof(m_Formatted) / sizeof(m_Formatted[0]); i++)
|
||||
{
|
||||
m_Formatted[i] = 0;
|
||||
}
|
||||
m_SaveExists[i] = true;
|
||||
}
|
||||
memset(m_Mempaks, 0, sizeof(m_Mempaks));
|
||||
}
|
||||
|
||||
|
|
@ -41,6 +42,7 @@ void CMempak::LoadMempak(int32_t Control, bool Create)
|
|||
CMempak::Format(Control);
|
||||
m_Formatted[Control] = true;
|
||||
}
|
||||
m_SaveExists[Control] = false;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -66,6 +68,7 @@ void CMempak::LoadMempak(int32_t Control, bool Create)
|
|||
else
|
||||
{
|
||||
m_MempakHandle[Control].Read(m_Mempaks[Control], 0x8000);
|
||||
m_Formatted[Control] = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -137,7 +140,7 @@ void CMempak::ReadFrom(int32_t Control, uint32_t address, uint8_t * data)
|
|||
{
|
||||
if (address < 0x8000)
|
||||
{
|
||||
if (!m_Formatted[Control] && !m_MempakHandle[Control].IsOpen())
|
||||
if (m_SaveExists[Control] && !m_MempakHandle[Control].IsOpen())
|
||||
{
|
||||
LoadMempak(Control, false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,6 +112,12 @@ bool CGfxPlugin::Initiate(CN64System * System, RenderWindow * Window)
|
|||
if (m_Initialized)
|
||||
{
|
||||
Close(Window);
|
||||
if (PluginOpened)
|
||||
{
|
||||
WriteTrace(PluginTraceType(), TraceDebug, "Before Plugin Opened");
|
||||
PluginOpened();
|
||||
WriteTrace(PluginTraceType(), TraceDebug, "After Plugin Opened");
|
||||
}
|
||||
}
|
||||
|
||||
typedef struct
|
||||
|
|
|
|||
|
|
@ -272,14 +272,23 @@ void CSettingTypeApplication::Save(int /*Index*/, uint32_t Value)
|
|||
}
|
||||
}
|
||||
|
||||
void CSettingTypeApplication::Save(int /*Index*/, const stdstr & Value)
|
||||
void CSettingTypeApplication::Save(int Index, const stdstr & Value)
|
||||
{
|
||||
m_SettingsIniFile->SaveString(SectionName(), m_KeyNameIdex.c_str(), Value.c_str());
|
||||
Save(Index, Value.c_str());
|
||||
}
|
||||
|
||||
void CSettingTypeApplication::Save(int /*Index*/, const char * Value)
|
||||
{
|
||||
m_SettingsIniFile->SaveString(SectionName(), m_KeyNameIdex.c_str(), Value);
|
||||
if (m_DefaultSetting != Default_None &&
|
||||
((m_DefaultSetting == Default_Constant && strcmp(m_DefaultStr,Value) == 0) ||
|
||||
(m_DefaultSetting != Default_Constant && strcmp(g_Settings->LoadStringVal(m_DefaultSetting).c_str(),Value) == 0)))
|
||||
{
|
||||
m_SettingsIniFile->SaveString(SectionName(), m_KeyNameIdex.c_str(), NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_SettingsIniFile->SaveString(SectionName(), m_KeyNameIdex.c_str(), Value);
|
||||
}
|
||||
}
|
||||
|
||||
stdstr CSettingTypeApplication::FixSectionName(const char * Section)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
|
||||
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
|
||||
<trustInfo xmlns='urn:schemas-microsoft-com:asm.v3'>
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<assemblyIdentity
|
||||
version='2.1.0.1'
|
||||
processorArchitecture='x86'
|
||||
name='Project64'
|
||||
type='win32'
|
||||
/>
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
type='win32'
|
||||
name='Microsoft.Windows.Common-Controls'
|
||||
version='6.0.0.0'
|
||||
processorArchitecture='X86'
|
||||
publicKeyToken='6595b64144ccf1df'
|
||||
language='*'
|
||||
/>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
</assembly>
|
||||
|
|
@ -19,6 +19,8 @@
|
|||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
|
||||
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\Project64.exe.manifest"
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
|
|
|
|||
Loading…
Reference in New Issue