matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some keyword fixes, "from" is a reserved name.

Browse Source
This commit is contained in:
Cracker64 2011-03-28 12:21:18 -04:00 committed by Simon
parent ed244f42cb
commit 83590424b0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main.c
View File

@ -1368,7 +1368,7 @@ static PyObject* emb_set_life(PyObject *self, PyObject *args, PyObject *keywds)
{ {
int i = -1,life,j,x=-1,y=-1; int i = -1,life,j,x=-1,y=-1;
char *name = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL; 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; int i = -1,life,j=-1,x=-1,y=-1;
char *name = ""; char *name = "";
char *type = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "|sIsIII:set_type",kwlist ,&type,&life,&name,&i,&x,&y))
return NULL; 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; int i = -1,life,j,x=-1,y=-1;
char *name = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL; 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; int i = -1,life,j,x=-1,y=-1;
char *name = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL; 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; int i = -1,life,j,x=-1,y=-1;
char *name = ""; char *name = "";
char *type = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL; 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; int i = -1,life,j,x=-1,y=-1;
char *name = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "I|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL; 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; int i = -1,life,j,x=-1,y=-1;
char *name = ""; char *name = "";
char *type = ""; 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, "s|IsIII:set_type",kwlist ,&type, &life, &name,&i,&x,&y)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "|sIsIII:set_type",kwlist ,&type, &life, &name,&i,&x,&y))
return NULL; return NULL;
// //
if(strcmp(name,"")==0 && x==-1 && y==-1 && i==-1) 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; int i = -1,life,j,x=-1,y=-1;
char *name = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "f|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL; return NULL;
// //
if(strcmp(name,"")==0 && x==-1 && y==-1 && i==-1) 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; int i = -1,life,j,x=-1,y=-1;
char *name = ""; 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)) if(!PyArg_ParseTupleAndKeywords(args, keywds, "f|sIII:set_type",kwlist ,&life,&name,&i,&x,&y))
return NULL; return NULL;
// //
if(strcmp(name,"")==0 && x==-1 && y==-1 && i==-1) if(strcmp(name,"")==0 && x==-1 && y==-1 && i==-1)