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

Preview images are cleared when selecting local only mods

This commit is contained in:
Titus Tscharntke 2011-09-09 19:02:08 +00:00
parent 41dfe298d3
commit 713741de37
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/glest_game/menu/menu_state_mods.cpp
View File

@ -73,6 +73,7 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
selectedTilesetName = "";
selectedMapName = "";
selectedScenarioName = "";
modInfoSelected = NULL;
showFullConsole = false;
keyButtonsLineHeight = 20;
keyButtonsHeight = 20;
@ -1738,13 +1739,14 @@ string MenuStateMods::getPreviewImageFileForMod(const ModInfo *modInfo) {
void MenuStateMods::showLocalDescription(string name) {
Lang &lang= Lang::getInstance();
modInfoSelected=NULL;
cleanupPreviewTexture();
modDescrLabel.setText(lang.get("ModOnlyLocal")+":\n'"+name+"'");
}
void MenuStateMods::showRemoteDesription(const ModInfo *modInfo) {
void MenuStateMods::showRemoteDesription(ModInfo *modInfo) {
//displayModPreviewImage = false;
modInfoSelected = *modInfo;
modInfoSelected = modInfo;
string modText = modInfo->description;
replaceAll(modText, "\\n", "\n");
@ -1867,21 +1869,23 @@ void MenuStateMods::render() {
renderer.renderButton(&buttonOnlyLocal);
renderer.renderLabel(&modDescrLabel);
string tempImage = getPreviewImageFileForMod(&modInfoSelected);
if(displayModPreviewImage.find(tempImage) != displayModPreviewImage.end() &&
displayModPreviewImage[tempImage] == true) {
if(modPreviewImage == NULL) {
string tempImage = getPreviewImageFileForMod(&modInfoSelected);
if(modInfoSelected!=NULL){
string tempImage = getPreviewImageFileForMod(modInfoSelected);
if(displayModPreviewImage.find(tempImage) != displayModPreviewImage.end() &&
displayModPreviewImage[tempImage] == true) {
if(modPreviewImage == NULL) {
string tempImage = getPreviewImageFileForMod(modInfoSelected);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("### Render tempImage [%s] fileExists(tempImage) = %d\n",tempImage.c_str(),fileExists(tempImage));
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("### Render tempImage [%s] fileExists(tempImage) = %d\n",tempImage.c_str(),fileExists(tempImage));
if(tempImage != "" && fileExists(tempImage) == true) {
cleanupPreviewTexture();
modPreviewImage = Renderer::findFactionLogoTexture(tempImage);
if(tempImage != "" && fileExists(tempImage) == true) {
cleanupPreviewTexture();
modPreviewImage = Renderer::findFactionLogoTexture(tempImage);
}
}
if(modPreviewImage != NULL) {
renderer.renderTextureQuad(508,90,485,325,modPreviewImage,1.0f);
}
}
if(modPreviewImage != NULL) {
renderer.renderTextureQuad(508,90,485,325,modPreviewImage,1.0f);
}
}

4
source/glest_game/menu/menu_state_mods.h
View File

@ -120,7 +120,7 @@ private:
GraphicLabel modDescrLabel;
Texture2D *modPreviewImage;
ModInfo modInfoSelected;
ModInfo *modInfoSelected;
map<string,bool> displayModPreviewImage;
GraphicButton buttonInstalled;
@ -185,7 +185,7 @@ private:
void refreshScenarios();
void showLocalDescription(string name);
void showRemoteDesription(const ModInfo *modInfo);
void showRemoteDesription(ModInfo *modInfo);
std::map<string,int32> mapCRCUpdateList;
public: