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

you can now disable(tpt.disable_python) or enable(python) the python console :D

Browse Source
This commit is contained in:
Lieuwe
2011-03-18 19:42:23 +01:00
parent 96959503cd
commit 7e27282b92
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/powder
View File

Binary file not shown.

1
includes/defines.h
View File

@@ -162,6 +162,7 @@ int death2;
int ISSPAWN1;
int ISSPAWN2;
extern char pyready;
extern char pygood;
extern sign signs[MAXSIGNS];
extern stamp stamps[STAMP_MAX];
extern int stamp_count;

2
includes/pyconsole.h
View File

File diff suppressed because one or more lines are too long

12
src/interface.c
View File

@@ -3851,7 +3851,7 @@ typedef struct command_history command_history;
command_history *last_command = NULL;
command_history *last_command2 = NULL;
char *console_ui(pixel *vid_buf,char error[255],char console_more) {
int mx,my,b,cc,ci = -1;
int mx,my,b,cc,ci = -1,i;
pixel *old_buf=calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
command_history *currentcommand;
command_history *currentcommand2;
@@ -3892,10 +3892,14 @@ char *console_ui(pixel *vid_buf,char error[255],char console_more) {
//clearrect(vid_buf, 0, 0, XRES+BARSIZE, 220);//anyway to make it transparent?
memcpy(vid_buf,old_buf,(XRES+BARSIZE)*YRES*PIXELSIZE);
draw_line(vid_buf, 0, 219, XRES+BARSIZE-1, 219, 228, 228, 228, XRES+BARSIZE);
if(pyready)
drawtext(vid_buf, 15, 15, "Welcome to The Powder Toy console v.3 (by cracker64, python by Doxin)",255, 255, 255, 255);
if(pygood)
i=255;
else
drawtext(vid_buf, 15, 15, "Welcome to The Powder Toy console v.3 (by cracker64, python disabled)",255, 0, 0, 255);
i=0;
if(pyready)
drawtext(vid_buf, 15, 15, "Welcome to The Powder Toy console v.3 (by cracker64, python by Doxin)",255,i,i, 255);
else
drawtext(vid_buf, 15, 15, "Welcome to The Powder Toy console v.3 (by cracker64, python disabled)",255,i,i, 255);
cc = 0;
currentcommand = last_command;

24
src/main.c
View File

@@ -31,6 +31,7 @@
#include "pyconsole.h"
//#include "pystdlib.h"
char pyready=1;
char pygood=1;
#endif
#include <stdio.h>
@@ -1965,6 +1966,15 @@ emb_set_velocity(PyObject *self, PyObject *args)
return Py_BuildValue("i",1);
}
static PyObject*
emb_disable_python(PyObject *self, PyObject *args)
{
if(!PyArg_ParseTuple(args, ":disable_python"))
return NULL;
pyready=0;
return Py_BuildValue("i",1);
}
static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your function here!
{"create", (PyCFunction)emb_create, METH_VARARGS|METH_KEYWORDS, "create a particle."},
{"log", (PyCFunction)emb_log, METH_VARARGS, "logs an error string to the console."},
@@ -2004,6 +2014,7 @@ static PyMethodDef EmbMethods[] = { //WARNING! don't forget to register your fun
{"delete", (PyCFunction)emb_delete, METH_VARARGS, "delete a particle"},
{"set_pressure", (PyCFunction)emb_set_pressure, METH_VARARGS, "set pressure"},
{"set_velocity", (PyCFunction)emb_set_velocity, METH_VARARGS, "set velocity"},
{"disable_python", (PyCFunction)emb_disable_python, METH_VARARGS, "switch back to the old console."},
{NULL, NULL, 0, NULL}
};
#endif
@@ -2093,6 +2104,7 @@ int main(int argc, char *argv[])
printf("unable to find handle function, mangled console.py?\n");
//return -1;
pyready=0;
pygood=0;
}
pstep=PyObject_GetAttrString(pmodule,"step");//get the handler function
@@ -2122,6 +2134,7 @@ int main(int argc, char *argv[])
printf("unable to find console module, missing file or mangled console.py?\n");
//return -1;
pyready=0;
pygood=0;
}
#else
printf("python console disabled at compile time.");
@@ -2751,7 +2764,7 @@ int main(int argc, char *argv[])
}
}
#ifdef PYCONSOLE
if(pyready==1)
if(pyready==1 && pygood==1)
if(pkey!=NULL && sdl_key!=NULL)
{
pargs=Py_BuildValue("(c)",sdl_key);
@@ -3664,7 +3677,7 @@ int main(int argc, char *argv[])
if(console_mode)
{
#ifdef PYCONSOLE
if(pyready==1)
if(pyready==1 && pygood==1)
{
char *console;
//char error[255] = "error!";
@@ -3716,7 +3729,7 @@ int main(int argc, char *argv[])
//execute python step hook
#ifdef PYCONSOLE
if(pyready==1)
if(pyready==1 && pygood==1)
if(pstep!=NULL)
{
pargs=Py_BuildValue("()");
@@ -3907,6 +3920,11 @@ int process_command_old(pixel *vid_buf,char *console,char *console_error) {
if (sound_enable) play_sound(console3);
else strcpy(console_error, "Audio device not available - cannot play sounds");
}
else if(strcmp(console2, "python")==0)
if(pygood==1)
pyready=1;
else
strcpy(console_error, "python not ready. check stdout for more info.");
else if(strcmp(console2, "load")==0 && console3)
{
j = atoi(console3);