funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-04-03 02:37:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaning up some accessors/mutators

Browse Source
This commit is contained in:
Don Honerbrink
2015-06-19 17:24:25 -05:00
parent 297f3e2787
commit 3ea62b9c64
23 changed files with 139 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RetroFE/Source/Execute/AttractMode.cpp
View File

@@ -19,17 +19,13 @@
#include <cstdlib>
AttractMode::AttractMode()
: IsActive(false)
: IdleTime(0)
, IsActive(false)
, ElapsedTime(0)
, ActiveTime(0)
, IdleTime(0)
{
}
void AttractMode::SetIdleTime(float time)
{
IdleTime = time;
}
void AttractMode::Reset()
{
ElapsedTime = 0;
@@ -60,4 +56,4 @@ void AttractMode::Update(float dt, Page &page)
page.SetScrolling(Page::ScrollDirectionIdle);
}
}
}
}

3
RetroFE/Source/Execute/AttractMode.h
View File

@@ -21,14 +21,13 @@ class AttractMode
{
public:
AttractMode();
void SetIdleTime(float time);
void Reset();
void Update(float dt, Page &page);
float IdleTime;
private:
bool IsActive;
float ElapsedTime;
float ActiveTime;
float IdleTime;
};

22
RetroFE/Source/Execute/Launcher.cpp
View File

@@ -38,7 +38,7 @@ Launcher::Launcher(RetroFE &p, Configuration &c)
bool Launcher::Run(std::string collection, Item *collectionItem)
{
std::string launcherName = collectionItem->GetLauncher();
std::string launcherName = collectionItem->Launcher;
std::string executablePath;
std::string selectedItemsDirectory;
std::string selectedItemsPath;
@@ -67,29 +67,29 @@ bool Launcher::Run(std::string collection, Item *collectionItem)
Logger::Write(Logger::ZONE_ERROR, "Launcher", "No launcher arguments specified for launcher " + launcherName);
return false;
}
if(!FindFile(selectedItemsPath, matchedExtension, selectedItemsDirectory, collectionItem->GetName(), extensions))
if(!FindFile(selectedItemsPath, matchedExtension, selectedItemsDirectory, collectionItem->Name, extensions))
{
// FindFile() prints out diagnostic messages for us, no need to print anything here
return false;
}
args = ReplaceVariables(args,
selectedItemsPath,
collectionItem->GetName(),
collectionItem->GetFileName(),
collectionItem->Name,
collectionItem->FileName(),
selectedItemsDirectory,
collection);
executablePath = ReplaceVariables(executablePath,
selectedItemsPath,
collectionItem->GetName(),
collectionItem->GetFileName(),
collectionItem->Name,
collectionItem->FileName(),
selectedItemsDirectory,
collection);
currentDirectory = ReplaceVariables(currentDirectory,
selectedItemsPath,
collectionItem->GetName(),
collectionItem->GetFileName(),
collectionItem->Name,
collectionItem->FileName(),
selectedItemsDirectory,
collection);
@@ -114,11 +114,11 @@ std::string Launcher::ReplaceVariables(std::string str,
str = Utils::Replace(str, "%ITEM_FILENAME%", itemFilename);
str = Utils::Replace(str, "%ITEM_DIRECTORY%", itemDirectory);
str = Utils::Replace(str, "%ITEM_COLLECTION_NAME%", itemCollectionName);
str = Utils::Replace(str, "%RETROFE_PATH%", Configuration::GetAbsolutePath());
str = Utils::Replace(str, "%RETROFE_PATH%", Configuration::AbsolutePath);
#ifdef WIN32
str = Utils::Replace(str, "%RETROFE_EXEC_PATH%", Utils::CombinePath(Configuration::GetAbsolutePath(), "RetroFE.exe"));
str = Utils::Replace(str, "%RETROFE_EXEC_PATH%", Utils::CombinePath(Configuration::AbsolutePath, "RetroFE.exe"));
#else
str = Utils::Replace(str, "%RETROFE_EXEC_PATH%", Utils::CombinePath(Configuration::GetAbsolutePath(), "RetroFE"));
str = Utils::Replace(str, "%RETROFE_EXEC_PATH%", Utils::CombinePath(Configuration::AbsolutePath, "RetroFE"));
#endif
return str;