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

Remove references to python console

Browse Source
This commit is contained in:
Simon Robertshaw 2011-10-26 14:55:26 +01:00
parent e46ef289e1
commit 18ca4024c1
3 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes/defines.h
View File

@ -23,8 +23,6 @@
#define LOCAL_SAVE_DIR "Saves" #define LOCAL_SAVE_DIR "Saves"
#define LOCAL_LUA_DIR "Lua"
#define APPDATA_SUBDIR "\\HardWIRED" #define APPDATA_SUBDIR "\\HardWIRED"
#define THUMB_CACHE_SIZE 256 #define THUMB_CACHE_SIZE 256
@ -99,13 +97,6 @@ extern unsigned char ZSIZE;
#define TRI_BRUSH 2 #define TRI_BRUSH 2
#define BRUSH_NUM 3 #define BRUSH_NUM 3
//#define GRAVFFT
//#define LUACONSOLE
//#define PYCONSOLE
//#define PYEXT
//no longer needed
#ifdef PIX16 #ifdef PIX16
typedef unsigned short pixel; typedef unsigned short pixel;
#else #else

2
includes/luaconsole.h
View File

@ -11,6 +11,8 @@
#endif #endif
#include <defines.h> #include <defines.h>
#define LOCAL_LUA_DIR "Lua"
#define LUACON_MDOWN 1 #define LUACON_MDOWN 1
#define LUACON_MUP 2 #define LUACON_MUP 2
#define LUACON_MPRESS 3 #define LUACON_MPRESS 3

54
src/main.c
View File

@ -55,9 +55,6 @@
#include <air.h> #include <air.h>
#include <icon.h> #include <icon.h>
#include <console.h> #include <console.h>
#ifdef PYCONSOLE
#include "pythonconsole.h"
#endif
#ifdef LUACONSOLE #ifdef LUACONSOLE
#include "luaconsole.h" #include "luaconsole.h"
#endif #endif
@ -1625,10 +1622,6 @@ int main(int argc, char *argv[])
#ifdef LUACONSOLE #ifdef LUACONSOLE
luacon_open(); luacon_open();
#endif #endif
#ifdef PYCONSOLE
pycon_open();
#endif
#ifdef MT #ifdef MT
numCores = core_count(); numCores = core_count();
#endif #endif
@ -2100,11 +2093,6 @@ int main(int argc, char *argv[])
if(!luacon_keyevent(sdl_rkey, sdl_mod, LUACON_KUP)) if(!luacon_keyevent(sdl_rkey, sdl_mod, LUACON_KUP))
sdl_rkey = 0; sdl_rkey = 0;
} }
#endif
#ifdef PYCONSOLE
if(sdl_key){
pycon_keypress(sdl_key, sdl_mod);
}
#endif #endif
if (sys_shortcuts==1)//all shortcuts can be disabled by python scripts if (sys_shortcuts==1)//all shortcuts can be disabled by python scripts
{ {
@ -3563,41 +3551,7 @@ int main(int argc, char *argv[])
if (console_mode) if (console_mode)
{ {
#ifdef PYCONSOLE #ifdef LUACONSOLE
if (pyready==1 && pygood==1)
{
char *console;
//char error[255] = "error!";
sys_pause = 1;
console = console_ui(vid_buf,console_error,console_more);
console = mystrdup(console);
strcpy(console_error,"");
if (process_command_py(vid_buf, console, console_error)==-1)
{
free(console);
break;
}
free(console);
if (!console_mode)
hud_enable = 1;
}
else
{
char *console;
sys_pause = 1;
console = console_ui(vid_buf,console_error,console_more);
console = mystrdup(console);
strcpy(console_error,"");
if (process_command_old(vid_buf, console, console_error)==-1)
{
free(console);
break;
}
free(console);
if (!console_mode)
hud_enable = 1;
}
#elif defined LUACONSOLE
char *console; char *console;
sys_pause = 1; sys_pause = 1;
console = console_ui(vid_buf, console_error, console_more); console = console_ui(vid_buf, console_error, console_more);
@ -3629,9 +3583,6 @@ int main(int argc, char *argv[])
} }
//execute python step hook //execute python step hook
#ifdef PYCONSOLE
pycon_step();
#endif
sdl_blit(0, 0, XRES+BARSIZE, YRES+MENUSIZE, vid_buf, XRES+BARSIZE); sdl_blit(0, 0, XRES+BARSIZE, YRES+MENUSIZE, vid_buf, XRES+BARSIZE);
//Setting an element for the stick man //Setting an element for the stick man
@ -3658,9 +3609,6 @@ int main(int argc, char *argv[])
#ifdef LUACONSOLE #ifdef LUACONSOLE
luacon_close(); luacon_close();
#endif #endif
#ifdef PYCONSOLE
pycon_close();
#endif
#ifdef PTW32_STATIC_LIB #ifdef PTW32_STATIC_LIB
pthread_win32_thread_detach_np(); pthread_win32_thread_detach_np();
pthread_win32_process_detach_np(); pthread_win32_process_detach_np();