summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-03-28 16:21:18 (GMT)
committer Simon <simon@hardwired.org.uk>2011-03-29 17:24:08 (GMT)
commit83590424b07c788e7ebf09981a51a82ed53a0353 (patch)
treebb44385025a5c01c6e6604d5751b32167c57649e /src
parented244f42cb4ceb11af936781e336367cfc8ed0e7 (diff)
downloadpowder-83590424b07c788e7ebf09981a51a82ed53a0353.zip
powder-83590424b07c788e7ebf09981a51a82ed53a0353.tar.gz
some keyword fixes, "from" is a reserved name.
Diffstat (limited to 'src')
-rw-r--r--src/main.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main.c b/src/main.c
index 16dac00..c36fe0d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1368,7 +1368,7 @@ static PyObject* emb_set_life(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
char *name = "";
- char *kwlist[] = {"setto", "from", "i", "x", "y", NULL};
+ char *kwlist[] = {"setto", "setfrom", "i", "x", "y", NULL};
if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL;
//
@@ -1409,7 +1409,7 @@ static PyObject* emb_set_type(PyObject *self, PyObject *args, PyObject *keywds)
int i = -1,life,j=-1,x=-1,y=-1;
char *name = "";
char *type = "";
- char *kwlist[] = {"setto", "settoint", "from", "i", "x", "y", NULL};
+ char *kwlist[] = {"setto", "settoint", "setfrom", "i", "x", "y", NULL};
if(!PyArg_ParseTupleAndKeywords(args, keywds, "|sIsIII:set_type",kwlist ,&type,&life,&name,&i,&x,&y))
return NULL;
//
@@ -1450,7 +1450,7 @@ static PyObject* emb_set_temp(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
char *name = "";
- char *kwlist[] = {"setto", "from", "i", "x", "y", NULL};
+ char *kwlist[] = {"setto", "setfrom", "i", "x", "y", NULL};
if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL;
//
@@ -1490,7 +1490,7 @@ static PyObject* emb_set_tmp(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
char *name = "";
- char *kwlist[] = {"setto", "from", "i", "x", "y", NULL};
+ char *kwlist[] = {"setto", "setfrom", "i", "x", "y", NULL};
if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL;
//
@@ -1531,7 +1531,7 @@ static PyObject* emb_set_x(PyObject *self, PyObject *args, PyObject *keywds)
int i = -1,life,j,x=-1,y=-1;
char *name = "";
char *type = "";
- char *kwlist[] = {"setto", "from", "i", "x", "y", NULL};
+ char *kwlist[] = {"setto", "setfrom", "i", "x", "y", NULL};
if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL;
//
@@ -1571,7 +1571,7 @@ static PyObject* emb_set_y(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
char *name = "";
- char *kwlist[] = {"setto", "from", "i", "x", "y", NULL};
+ char *kwlist[] = {"setto", "setfrom", "i", "x", "y", NULL};
if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL;
//
@@ -1612,8 +1612,8 @@ static PyObject* emb_set_ctype(PyObject *self, PyObject *args, PyObject *keywds)
int i = -1,life,j,x=-1,y=-1;
char *name = "";
char *type = "";
- char *kwlist[] = {"setto", "settoint", "from", "i", "x", "y", NULL};
- if(!PyArg_ParseTupleAndKeywords(args, keywds, "s|IsIII:set_type",kwlist ,&type, &life, &name,&i,&x,&y))
+ char *kwlist[] = {"setto", "settoint", "setfrom", "i", "x", "y", NULL};
+ if(!PyArg_ParseTupleAndKeywords(args, keywds, "|sIsIII:set_type",kwlist ,&type, &life, &name,&i,&x,&y))
return NULL;
//
if(strcmp(name,"")==0 && x==-1 && y==-1 && i==-1)
@@ -1654,8 +1654,8 @@ static PyObject* emb_set_vx(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
char *name = "";
- char *kwlist[] = {"setto", "from", "i", "x", "y", NULL};
- if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
+ char *kwlist[] = {"setto", "setfrom", "i", "x", "y", NULL};
+ if(!PyArg_ParseTupleAndKeywords(args, keywds, "f|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL;
//
if(strcmp(name,"")==0 && x==-1 && y==-1 && i==-1)
@@ -1694,8 +1694,8 @@ static PyObject* emb_set_vy(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
char *name = "";
- char *kwlist[] = {"setto", "from", "i", "x", "y", NULL};
- if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
+ char *kwlist[] = {"setto", "setfrom", "i", "x", "y", NULL};
+ if(!PyArg_ParseTupleAndKeywords(args, keywds, "f|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL;
//
if(strcmp(name,"")==0 && x==-1 && y==-1 && i==-1)