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

Fix small visual issues and crash when folder doesn't exist

Browse Source
This commit is contained in:
Simon Robertshaw 2011-06-14 16:23:11 +01:00
parent 307fff2e3d
commit 464d36d910
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/interface.c
View File

@ -5112,7 +5112,7 @@ savelist_e *get_local_saves(char *folder, char *search, int *results_ret)
{ {
printf("Unable to open directory\n"); printf("Unable to open directory\n");
*results_ret = 0; *results_ret = 0;
return; return NULL;
} }
while(derp = readdir(directory)){ while(derp = readdir(directory)){
char *ext; char *ext;
@ -5331,7 +5331,7 @@ void catalogue_ui(pixel * vid_buf)
while (!sdl_poll()) while (!sdl_poll())
{ {
b = SDL_GetMouseState(&mx, &my); b = SDL_GetMouseState(&mx, &my);
sprintf(savetext, "Found %d saves", rescount); sprintf(savetext, "Found %d save%s", rescount, rescount==1?"":"s");
clearrect(vid_buf, x0-2, y0-2, xsize+4, ysize+4); clearrect(vid_buf, x0-2, y0-2, xsize+4, ysize+4);
clearrect(vid_buf2, x0-2, y0-2, xsize+4, ysize+4); clearrect(vid_buf2, x0-2, y0-2, xsize+4, ysize+4);
drawrect(vid_buf, x0, y0, xsize, ysize, 192, 192, 192, 255); drawrect(vid_buf, x0, y0, xsize, ysize, 192, 192, 192, 255);
@ -5359,7 +5359,7 @@ void catalogue_ui(pixel * vid_buf)
} }
offsetf += scrollvel; offsetf += scrollvel;
scrollvel*=0.99f; scrollvel*=0.99f;
if(offsetf >= (YRES/CATALOGUE_S+20)) if(offsetf >= (YRES/CATALOGUE_S+20) && rescount)
{ {
if(rescount - thidden > CATALOGUE_X*(CATALOGUE_Y+1)) if(rescount - thidden > CATALOGUE_X*(CATALOGUE_Y+1))
{ {
@ -5375,11 +5375,11 @@ void catalogue_ui(pixel * vid_buf)
offsetf = (YRES/CATALOGUE_S+20); offsetf = (YRES/CATALOGUE_S+20);
} }
} }
if(offsetf > 0.0f && rescount <= CATALOGUE_X*CATALOGUE_Y) if(offsetf > 0.0f && rescount <= CATALOGUE_X*CATALOGUE_Y && rescount)
{ {
offsetf = 0.0f; offsetf = 0.0f;
} }
if(offsetf < 0.0f) if(offsetf < 0.0f && rescount)
{ {
if(thidden >= CATALOGUE_X) if(thidden >= CATALOGUE_X)
{ {
@ -5476,7 +5476,7 @@ void catalogue_ui(pixel * vid_buf)
} }
imageoncycle = 0; imageoncycle = 0;
} else { } else {
drawtext(vid_buf2, x0+8, y0+8, "No saves found", 255, 255, 255, 180); drawtext(vid_buf2, x0+(xsize/2)-(textwidth("No saves found")/2), y0+(ysize/2)+20, "No saves found", 255, 255, 255, 180);
} }
ui_edit_draw(vid_buf, &ed); ui_edit_draw(vid_buf, &ed);
ui_edit_process(mx, my, b, &ed); ui_edit_process(mx, my, b, &ed);