Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorMichel Selten <michel@mselten.demon.nl>2003-01-04 00:36:16 +0300
committerMichel Selten <michel@mselten.demon.nl>2003-01-04 00:36:16 +0300
commit0a51feab36350c79f3247de13f5e7998288d3011 (patch)
tree0df509b791b61e13ede55726efc93507fce5ecba /source
parent1af0e07f74848acf9411250a018789c17067615f (diff)
These updates enable the build of the gameengine
(configure --enable-gameengine). However, you still need to manually configure, compile and install ode. * Following the original NaN makefile, I removed the TerraplayNetwork files from the build. (Moved the two files to EXTRA_DIST). * Pass a const char * to Py_BuildValue instead of a STR_String in BL_ActionActuator.cpp * Added some include directories in Makefile.am's Michel
Diffstat (limited to 'source')
-rw-r--r--source/gameengine/Converter/BL_ActionActuator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 50860bb4ad3..78967a55ac1 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -126,7 +126,7 @@ bool BL_ActionActuator::Update(double curtime,double deltatime)
/* We know that action actuators have been discarded from all non armature objects:
if we're being called, we're attached to a BL_ArmatureObject */
BL_ArmatureObject *obj = (BL_ArmatureObject*)GetParent();
- int length = m_endtime - m_starttime;
+ float length = m_endtime - m_starttime;
priority = m_priority;
@@ -436,7 +436,7 @@ PyObject* BL_ActionActuator::PyGetProperty(PyObject* self,
PyObject* kwds) {
PyObject *result;
- result = Py_BuildValue("s", m_propname);
+ result = Py_BuildValue("s", (const char *)m_propname);
return result;
}