sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixed warnings and bug. Updated binaries.

Browse Source 
This was SVN commit r2136.
This commit is contained in:
Ykkrosh 2005-04-15 22:40:15 +00:00
parent f99a36fa43
commit 4c08a07052
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/CList.cpp
View File

@ -86,7 +86,7 @@ void CList::SetupText()
// Generate texts
float buffered_y = 0.f;
for (int i=0; i<m_Items.size(); ++i)
for (size_t i=0; i<m_Items.size(); ++i)
{
// Create a new SGUIText. Later on, input it using AddText()
SGUIText *text = new SGUIText();
@ -167,7 +167,7 @@ void CList::HandleMessage(const SGUIMessage &Message)
CPos mouse = GetMousePos();
mouse.y += scroll;
int set=-1;
for (int i=0; i<m_Items.size(); ++i)
for (int i=0; i<(int)m_Items.size(); ++i)
{
if (mouse.y >= m_CachedActualSize.top + m_ItemsYPositions[i] &&
mouse.y < m_CachedActualSize.top + m_ItemsYPositions[i+1] &&
@ -328,7 +328,7 @@ void CList::Draw()
CColor color;
GUI<CColor>::GetSetting(this, "textcolor", color);
for (int i=0; i<m_Items.size(); ++i)
for (int i=0; i<(int)m_Items.size(); ++i)
{
if (m_ItemsYPositions[i+1] - scroll < 0 ||
m_ItemsYPositions[i] - scroll > m_CachedActualSize.GetHeight())
@ -404,7 +404,7 @@ void CList::SelectLastElement()
if (selected != m_Items.size()-1)
{
GUI<int>::SetSetting(this, "selected", m_Items.size()-1);
GUI<int>::SetSetting(this, "selected", (int)m_Items.size()-1);
}
}

3
source/simulation/BaseEntity.cpp
View File

@ -173,7 +173,8 @@ bool CBaseEntity::loadXML( CStr filename )
if( ExternalFunction != CStrW() )
{
jsval fnval;
assert( JS_TRUE == JS_GetUCProperty( g_ScriptingHost.GetContext(), g_ScriptingHost.GetGlobalObject(), ExternalFunction.c_str(), ExternalFunction.Length(), &fnval ) );
JSBool ret = JS_GetUCProperty( g_ScriptingHost.GetContext(), g_ScriptingHost.GetGlobalObject(), ExternalFunction.c_str(), ExternalFunction.Length(), &fnval );
assert( ret );
JSFunction* fn = JS_ValueToFunction( g_ScriptingHost.GetContext(), fnval );
if( !fn )
{