X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fleveleditor.cpp;h=e18011ddf38c46f1102ca47dc3ec15b6f7544a9d;hb=9e082fc66762cb43a25955a971082a0a5aab0840;hp=5dcc547bff622142b6b2d4237aa4999f1e6e2b6b;hpb=f421158b0b58289fe29698bb45204df451014d59;p=supertux.git diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp index 5dcc547bf..e18011ddf 100644 --- a/src/leveleditor.cpp +++ b/src/leveleditor.cpp @@ -24,16 +24,19 @@ #include #include "leveleditor.h" +#include "world.h" #include "screen.h" #include "defines.h" #include "globals.h" #include "setup.h" #include "menu.h" #include "level.h" +#include "gameloop.h" #include "badguy.h" #include "scene.h" #include "button.h" #include "tile.h" +#include "resources.h" /* definitions to aid development */ #define DONE_LEVELEDITOR 1 @@ -57,11 +60,6 @@ #define SELECT_W 2 // size of the selections lines #define SELECT_CLR 0, 255, 0, 255 // lines color (R, G, B, A) -/* gameloop funcs declerations */ - -void loadshared(void); -void unloadshared(void); - /* own declerations */ /* crutial ones (main loop) */ int le_init(); @@ -86,11 +84,12 @@ 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 st_level* le_current_level; +static Level* le_current_level; +static World 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]; @@ -113,7 +112,7 @@ static Menu* subset_new_menu; static Menu* subset_settings_menu; static Menu* level_settings_menu; static Menu* select_tilegroup_menu; -static timer_type select_tilegroup_menu_effect; +static Timer select_tilegroup_menu_effect; static std::map tilegroups_map; static std::string cur_tilegroup; @@ -158,9 +157,10 @@ int leveleditor(int levelnb) if(current_menu == select_tilegroup_menu) { - if(timer_check(&select_tilegroup_menu_effect)) + if(select_tilegroup_menu_effect.check()) { - select_tilegroup_menu->set_pos(screen->w - 64 + timer_get_left(&select_tilegroup_menu_effect),82,-0.5,0.5); + select_tilegroup_menu->set_pos(screen->w - 64 + select_tilegroup_menu_effect.get_left(), + 82,-0.5,0.5); } else select_tilegroup_menu->set_pos(screen->w - 64,82,-0.5,0.5); @@ -205,7 +205,7 @@ int leveleditor(int levelnb) { switch (level_settings_menu->check()) { - case 13: + case 17: apply_level_settings_menu(); Menu::set_current(leveleditor_menu); break; @@ -242,17 +242,16 @@ int leveleditor(int levelnb) le_level_subset.load(level_subsets.item[i-2]); leveleditor_menu->item[3].kind = MN_GOTO; le_level = 1; - arrays_free(); - loadshared(); - le_current_level = new st_level; + le_world.arrays_free(); + le_current_level = new Level; if(le_current_level->load(le_level_subset.name.c_str(), le_level) != 0) { le_quit(); return 1; } le_set_defaults(); - level_load_gfx(le_current_level); - activate_bad_guys(le_current_level); + le_current_level->load_gfx(); + le_world.activate_bad_guys(); show_menu = true; } break; @@ -273,18 +272,17 @@ int leveleditor(int levelnb) le_level_subset.load(subset_new_menu->item[2].input); leveleditor_menu->item[3].kind = MN_GOTO; le_level = 1; - arrays_free(); - loadshared(); - le_current_level = new st_level; + le_world.arrays_free(); + le_current_level = new Level; if(le_current_level->load(le_level_subset.name.c_str(), le_level) != 0) { le_quit(); return 1; } le_set_defaults(); - level_load_gfx(le_current_level); - activate_bad_guys(le_current_level); - menu_item_change_input(&subset_new_menu->item[2],""); + le_current_level->load_gfx(); + le_world.activate_bad_guys(); + subset_new_menu->item[2].change_input(""); show_menu = true; break; } @@ -354,9 +352,9 @@ int le_init() 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); - timer_init(&select_tilegroup_menu_effect,false); + select_tilegroup_menu_effect.init(false); /* Load buttons */ le_save_level_bt = new Button("/images/icons/save.png","Save level", SDLK_F6,screen->w-64,32); @@ -428,15 +426,19 @@ int le_init() 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); @@ -465,37 +467,44 @@ void update_level_settings_menu() char str[80]; int i; - menu_item_change_input(&level_settings_menu->item[2], le_current_level->name.c_str()); + 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; - menu_item_change_input(&level_settings_menu->item[6], str); + level_settings_menu->item[7].change_input(str); sprintf(str,"%d",le_current_level->time_left); - menu_item_change_input(&level_settings_menu->item[7], str); + level_settings_menu->item[8].change_input(str); sprintf(str,"%2.0f",le_current_level->gravity); - menu_item_change_input(&level_settings_menu->item[8], str); - sprintf(str,"%d",le_current_level->bkgd_red); - menu_item_change_input(&level_settings_menu->item[9], str); - sprintf(str,"%d",le_current_level->bkgd_green); - menu_item_change_input(&level_settings_menu->item[10], str); - sprintf(str,"%d",le_current_level->bkgd_blue); - menu_item_change_input(&level_settings_menu->item[11], str); + level_settings_menu->item[9].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() { - menu_item_change_input(&subset_settings_menu->item[2], le_level_subset.title.c_str()); - menu_item_change_input(&subset_settings_menu->item[3], le_level_subset.description.c_str()); + subset_settings_menu->item[2].change_input(le_level_subset.title.c_str()); + subset_settings_menu->item[3].change_input(le_level_subset.description.c_str()); } void apply_level_settings_menu() @@ -504,33 +513,37 @@ void apply_level_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; } if(i) { - level_free_gfx(); - level_load_gfx(le_current_level); + le_current_level->free_gfx(); + le_current_level->load_gfx(); } - le_current_level->song_title = string_list_active(level_settings_menu->item[4].list); - - level_change_size(le_current_level, 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() @@ -542,7 +555,7 @@ void save_subset_settings_menu() void le_goto_level(int levelnb) { - arrays_free(); + le_world.arrays_free(); le_current_level->cleanup(); if(le_current_level->load(le_level_subset.name.c_str(), levelnb) != 0) @@ -556,10 +569,10 @@ void le_goto_level(int levelnb) le_set_defaults(); + le_current_level->free_gfx(); + le_current_level->load_gfx(); - level_free_gfx(); - level_load_gfx(le_current_level); - activate_bad_guys(le_current_level); + le_world.activate_bad_guys(); } void le_quit(void) @@ -570,7 +583,7 @@ void le_quit(void) 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; @@ -593,10 +606,9 @@ void le_quit(void) if(le_current_level != NULL) { - level_free_gfx(); + le_current_level->free_gfx(); le_current_level->cleanup(); - unloadshared(); - arrays_free(); + le_world.arrays_free(); } } @@ -618,7 +630,7 @@ void le_drawinterface() } 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; @@ -635,10 +647,10 @@ void le_drawinterface() /* draw button bar */ fillrect(screen->w - 64, 0, 64, screen->h, 50, 50, 50,255); - drawshape(19 * 32, 14 * 32, le_current_tile); + 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) { @@ -659,16 +671,16 @@ void le_drawinterface() 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); } } @@ -682,12 +694,14 @@ void le_drawlevel() if(le_current_level->bkgd_image[0] != '\0') { s = pos_x / 30; - texture_draw_part(&img_bkgd,s,0,0,0,img_bkgd.w - s - 32, img_bkgd.h); - texture_draw_part(&img_bkgd,0,0,screen->w - s - 32 ,0,s,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); */ @@ -701,42 +715,42 @@ void le_drawlevel() else a = 128; - drawshape(32*x - fmodf(pos_x, 32), y * 32, le_current_level->bg_tiles[y][x + (int)(pos_x / 32)],a); + Tile::draw(32*x - fmodf(pos_x, 32), y * 32, le_current_level->bg_tiles[y][x + (int)(pos_x / 32)],a); if(active_tm == TM_IA) a = 255; else a = 128; - drawshape(32*x - fmodf(pos_x, 32), y * 32, le_current_level->ia_tiles[y][x + (int)(pos_x / 32)],a); + Tile::draw(32*x - fmodf(pos_x, 32), y * 32, le_current_level->ia_tiles[y][x + (int)(pos_x / 32)],a); if(active_tm == TM_FG) a = 255; else a = 128; - drawshape(32*x - fmodf(pos_x, 32), y * 32, le_current_level->fg_tiles[y][x + (int)(pos_x / 32)],a); + Tile::draw(32*x - fmodf(pos_x, 32), y * 32, le_current_level->fg_tiles[y][x + (int)(pos_x / 32)],a); /* 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 Bad guys: */ - for (i = 0; i < bad_guys.size(); ++i) + for (i = 0; i < le_world.bad_guys.size(); ++i) { /* to support frames: img_bsod_left[(frame / 5) % 4] */ scroll_x = pos_x; - bad_guys[i].draw(); + le_world.bad_guys[i].draw(); } /* 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() @@ -751,7 +765,7 @@ void le_checkevents() while(SDL_PollEvent(&event)) { if(show_menu) - menu_event(event); + current_menu->event(event); else mouse_cursor->set_state(MC_NORMAL); @@ -915,7 +929,7 @@ void le_checkevents() le_testlevel(); le_save_level_bt->event(event); if(le_save_level_bt->get_state() == BUTTON_CLICKED) - level_save(le_current_level,le_level_subset.name.c_str(),le_level); + le_current_level->save(le_level_subset.name.c_str(),le_level); le_exit_bt->event(event); if(le_exit_bt->get_state() == BUTTON_CLICKED) { @@ -931,13 +945,13 @@ void le_checkevents() } else { - st_level new_lev; + Level new_lev; 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) { @@ -949,7 +963,7 @@ void le_checkevents() { case SDLK_y: new_lev.init_defaults(); - level_save(&new_lev,le_level_subset.name.c_str(),++le_level); + new_lev.save(le_level_subset.name.c_str(),++le_level); le_level_subset.levels = le_level; le_goto_level(le_level); d = 1; @@ -988,7 +1002,7 @@ void le_checkevents() if(le_tilegroup_bt->get_state() == BUTTON_CLICKED) { Menu::set_current(select_tilegroup_menu); - timer_start(&select_tilegroup_menu_effect,200); + select_tilegroup_menu_effect.start(200); select_tilegroup_menu->set_pos(screen->w - 64,100,-0.5,0.5); show_menu = true; } @@ -1113,22 +1127,22 @@ void le_change(float x, float y, int tm, unsigned int c) switch(le_selection_mode) { case CURSOR: - level_change(le_current_level,x,y,tm,c); + le_current_level->change(x,y,tm,c); yy = ((int)y / 32); xx = ((int)x / 32); /* if there is a bad guy over there, remove it */ - for(i = 0; i < bad_guys.size(); ++i) - if(xx == bad_guys[i].base.x/32 && yy == bad_guys[i].base.y/32) - bad_guys.erase(static_cast::iterator>(&bad_guys[i])); + for(i = 0; i < le_world.bad_guys.size(); ++i) + if(xx == le_world.bad_guys[i].base.x/32 && yy == le_world.bad_guys[i].base.y/32) + le_world.bad_guys.erase(static_cast::iterator>(&le_world.bad_guys[i])); if(c == '0') /* if it's a bad guy */ - add_bad_guy(xx*32, yy*32, BAD_BSOD); + le_world.add_bad_guy(xx*32, yy*32, BAD_BSOD); else if(c == '1') - add_bad_guy(xx*32, yy*32, BAD_LAPTOP); + le_world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP); else if(c == '2') - add_bad_guy(xx*32, yy*32, BAD_MONEY); + le_world.add_bad_guy(xx*32, yy*32, BAD_MONEY); break; case SQUARE: @@ -1159,22 +1173,22 @@ void le_change(float x, float y, int tm, unsigned int c) y2 /= 32; /* if there is a bad guy over there, remove it */ - for(i = 0; i < bad_guys.size(); ++i) - if(bad_guys[i].base.x/32 >= x1 && bad_guys[i].base.x/32 <= x2 - && bad_guys[i].base.y/32 >= y1 && bad_guys[i].base.y/32 <= y2) - bad_guys.erase(static_cast::iterator>(&bad_guys[i])); + for(i = 0; i < le_world.bad_guys.size(); ++i) + if(le_world.bad_guys[i].base.x/32 >= x1 && le_world.bad_guys[i].base.x/32 <= x2 + && le_world.bad_guys[i].base.y/32 >= y1 && le_world.bad_guys[i].base.y/32 <= y2) + le_world.bad_guys.erase(static_cast::iterator>(&le_world.bad_guys[i])); for(xx = x1; xx <= x2; xx++) for(yy = y1; yy <= y2; yy++) { - level_change(le_current_level, xx*32, yy*32, tm, c); + le_current_level->change(xx*32, yy*32, tm, c); if(c == '0') // if it's a bad guy - add_bad_guy(xx*32, yy*32, BAD_BSOD); + le_world.add_bad_guy(xx*32, yy*32, BAD_BSOD); else if(c == '1') - add_bad_guy(xx*32, yy*32, BAD_LAPTOP); + le_world.add_bad_guy(xx*32, yy*32, BAD_LAPTOP); else if(c == '2') - add_bad_guy(xx*32, yy*32, BAD_MONEY); + le_world.add_bad_guy(xx*32, yy*32, BAD_MONEY); } break; default: @@ -1185,13 +1199,15 @@ void le_change(float x, float y, int tm, unsigned int c) void le_testlevel() { - level_save(le_current_level,"test",le_level); - gameloop("test",le_level, ST_GL_TEST); + le_current_level->save("test", le_level); + + GameSession session("test",le_level, ST_GL_TEST); + session.run(); + Menu::set_current(leveleditor_menu); - arrays_free(); - level_load_gfx(le_current_level); - loadshared(); - activate_bad_guys(le_current_level); + le_world.arrays_free(); + le_current_level->load_gfx(); + le_world.activate_bad_guys(); } void le_showhelp() @@ -1230,12 +1246,12 @@ void le_showhelp() }; - 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();