AIO: Merge Vista/7/10, don't delete existing config when updating

This commit is contained in:
nastys
2020-09-24 00:31:09 +02:00
parent 3141c651b6
commit c23bb3d016
28 changed files with 161 additions and 168 deletions
@@ -7,7 +7,6 @@
#include "PlayerDataManager.h"
#include "FrameRateManager.h"
#include "FastLoader.h"
#include "StageManager.h"
#include "CameraController.h"
#include "DebugComponent.h"
#include "ScaleComponent.h"
@@ -43,7 +42,6 @@ namespace TLAC::Components
new FastLoader(),
new ScaleComponent(),
new ScoreSaver(),
new StageManager(),
new CameraController(),
new DebugComponent(),
};
@@ -1,41 +0,0 @@
#include "StageManager.h"
#include "../Constants.h"
#include <windows.h>
namespace TLAC::Components
{
StageManager::StageManager()
{
}
StageManager::~StageManager()
{
}
const char* StageManager::GetDisplayName()
{
return "stage_manager";
}
void StageManager::Initialize(ComponentsManager*)
{
// add the offset between moving 2 into ebx and the start of the function
int32_t* playCount = (int32_t*)(((uint8_t*)PLAYS_PER_SESSION_GETTER_ADDRESS) + 0x7);
DWORD oldProtect;
VirtualProtect(playCount, sizeof(int32_t), PAGE_EXECUTE_READWRITE, &oldProtect);
// set ’Ê�탂�[ƒh per session play count
*playCount = GetPlayCount();
}
void StageManager::Update()
{
return;
}
int32_t StageManager::GetPlayCount()
{
return INT32_MAX;
}
}
@@ -1,21 +0,0 @@
#pragma once
#include "EmulatorComponent.h"
#include <stdint.h>
namespace TLAC::Components
{
class StageManager : public EmulatorComponent
{
public:
StageManager();
~StageManager();
virtual const char* GetDisplayName() override;
virtual void Initialize(ComponentsManager*) override;
virtual void Update() override;
private:
int32_t GetPlayCount();
};
}
@@ -5,7 +5,7 @@
#include "../../../FileSystem/ConfigFile.h"
#include <stdio.h>
const std::string GU_CONFIG_FILE_NAME = "genericusbinput.ini";
const std::string GU_CONFIG_FILE_NAME = "keyconfig.ini";
namespace TLAC::Input
{
@@ -133,7 +133,6 @@
<ClInclude Include="Components\PlayerDataManager.h" />
<ClInclude Include="Components\ScaleComponent.h" />
<ClInclude Include="Components\ScoreSaver.h" />
<ClInclude Include="Components\StageManager.h" />
<ClInclude Include="Constants.h" />
<ClInclude Include="FileSystem\ConfigFile.h" />
<ClInclude Include="FileSystem\TextFile.h" />
@@ -192,7 +191,6 @@
<ClCompile Include="Components\PlayerDataManager.cpp" />
<ClCompile Include="Components\ScaleComponent.cpp" />
<ClCompile Include="Components\ScoreSaver.cpp" />
<ClCompile Include="Components\StageManager.cpp" />
<ClCompile Include="dllmain.cpp" />
<ClCompile Include="FileSystem\ConfigFile.cpp" />
<ClCompile Include="FileSystem\TextFile.cpp" />
@@ -51,9 +51,6 @@
<ClInclude Include="Components\PlayerDataManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Components\StageManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Components\Input\InputBufferType.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -245,9 +242,6 @@
<ClCompile Include="Components\PlayerDataManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Components\StageManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Components\Input\InputEmulator.cpp">
<Filter>Source Files</Filter>
</ClCompile>