ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated ocean and peach skins to also include scrollbars + fixed invalid pointer usage in addons that caused crash

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5664 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-07-06 23:56:58 +00:00
parent 396db5ae2b
commit 5efcf2fd90
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/gui/skins/Ocean.stkskin
View File

@ -75,7 +75,15 @@ when the border that intersect at this corner are enabled.
<!-- TODO : buttons could support 'pressed' state -->
<element type="progress" state="fill" image="ocean/glasssgauge_fill.png"
left_border="20" right_border="20" top_border="0" bottom_border="0"
preserve_h_aspect_ratios="true" />
<element type="progress" state="neutral" image="ocean/scrollbar_bg.png"
left_border="31" right_border="31" top_border="15" bottom_border="15"
preserve_h_aspect_ratios="true" />
<element type="tab" state="neutral" image="ocean/glasstab.png"
left_border="75" right_border="75" top_border="0" bottom_border="15"
hborder_out_portion="0.2" />

8
data/gui/skins/Peach.stkskin
View File

@ -75,7 +75,15 @@ when the border that intersect at this corner are enabled.
<!-- TODO : buttons could support 'pressed' state -->
<element type="progress" state="fill" image="peach/glasssgauge_fill.png"
left_border="20" right_border="20" top_border="0" bottom_border="0"
preserve_h_aspect_ratios="true" />
<element type="progress" state="neutral" image="peach/scrollbar_bg.png"
left_border="31" right_border="31" top_border="15" bottom_border="15"
preserve_h_aspect_ratios="true" />
<element type="tab" state="neutral" image="peach/glasstab.png"
left_border="75" right_border="75" top_border="0" bottom_border="15"
hborder_out_portion="0.2" />

6
src/addons/addons.cpp
View File

@ -49,7 +49,7 @@ Addons::Addons()
this->index = -1;
std::cout << "Loading an xml file for addons: ";
int download_state = 0;
m_download_state = &download_state;
m_download_state = download_state;
download("list");
std::string xml_file = file_manager->getConfigDir() + "/" + "list";
std::cout << xml_file << std::endl;
@ -319,7 +319,7 @@ void Addons::Install()
//download of the addons file
download(std::string("file/" + this->m_addons_list[this->index].file),
this->m_addons_list[this->index].name, m_download_state);
this->m_addons_list[this->index].name, &m_download_state);
file_manager->checkAndCreateDirForAddons(this->m_addons_list[this->index].name,
this->m_addons_list[this->index].type + "s/");
@ -441,7 +441,7 @@ int Addons::RemoveDirectory(char const *name)
int Addons::getDownloadState()
{
pthread_mutex_lock(&download_mutex);
int value = *m_download_state;
int value = m_download_state;
pthread_mutex_unlock(&download_mutex);
return value;
}

2
src/addons/addons.hpp
View File

@ -46,7 +46,7 @@ class Addons
int RemoveDirectory(char const *name);
void GetInstalledAddons();
std::string type;
int * m_download_state;
int m_download_state;
public:
Addons();