Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

custom menu layouts disbaled by default 

saving and using custum menus layouts ( used for mods ) is disabled now
by default becasue it made trouble with new layout.  There are two new
switches for user.ini to control it:
CustomPropertiesUsageAllowed ( default = false )
CustomPropertiesSaveAllowed ( default=false )
This commit is contained in:
titiger 2019-11-12 01:29:25 +01:00
parent 32859457f6
commit 68de0209fb
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/glest_game/facilities/components.cpp
View File

@ -158,6 +158,10 @@ GraphicComponent * GraphicComponent::findRegisteredComponent(std::string contain
}
void GraphicComponent::applyAllCustomProperties(std::string containerName) {
Config &config = Config::getInstance();
if( config.getBool("CustomPropertiesUsageAllowed","false")==false){
return;
}
std::map<std::string, std::map<std::string, GraphicComponent *> >::iterator iterFind1 = GraphicComponent::registeredGraphicComponentList.find(containerName);
if(iterFind1 != GraphicComponent::registeredGraphicComponentList.end()) {
for(std::map<std::string, GraphicComponent *>::iterator iterFind2 = iterFind1->second.begin();
@ -169,11 +173,14 @@ void GraphicComponent::applyAllCustomProperties(std::string containerName) {
void GraphicComponent::applyCustomProperties(std::string containerName) {
if(instanceName != "") {
Config &config = Config::getInstance();
if( config.getBool("CustomPropertiesUsageAllowed","false")==false){
return;
}
std::map<std::string, std::map<std::string, GraphicComponent *> >::iterator iterFind1 = GraphicComponent::registeredGraphicComponentList.find(containerName);
if(iterFind1 != GraphicComponent::registeredGraphicComponentList.end()) {
std::map<std::string, GraphicComponent *>::iterator iterFind2 = iterFind1->second.find(instanceName);
if(iterFind2 != iterFind1->second.end()) {
Config &config = Config::getInstance();
//string languageToken = config.getString("Lang");
string languageToken = Lang::getInstance().getLanguage();
@ -201,7 +208,10 @@ void GraphicComponent::applyCustomProperties(std::string containerName) {
bool GraphicComponent::saveAllCustomProperties(std::string containerName) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] registered [%s] count = %d\n",__FILE__,__FUNCTION__,__LINE__,containerName.c_str(),registeredGraphicComponentList[containerName].size());
Config &config = Config::getInstance();
if( config.getBool("CustomPropertiesSaveAllowed","false")==false){
return false;
}
bool foundPropertiesToSave = false;
std::map<std::string, std::map<std::string, GraphicComponent *> >::iterator iterFind1 = GraphicComponent::registeredGraphicComponentList.find(containerName);
if(iterFind1 != GraphicComponent::registeredGraphicComponentList.end()) {
@ -223,6 +233,10 @@ bool GraphicComponent::saveAllCustomProperties(std::string containerName) {
bool GraphicComponent::saveCustomProperties(std::string containerName) {
bool savedChange = false;
if(instanceName != "") {
Config &config = Config::getInstance();
if( config.getBool("CustomPropertiesSaveAllowed","false")==false){
return false;
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] looking for [%s] [%s]\n",__FILE__,__FUNCTION__,__LINE__,containerName.c_str(),instanceName.c_str());
@ -236,8 +250,6 @@ bool GraphicComponent::saveCustomProperties(std::string containerName) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] FOUND [%s]\n",__FILE__,__FUNCTION__,__LINE__,instanceName.c_str());
Config &config = Config::getInstance();
//string languageToken = config.getString("Lang");
//if(dynamic_cast<GraphicButton *>(iterFind2->second) != NULL) {