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

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon 2011-02-21 16:10:05 +00:00
commit 064579c9e4
3 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/interface.h
View File

@ -154,8 +154,6 @@ extern char search_expr[256];
extern char *tag_names[TAG_MAX]; extern char *tag_names[TAG_MAX];
extern int tag_votes[TAG_MAX]; extern int tag_votes[TAG_MAX];
extern int Z_keysym;
extern int zoom_en; extern int zoom_en;
extern int zoom_x, zoom_y; extern int zoom_x, zoom_y;
extern int zoom_wx, zoom_wy; extern int zoom_wx, zoom_wy;

8
src/interface.c
View File

@ -60,8 +60,6 @@ char search_expr[256] = "";
char *tag_names[TAG_MAX]; char *tag_names[TAG_MAX];
int tag_votes[TAG_MAX]; int tag_votes[TAG_MAX];
int Z_keysym = 'z';
int zoom_en = 0; int zoom_en = 0;
int zoom_x=(XRES-ZSIZE_D)/2, zoom_y=(YRES-ZSIZE_D)/2; int zoom_x=(XRES-ZSIZE_D)/2, zoom_y=(YRES-ZSIZE_D)/2;
int zoom_wx=0, zoom_wy=0; int zoom_wx=0, zoom_wy=0;
@ -1763,10 +1761,9 @@ int sdl_poll(void)
sdl_ascii=event.key.keysym.unicode; sdl_ascii=event.key.keysym.unicode;
if (event.key.keysym.sym == SDLK_CAPSLOCK) if (event.key.keysym.sym == SDLK_CAPSLOCK)
sdl_caps = 1; sdl_caps = 1;
if (event.key.keysym.unicode=='z' || event.key.keysym.unicode=='Z') if (event.key.keysym.sym=='z')
{ {
sdl_zoom_trig = 1; sdl_zoom_trig = 1;
Z_keysym = event.key.keysym.sym;
} }
if ( event.key.keysym.sym == SDLK_PLUS) if ( event.key.keysym.sym == SDLK_PLUS)
{ {
@ -1816,7 +1813,7 @@ int sdl_poll(void)
case SDL_KEYUP: case SDL_KEYUP:
if (event.key.keysym.sym == SDLK_CAPSLOCK) if (event.key.keysym.sym == SDLK_CAPSLOCK)
sdl_caps = 0; sdl_caps = 0;
if (event.key.keysym.sym == Z_keysym) if (event.key.keysym.sym == 'z')
sdl_zoom_trig = 0; sdl_zoom_trig = 0;
if (event.key.keysym.sym == SDLK_RIGHT || event.key.keysym.sym == SDLK_LEFT) if (event.key.keysym.sym == SDLK_RIGHT || event.key.keysym.sym == SDLK_LEFT)
{ {
@ -3953,6 +3950,7 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show
} }
} }
} }
console_mode = 0;
return NULL; return NULL;
} }

26
src/main.c
View File

@ -1952,35 +1952,29 @@ int main(int argc, char *argv[])
} }
if (!((cr>>8)>=NPART || !cr)) if (!((cr>>8)>=NPART || !cr))
{ {
#ifdef BETA
if (DEBUG_MODE) if (DEBUG_MODE)
{ {
int tctype = parts[cr>>8].ctype; int tctype = parts[cr>>8].ctype;
if (tctype>=PT_NUM) if (tctype>=PT_NUM)
tctype = 0; tctype = 0;
sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d, #%d", ptypes[cr&0xFF].name, ptypes[tctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life, cr>>8); sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d", ptypes[cr&0xFF].name, ptypes[tctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life);
//sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d", ptypes[cr&0xFF].name, ptypes[parts[cr>>8].ctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life); sprintf(coordtext, "#%d, X:%d Y:%d", cr>>8, x/sdl_scale, y/sdl_scale);
} else } else {
#ifdef BETA
sprintf(heattext, "%s, Pressure: %3.2f, Temp: %4.2f C, Life: %d", ptypes[cr&0xFF].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life); sprintf(heattext, "%s, Pressure: %3.2f, Temp: %4.2f C, Life: %d", ptypes[cr&0xFF].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life);
#else #else
if (DEBUG_MODE)
{
int tctype = parts[cr>>8].ctype;
if (tctype>=PT_NUM)
tctype = 0;
sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d, #%d", ptypes[cr&0xFF].name, ptypes[tctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life ,cr>>8);
//sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d", ptypes[cr&0xFF].name, ptypes[parts[cr>>8].ctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life);
} else {
sprintf(heattext, "%s, Pressure: %3.2f, Temp: %4.2f C", ptypes[cr&0xFF].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f); sprintf(heattext, "%s, Pressure: %3.2f, Temp: %4.2f C", ptypes[cr&0xFF].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f);
}
#endif #endif
}
} }
else else
{ {
sprintf(heattext, "Empty, Pressure: %3.2f", pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL]); sprintf(heattext, "Empty, Pressure: %3.2f", pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL]);
if (DEBUG_MODE)
{
sprintf(coordtext, "X:%d Y:%d", x/sdl_scale, y/sdl_scale);
}
} }
if (DEBUG_MODE)
sprintf(coordtext, "X:%d Y:%d", x/sdl_scale, y/sdl_scale);
} }
mx = x; mx = x;
my = y; my = y;
@ -2131,7 +2125,7 @@ int main(int argc, char *argv[])
if (!sdl_zoom_trig && zoom_en==1) if (!sdl_zoom_trig && zoom_en==1)
zoom_en = 0; zoom_en = 0;
if (sdl_key==Z_keysym && zoom_en==2) if (sdl_key=='z' && zoom_en==2)
zoom_en = 1; zoom_en = 1;
if (load_mode) if (load_mode)