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

NLA SoC: Merge from 2.5

Browse Source 
21210 to 21300

Note to self: the next merge will be messy again, since 2 commits occurred this one was complete
This commit is contained in:
Joshua Leung
2009-07-02 03:32:57 +00:00
parent 78939898c7
commit b1a106dd49
283 changed files with 6697 additions and 5513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/gameengine/GameLogic/SCA_NANDController.cpp
View File

@@ -42,10 +42,9 @@
/* Native functions */
/* ------------------------------------------------------------------------- */
SCA_NANDController::SCA_NANDController(SCA_IObject* gameobj,
PyTypeObject* T)
SCA_NANDController::SCA_NANDController(SCA_IObject* gameobj)
:
SCA_IController(gameobj,T)
SCA_IController(gameobj)
{
}
@@ -116,19 +115,15 @@ PyTypeObject SCA_NANDController::Type = {
0,
0,
py_base_repr,
0,0,0,0,0,0,
py_base_getattro,
py_base_setattro,
0,0,0,0,0,0,0,0,0,
Methods
};
PyParentObject SCA_NANDController::Parents[] = {
&SCA_NANDController::Type,
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
0,0,0,0,0,0,0,
Methods,
0,
0,
&SCA_IController::Type,
&SCA_ILogicBrick::Type,
&CValue::Type,
NULL
0,0,0,0,0,0,
py_base_new
};
PyMethodDef SCA_NANDController::Methods[] = {
@@ -139,12 +134,4 @@ PyAttributeDef SCA_NANDController::Attributes[] = {
{ NULL } //Sentinel
};
PyObject* SCA_NANDController::py_getattro(PyObject *attr) {
py_getattro_up(SCA_IController);
}
PyObject* SCA_NANDController::py_getattro_dict() {
py_getattro_dict_up(SCA_IController);
}
/* eof */