Big patches:

Erwin Coumans: Abstract the physics engine
Charlie C: Joystick fixes
Me: Moved the ray cast (shadows, mouse sensor & ray sensor)

6 files changed, 16 insertions, 12 deletions

diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp
index 090c95e3c07..24033dd21a2 100644
--- a/source/gameengine/Expressions/InputParser.cpp
+++ b/source/gameengine/Expressions/InputParser.cpp
@@ -14,6 +14,8 @@
 
 #include <stdlib.h>
 
+#include "MT_assert.h"
+
 #include "Value.h"
 #include "InputParser.h"
 #include "ErrorValue.h"
@@ -371,7 +373,7 @@ int CParser::Priority(int optorkind) {
     case OPtimes:
     case OPdivide: return 5;
 	}
-	assert(false);
+	MT_assert(false);
 	return 0;      // should not happen
 }
 
@@ -400,7 +402,7 @@ CExpression *CParser::Ex(int i) {
 			case OPless: e1 = new COperator2Expr(VALUE_LES_OPERATOR,e1, e2); break;
 			case OPgreaterequal: e1 = new COperator2Expr(VALUE_GEQ_OPERATOR,e1, e2); break;
 			case OPlessequal: e1 = new COperator2Expr(VALUE_LEQ_OPERATOR,e1, e2); break;
-			default: assert(false);	break; // should not happen
+			default: MT_assert(false);	break; // should not happen
 			}
 		}
 	} else if (i == NUM_PRIORITY) {
@@ -445,7 +447,7 @@ CExpression *CParser::Ex(int i) {
 					e1 = new CConstExpr(new CStringValue(const_as_string,""));
 					break;
 				default :
-					assert(false);
+					MT_assert(false);
 					break;
 				}
 				NextSym();
@@ -483,7 +485,7 @@ CExpression *CParser::Ex(int i) {
 				}
 			case errorsym:
 				{
-					assert(!e1);
+					MT_assert(!e1);
 					STR_String errtext="[no info]";
 					if (errmsg)
 					{
@@ -498,7 +500,7 @@ CExpression *CParser::Ex(int i) {
 							errmsg=NULL;
 						} else {
 							// does this happen ?
-							assert ("does this happen");
+							MT_assert ("does this happen");
 						}
 					}
 					e1 = Error(errtext);
@@ -508,7 +510,7 @@ CExpression *CParser::Ex(int i) {
 			default:
 				NextSym();
 				//return Error("Expression expected");
-				assert(!e1);
+				MT_assert(!e1);
 				e1 = Error("Expression expected");
 			}
 		}
diff --git a/source/gameengine/Expressions/Makefile b/source/gameengine/Expressions/Makefile
index 88746c18eae..18dca9a1c68 100644
--- a/source/gameengine/Expressions/Makefile
+++ b/source/gameengine/Expressions/Makefile
@@ -40,6 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
-CPPFLAGS += -I$(NAN_STRING)/include    
+CPPFLAGS += -I$(NAN_STRING)/include
+CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../kernel/gen_system
 
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 2b331d7f728..b75da2c12a2 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -49,7 +49,7 @@
  * http://www.python.org/doc/PyCPP.html
  *
 ------------------------------*/
-#include <assert.h>
+#include <MT_assert.h>
 #include "stdlib.h"
 #include "PyObjectPlus.h"
 #include "STR_String.h"
@@ -79,7 +79,7 @@ PyTypeObject PyObjectPlus::Type = {
 
 PyObjectPlus::PyObjectPlus(PyTypeObject *T) 				// constructor
 {
-	assert(T != NULL);
+	MT_assert(T != NULL);
 	this->ob_type = T; 
 	_Py_NewReference(this);
 };
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 7e6b3f29bab..8784d28d502 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -48,7 +48,7 @@
 
 								// some basic python macros
 #define Py_NEWARGS 1			
-#define Py_Return Py_INCREF(Py_None); return Py_None;	
+#define Py_Return { Py_INCREF(Py_None); return Py_None;}
 
 #define Py_Error(E, M)   {PyErr_SetString(E, M); return NULL;}
 #define Py_Try(F) {if (!(F)) return NULL;}
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index 93a197e085b..212381cc034 100755
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -26,7 +26,8 @@ source_files = ['BoolValue.cpp',
 
 expressions_env.Append (CPPPATH = ['.',
                                    '#source/kernel/gen_system',
-                                   '#intern/string'])
+                                   '#intern/string',
+				   '#intern/moto/include'])
 
 expressions_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
 
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index fbb1e9a8c99..1a09123c107 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -532,7 +532,7 @@ int	CValue::Release()
 	else
 	{
 		// Reference count reached 0, delete ourselves and return 0
-//		assert(m_refcount==0, "Reference count reached sub-zero, object released too much");
+//		MT_assert(m_refcount==0, "Reference count reached sub-zero, object released too much");
 		delete this;
 		return 0;
 	}