X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fleveleditor.c;h=7f014b11cefabfcbabbaf7a3cc389b4050dd50b2;hb=6d9952207d28e19d3448c9e0f8859be19d3acc88;hp=9981c8d17dee58f2730c9e6c64c2bf5d055ab91b;hpb=05a38383bb378e05aadad886e87f0fe64fdc6ba0;p=supertux.git diff --git a/src/leveleditor.c b/src/leveleditor.c index 9981c8d17..7f014b11c 100644 --- a/src/leveleditor.c +++ b/src/leveleditor.c @@ -135,7 +135,7 @@ int leveleditor() char str[LEVEL_NAME_MAX]; int done; int x, y, i; /* for cicles */ - int pos_x, cursor_x, cursor_y, fire; + int pos_x, cursor_x, cursor_y, cursor_tile, fire; SDL_Event event; SDLKey key; SDLMod keymod; @@ -458,7 +458,7 @@ int leveleditor() drawshape(x * 32, y * 32, current_level.tiles[y][x + (pos_x / 32)]); /* draw whats inside stuff when cursor is selecting those */ -int cursor_tile = current_level.tiles[cursor_y/32][cursor_x/32]; +cursor_tile = current_level.tiles[cursor_y/32][cursor_x/32]; switch(cursor_tile) { case 'B': @@ -554,64 +554,10 @@ int xx, yy; bad_guys[i].base.alive = NO; } -/* Save data for this level: */ -void savelevel(void) -{ - FILE * fi; - char * filename; - int y; - char str[80]; - - /* Save data file: */ - - filename = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) + 20) + strlen(level_subset)); - sprintf(filename, "%s/levels/%s/level%d.dat", DATA_PREFIX, level_subset, level); - fi = fopen(filename, "w"); - if (fi == NULL) - { - perror(filename); - st_shutdown(); - free(filename); - exit(-1); - } - free(filename); - - - /* sptrinf("# Level created by SuperTux built-in editor", fi); */ - - fputs(current_level.name, fi); - fputs("\n", fi); - fputs(current_level.theme, fi); - fputs("\n", fi); - sprintf(str, "%d\n", current_level.time_left); /* time */ - fputs(str, fi); - fputs(current_level.song_title, fi); /* song filename */ - sprintf(str, "\n%d\n", current_level.bkgd_red); /* red background color */ - fputs(str, fi); - sprintf(str, "%d\n", current_level.bkgd_green); /* green background color */ - fputs(str, fi); - sprintf(str, "%d\n", current_level.bkgd_blue); /* blue background color */ - fputs(str, fi); - sprintf(str, "%d\n", current_level.width); /* level width */ - fputs(str, fi); - - for(y = 0; y < 15; ++y) - { - fputs(current_level.tiles[y], fi); - fputs("\n", fi); - } - - fclose(fi); - - text_drawf(&gold_text, "SAVED!", 0, 240, A_HMIDDLE, A_TOP, 1, NO_UPDATE); - flipscreen(); - SDL_Delay(1000); -} - void showhelp() { SDL_Event event; - int done; + int i, done; char *text[] = { "X/x - Brick0", "Y/y - Brick1", @@ -639,8 +585,7 @@ void showhelp() text_drawf(&red_text, "- Help -", 0, 30, A_HMIDDLE, A_TOP, 2, NO_UPDATE); text_draw(&gold_text, "Keys:", 80, 60, 1, NO_UPDATE); - - int i; + for(i = 0; i < sizeof(text)/sizeof(char *); i++) text_draw(&blue_text, text[i], 40, 90+(i*16), 1, NO_UPDATE);