Merge branch 'master' of https://notabug.org/nastys/PD-Loader
This commit is contained in:
+7
-3
@@ -12,6 +12,8 @@ after_build:
|
||||
md %TMP%\full\
|
||||
|
||||
md %TMP%\full\plugins\
|
||||
|
||||
md %TMP%\full\plugins\pv_equip\
|
||||
|
||||
md %TMP%\full\ram\
|
||||
|
||||
@@ -36,11 +38,11 @@ after_build:
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\keyconfig.ini %TMP%\update\plugins\
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\modules.ini %TMP%\update\plugins\pv_equip\
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\pv_equip\modules.ini %TMP%\update\plugins\pv_equip\
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\skins.ini %TMP%\update\plugins\pv_equip\
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\pv_equip\skins.ini %TMP%\update\plugins\pv_equip\
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\sfx.ini %TMP%\update\plugins\pv_equip\
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\pv_equip\sfx.ini %TMP%\update\plugins\pv_equip\
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\x64\%CONFIGURATION%\dnsapi.dll %TMP%\full\
|
||||
|
||||
@@ -51,6 +53,8 @@ after_build:
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\glut32.dll %TMP%\full\
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\*.* %TMP%\full\plugins\
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\plugins\*.* %TMP%\full\plugins\pv_equip\
|
||||
|
||||
copy %APPVEYOR_BUILD_FOLDER%\source-code\data\ram\databank\*.dat %TMP%\full\ram\databank\
|
||||
|
||||
|
||||
@@ -566,22 +566,6 @@ namespace TLAC::Components
|
||||
|
||||
const WCHAR section[] = L"modules";
|
||||
swprintf(keyBase, 32, L"pv.%03d", pvNum);
|
||||
swprintf(key, 32, L"%ls.skin", keyBase);
|
||||
int INISkin = GetPrivateProfileIntW(section, key, 0, skins_configPath);
|
||||
if (INISkin > 0)
|
||||
{
|
||||
DivaScore* cachedScore = GetCachedScore(pvNum, diff, exDiff);
|
||||
if (cachedScore == nullptr)
|
||||
{
|
||||
ScoreCache[diff].push_back(DivaScore(pvNum, exDiff));
|
||||
cachedScore = GetCachedScore(pvNum, diff, exDiff);
|
||||
}
|
||||
if (cachedScore != nullptr)
|
||||
{
|
||||
cachedScore->per_skin_equip = INISkin;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < 6; ++i)
|
||||
{
|
||||
swprintf(key, 32, L"%ls.module%d", keyBase, i);
|
||||
@@ -619,17 +603,13 @@ namespace TLAC::Components
|
||||
{
|
||||
swprintf(key, 32, L"%ls.module%d", keyBase, i);
|
||||
int INImodule = GetPrivateProfileIntW(section, key, 0, modules_configPath);
|
||||
if (INImodule != cachedScore->per_module_equip[0] || INImodule != cachedScore->per_module_equip[1] || INImodule != cachedScore->per_module_equip[2] || INImodule != cachedScore->per_module_equip[3] || INImodule != cachedScore->per_module_equip[4] || INImodule != cachedScore->per_module_equip[5])
|
||||
if (INImodule != cachedScore->per_module_equip[i])
|
||||
{
|
||||
INImodule = *cachedScore->per_module_equip;
|
||||
WCHAR val[32];
|
||||
swprintf(val, 32, L"%d", cachedScore->per_module_equip[i]);
|
||||
WritePrivateProfileStringW(L"modules", key, val, modules_configPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -647,7 +627,7 @@ namespace TLAC::Components
|
||||
swprintf(keyBase, 32, L"pv.%03d", pvNum);
|
||||
swprintf(key, 32, L"%ls.skin", keyBase);
|
||||
int INISkin = GetPrivateProfileIntW(section, key, 0, skins_configPath);
|
||||
if (INISkin > 0)
|
||||
if (INISkin > -1)
|
||||
{
|
||||
DivaScore* cachedScore = GetCachedScore(pvNum, diff, exDiff);
|
||||
if (cachedScore == nullptr)
|
||||
|
||||
Reference in New Issue
Block a user