#include <SDL_image.h>
#include "leveleditor.h"
-#include "world.h"
#include "screen.h"
#include "defines.h"
#include "globals.h"
void update_subset_settings_menu();
void save_subset_settings_menu();
+static Level* le_current_level;
+
+struct LevelEditorWorld
+{
+ std::vector<BadGuy> bad_guys;
+ void arrays_free(void)
+ {
+ bad_guys.clear();
+ }
+
+ void add_bad_guy(float x, float y, BadGuyKind kind)
+ {
+ bad_guys.push_back(BadGuy());
+ BadGuy& new_bad_guy = bad_guys.back();
+
+ new_bad_guy.init(x,y,kind);
+ }
+
+ void activate_bad_guys()
+ {
+ for (std::vector<BadGuyData>::iterator i = le_current_level->badguy_data.begin();
+ i != le_current_level->badguy_data.end();
+ ++i)
+ {
+ add_bad_guy(i->x, i->y, i->kind);
+ }
+ }
+};
+
/* leveleditor internals */
static string_list_type level_subsets;
static bool le_level_changed; /* if changes, ask for saving, when quiting*/
static int pos_x, cursor_x, cursor_y, fire;
static int le_level;
-static Level* le_current_level;
-static World le_world;
+static LevelEditorWorld le_world;
static st_subset le_level_subset;
static int le_show_grid;
static int le_frame;
-static texture_type le_selection;
+static Surface* le_selection;
static int done;
static unsigned int le_current_tile;
static bool le_mouse_pressed[2];
{
switch (level_settings_menu->check())
{
- case 13:
+ case 17:
apply_level_settings_menu();
Menu::set_current(leveleditor_menu);
break;
le_mouse_pressed[LEFT] = false;
le_mouse_pressed[RIGHT] = false;
- texture_load(&le_selection, datadir + "/images/leveleditor/select.png", USE_ALPHA);
+ le_selection = new Surface(datadir + "/images/leveleditor/select.png", USE_ALPHA);
select_tilegroup_menu_effect.init(false);
level_settings_menu->additem(MN_LABEL,"Level Settings",0,0);
level_settings_menu->additem(MN_HL,"",0,0);
level_settings_menu->additem(MN_TEXTFIELD,"Name ",0,0);
+ level_settings_menu->additem(MN_TEXTFIELD,"Author ",0,0);
level_settings_menu->additem(MN_STRINGSELECT,"Theme ",0,0);
level_settings_menu->additem(MN_STRINGSELECT,"Song ",0,0);
level_settings_menu->additem(MN_STRINGSELECT,"Bg-Image",0,0);
level_settings_menu->additem(MN_NUMFIELD,"Length ",0,0);
level_settings_menu->additem(MN_NUMFIELD,"Time ",0,0);
level_settings_menu->additem(MN_NUMFIELD,"Gravity",0,0);
- level_settings_menu->additem(MN_NUMFIELD,"Red ",0,0);
- level_settings_menu->additem(MN_NUMFIELD,"Green ",0,0);
- level_settings_menu->additem(MN_NUMFIELD,"Blue ",0,0);
+ level_settings_menu->additem(MN_NUMFIELD,"Top Red ",0,0);
+ level_settings_menu->additem(MN_NUMFIELD,"Top Green ",0,0);
+ level_settings_menu->additem(MN_NUMFIELD,"Top Blue ",0,0);
+ level_settings_menu->additem(MN_NUMFIELD,"Bottom Red ",0,0);
+ level_settings_menu->additem(MN_NUMFIELD,"Bottom Green",0,0);
+ level_settings_menu->additem(MN_NUMFIELD,"Bottom Blue",0,0);
level_settings_menu->additem(MN_HL,"",0,0);
level_settings_menu->additem(MN_ACTION,"Apply Changes",0,0);
int i;
level_settings_menu->item[2].change_input(le_current_level->name.c_str());
+ level_settings_menu->item[3].change_input(le_current_level->author.c_str());
sprintf(str,"%d",le_current_level->width);
- string_list_copy(level_settings_menu->item[3].list, dsubdirs("images/themes", "solid0.png"));
- string_list_copy(level_settings_menu->item[4].list, dfiles("music/",NULL, "-fast"));
- string_list_copy(level_settings_menu->item[5].list, dfiles("images/background",NULL, NULL));
- string_list_add_item(level_settings_menu->item[5].list,"");
- if((i = string_list_find(level_settings_menu->item[3].list,le_current_level->theme.c_str())) != -1)
+ string_list_copy(level_settings_menu->item[4].list, dsubdirs("images/themes", "solid0.png"));
+ string_list_copy(level_settings_menu->item[5].list, dfiles("music/",NULL, "-fast"));
+ string_list_copy(level_settings_menu->item[6].list, dfiles("images/background",NULL, NULL));
+ string_list_add_item(level_settings_menu->item[6].list,"");
+ if((i = string_list_find(level_settings_menu->item[4].list,le_current_level->theme.c_str())) != -1)
level_settings_menu->item[3].list->active_item = i;
- if((i = string_list_find(level_settings_menu->item[4].list,le_current_level->song_title.c_str())) != -1)
+ if((i = string_list_find(level_settings_menu->item[5].list,le_current_level->song_title.c_str())) != -1)
level_settings_menu->item[4].list->active_item = i;
- if((i = string_list_find(level_settings_menu->item[5].list,le_current_level->bkgd_image.c_str())) != -1)
+ if((i = string_list_find(level_settings_menu->item[6].list,le_current_level->bkgd_image.c_str())) != -1)
level_settings_menu->item[5].list->active_item = i;
- level_settings_menu->item[6].change_input(str);
- sprintf(str,"%d",le_current_level->time_left);
level_settings_menu->item[7].change_input(str);
- sprintf(str,"%2.0f",le_current_level->gravity);
+ sprintf(str,"%d",le_current_level->time_left);
level_settings_menu->item[8].change_input(str);
- sprintf(str,"%d",le_current_level->bkgd_red);
+ sprintf(str,"%2.0f",le_current_level->gravity);
level_settings_menu->item[9].change_input(str);
- sprintf(str,"%d",le_current_level->bkgd_green);
- level_settings_menu->item[10].change_input(str);
- sprintf(str,"%d",le_current_level->bkgd_blue);
- level_settings_menu->item[11].change_input(str);
+ sprintf(str,"%d",le_current_level->bkgd_top.red);
+ level_settings_menu->item[10].change_input(str);
+ sprintf(str,"%d",le_current_level->bkgd_top.green);
+ level_settings_menu->item[11].change_input(str);
+ sprintf(str,"%d",le_current_level->bkgd_top.blue);
+ level_settings_menu->item[12].change_input(str);
+ sprintf(str,"%d",le_current_level->bkgd_bottom.red);
+ level_settings_menu->item[13].change_input(str);
+ sprintf(str,"%d",le_current_level->bkgd_bottom.green);
+ level_settings_menu->item[14].change_input(str);
+ sprintf(str,"%d",le_current_level->bkgd_bottom.blue);
+ level_settings_menu->item[15].change_input(str);
}
void update_subset_settings_menu()
i = false;
le_current_level->name = level_settings_menu->item[2].input;
+ le_current_level->author = level_settings_menu->item[3].input;
- if(le_current_level->bkgd_image.compare(string_list_active(level_settings_menu->item[5].list)) != 0)
+ if(le_current_level->bkgd_image.compare(string_list_active(level_settings_menu->item[6].list)) != 0)
{
- le_current_level->bkgd_image = string_list_active(level_settings_menu->item[5].list);
+ le_current_level->bkgd_image = string_list_active(level_settings_menu->item[6].list);
i = true;
}
- if(le_current_level->theme.compare(string_list_active(level_settings_menu->item[3].list)) != 0)
+ if(le_current_level->theme.compare(string_list_active(level_settings_menu->item[4].list)) != 0)
{
- le_current_level->theme = string_list_active(level_settings_menu->item[3].list);
+ le_current_level->theme = string_list_active(level_settings_menu->item[4].list);
i = true;
}
le_current_level->load_gfx();
}
- le_current_level->song_title = string_list_active(level_settings_menu->item[4].list);
-
- le_current_level->change_size(atoi(level_settings_menu->item[6].input));
- le_current_level->time_left = atoi(level_settings_menu->item[7].input);
- le_current_level->gravity = atof(level_settings_menu->item[8].input);
- le_current_level->bkgd_red = atoi(level_settings_menu->item[9].input);
- le_current_level->bkgd_green = atoi(level_settings_menu->item[10].input);
- le_current_level->bkgd_blue = atoi(level_settings_menu->item[11].input);
+ le_current_level->song_title = string_list_active(level_settings_menu->item[5].list);
+
+ le_current_level->change_size(atoi(level_settings_menu->item[7].input));
+ le_current_level->time_left = atoi(level_settings_menu->item[8].input);
+ le_current_level->gravity = atof(level_settings_menu->item[9].input);
+ le_current_level->bkgd_top.red = atoi(level_settings_menu->item[10].input);
+ le_current_level->bkgd_top.green = atoi(level_settings_menu->item[11].input);
+ le_current_level->bkgd_top.blue = atoi(level_settings_menu->item[12].input);
+ le_current_level->bkgd_bottom.red = atoi(level_settings_menu->item[13].input);
+ le_current_level->bkgd_bottom.green = atoi(level_settings_menu->item[14].input);
+ le_current_level->bkgd_bottom.blue = atoi(level_settings_menu->item[15].input);
}
void save_subset_settings_menu()
SDL_EnableKeyRepeat(0, 0); // disables key repeating
- texture_free(&le_selection);
+ delete le_selection;
delete leveleditor_menu;
delete subset_load_menu;
delete subset_new_menu;
}
if(le_selection_mode == CURSOR)
- texture_draw(&le_selection, cursor_x - pos_x, cursor_y);
+ le_selection->draw( cursor_x - pos_x, cursor_y);
else if(le_selection_mode == SQUARE)
{
int w, h;
Tile::draw(19 * 32, 14 * 32, le_current_tile);
if(TileManager::instance()->get(le_current_tile)->editor_images.size() > 0)
- texture_draw(&TileManager::instance()->get(le_current_tile)->editor_images[0], 19 * 32, 14 * 32);
+ TileManager::instance()->get(le_current_tile)->editor_images[0]->draw( 19 * 32, 14 * 32);
if(le_current_level != NULL)
{
le_tilemap_panel->draw();
sprintf(str, "%d/%d", le_level,le_level_subset.levels);
- text_drawf(&white_text, str, -10, 16, A_RIGHT, A_TOP, 0);
+ white_text->drawf(str, -10, 16, A_RIGHT, A_TOP, 0);
- text_draw(&white_small_text, "F1 for Help", 10, 430, 1);
+ white_small_text->draw("F1 for Help", 10, 430, 1);
}
else
{
if(show_menu == false)
- text_draw(&white_small_text, "No Level Subset loaded - Press ESC and choose one in the menu", 10, 430, 1);
+ white_small_text->draw("No Level Subset loaded - Press ESC and choose one in the menu", 10, 430, 1);
else
- text_draw(&white_small_text, "No Level Subset loaded", 10, 430, 1);
+ white_small_text->draw("No Level Subset loaded", 10, 430, 1);
}
}
if(le_current_level->bkgd_image[0] != '\0')
{
s = pos_x / 30;
- texture_draw_part(&le_current_level->img_bkgd,s,0,0,0,
- le_current_level->img_bkgd.w - s - 32, le_current_level->img_bkgd.h);
- texture_draw_part(&le_current_level->img_bkgd,0,0,screen->w - s - 32 ,0,s,
- le_current_level->img_bkgd.h);
+ le_current_level->img_bkgd->draw_part(s,0,0,0,
+ le_current_level->img_bkgd->w - s - 32, le_current_level->img_bkgd->h);
+ le_current_level->img_bkgd->draw_part(0,0,screen->w - s - 32 ,0,s,
+ le_current_level->img_bkgd->h);
}
else
{
- clearscreen(le_current_level->bkgd_red, le_current_level->bkgd_green, le_current_level->bkgd_blue);
+ drawgradient(le_current_level->bkgd_top, le_current_level->bkgd_bottom);
}
/* clearscreen(current_level.bkgd_red, current_level.bkgd_green, current_level.bkgd_blue); */
/* draw whats inside stuff when cursor is selecting those */
/* (draw them all the time - is this the right behaviour?) */
if(TileManager::instance()->get(le_current_level->ia_tiles[y][x + (int)(pos_x / 32)])->editor_images.size() > 0)
- texture_draw(&TileManager::instance()->get(le_current_level->ia_tiles[y][x + (int)(pos_x / 32)])->editor_images[0], x * 32 - ((int)pos_x % 32), y*32);
+ TileManager::instance()->get(le_current_level->ia_tiles[y][x + (int)(pos_x / 32)])->editor_images[0]->draw( x * 32 - ((int)pos_x % 32), y*32);
}
/* Draw the player: */
/* for now, the position is fixed at (100, 240) */
- texture_draw(&tux_right[(global_frame_counter / 5) % 3], 100 - pos_x, 240);
+ tux_right[(global_frame_counter / 5) % 3]->draw( 100 - pos_x, 240);
}
void le_checkevents()
char str[1024];
int d = 0;
sprintf(str,"Level %d doesn't exist.",le_level+1);
- text_drawf(&white_text,str,0,-18,A_HMIDDLE,A_VMIDDLE,2);
- text_drawf(&white_text,"Do you want to create it?",0,0,A_HMIDDLE,A_VMIDDLE,2);
- text_drawf(&red_text,"(Y)es/(N)o",0,20,A_HMIDDLE,A_VMIDDLE,2);
+ white_text->drawf(str,0,-18,A_HMIDDLE,A_VMIDDLE,2);
+ white_text->drawf("Do you want to create it?",0,0,A_HMIDDLE,A_VMIDDLE,2);
+ red_text->drawf("(Y)es/(N)o",0,20,A_HMIDDLE,A_VMIDDLE,2);
flipscreen();
while(d == 0)
{
};
- text_drawf(&blue_text, "- Help -", 0, 30, A_HMIDDLE, A_TOP, 2);
+ blue_text->drawf("- Help -", 0, 30, A_HMIDDLE, A_TOP, 2);
for(i = 0; i < sizeof(text)/sizeof(char *); i++)
- text_draw(&white_text, text[i], 5, 80+(i*18), 1);
+ white_text->draw(text[i], 5, 80+(i*18), 1);
- text_drawf(&gold_text, "Press Any Key to Continue", 0, 440, A_HMIDDLE, A_TOP, 1);
+ gold_text->drawf("Press Any Key to Continue", 0, 440, A_HMIDDLE, A_TOP, 1);
flipscreen();
projects / supertux.git / blobdiff