griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

Browse Source 
[[Split portion of a mixed commit.]]
This commit is contained in:
Joseph Eagar
2009-05-23 03:24:15 +00:00
parent b7fe3258b6
commit f026266e18
1037 changed files with 66726 additions and 65353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/gameengine/Expressions/IntValue.cpp
View File

@@ -42,10 +42,10 @@ effect: constructs a new CIntValue
CIntValue::CIntValue(int innie)
CIntValue::CIntValue(cInt innie)
/*
pre:
effect: constructs a new CIntValue containing int innie
effect: constructs a new CIntValue containing cInt innie
*/
{
m_int = innie;
@@ -54,7 +54,7 @@ effect: constructs a new CIntValue containing int innie
CIntValue::CIntValue(int innie,STR_String name,AllocationTYPE alloctype)
CIntValue::CIntValue(cInt innie,STR_String name,AllocationTYPE alloctype)
{
m_int = innie;
SetName(name);
@@ -280,10 +280,10 @@ this object
int CIntValue::GetInt()
cInt CIntValue::GetInt()
/*
pre:
ret: the int stored in the object
ret: the cInt stored in the object
*/
{
return m_int;
@@ -291,7 +291,7 @@ ret: the int stored in the object
float CIntValue::GetNumber()
double CIntValue::GetNumber()
{
return (float) m_int;
}
@@ -302,7 +302,7 @@ const STR_String & CIntValue::GetText()
{
if (!m_pstrRep)
m_pstrRep=new STR_String();
m_pstrRep->Format("%d",m_int);
m_pstrRep->Format("%lld",m_int);
return *m_pstrRep;
}
@@ -321,7 +321,7 @@ CValue* CIntValue::GetReplica() {
void CIntValue::SetValue(CValue* newval)
{
m_int = (int)newval->GetNumber();
m_int = (cInt)newval->GetNumber();
SetModified(true);
}
@@ -329,5 +329,8 @@ void CIntValue::SetValue(CValue* newval)
PyObject* CIntValue::ConvertValueToPython()
{
return PyInt_FromLong(m_int);
if((m_int > INT_MIN) && (m_int < INT_MAX))
return PyInt_FromLong(m_int);
else
return PyLong_FromLongLong(m_int);
}