diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-26 13:55:26 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-26 13:55:26 (GMT) |
| commit | 18ca4024c13a6b4dc5e4028d50852f401ebc4bde (patch) | |
| tree | ef4ceec13f80ac1c5d9d9d685851911960aedd89 | |
| parent | e46ef289e142982d7bd592faa7b0f85470364c01 (diff) | |
| download | powder-18ca4024c13a6b4dc5e4028d50852f401ebc4bde.zip powder-18ca4024c13a6b4dc5e4028d50852f401ebc4bde.tar.gz | |
Remove references to python console
| -rw-r--r-- | includes/defines.h | 9 | ||||
| -rw-r--r-- | includes/luaconsole.h | 2 | ||||
| -rw-r--r-- | src/main.c | 54 |
3 files changed, 3 insertions, 62 deletions
diff --git a/includes/defines.h b/includes/defines.h index e33bc0c..f4b4d08 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -23,8 +23,6 @@ #define LOCAL_SAVE_DIR "Saves" -#define LOCAL_LUA_DIR "Lua" - #define APPDATA_SUBDIR "\\HardWIRED" #define THUMB_CACHE_SIZE 256 @@ -99,13 +97,6 @@ extern unsigned char ZSIZE; #define TRI_BRUSH 2 #define BRUSH_NUM 3 - -//#define GRAVFFT -//#define LUACONSOLE -//#define PYCONSOLE -//#define PYEXT -//no longer needed - #ifdef PIX16 typedef unsigned short pixel; #else diff --git a/includes/luaconsole.h b/includes/luaconsole.h index de33a04..f98e662 100644 --- a/includes/luaconsole.h +++ b/includes/luaconsole.h @@ -11,6 +11,8 @@ #endif #include <defines.h> +#define LOCAL_LUA_DIR "Lua" + #define LUACON_MDOWN 1 #define LUACON_MUP 2 #define LUACON_MPRESS 3 @@ -55,9 +55,6 @@ #include <air.h> #include <icon.h> #include <console.h> -#ifdef PYCONSOLE -#include "pythonconsole.h" -#endif #ifdef LUACONSOLE #include "luaconsole.h" #endif @@ -1625,10 +1622,6 @@ int main(int argc, char *argv[]) #ifdef LUACONSOLE luacon_open(); #endif -#ifdef PYCONSOLE - pycon_open(); -#endif - #ifdef MT numCores = core_count(); #endif @@ -2101,11 +2094,6 @@ int main(int argc, char *argv[]) sdl_rkey = 0; } #endif -#ifdef PYCONSOLE - if(sdl_key){ - pycon_keypress(sdl_key, sdl_mod); - } -#endif if (sys_shortcuts==1)//all shortcuts can be disabled by python scripts { if (sdl_key=='q' || sdl_key==SDLK_ESCAPE) @@ -3563,41 +3551,7 @@ int main(int argc, char *argv[]) if (console_mode) { -#ifdef PYCONSOLE - 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 +#ifdef LUACONSOLE char *console; sys_pause = 1; console = console_ui(vid_buf, console_error, console_more); @@ -3629,9 +3583,6 @@ int main(int argc, char *argv[]) } //execute python step hook -#ifdef PYCONSOLE - pycon_step(); -#endif sdl_blit(0, 0, XRES+BARSIZE, YRES+MENUSIZE, vid_buf, XRES+BARSIZE); //Setting an element for the stick man @@ -3658,9 +3609,6 @@ int main(int argc, char *argv[]) #ifdef LUACONSOLE luacon_close(); #endif -#ifdef PYCONSOLE - pycon_close(); -#endif #ifdef PTW32_STATIC_LIB pthread_win32_thread_detach_np(); pthread_win32_process_detach_np(); |