mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-31 11:41:51 +02:00
Code Issues Projects Releases Wiki Activity

this might fix the python console on 64bit without #define PYEXT

Browse Source
This commit is contained in:
Lieuwe
2011-03-14 21:37:02 +01:00
parent c33f6adae7
commit 67b68e32ff
3 changed files with 1825 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -23,7 +23,7 @@ powder-debug-64: $(SOURCES)
mv $@ build
powder-debug: $(SOURCES)
$(PYCOMMAND)
$(COMPILER) -m32 -o$@ $(FLAGS_DBUG) -DLIN32 $(SOURCES) -Iincludes/
$(COMPILER) -DINTERNAL -o$@ $(CFLAGS) $(OFLAGS) $(LFLAGS) $(MFLAGS_SSE3) $(SOURCES) -DLIN64 $(FLAGS_DBUG)
mv $@ build
powder-sse3: $(SOURCES)
$(PYCOMMAND)

1788
log.log
View File

File diff suppressed because it is too large Load Diff

38
src/main.c
View File

@@ -1214,6 +1214,7 @@ emb_create(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",create_part(-1,x,y,t));
}
//sys_pause = !sys_pause
static PyObject*
emb_pause(PyObject *self, PyObject *args)
{
int x,y,t;
@@ -1224,6 +1225,7 @@ emb_pause(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_unpause(PyObject *self, PyObject *args)
{
int x,y,t;
@@ -1234,6 +1236,7 @@ emb_unpause(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_toggle_pause(PyObject *self, PyObject *args)
{
int x,y,t;
@@ -1246,6 +1249,7 @@ emb_toggle_pause(PyObject *self, PyObject *args)
//console_mode
static PyObject*
emb_toggle_console(PyObject *self, PyObject *args)
{
int x,y,t;
@@ -1256,6 +1260,7 @@ emb_toggle_console(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_open_console(PyObject *self, PyObject *args)
{
int x,y,t;
@@ -1266,6 +1271,7 @@ emb_open_console(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_close_console(PyObject *self, PyObject *args)
{
int x,y,t;
@@ -1276,7 +1282,7 @@ emb_close_console(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_log(PyObject *self, PyObject *args)
{
char *buffer;
@@ -1290,6 +1296,7 @@ emb_log(PyObject *self, PyObject *args)
char console_more=0;
static PyObject*
emb_console_more(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":log"))
@@ -1299,6 +1306,7 @@ emb_console_more(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_console_less(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":log"))
@@ -1310,7 +1318,7 @@ emb_console_less(PyObject *self, PyObject *args)
//drawtext(vid_buf, 15, 175-(cc*12), currentcommand->command, 255, 255, 255, 255);
static PyObject*
emb_reset_pressure(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":reset_pressure"))
@@ -1324,6 +1332,7 @@ emb_reset_pressure(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_reset_velocity(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":reset_velocity"))
@@ -1338,6 +1347,7 @@ emb_reset_velocity(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_reset_sparks(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":reset_sparks"))
@@ -1354,6 +1364,7 @@ emb_reset_sparks(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_life(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1394,6 +1405,7 @@ emb_set_life(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_type(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j=-1,x=-1,y=-1;
@@ -1436,6 +1448,7 @@ emb_set_type(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_temp(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1476,6 +1489,7 @@ emb_set_temp(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_tmp(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1516,6 +1530,7 @@ emb_set_tmp(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_x(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1557,6 +1572,7 @@ emb_set_x(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_y(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1597,6 +1613,7 @@ emb_set_y(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_ctype(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1640,6 +1657,7 @@ emb_set_ctype(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_vx(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1680,6 +1698,7 @@ emb_set_vx(PyObject *self, PyObject *args, PyObject *keywds)
return Py_BuildValue("i",1);
}
static PyObject*
emb_set_vy(PyObject *self, PyObject *args, PyObject *keywds)
{
int i = -1,life,j,x=-1,y=-1;
@@ -1719,6 +1738,8 @@ emb_set_vy(PyObject *self, PyObject *args, PyObject *keywds)
}
return Py_BuildValue("i",1);
}
static PyObject*
emb_get_pmap(PyObject *self, PyObject *args)
{
int x,y;
@@ -1730,6 +1751,8 @@ emb_get_pmap(PyObject *self, PyObject *args)
return Py_BuildValue("I",pmap[y][x]);
}
static PyObject*
emb_get_prop(PyObject *self, PyObject *args)
{
int i;
@@ -1762,6 +1785,7 @@ emb_get_prop(PyObject *self, PyObject *args)
return Py_BuildValue("i",-1);
}
static PyObject*
emb_draw_pixel(PyObject *self, PyObject *args)
{
int x,y,r,g,b,a;
@@ -1779,6 +1803,7 @@ emb_draw_pixel(PyObject *self, PyObject *args)
}
//drawtext(pixel *vid, int x, int y, const char *s, int r, int g, int b, int a)
static PyObject*
emb_draw_text(PyObject *self, PyObject *args)
{
int x,y,r,g,b,a;
@@ -1795,6 +1820,7 @@ emb_draw_text(PyObject *self, PyObject *args)
}
//drawrect(pixel *vid, int x, int y, int w, int h, int r, int g, int b, int a)
static PyObject*
emb_draw_rect(PyObject *self, PyObject *args)
{
int x,y,w,h,r,g,b,a;
@@ -1810,6 +1836,7 @@ emb_draw_rect(PyObject *self, PyObject *args)
return Py_BuildValue("i",-1);
}
static PyObject*
emb_draw_fillrect(PyObject *self, PyObject *args)
{
int x,y,w,h,r,g,b,a;
@@ -1824,7 +1851,9 @@ emb_draw_fillrect(PyObject *self, PyObject *args)
}
return Py_BuildValue("i",-1);
}
//int textwidth(char *s)
static PyObject*
emb_get_width(PyObject *self, PyObject *args)
{
char *txt;
@@ -1834,6 +1863,7 @@ emb_get_width(PyObject *self, PyObject *args)
}
//SDL_GetMouseState(&x, &y)
static PyObject*
emb_get_mouse(PyObject *self, PyObject *args)
{
int x,y,mask,b1,b2,b3;
@@ -1847,6 +1877,7 @@ emb_get_mouse(PyObject *self, PyObject *args)
}
//svf_name
static PyObject*
emb_get_name(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":get_name"))
@@ -1857,6 +1888,7 @@ emb_get_name(PyObject *self, PyObject *args)
return Py_BuildValue("s","");
}
static PyObject*
emb_shortcuts_disable(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":shortcuts_disable"))
@@ -1866,6 +1898,7 @@ emb_shortcuts_disable(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_shortcuts_enable(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":shortcuts_enable"))
@@ -1875,6 +1908,7 @@ emb_shortcuts_enable(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_get_modifier(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":get_modifier"))