mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-16 05:14:01 +02:00
Code Issues Projects Releases Wiki Activity

move some key stuff out of sdl_poll, zoom won't be triggered even when disabled by lua now

Browse Source 
Conflicts:

	src/interface.c
	src/main.c
This commit is contained in:
jacob1
2012-07-23 12:10:54 -04:00
committed by Simon Robertshaw
parent 23f9de6f81
commit daeddd5519
3 changed files with 109 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/interface.h
View File

@@ -196,7 +196,7 @@ typedef struct ui_richtext ui_richtext;
int SLALT;
extern SDLMod sdl_mod;
extern int sdl_key, sdl_rkey, sdl_wheel, sdl_caps, sdl_ascii, sdl_zoom_trig;
extern int sdl_key, sdl_rkey, sdl_wheel, sdl_ascii, sdl_zoom_trig;
#if (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11)
extern SDL_SysWMinfo sdl_wminfo;
extern Atom XA_CLIPBOARD, XA_TARGETS;
@@ -319,6 +319,8 @@ int color_menu_ui(pixel *vid_buf, int i, int *cr, int *cg, int *cb, int b, int b
int sdl_poll(void);
void stickmen_keys();
void set_cmode(int cm);
char *download_ui(pixel *vid_buf, char *uri, int *len);