1 files changed, 7 insertions(+), 11 deletions(-)

M nasu.c

@@ 380,15 380,11 @@ loadtheme(FILE *f)
 		return;
 	while(fgets(line, 256, f)) {
 		int i = 0;
-		while(line[i++]) {
-			if(line[i] != '#')
-				continue;
-			if(id == 0 || id > 4)
-				theme[id > 4 ? id - 4 : 0] = shex(line + i + 1, 6);
-			id++;
+		while(line[i++] && id < 5) {
+			if(line[i] == '#')
+				theme[id++] = shex(line + i + 1, 6);
 		}
 	}
-	puts("Theme: Complete");
 	fclose(f);
 }
 


@@ 447,8 443,8 @@ domouse(SDL_Event *event, Brush *b)
 		}
 		b->px = (event->motion.x - (PAD * ZOOM)) / ZOOM;
 		b->py = (event->motion.y - (PAD * ZOOM)) / ZOOM;
-		if(b->py >= VER * 8)
-			selectoption(abs(b->px / 8));
+		if(event->motion.y / ZOOM / 8 == VER + 2)
+			selectoption(event->motion.x / ZOOM / 8 - 1);
 		if(b->down && b->mode == 0) {
 			putchr(b->px - 1, b->py, b->erase ? 0 : b->color);
 			redraw(pixels);


@@ 553,9 549,9 @@ main(int argc, char **argv)
 				quit();
 			else if(event.type == SDL_MOUSEBUTTONUP ||
 					event.type == SDL_MOUSEBUTTONDOWN ||
-					event.type == SDL_MOUSEMOTION) {
+					event.type == SDL_MOUSEMOTION)
 				domouse(&event, &brush);
-			} else if(event.type == SDL_KEYDOWN)
+			else if(event.type == SDL_KEYDOWN)
 				dokey(&event, &brush);
 			else if(event.type == SDL_WINDOWEVENT)
 				if(event.window.event == SDL_WINDOWEVENT_EXPOSED)