diff --git a/osx/boe.actions.cpp b/osx/boe.actions.cpp index 4e7ae949..f0b35ee1 100644 --- a/osx/boe.actions.cpp +++ b/osx/boe.actions.cpp @@ -36,40 +36,40 @@ #include "cursors.h" #include "spell.hpp" -RECT bottom_buttons[7]; -RECT town_buttons[10]; -RECT combat_buttons[9]; -RECT world_screen = {23, 23, 346, 274}; -// TODO: The duplication of RECT here shouldn't be necessary... -RECT item_screen_button_rects[9] = { - RECT{125,10,141,28},RECT{125,40,141,58},RECT{125,68,141,86},RECT{125,98,141,116},RECT{125,126,141,144},RECT{125,156,141,174}, - RECT{126,176,141,211}, - RECT{126,213,141,248}, - RECT{127,251,140,267}}; +rectangle bottom_buttons[7]; +rectangle town_buttons[10]; +rectangle combat_buttons[9]; +rectangle world_screen = {23, 23, 346, 274}; +// TODO: The duplication of rectangle here shouldn't be necessary... +rectangle item_screen_button_rects[9] = { + rectangle{125,10,141,28},rectangle{125,40,141,58},rectangle{125,68,141,86},rectangle{125,98,141,116},rectangle{125,126,141,144},rectangle{125,156,141,174}, + rectangle{126,176,141,211}, + rectangle{126,213,141,248}, + rectangle{127,251,140,267}}; -RECT border_rect[4] = {RECT{5, 5, 15, 283}, RECT{5, 5, 355, 15}, - RECT{345, 5, 355, 283}, RECT{5, 273, 355, 283}}; -RECT medium_buttons[4] = {RECT{383,190,401,225}, RECT{402, 190, 420, 225}, - RECT{383, 227, 401, 263}, RECT{402, 227,420, 263}}; ; +rectangle border_rect[4] = {rectangle{5, 5, 15, 283}, rectangle{5, 5, 355, 15}, + rectangle{345, 5, 355, 283}, rectangle{5, 273, 355, 283}}; +rectangle medium_buttons[4] = {rectangle{383,190,401,225}, rectangle{402, 190, 420, 225}, + rectangle{383, 227, 401, 263}, rectangle{402, 227,420, 263}}; ; -RECT item_buttons[8][6]; +rectangle item_buttons[8][6]; // name, use, give, drip, info, sell/id -RECT pc_buttons[6][5]; +rectangle pc_buttons[6][5]; // name, hp, sp, info, trade short num_chirps_played = 0; -extern RECT startup_button[6]; +extern rectangle startup_button[6]; extern bool flushingInput; bool ghost_mode; -RECT startup_top; +rectangle startup_top; -// TODO: The duplication of RECT here shouldn't be necessary... +// TODO: The duplication of rectangle here shouldn't be necessary... cItemRec start_items[6] = {cItemRec('nife'),cItemRec('buck'),cItemRec('bow '),cItemRec('arrw'),cItemRec('pole'),cItemRec('helm')}; bool item_area_button_active[8][6]; bool pc_area_button_active[6][5]; short item_bottom_button_active[9] = {0,0,0,0,0, 0,1,1,1}; -RECT pc_help_button,pc_area_rect,item_area_rect; +rectangle pc_help_button,pc_area_rect,item_area_rect; short current_terrain_type = 0,num_out_moves = 0; short door_pc,store_drop_item; @@ -134,15 +134,15 @@ short monst_place_count = 0; // 1 - standard place 2 - place last // 0 - whole area, 1 - active area 2 - graphic 3 - item name // 4 - item cost 5 - item extra str 6 - item help button -RECT shopping_rects[8][7]; +rectangle shopping_rects[8][7]; std::queue special_queue; bool end_scenario = false; bool current_bash_is_bash = false; void init_screen_locs() { short i,j,k,l; - RECT startup_base = {279,5,327,306}; - RECT shop_base = {63,12,99,267}; + rectangle startup_base = {279,5,327,306}; + rectangle shop_base = {63,12,99,267}; for(i = 0; i < 7; i++) shopping_rects[0][i] = shop_base; diff --git a/osx/boe.dlgutil.cpp b/osx/boe.dlgutil.cpp index 0bc9ff38..d6bdfbd4 100644 --- a/osx/boe.dlgutil.cpp +++ b/osx/boe.dlgutil.cpp @@ -43,7 +43,7 @@ extern eGameMode overall_mode; //extern party_record_type party; extern bool play_sounds,give_intro_hint,show_startup_splash,changed_display_mode; extern sf::RenderWindow mainPtr; -extern RECT d_rects[80]; +extern rectangle d_rects[80]; extern short d_rect_index[80]; extern short display_mode,stat_screen_mode,current_pc; extern long register_flag; @@ -74,11 +74,11 @@ short store_personality,store_personality_graphic,shop_identify_cost; std::string save_talk_str1, save_talk_str2; sf::RenderTexture talk_gworld; bool talk_end_forced; -RECT talk_area_rect = {5,5,420,284}, word_place_rect = {44,7,372,257},talk_help_rect = {5,254,21,272}; +rectangle talk_area_rect = {5,5,420,284}, word_place_rect = {44,7,372,257},talk_help_rect = {5,254,21,272}; std::string title_string; m_num_t store_monst_type; short store_m_num; -RECT dummy_rect = {0,0,0,0}; +rectangle dummy_rect = {0,0,0,0}; //hold_responses store_resp[83]; short strnum1,strnum2,oldstrnum1,oldstrnum2; short store_talk_face_pic;//,cur_town_talk_loaded = -1; @@ -101,12 +101,12 @@ eGameMode store_pre_shop_mode; char store_store_name[256]; // 0 - whole area, 1 - active area 2 - graphic 3 - item name // 4 - item cost 5 - item extra str 6 - item help button -extern RECT shopping_rects[8][7]; -// TODO: The duplication of RECT here shouldn't be necessary... -RECT bottom_help_rects[4] = {RECT{356,6,368,250},RECT{374,6,386,270},RECT{386,6,398,250},RECT{398,6,410,250}}; -RECT shop_name_str = {44,6,56,200}; -RECT shop_frame = {62,10,352,269}; -RECT shop_done_rect = {388,212,411,275}; +extern rectangle shopping_rects[8][7]; +// TODO: The duplication of rectangle here shouldn't be necessary... +rectangle bottom_help_rects[4] = {rectangle{356,6,368,250},rectangle{374,6,386,270},rectangle{386,6,398,250},rectangle{398,6,410,250}}; +rectangle shop_name_str = {44,6,56,200}; +rectangle shop_frame = {62,10,352,269}; +rectangle shop_done_rect = {388,212,411,275}; extern short store_shop_type; @@ -131,7 +131,7 @@ shop_type: 12 alchemy */ void start_shop_mode(short shop_type,short shop_min,short shop_max,short cost_adj,const char* store_name) { - RECT area_rect; + rectangle area_rect; // This would be a place to hide the text box, if I add it. @@ -173,7 +173,7 @@ static void update_last_talk(int new_node) { } void end_shop_mode() { - RECT dummy_rect = {0,0,0,0}; + rectangle dummy_rect = {0,0,0,0}; // This would be a place to show the text box, if I add it (and if this is not an outdoor shop). @@ -234,7 +234,7 @@ void handle_shop_event(location p) { void handle_sale(short what_chosen,short cost) { cItemRec base_item; short what_magic_shop,what_magic_shop_item,i; - RECT dummy_rect = {0,0,0,0}; + rectangle dummy_rect = {0,0,0,0}; switch(what_chosen / 100) { case 0: case 1: case 2: case 3: case 4: @@ -525,7 +525,7 @@ void set_up_shop_array() { } void start_talk_mode(short m_num,short personality,m_num_t monst_type,short store_face_pic) { - RECT area_rect; + rectangle area_rect; std::string place_string1; store_personality = personality; diff --git a/osx/boe.fileio.h b/osx/boe.fileio.h index d403ac80..8504e5e4 100644 --- a/osx/boe.fileio.h +++ b/osx/boe.fileio.h @@ -11,7 +11,7 @@ namespace fs = boost::filesystem; // TODO: Centralize this alias! //void load_file(); //void save_file(short mode); void finish_load_party(); -void change_rect_terrain(RECT r,ter_num_t terrain_type,short probability,bool hollow); +void change_rect_terrain(rectangle r,ter_num_t terrain_type,short probability,bool hollow); void swap_val(unsigned char *val,short a,short b); void change_val_4 (unsigned char *val,short a,short b,short c,short d); void change_val (unsigned char *val,short a,short b); @@ -61,8 +61,8 @@ __declspec(deprecated) void init_town(); //void port_out(outdoor_record_type *out); //void flip_spec_node(cSpecial *spec); //void flip_short(short *s); -//void flip_rect(RECT *s); +//void flip_rect(rectangle *s); - void alter_rect(RECT *r); + void alter_rect(rectangle *r); #endif diff --git a/osx/boe.graphics.cpp b/osx/boe.graphics.cpp index bdf70b0c..fd5e31d7 100644 --- a/osx/boe.graphics.cpp +++ b/osx/boe.graphics.cpp @@ -47,8 +47,8 @@ extern location spell_targets[8]; extern short display_mode; extern std::shared_ptr text_sbar,item_sbar,shop_sbar; extern sf::Texture bg_gworld; -extern RECT sbar_rect,item_sbar_rect,shop_sbar_rect,startup_top; -extern RECT talk_area_rect, word_place_rect; +extern rectangle sbar_rect,item_sbar_rect,shop_sbar_rect,startup_top; +extern rectangle talk_area_rect, word_place_rect; extern tessel_ref_t map_pat[]; extern location store_anim_ul; extern long register_flag; @@ -63,7 +63,7 @@ bool map_visible = false; extern bool show_startup_splash; //*********************** -RECT menuBarRect; +rectangle menuBarRect; short menuBarHeight; Region originalGrayRgn, newGrayRgn, underBarRgn; @@ -77,18 +77,18 @@ long anim_ticks = 0; // 0 - terrain 1 - buttons 2 - pc stats // 3 - item stats 4 - text bar 5 - text area (not right) -// TODO: The duplication of RECT here shouldn't be necessary... -RECT win_from_rects[6] = {RECT{0,0,351,279},RECT{0,0,37,258},RECT{0,0,115,288},RECT{0,0,143,288},RECT{0,0,21,279},RECT{0,0,0,288}}; -RECT win_to_rects[6] = {RECT{5,5,356,284},RECT{383,5,420,263},RECT{0,0,116,271},RECT{0,0,144,271},RECT{358,5,379,284},RECT{0,0,138,256}}; +// TODO: The duplication of rectangle here shouldn't be necessary... +rectangle win_from_rects[6] = {rectangle{0,0,351,279},rectangle{0,0,37,258},rectangle{0,0,115,288},rectangle{0,0,143,288},rectangle{0,0,21,279},rectangle{0,0,0,288}}; +rectangle win_to_rects[6] = {rectangle{5,5,356,284},rectangle{383,5,420,263},rectangle{0,0,116,271},rectangle{0,0,144,271},rectangle{358,5,379,284},rectangle{0,0,138,256}}; // 0 - title 1 - button 2 - credits 3 - base button -RECT startup_from[4] = {RECT{0,0,274,602},RECT{274,0,322,301},RECT{0,301,67,579},RECT{274,301,314,341}}; //// -extern RECT startup_button[6]; +rectangle startup_from[4] = {rectangle{0,0,274,602},rectangle{274,0,322,301},rectangle{0,301,67,579},rectangle{274,301,314,341}}; //// +extern rectangle startup_button[6]; -// RECT trim_rects[8] = {{0,0,5,28},{31,0,36,28},{0,0,36,5},{0,24,36,28}, +// rectangle trim_rects[8] = {{0,0,5,28},{31,0,36,28},{0,0,36,5},{0,24,36,28}, // {0,0,5,5},{0,24,5,28},{31,24,36,28},{31,0,36,5}}; -RECT top_left_rec = {0,0,36,28}; +rectangle top_left_rec = {0,0,36,28}; short which_graphic_index[6] = {50,50,50,50,50,50}; char combat_graphics[5] = {28,29,36,79,2}; @@ -136,18 +136,18 @@ bool has_run_anim = false,currently_loading_graphics = false; //short anim_step = 0; //short overall_anim_step = 0; -RECT main_win_rect = {0,0,410,250}; -RECT main_win2_source_rect = {0,0,410,265}; -RECT main_win2_rect = {0,250,410,515}; +rectangle main_win_rect = {0,0,410,250}; +rectangle main_win2_source_rect = {0,0,410,265}; +rectangle main_win2_rect = {0,250,410,515}; -RECT tiny_world_1_source_rect = {0,0,190,145}, +rectangle tiny_world_1_source_rect = {0,0,190,145}, tiny_world_1_rect = {195,242,385,475}; -RECT share_mess_source_rect = {0,0,59,120}, +rectangle share_mess_source_rect = {0,0,59,120}, share_mess_rect = {120,384,179,504}; -//RECT start_buttons_source_rect = {0,0,180,180}, +//rectangle start_buttons_source_rect = {0,0,180,180}, // start_buttons_rect = {224,30,405,210}; -RECT start_buttons_source_rect = {0,0,186,190}, +rectangle start_buttons_source_rect = {0,0,186,190}, start_buttons_rect = {214,30,400,220}; // Array to store which spots have been seen. Time-saver for drawing fields @@ -164,7 +164,7 @@ location ok_space[4] = {loc(),loc(),loc(),loc()}; sf::Image hold_pict; void adjust_window_mode() { - RECT r; + rectangle r; sf::ContextSettings winSettings; winSettings.stencilBits = 1; sf::VideoMode desktop = sf::VideoMode::getDesktopMode(); @@ -174,12 +174,12 @@ void adjust_window_mode() { ul.x = 14; ul.y = 2; mainPtr.create(sf::VideoMode(605,430,32), "Blades of Exile", sf::Style::Titlebar | sf::Style::Close, winSettings); mainPtr.setPosition({(desktop.width - 605) / 2, (desktop.height - 430) / 2}); - r = RECT(mainPtr); + r = rectangle(mainPtr); } else { mainPtr.create(desktop, "Blades of Exile", sf::Style::None, winSettings); mainPtr.setPosition({0,0}); - RECT windRect(mainPtr); + rectangle windRect(mainPtr); switch(display_mode) { case 0: ul.x = (windRect.right - 560) / 2; ul.y = (windRect.bottom - 422) / 2 + 14; break; case 1: ul.x = 10; ul.y = 28; break; @@ -203,9 +203,9 @@ void plop_fancy_startup() { sf::Event event; short i,j; - RECT whole_window,from_rect; - RECT logo_from = {0,0,350,350}; - RECT intro_from = {0,0,480,640}; + rectangle whole_window,from_rect; + rectangle logo_from = {0,0,350,350}; + rectangle intro_from = {0,0,480,640}; if(display_mode != 5) { hideMenuBar(); @@ -222,10 +222,10 @@ void plop_fancy_startup() { win_to_rects[2].offset(PC_WIN_UL_X,PC_WIN_UL_Y); win_to_rects[3].offset(ITEM_WIN_UL_X,ITEM_WIN_UL_Y); - whole_window = RECT(mainPtr); + whole_window = rectangle(mainPtr); logo_from.offset((whole_window.right - logo_from.right) / 2,(whole_window.bottom - logo_from.bottom) / 2); pict_to_draw.loadFromImage(*ResMgr::get("spidlogo")); - from_rect = RECT(pict_to_draw); + from_rect = rectangle(pict_to_draw); // TODO: Looping 10 times here is a bit of a hack; fix it for(int k = 0; k < 10; k++) { make_cursor_watch(); @@ -248,7 +248,7 @@ void plop_fancy_startup() { mainPtr.clear(sf::Color::Black); intro_from.offset((whole_window.right - intro_from.right) / 2,(whole_window.bottom - intro_from.bottom) / 2); pict_to_draw.loadFromImage(*ResMgr::get("startsplash")); - from_rect = RECT(pict_to_draw); + from_rect = rectangle(pict_to_draw); rect_draw_some_item(pict_to_draw, from_rect, mainPtr, intro_from); } else delay = 60; delay = time_in_ticks(delay).asMilliseconds(); @@ -281,8 +281,8 @@ void next_animation_step() {} void draw_startup(short but_type) { - RECT to_rect; - RECT r1 = {-1000,-1000,5,1000},r2 = {-1000,-1000,1000,5},r3 = {418,-1000,2000,1000}, + rectangle to_rect; + rectangle r1 = {-1000,-1000,5,1000},r2 = {-1000,-1000,1000,5},r3 = {418,-1000,2000,1000}, r4 = {-1000,579,1000,2500}; short i; @@ -307,8 +307,8 @@ void draw_startup(short but_type) { void draw_startup_anim(bool advance) { static short startup_anim_pos = 43; // was a global variable, but since it's only used in this function I moved it here - RECT anim_to = {4,1,44,276},anim_from; - RECT anim_size = {0,0,48,301}; + rectangle anim_to = {4,1,44,276},anim_from; + rectangle anim_size = {0,0,48,301}; anim_from = anim_to; anim_from.offset(-1,-4 + startup_anim_pos); @@ -319,7 +319,7 @@ void draw_startup_anim(bool advance) { } void draw_startup_stats() { - RECT from_rect,to_rect,party_to = {0,0,36,28},pc_rect,frame_rect; + rectangle from_rect,to_rect,party_to = {0,0,36,28},pc_rect,frame_rect; short i; char str[256]; @@ -431,7 +431,7 @@ void draw_startup_stats() { void draw_start_button(short which_position,short which_button) { - RECT from_rect,to_rect; + rectangle from_rect,to_rect; // TODO: Change third button (Windows calls it "Support and Downloads") const char *button_labels[] = {"Load Game","Make New Party","How To Order", "Start Scenario","Custom Scenario","Quit"}; @@ -464,7 +464,7 @@ void draw_start_button(short which_position,short which_button) { win_draw_string(mainPtr,to_rect,button_labels[which_position],eTextMode::CENTRE,style,ul); } -void main_button_click(RECT button_rect) { +void main_button_click(rectangle button_rect) { button_rect.offset(ul); mainPtr.setActive(); clip_rect(mainPtr, button_rect); @@ -479,7 +479,7 @@ void main_button_click(RECT button_rect) { undo_clip(mainPtr); } -void arrow_button_click(RECT button_rect) { +void arrow_button_click(rectangle button_rect) { button_rect.offset(ul); mainPtr.setActive(); clip_rect(mainPtr, button_rect); @@ -523,17 +523,17 @@ void end_startup() { static void loadImageToRenderTexture(sf::RenderTexture& tex, std::string imgName) { sf::Texture temp_gworld; temp_gworld.loadFromImage(*ResMgr::get(imgName)); - RECT texrect(temp_gworld); + rectangle texrect(temp_gworld); tex.create(texrect.width(), texrect.height()); rect_draw_some_item(temp_gworld, texrect, tex, texrect, sf::BlendNone); } // This loads the graphics at the top of the game. void Set_up_win () { - RECT temp_rect = {0,0,0,280},map_world_rect; - RECT map_rect = {0,0,384,384}; - RECT pc_rect = {0,0,216,113}; - RECT r; + rectangle temp_rect = {0,0,0,280},map_world_rect; + rectangle map_rect = {0,0,384,384}; + rectangle pc_rect = {0,0,216,113}; + rectangle r; // TODO: I think this is a relic of the Exile III demo screen at the main menu; we don't actually need to load it until the function below loadImageToRenderTexture(terrain_screen_gworld, "terscreen"); @@ -544,7 +544,7 @@ void Set_up_win () { play_sound(2,3); exit(1); } else { - map_world_rect = RECT(map_gworld); + map_world_rect = rectangle(map_gworld); fill_rect(map_gworld, map_world_rect, sf::Color::White); } @@ -630,12 +630,12 @@ void put_background() { bg_pict = bg[8]; else bg_pict = bg[13]; } - tileImage(mainPtr, RECT(mainPtr), bg_pict); + tileImage(mainPtr, rectangle(mainPtr), bg_pict); } //mode; // 0 - regular 1 - button action void draw_buttons(short mode) { - RECT source_rect = {0,0,37,258}, dest_rec; bool spec_draw = false; + rectangle source_rect = {0,0,37,258}, dest_rec; bool spec_draw = false; if(mode == 1) { spec_draw = true; @@ -739,7 +739,7 @@ void put_text_bar(std::string str) { style.font = FONT_BOLD; style.pointSize = 12; style.lineHeight = 12; - RECT to_rect = RECT(text_bar_gworld); + rectangle to_rect = rectangle(text_bar_gworld); // TODO: Not sure what the line height should be, so I just picked something win_draw_string(text_bar_gworld, to_rect, str, eTextMode::LEFT_TOP, style); @@ -1180,19 +1180,19 @@ void draw_trim(short q,short r,short which_trim,ter_num_t ground_ter) { // 50 - walkway bl, 51 - walkway tl, 52 - walkway tr, 53 - walkway br // 54 - walkway top, 55 - walkway right, 56 - walkway bottom, 57 - walkway left // 58 - lone walkway - RECT from_rect = {0,0,36,28},to_rect,mask_rect; + rectangle from_rect = {0,0,36,28},to_rect,mask_rect; sf::Texture* from_gworld; - // TODO: The duplication of RECT here shouldn't be necessary... - static RECT trim_rects[] = { - RECT{0,0,36,14}, RECT{0,0,36,14}, - RECT{0,0,18,28}, RECT{0,0,18,28}, - RECT{0,0,18,14}, RECT{0,0,18,14}, RECT{0,0,18,14}, RECT{0,0,18,14}, - RECT{0,0,18,14}, RECT{0,0,18,14}, RECT{0,0,18,14}, RECT{0,0,18,14}, + // TODO: The duplication of rectangle here shouldn't be necessary... + static rectangle trim_rects[] = { + rectangle{0,0,36,14}, rectangle{0,0,36,14}, + rectangle{0,0,18,28}, rectangle{0,0,18,28}, + rectangle{0,0,18,14}, rectangle{0,0,18,14}, rectangle{0,0,18,14}, rectangle{0,0,18,14}, + rectangle{0,0,18,14}, rectangle{0,0,18,14}, rectangle{0,0,18,14}, rectangle{0,0,18,14}, }; - static RECT walkway_rects[] = { - RECT{0,0,36,28}, RECT{0,0,36,28}, RECT{0,0,36,28}, RECT{0,0,36,28}, - RECT{0,0,36,28}, RECT{0,0,36,28}, RECT{0,0,36,28}, RECT{0,0,36,28}, - RECT{0,0,36,28}, + static rectangle walkway_rects[] = { + rectangle{0,0,36,28}, rectangle{0,0,36,28}, rectangle{0,0,36,28}, rectangle{0,0,36,28}, + rectangle{0,0,36,28}, rectangle{0,0,36,28}, rectangle{0,0,36,28}, rectangle{0,0,36,28}, + rectangle{0,0,36,28}, }; static bool inited = false; if(!inited){ @@ -1339,23 +1339,23 @@ static bool connect_roads(ter_num_t ter){ void place_road(short q,short r,location where, bool here) { location draw_loc; ter_num_t ter; - RECT to_rect; - //RECT road_rects[2] = {{76,112,80,125},{72,144,90,148}}; // 0 - rl partial 1 - ud partial - // TODO: The duplication of RECT here shouldn't be necessary... - static const RECT road_rects[4] = { - RECT{4,112,8,125}, // horizontal partial - RECT{0,144,18,148}, // vertical partial - RECT{0,112,4,140}, // horizontal full - RECT{0,140,36,144}, // vertical full + rectangle to_rect; + //rectangle road_rects[2] = {{76,112,80,125},{72,144,90,148}}; // 0 - rl partial 1 - ud partial + // TODO: The duplication of rectangle here shouldn't be necessary... + static const rectangle road_rects[4] = { + rectangle{4,112,8,125}, // horizontal partial + rectangle{0,144,18,148}, // vertical partial + rectangle{0,112,4,140}, // horizontal full + rectangle{0,140,36,144}, // vertical full }; - //RECT road_dest_rects[4] = {{0,12,18,16},{16,15,20,28},{18,12,36,16},{16,0,20,13}}; // top right bottom left - static const RECT road_dest_rects[6] = { - RECT{0,12,18,16}, // top - RECT{16,15,20,28}, // right - RECT{18,12,36,16}, // bottom - RECT{16,0,20,13}, // left - RECT{0,12,36,16}, // top + bottom - RECT{16,0,20,28}, // right + left + //rectangle road_dest_rects[4] = {{0,12,18,16},{16,15,20,28},{18,12,36,16},{16,0,20,13}}; // top right bottom left + static const rectangle road_dest_rects[6] = { + rectangle{0,12,18,16}, // top + rectangle{16,15,20,28}, // right + rectangle{18,12,36,16}, // bottom + rectangle{16,0,20,13}, // left + rectangle{0,12,36,16}, // top + bottom + rectangle{16,0,20,28}, // right + left }; draw_loc.x = q; draw_loc.y = r; @@ -1470,7 +1470,7 @@ void draw_rest_screen() { // 8 - acid 9 - claw 10 - bite 11 - slime 12 - zap 13 - missile hit void boom_space(location where,short mode,short type,short damage,short sound) { location where_draw(4,4); - RECT source_rect = {0,0,36,28},text_rect,dest_rect = {13,13,49,41},big_to = {13,13,337,265},store_rect; + rectangle source_rect = {0,0,36,28},text_rect,dest_rect = {13,13,49,41},big_to = {13,13,337,265},store_rect; short del_len; char dam_str[20]; short x_adj = 0,y_adj = 0,which_m; @@ -1564,15 +1564,15 @@ void boom_space(location where,short mode,short type,short damage,short sound) { void draw_pointing_arrows() { - // TODO: The duplication of RECT here shouldn't be necessary... - RECT sources[4] = { - RECT{352,28,360,36}, // up - RECT{352,10,360,18}, // left - RECT{352,01,360,9}, // down - RECT{352,19,360,27} // right + // TODO: The duplication of rectangle here shouldn't be necessary... + rectangle sources[4] = { + rectangle{352,28,360,36}, // up + rectangle{352,10,360,18}, // left + rectangle{352,01,360,9}, // down + rectangle{352,19,360,27} // right }; - RECT dests[8] = {RECT{7,100,15,108},RECT{7,170,15,178},RECT{140,7,148,15},RECT{212,7,220,15}, - RECT{346,100,354,108},RECT{346,170,354,178},RECT{140,274,148,282},RECT{212,274,220,282}}; + rectangle dests[8] = {rectangle{7,100,15,108},rectangle{7,170,15,178},rectangle{140,7,148,15},rectangle{212,7,220,15}, + rectangle{346,100,354,108},rectangle{346,170,354,178},rectangle{140,274,148,282},rectangle{212,274,220,282}}; short i; if((monsters_going) || /*(overall_mode <= MODE_TOWN) ||*/ (overall_mode <= MODE_COMBAT) @@ -1585,7 +1585,7 @@ void draw_pointing_arrows() { } void redraw_terrain() { - RECT to_rect; + rectangle to_rect; to_rect = win_to_rects[0]; rect_draw_some_item(terrain_screen_gworld.getTexture(), win_from_rects[0], to_rect,ul); @@ -1600,7 +1600,7 @@ void redraw_terrain() { void draw_targets(location center) { - RECT source_rect = {74,36,85,47},dest_rect; + rectangle source_rect = {74,36,85,47},dest_rect; short i = 0; if(party_toast()) @@ -1618,7 +1618,7 @@ void draw_targets(location center) { //mode; // 0 - red 1 - green void frame_space(location where,short mode,short width,short height) { location where_put; - RECT to_frame; + rectangle to_frame; if(!point_onscreen(center,where)) return; @@ -1637,7 +1637,7 @@ void frame_space(location where,short mode,short width,short height) { void erase_spot(short i,short j) { - RECT to_erase; + rectangle to_erase; to_erase = coord_to_rect(i,j); fill_rect(mainPtr, to_erase, sf::Color::Black); @@ -1647,9 +1647,9 @@ void erase_spot(short i,short j) { void draw_targeting_line(location where_curs) { location which_space,store_loc; short i,j,k,l; - RECT redraw_rect,redraw_rect2,terrain_rect = {0,0,351,279},target_rect; + rectangle redraw_rect,redraw_rect2,terrain_rect = {0,0,351,279},target_rect; location from_loc; - RECT on_screen_terrain_area = {23, 23, 346, 274}; + rectangle on_screen_terrain_area = {23, 23, 346, 274}; if(overall_mode >= MODE_COMBAT) from_loc = univ.party[current_pc].combat_pos; @@ -1708,7 +1708,7 @@ void draw_targeting_line(location where_curs) { const char chr[2] = {static_cast(num_targets_left + '0')}; int x = ((target_rect.left + target_rect.right) / 2) - 3; int y = (target_rect.top + target_rect.bottom) / 2; - win_draw_string(mainPtr, RECT(y, x, y + 12, x + 12), chr, eTextMode::CENTRE, style); + win_draw_string(mainPtr, rectangle(y, x, y + 12, x + 12), chr, eTextMode::CENTRE, style); } } @@ -1731,8 +1731,8 @@ bool party_toast() { return true; } -void redraw_partial_terrain(RECT redraw_rect) { - RECT from_rect; +void redraw_partial_terrain(rectangle redraw_rect) { + rectangle from_rect; from_rect = redraw_rect; from_rect.offset(-ul.x,-ul.y); diff --git a/osx/boe.graphics.h b/osx/boe.graphics.h index c6060083..22d20b01 100644 --- a/osx/boe.graphics.h +++ b/osx/boe.graphics.h @@ -28,8 +28,8 @@ void draw_startup(short but_type); void draw_anim(); void place_anim(); void draw_start_button(short which_position,short which_button); -void main_button_click(RECT button_rect); -void arrow_button_click(RECT button_rect); +void main_button_click(rectangle button_rect); +void arrow_button_click(rectangle button_rect); void end_startup(); void Set_up_win (); void load_main_screen(); @@ -54,9 +54,9 @@ void frame_space(location where,short mode,short width,short height); void erase_spot(short i,short j); void draw_targeting_line(location where_curs); bool party_toast(); -void redraw_partial_terrain(RECT redraw_rect); +void redraw_partial_terrain(rectangle redraw_rect); bool is_nature(char i, char j, unsigned char ground_t); -void put_dialog_graphic(short graphic_num,short spec_g,RECT draw_rect); +void put_dialog_graphic(short graphic_num,short spec_g,rectangle draw_rect); void draw_startup_stats(); void draw_trim(short q,short r,short which_trim,ter_num_t ground_ter); diff --git a/osx/boe.graphutil.cpp b/osx/boe.graphutil.cpp index af3cbd39..b8758f49 100644 --- a/osx/boe.graphutil.cpp +++ b/osx/boe.graphutil.cpp @@ -22,7 +22,7 @@ #include "dlogutil.h" extern sf::RenderWindow mainPtr; -extern RECT windRect; +extern rectangle windRect; extern short stat_window,give_delays; extern eGameMode overall_mode; extern short current_spell_range; @@ -74,8 +74,8 @@ extern bool can_draw_pcs; extern cScenario scenario; extern cCustomGraphics spec_scen_g; -// TODO: The duplication of RECT here shouldn't be necessary... -RECT boat_rects[4] = {RECT{0,0,36,28}, RECT{0,28,36,56},RECT{0,56,36,84},RECT{0,84,36,112}}; +// TODO: The duplication of rectangle here shouldn't be necessary... +rectangle boat_rects[4] = {rectangle{0,0,36,28}, rectangle{0,28,36,56},rectangle{0,56,36,84},rectangle{0,84,36,112}}; bool gave_no_g_error = false; eAmbientSound ambient_sound; @@ -83,8 +83,8 @@ eAmbientSound ambient_sound; // if terrain_to_draw is -1, do black // if terrain_to_draw >= 10000, force to draw graphic which is terrain_to_draw - 10000 void draw_one_terrain_spot (short i,short j,short terrain_to_draw) { - RECT where_draw; - RECT source_rect; + rectangle where_draw; + rectangle source_rect; sf::Texture* source_gworld; short anim_type = 0; location l; @@ -152,16 +152,16 @@ void draw_one_terrain_spot (short i,short j,short terrain_to_draw) { void draw_monsters() { short i,j = 0,k; short width,height; - RECT source_rect,to_rect; + rectangle source_rect,to_rect; location where_draw,store_loc; short picture_wanted; ter_num_t ter; - // TODO: The duplication of RECT here shouldn't be necessary... - RECT monst_rects[4][4] = { - {RECT{0,0,36,28}}, - {RECT{0,7,18,21},RECT{18,7,36,21}}, - {RECT{9,0,27,14},RECT{9,14,27,28}}, - {RECT{0,0,18,14},RECT{0,14,18,28},RECT{18,0,36,14},RECT{18,14,36,28}} + // TODO: The duplication of rectangle here shouldn't be necessary... + rectangle monst_rects[4][4] = { + {rectangle{0,0,36,28}}, + {rectangle{0,7,18,21},rectangle{18,7,36,21}}, + {rectangle{9,0,27,14},rectangle{9,14,27,28}}, + {rectangle{0,0,18,14},rectangle{0,14,18,28},rectangle{18,0,36,14},rectangle{18,14,36,28}} }; if(is_out()) @@ -327,7 +327,7 @@ void play_see_monster_str(unsigned short m, location monst_loc) { //short mode; // 0 - put pcs in gworld 1 - only rectangle around active pc void draw_pcs(location center,short mode) { short i; - RECT source_rect,active_pc_rect; + rectangle source_rect,active_pc_rect; location where_draw; if(party_toast()) @@ -380,7 +380,7 @@ void draw_pcs(location center,short mode) { void draw_items(location where){ if(!point_onscreen(center,where)) return; location where_draw(4 + where.x - center.x, 4 + where.y - center.y); - RECT from_rect, to_rect; + rectangle from_rect, to_rect; if(supressing_some_spaces && (where != ok_space[0]) && (where != ok_space[1]) && (where != ok_space[2]) && (where != ok_space[3])) return; for(int i = 0; i < NUM_TOWN_ITEMS; i++) { @@ -409,7 +409,7 @@ void draw_items(location where){ void draw_outd_boats(location center) { location where_draw; - RECT source_rect; + rectangle source_rect; short i; for(i = 0; i < 30; i++) @@ -438,7 +438,7 @@ void draw_outd_boats(location center) { void draw_town_boat(location center) { location where_draw; - RECT source_rect; + rectangle source_rect; short i; for(i = 0; i < 30; i++) @@ -530,7 +530,7 @@ void draw_fields(location where){ } void draw_party_symbol(location center) { - RECT source_rect; + rectangle source_rect; location target(4,4); short i = 0; @@ -573,8 +573,8 @@ void draw_party_symbol(location center) { // Give the position of the monster graphic in the picture resource // Will store monsters the same in Exile's II and III //short mode; // 0 - left 1 - right 2 - both -RECT get_monster_rect (unsigned short type_wanted,short mode) { - RECT store_rect; +rectangle get_monster_rect (unsigned short type_wanted,short mode) { + rectangle store_rect; short i; i = (short) type_wanted; @@ -589,8 +589,8 @@ RECT get_monster_rect (unsigned short type_wanted,short mode) { // Give the position of the monster graphic in the template in memory //mode; // 0 - left 1 - right +10 - combat mode -RECT get_monster_template_rect (pic_num_t picture_wanted,short mode,short which_part) { - RECT store_rect = {0,0,36,28}; +rectangle get_monster_template_rect (pic_num_t picture_wanted,short mode,short which_part) { + rectangle store_rect = {0,0,36,28}; short adj = 0; if(mode >= 10) { @@ -605,8 +605,8 @@ RECT get_monster_template_rect (pic_num_t picture_wanted,short mode,short which_ // Returns rect for drawing an item, if num < 25, rect is in big item template, // otherwise in small item template -RECT get_item_template_rect (short type_wanted) { - RECT store_rect; +rectangle get_item_template_rect (short type_wanted) { + rectangle store_rect; if(type_wanted < 45) { store_rect.top = (type_wanted / 5) * BITMAP_HEIGHT; diff --git a/osx/boe.graphutil.h b/osx/boe.graphutil.h index ccd5d2f8..544a7b5a 100644 --- a/osx/boe.graphutil.h +++ b/osx/boe.graphutil.h @@ -13,9 +13,9 @@ void draw_pcs(location center,short mode); void draw_outd_boats(location center); void draw_town_boat(location center) ; void draw_party_symbol(location center); -RECT get_monster_rect (pic_num_t type_wanted,short mode) ; -RECT get_monster_template_rect (pic_num_t type_wanted,short mode,short which_part) ; -RECT get_item_template_rect (short type_wanted); +rectangle get_monster_rect (pic_num_t type_wanted,short mode) ; +rectangle get_monster_template_rect (pic_num_t type_wanted,short mode,short which_part) ; +rectangle get_item_template_rect (short type_wanted); bool is_fluid(ter_num_t ter_type); bool is_shore(ter_num_t ter_type); bool is_wall(ter_num_t ter_type); diff --git a/osx/boe.items.cpp b/osx/boe.items.cpp index 3c1ae8b7..88b14371 100644 --- a/osx/boe.items.cpp +++ b/osx/boe.items.cpp @@ -36,7 +36,7 @@ extern eGameMode overall_mode; //extern town_item_list univ.town.items; extern sf::RenderWindow mainPtr; extern bool boom_anim_active; -extern RECT d_rects[80]; +extern rectangle d_rects[80]; extern short d_rect_index[80]; //extern big_tr_type t_d; @@ -1123,9 +1123,9 @@ void custom_pic_dialog(std::string title, pic_num_t bigpic) { map.setPict(bigpic, PIC_CUSTOM_FULL); // Now we need to adjust the size to ensure that everything fits correctly. map.recalcRect(); - RECT mapBounds = map.getBounds(); - RECT btnBounds = okay.getBounds(); - RECT txtBounds = text.getBounds(); + rectangle mapBounds = map.getBounds(); + rectangle btnBounds = okay.getBounds(); + rectangle txtBounds = text.getBounds(); btnBounds.offset(-btnBounds.left, -btnBounds.top); btnBounds.offset(mapBounds.right - btnBounds.width(), mapBounds.bottom + 10); okay.setBounds(btnBounds); diff --git a/osx/boe.main.cpp b/osx/boe.main.cpp index ef05c27f..3f0c1b7b 100644 --- a/osx/boe.main.cpp +++ b/osx/boe.main.cpp @@ -42,9 +42,9 @@ bool first_startup_update = true; bool diff_depth_ok = false,first_sound_played = false,spell_forced = false,startup_loaded = false; bool save_maps = true,party_in_memory = false; std::shared_ptr text_sbar, item_sbar, shop_sbar; -RECT sbar_rect = {283,546,421,562}; -RECT shop_sbar_rect = {67,258,357,274}; -RECT item_sbar_rect = {146,546,253,562}; +rectangle sbar_rect = {283,546,421,562}; +rectangle shop_sbar_rect = {67,258,357,274}; +rectangle item_sbar_rect = {146,546,253,562}; bool bgm_on = false,bgm_init = false; //short dialog_answer; location store_anim_ul; @@ -95,7 +95,7 @@ bool monsters_going = false,boom_anim_active = false; short give_delays = 0; sf::RenderWindow mini_map; -//RECT d_rects[80]; +//rectangle d_rects[80]; ////short d_rect_index[80]; //short town_size[3] = {64,48,32}; short which_item_page[6] = {0,0,0,0,0,0}; // Remembers which of the 2 item pages pc looked at @@ -721,7 +721,7 @@ static cursor_type get_mode_cursor(){ void change_cursor(location where_curs) { cursor_type cursor_needed; location cursor_direction; - RECT world_screen = {23, 23, 346, 274}; + rectangle world_screen = {23, 23, 346, 274}; where_curs.x -= ul.x; where_curs.y -= ul.y; diff --git a/osx/boe.newgraph.cpp b/osx/boe.newgraph.cpp index f925ec20..a70795c2 100644 --- a/osx/boe.newgraph.cpp +++ b/osx/boe.newgraph.cpp @@ -44,7 +44,7 @@ short monsters_faces[190] = { 23,0,0,0,0,0,0,0,23,23, 0,0,0,55,23,36,31,0,0,0}; extern location ul; -extern RECT windRect; +extern rectangle windRect; extern long anim_ticks; extern tessel_ref_t bg[]; extern sf::RenderWindow mainPtr; @@ -56,7 +56,7 @@ extern sf::Texture tiny_obj_gworld, items_gworld, talkfaces_gworld; extern sf::RenderTexture terrain_screen_gworld; //extern party_record_type party; extern sf::Texture bg_gworld; -extern RECT sbar_rect,item_sbar_rect,shop_sbar_rect; +extern rectangle sbar_rect,item_sbar_rect,shop_sbar_rect; extern std::shared_ptr text_sbar,item_sbar,shop_sbar; extern location center; extern short monst_marked_damage[60]; @@ -81,7 +81,7 @@ extern short store_personality,store_personality_graphic,current_pc; extern sf::RenderTexture talk_gworld; extern bool talk_end_forced; extern std::string old_str1,old_str2,one_back1,one_back2; -extern RECT talk_area_rect, word_place_rect,talk_help_rect; +extern rectangle talk_area_rect, word_place_rect,talk_help_rect; extern std::string title_string; extern m_num_t store_monst_type; std::vector talk_words; @@ -91,11 +91,11 @@ extern short store_shop_items[30],store_shop_costs[30]; extern short store_shop_type,store_shop_min,store_shop_max,store_cost_mult; extern eGameMode store_pre_shop_mode; extern char store_store_name[256]; -extern RECT shopping_rects[8][7]; -extern RECT bottom_help_rects[4]; -extern RECT shop_name_str; -extern RECT shop_frame ; -extern RECT shop_done_rect; +extern rectangle shopping_rects[8][7]; +extern rectangle bottom_help_rects[4]; +extern rectangle shop_name_str; +extern rectangle shop_frame ; +extern rectangle shop_done_rect; //extern item_record_type food_types[15]; extern char *heal_types[]; extern short heal_costs[8]; @@ -117,7 +117,7 @@ typedef struct { store_missile_type store_missiles[30]; store_boom_type store_booms[30]; bool have_missile,have_boom; -RECT explode_place_rect[30]; +rectangle explode_place_rect[30]; // Animation vars @@ -139,7 +139,7 @@ RECT explode_place_rect[30]; char last_light_mask[13][13]; void apply_unseen_mask() { - RECT base_rect = {9,9,53,45},to_rect,big_to = {13,13,337,265}; + rectangle base_rect = {9,9,53,45},to_rect,big_to = {13,13,337,265}; short i,j,k,l; bool need_bother = false; @@ -177,8 +177,8 @@ void apply_unseen_mask() { void apply_light_mask(bool onWindow) { static Region dark_mask_region; - RECT temp = {0,0,108,84},paint_rect,base_rect = {0,0,36,28}; - RECT big_to = {13,13,337,265}; + rectangle temp = {0,0,108,84},paint_rect,base_rect = {0,0,36,28}; + rectangle big_to = {13,13,337,265}; short i,j; bool is_dark = false,same_mask = true; if(PSD[SDF_NO_FRILLS] > 0) @@ -372,13 +372,13 @@ void add_explosion(location dest,short val_to_place,short place_type,short boom_ void do_missile_anim(short num_steps,location missile_origin,short sound_num) { // TODO: Get rid of temp_rect, at least - RECT temp_rect,missile_origin_base = {1,1,17,17},active_area_rect,to_rect,from_rect; + rectangle temp_rect,missile_origin_base = {1,1,17,17},active_area_rect,to_rect,from_rect; short i,store_missile_dir; location start_point,finish_point[30]; location screen_ul; short x1[30],x2[30],y1[30],y2[30],t; // for path paramaterization - RECT missile_place_rect[30],missile_origin_rect[30],store_erase_rect[30]; + rectangle missile_place_rect[30],missile_origin_rect[30],store_erase_rect[30]; location current_terrain_ul; sf::RenderTexture temp_gworld; @@ -402,13 +402,13 @@ void do_missile_anim(short num_steps,location missile_origin,short sound_num) { // make terrain_template contain current terrain all nicely draw_terrain(1); - to_rect = RECT(terrain_screen_gworld); - RECT oldBounds = to_rect; + to_rect = rectangle(terrain_screen_gworld); + rectangle oldBounds = to_rect; to_rect.offset(current_terrain_ul); rect_draw_some_item(terrain_screen_gworld.getTexture(),oldBounds,to_rect,ul); // create and clip temporary anim template - temp_rect = RECT(terrain_screen_gworld); + temp_rect = rectangle(terrain_screen_gworld); active_area_rect = temp_rect; active_area_rect.inset(13,13); temp_gworld.create(temp_rect.width(), temp_rect.height()); @@ -419,7 +419,7 @@ void do_missile_anim(short num_steps,location missile_origin,short sound_num) { // init missile paths for(i = 0; i < 30; i++) { - store_erase_rect[i] = RECT(); + store_erase_rect[i] = rectangle(); if((store_missiles[i].missile_type >= 0) && (missile_origin == store_missiles[i].dest)) store_missiles[i].missile_type = -1; } @@ -448,7 +448,7 @@ void do_missile_anim(short num_steps,location missile_origin,short sound_num) { y1[i] = finish_point[i].y - start_point.y; y2[i] = start_point.y; } - else missile_place_rect[i] = RECT(); + else missile_place_rect[i] = rectangle(); play_sound(-1 * sound_num); @@ -500,8 +500,8 @@ void do_missile_anim(short num_steps,location missile_origin,short sound_num) { for(i = 0; i < 30; i++) store_missiles[i].missile_type = -1; - to_rect = RECT(terrain_screen_gworld); - RECT oldRect = to_rect; + to_rect = rectangle(terrain_screen_gworld); + rectangle oldRect = to_rect; to_rect.offset(current_terrain_ul); rect_draw_some_item(terrain_screen_gworld.getTexture(),oldRect,to_rect,ul); } @@ -542,8 +542,8 @@ short get_missile_direction(location origin_point,location the_point) { // sound_num currently ignored // special_draw - 0 normal 1 - first half 2 - second half void do_explosion_anim(short /*sound_num*/,short special_draw) { - RECT temp_rect,active_area_rect,to_rect,from_rect; - RECT base_rect = {0,0,36,28},text_rect; + rectangle temp_rect,active_area_rect,to_rect,from_rect; + rectangle base_rect = {0,0,36,28},text_rect; char str[60]; short i,temp_val,temp_val2; location screen_ul; @@ -574,14 +574,14 @@ void do_explosion_anim(short /*sound_num*/,short special_draw) { // make terrain_template contain current terrain all nicely draw_terrain(1); if(special_draw != 2) { - to_rect = RECT(terrain_screen_gworld); - RECT oldRect = to_rect; + to_rect = rectangle(terrain_screen_gworld); + rectangle oldRect = to_rect; to_rect.offset(current_terrain_ul); rect_draw_some_item(terrain_screen_gworld.getTexture(),oldRect,to_rect,ul); } // create and clip temporary anim template - temp_rect = RECT(terrain_screen_gworld); + temp_rect = rectangle(terrain_screen_gworld); active_area_rect = temp_rect; active_area_rect.inset(13,13); TextStyle style; @@ -608,8 +608,8 @@ void do_explosion_anim(short /*sound_num*/,short special_draw) { } // eliminate stuff that's too gone. - RECT tempRect2; - tempRect2 = RECT(terrain_screen_gworld); + rectangle tempRect2; + tempRect2 = rectangle(terrain_screen_gworld); temp_rect = explode_place_rect[i] | tempRect2; if(temp_rect == explode_place_rect[i]) { store_booms[i].boom_type = -1; @@ -617,7 +617,7 @@ void do_explosion_anim(short /*sound_num*/,short special_draw) { } else if(special_draw < 2) - explode_place_rect[i] = RECT(); + explode_place_rect[i] = rectangle(); //play_sound(-1 * sound_num); if(special_draw < 2) @@ -690,7 +690,7 @@ shop_type: 11 - priest spells 12 alchemy */ -void click_shop_rect(RECT area_rect) { +void click_shop_rect(rectangle area_rect) { draw_shop_graphics(1,area_rect); mainPtr.display(); @@ -701,8 +701,8 @@ void click_shop_rect(RECT area_rect) { } -static graf_pos calc_item_rect(int num,RECT& to_rect) { - RECT from_rect = {0,0,18,18}; +static graf_pos calc_item_rect(int num,rectangle& to_rect) { + rectangle from_rect = {0,0,18,18}; sf::Texture *from_gw = &tiny_obj_gworld; if(num < 55) { from_gw = &items_gworld; @@ -715,12 +715,12 @@ static graf_pos calc_item_rect(int num,RECT& to_rect) { } // mode 1 - drawing dark for button press -void draw_shop_graphics(bool pressed,RECT clip_area_rect) { - RECT area_rect,item_info_from = {11,42,24,56}; +void draw_shop_graphics(bool pressed,rectangle clip_area_rect) { + rectangle area_rect,item_info_from = {11,42,24,56}; - RECT face_rect = {6,6,38,38}; - RECT title_rect = {15,48,42,260}; - RECT dest_rect,help_from = {85,36,101,54}; + rectangle face_rect = {6,6,38,38}; + rectangle title_rect = {15,48,42,260}; + rectangle dest_rect,help_from = {85,36,101,54}; short faces[13] = {1,1,1,42,43, 1,1,1,1,1, 44,44,44}; short i,what_chosen; @@ -730,7 +730,7 @@ void draw_shop_graphics(bool pressed,RECT clip_area_rect) { // TODO: The Windows version appears to use completely different colours? sf::Color c[7] = {sf::Color{0,0,0},sf::Color{0,0,128},sf::Color{0,0,57},sf::Color{0,0,104},sf::Color{0,0,232}, sf::Color{0,160,0},sf::Color{0,96,0}}; - RECT shopper_name = {44,6,56,260}; + rectangle shopper_name = {44,6,56,260}; short current_pos; short cur_cost,what_magic_shop,what_magic_shop_item; @@ -755,7 +755,7 @@ void draw_shop_graphics(bool pressed,RECT clip_area_rect) { clip_rect(talk_gworld, clip_area_rect); } - area_rect = RECT(talk_gworld); + area_rect = rectangle(talk_gworld); frame_rect(talk_gworld, area_rect, sf::Color::Black); area_rect.inset(1,1); tileImage(talk_gworld, area_rect,bg[12]); @@ -765,7 +765,7 @@ void draw_shop_graphics(bool pressed,RECT clip_area_rect) { // Place store icon if(!pressed) { i = faces[store_shop_type]; - RECT from_rect = {0,0,32,32}; + rectangle from_rect = {0,0,32,32}; from_rect.offset(32 * (i % 10),32 * (i / 10)); rect_draw_some_item(talkfaces_gworld, from_rect, talk_gworld, face_rect); } @@ -798,11 +798,11 @@ void draw_shop_graphics(bool pressed,RECT clip_area_rect) { // Place help and done buttons // TODO: Reimplement these with a cButton #if 0 - help_from = RECT(dlg_buttons_gworld[3][0]); // help + help_from = rectangle(dlg_buttons_gworld[3][0]); // help talk_help_rect.right = talk_help_rect.left + help_from.right - help_from.left; talk_help_rect.bottom = talk_help_rect.top + help_from.bottom - help_from.top; rect_draw_some_item(dlg_buttons_gworld[3][pressed],help_from,talk_gworld,talk_help_rect); - help_from = RECT(dlg_buttons_gworld[11][0]); // done + help_from = rectangle(dlg_buttons_gworld[11][0]); // done //talk_help_rect.right = talk_help_rect.left + help_from.right - help_from.left; //talk_help_rect.bottom = talk_help_rect.top + help_from.bottom - help_from.top; rect_draw_some_item(dlg_buttons_gworld[11][pressed],help_from,talk_gworld,shop_done_rect); @@ -819,7 +819,7 @@ void draw_shop_graphics(bool pressed,RECT clip_area_rect) { break; // theoretically, this shouldn't happen cur_cost = store_shop_costs[current_pos]; what_chosen = store_shop_items[current_pos]; - RECT from_rect, to_rect = shopping_rects[i][2]; + rectangle from_rect, to_rect = shopping_rects[i][2]; sf::Texture* from_gw; switch(what_chosen / 100) { case 0: case 1: case 2: case 3: case 4: @@ -911,9 +911,9 @@ void draw_shop_graphics(bool pressed,RECT clip_area_rect) { } void refresh_shopping() { - // TODO: The duplication of RECT here shouldn't be necessary... - RECT from_rects[4] = {RECT{0,0,62,279},RECT{62,0,352,253},RECT{62,269,352,279},RECT{352,0,415,279}}; - RECT to_rect; + // TODO: The duplication of rectangle here shouldn't be necessary... + rectangle from_rects[4] = {rectangle{0,0,62,279},rectangle{62,0,352,253},rectangle{62,269,352,279},rectangle{352,0,415,279}}; + rectangle to_rect; short i; for(i = 0; i < 4; i++) { @@ -924,7 +924,7 @@ void refresh_shopping() { } static void place_talk_face() { - RECT face_rect = {6,6,38,38}; + rectangle face_rect = {6,6,38,38}; face_rect.offset(talk_area_rect.topLeft()); face_rect.offset(ul); mainPtr.setActive(); @@ -943,7 +943,7 @@ static void place_talk_face() { } void click_talk_rect(word_rect_t word) { - RECT talkRect(talk_gworld), wordRect(word.rect); + rectangle talkRect(talk_gworld), wordRect(word.rect); mainPtr.setActive(); rect_draw_some_item(talk_gworld.getTexture(),talkRect,talk_area_rect,ul); wordRect.offset(talk_area_rect.topLeft()); @@ -1084,11 +1084,11 @@ void get_item_interesting_string(cItemRec item,char *message) { } // color 0 - regular 1 - darker -void place_talk_str(std::string str_to_place,std::string str_to_place2,short color,RECT c_rect) { - RECT area_rect; +void place_talk_str(std::string str_to_place,std::string str_to_place2,short color,rectangle c_rect) { + rectangle area_rect; - RECT title_rect = {19,48,42,260}; - RECT dest_rect,help_from = {46,60,59,76}; + rectangle title_rect = {19,48,42,260}; + rectangle dest_rect,help_from = {46,60,59,76}; sf::Text str_to_draw; short i; @@ -1112,7 +1112,7 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col clip_rect(mainPtr, c_rect); } - area_rect = RECT(talk_gworld); + area_rect = rectangle(talk_gworld); frame_rect(talk_gworld, area_rect, sf::Color::Black); area_rect.inset(1,1); tileImage(talk_gworld, area_rect,bg[12]); @@ -1134,11 +1134,11 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col win_draw_string(talk_gworld,dest_rect,title_string,eTextMode::LEFT_TOP,style); talk_words.clear(); - static const RECT preset_rects[9] = { - RECT{366,4,386,54}, RECT{366,70,386,130}, RECT{366,136,386,186}, - RECT{389,4,409,54}, RECT{389,70,409,120}, RECT{389,121,409,186}, - RECT{389,210,409,270}, RECT{366,190,386,270}, - RECT{343,4,363,134}, + static const rectangle preset_rects[9] = { + rectangle{366,4,386,54}, rectangle{366,70,386,130}, rectangle{366,136,386,186}, + rectangle{389,4,409,54}, rectangle{389,70,409,120}, rectangle{389,121,409,186}, + rectangle{389,210,409,270}, rectangle{366,190,386,270}, + rectangle{343,4,363,134}, }; static const char*const preset_words[9] = { "Look", "Name", "Job", @@ -1168,7 +1168,7 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col case 8: preset_word.node = TALK_ASK; break; } talk_words.push_back(preset_word); - RECT draw_rect = preset_word.rect; + rectangle draw_rect = preset_word.rect; win_draw_string(talk_gworld,draw_rect,preset_word.word,eTextMode::LEFT_TOP,style); } } @@ -1195,7 +1195,7 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col } } - std::vector word_rects = draw_string_hilite(talk_gworld, dest_rect, str, style, hilites, color ? c[1] : c[7]); + std::vector word_rects = draw_string_hilite(talk_gworld, dest_rect, str, style, hilites, color ? c[1] : c[7]); if(!talk_end_forced) { // Now build the list of word rects @@ -1210,7 +1210,7 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col } } - RECT oldRect(talk_gworld); + rectangle oldRect(talk_gworld); undo_clip(talk_gworld); talk_gworld.display(); @@ -1222,7 +1222,7 @@ void place_talk_str(std::string str_to_place,std::string str_to_place2,short col } void refresh_talking() { - RECT tempRect(talk_gworld); + rectangle tempRect(talk_gworld); rect_draw_some_item(talk_gworld.getTexture(),tempRect,talk_area_rect,ul); place_talk_face(); } diff --git a/osx/boe.newgraph.h b/osx/boe.newgraph.h index 4cb544da..7dffb321 100644 --- a/osx/boe.newgraph.h +++ b/osx/boe.newgraph.h @@ -6,10 +6,10 @@ struct word_rect_t { std::string word; - RECT rect; + rectangle rect; int node = -1; sf::Color on, off; - word_rect_t(std::string w, RECT r) : word(w), rect(r) {} + word_rect_t(std::string w, rectangle r) : word(w), rect(r) {} word_rect_t() {} }; @@ -55,14 +55,14 @@ void add_missile(location dest,short missile_type,short path_type,short x_adj,sh void add_explosion(location dest,short val_to_place,short place_type,short boom_type,short x_adj,short y_adj); void do_missile_anim(short num_steps,location missile_origin,short sound_num) ; void do_explosion_anim(short sound_num,short expand); -void click_shop_rect(RECT area_rect); -void draw_shop_graphics(bool pressed,RECT clip_area_rect); +void click_shop_rect(rectangle area_rect); +void draw_shop_graphics(bool pressed,rectangle clip_area_rect); void refresh_shopping(); cItemRec store_mage_spells(short which_s) ; cItemRec store_priest_spells(short which_s); cItemRec store_alchemy(short which_s); void get_item_interesting_string(cItemRec item,char *message); void click_talk_rect(word_rect_t word); -void place_talk_str(std::string str_to_place,std::string str_to_place2,short color,RECT c_rect); +void place_talk_str(std::string str_to_place,std::string str_to_place2,short color,rectangle c_rect); short scan_for_response(const char *str); void refresh_talking(); diff --git a/osx/boe.startup.cpp b/osx/boe.startup.cpp index d5ef37c6..bb164051 100644 --- a/osx/boe.startup.cpp +++ b/osx/boe.startup.cpp @@ -39,7 +39,7 @@ extern eGameMode overall_mode; //void start_game(); -RECT startup_button[6]; +rectangle startup_button[6]; // TODO: Always returns false, so make it void bool handle_startup_press(location the_point) { diff --git a/osx/boe.text.cpp b/osx/boe.text.cpp index ec943874..d1af53f0 100644 --- a/osx/boe.text.cpp +++ b/osx/boe.text.cpp @@ -30,24 +30,24 @@ bool printing_long = false; char c_str[256] = ""; bool save_mess_given = false; -RECT status_panel_clip_rect = {11, 299, 175, 495},item_panel_clip_rect = {11,297,175,463}; +rectangle status_panel_clip_rect = {11, 299, 175, 495},item_panel_clip_rect = {11,297,175,463}; -// TODO: The duplication of RECT here shouldn't be necessary... -RECT item_buttons_from[7] = { - RECT{11,0,24,14},RECT{11,14,24,28},RECT{11,28,24,42},RECT{11,42,24,56}, - RECT{24,0,36,30},RECT{24,30,36,60},RECT{36,0,48,30}}; +// TODO: The duplication of rectangle here shouldn't be necessary... +rectangle item_buttons_from[7] = { + rectangle{11,0,24,14},rectangle{11,14,24,28},rectangle{11,28,24,42},rectangle{11,42,24,56}, + rectangle{24,0,36,30},rectangle{24,30,36,60},rectangle{36,0,48,30}}; eGameMode store_mode; extern short had_text_freeze,stat_screen_mode; // graphics globals -extern RECT status_panel_rect,status_panel_title_rect; -extern RECT text_panel_rect; +extern rectangle status_panel_rect,status_panel_title_rect; +extern rectangle text_panel_rect; extern short which_combat_type,stat_window; extern eGameMode overall_mode; extern sf::RenderWindow mainPtr; -extern RECT more_info_button; +extern rectangle more_info_button; extern short which_item_page[6]; //extern CursHandle sword_curs; extern std::shared_ptr text_sbar,item_sbar; @@ -74,13 +74,13 @@ extern short terrain_there[9][9]; //extern big_tr_type t_d; extern location ul; extern bool play_sounds,suppress_stat_screen; -extern RECT item_buttons[8][6]; +extern rectangle item_buttons[8][6]; // name, use, give, drip, info, sell/id -extern RECT pc_buttons[6][5]; +extern rectangle pc_buttons[6][5]; // name, hp, sp, info, trade extern bool item_area_button_active[8][6]; extern bool pc_area_button_active[6][5]; -extern RECT item_screen_button_rects[9]; +extern rectangle item_screen_button_rects[9]; extern short spec_item_array[60]; extern std::map abil_chart; // combat globals @@ -95,15 +95,15 @@ extern location ok_space[4]; extern sf::Texture bg_gworld; // Draws the pc area in upper right -//void win_draw_string(WindowPtr dest_window,RECT dest_rect,char *str,short mode,short line_height) +//void win_draw_string(WindowPtr dest_window,rectangle dest_rect,char *str,short mode,short line_height) void put_pc_screen() { char to_draw[256]; short i = 0,j; - RECT erase_rect = {17,2,98,269},to_draw_rect,from_rect; - // TODO: The duplication of RECT here shouldn't be necessary... - RECT small_erase_rects[3] = {RECT{101,34,114,76},RECT{101,106,114,147},RECT{101,174,114,201}}; - RECT bottom_bar_rect = {99,0,116,271}; - RECT info_from = {0,1,12,13}; + rectangle erase_rect = {17,2,98,269},to_draw_rect,from_rect; + // TODO: The duplication of rectangle here shouldn't be necessary... + rectangle small_erase_rects[3] = {rectangle{101,34,114,76},rectangle{101,106,114,147},rectangle{101,174,114,201}}; + rectangle bottom_bar_rect = {99,0,116,271}; + rectangle info_from = {0,1,12,13}; pc_stats_gworld.setActive(); @@ -222,8 +222,8 @@ void put_item_screen(short screen_num,short suppress_buttons) { std::ostringstream sout; short i_num,item_offset; short i = 0,j,pc; - RECT erase_rect = {17,2,122,255},dest_rect; - RECT upper_frame_rect = {3,3,15,268}; + rectangle erase_rect = {17,2,122,255},dest_rect; + rectangle upper_frame_rect = {3,3,15,268}; item_stats_gworld.setActive(); @@ -355,9 +355,9 @@ void put_item_screen(short screen_num,short suppress_buttons) { } void place_buy_button(short position,short pc_num,short item_num) { - RECT dest_rect,source_rect; - // TODO: The duplication of RECT here shouldn't be necessary... - RECT button_sources[3] = {RECT{24,0,36,30},RECT{36,0,48,30},RECT{48,0,60,30}}; + rectangle dest_rect,source_rect; + // TODO: The duplication of rectangle here shouldn't be necessary... + rectangle button_sources[3] = {rectangle{24,0,36,30},rectangle{36,0,48,30},rectangle{48,0,60,30}}; short val_to_place; char store_str[60]; short aug_cost[10] = {4,7,10,8, 15,15,10, 0,0,0}; @@ -436,7 +436,7 @@ void place_buy_button(short position,short pc_num,short item_num) { // shortcuts - if which_button_to_put is 10, all 4 buttons now // if which_button_to_put is 11, just right 2 void place_item_button(short which_button_to_put,short which_slot,short which_button_position,short extra_val) { - RECT from_rect = {0,0,18,18},to_rect; + rectangle from_rect = {0,0,18,18},to_rect; if(which_button_position == 0) { // this means put little item graphic, extra val is which_graphic item_area_button_active[which_slot][which_button_position] = true; @@ -478,15 +478,15 @@ void place_item_button(short which_button_to_put,short which_slot,short which_bu rect_draw_some_item(invenbtn_gworld, from_rect, item_stats_gworld, to_rect, sf::BlendAlpha); } } -//RECT get_custom_rect (short which_rect) { -// RECT store_rect = {0,0,36,28}; +//rectangle get_custom_rect (short which_rect) { +// rectangle store_rect = {0,0,36,28}; // // OffsetRect(&store_rect,28 * (which_rect % 10),36 * (which_rect / 10)); // return store_rect; //} void place_item_bottom_buttons() { - RECT pc_from_rect = {0,0,36,28},but_from_rect = {30,60,46,78},to_rect; - RECT spec_from_rect = {0,60,15,95}, job_from_rect = {15,60,30,95}, help_from_rect = {46,60,59,76}; + rectangle pc_from_rect = {0,0,36,28},but_from_rect = {30,60,46,78},to_rect; + rectangle spec_from_rect = {0,60,15,95}, job_from_rect = {15,60,30,95}, help_from_rect = {46,60,59,76}; // TODO: What about when the buttons are pressed? short i; @@ -554,12 +554,12 @@ short first_active_pc() { void refresh_stat_areas(short mode) { short i; sf::BlendMode x; - // TODO: The duplication of RECT here shouldn't be necessary... - RECT dest_rect,parts_of_area_to_draw[3] = {RECT{0,0,17,271},RECT{16,0,123,256},RECT{123,0,144,271}}; + // TODO: The duplication of rectangle here shouldn't be necessary... + rectangle dest_rect,parts_of_area_to_draw[3] = {rectangle{0,0,17,271},rectangle{16,0,123,256},rectangle{123,0,144,271}}; //x = mode * 10; - dest_rect = RECT(pc_stats_gworld); - RECT oldRect = dest_rect; + dest_rect = rectangle(pc_stats_gworld); + rectangle oldRect = dest_rect; dest_rect.offset(PC_WIN_UL_X,PC_WIN_UL_Y); if(mode == 1) x = sf::BlendAdd; else x = sf::BlendNone; @@ -569,7 +569,7 @@ void refresh_stat_areas(short mode) { dest_rect.offset(ITEM_WIN_UL_X,ITEM_WIN_UL_Y); rect_draw_some_item(item_stats_gworld.getTexture(), parts_of_area_to_draw[i], dest_rect,ul, x); } - dest_rect = RECT(text_area_gworld); + dest_rect = rectangle(text_area_gworld); oldRect = dest_rect; dest_rect.offset(TEXT_WIN_UL_X,TEXT_WIN_UL_Y); rect_draw_some_item(text_area_gworld.getTexture(),oldRect, dest_rect,ul, x); @@ -589,25 +589,25 @@ short total_encumberance(short pc_num) { return store; } -RECT get_stat_effect_rect(eStatus which_effect) { +rectangle get_stat_effect_rect(eStatus which_effect) { int code = (int) which_effect; - RECT base = {0,0,12,12}; + rectangle base = {0,0,12,12}; base.offset(12 * (code % 3), 12 * (code / 3)); return base; } void draw_pc_effects(short pc) { // TODO: Calculate these rects from scratch instead of hard-coding them. (use above function) - // TODO: The duplication of RECT here shouldn't be necessary... - RECT source_rects[18] = { - RECT{00,0,12,12},RECT{00,12,12,24},RECT{00,24,12,36}, - RECT{12,0,24,12},RECT{12,12,24,24},RECT{12,24,24,36}, - RECT{24,0,36,12},RECT{24,12,36,24},RECT{24,24,36,36}, - RECT{36,0,47,12},RECT{36,12,47,24},RECT{36,24,47,36}, - RECT{47,0,60,12},RECT{47,12,60,24},RECT{47,24,60,36}, - RECT{60,0,72,12},RECT{60,12,72,24},RECT{60,24,72,36} + // TODO: The duplication of rectangle here shouldn't be necessary... + rectangle source_rects[18] = { + rectangle{00,0,12,12},rectangle{00,12,12,24},rectangle{00,24,12,36}, + rectangle{12,0,24,12},rectangle{12,12,24,24},rectangle{12,24,24,36}, + rectangle{24,0,36,12},rectangle{24,12,36,24},rectangle{24,24,36,36}, + rectangle{36,0,47,12},rectangle{36,12,47,24},rectangle{36,24,47,36}, + rectangle{47,0,60,12},rectangle{47,12,60,24},rectangle{47,24,60,36}, + rectangle{60,0,72,12},rectangle{60,12,72,24},rectangle{60,24,72,36} }; - RECT dest_rect = {18,15,30,27},dlog_dest_rect = {66,354,78,366}; + rectangle dest_rect = {18,15,30,27},dlog_dest_rect = {66,354,78,366}; short right_limit = 250; short name_width; @@ -1320,7 +1320,7 @@ void print_buf () { short line_to_print; short start_print_point; bool end_loop = false; - RECT store_text_rect,dest_rect,erase_rect = {2,2,136,255}; + rectangle store_text_rect,dest_rect,erase_rect = {2,2,136,255}; text_area_gworld.setActive(); @@ -1374,8 +1374,8 @@ void through_sending() { /* Draw a bitmap in the world window. hor in 0 .. 8, vert in 0 .. 8, object is ptr. to bitmap to be drawn, and masking is for Copybits. */ -void Draw_Some_Item (sf::Texture& src_gworld, RECT src_rect, sf::RenderTarget& targ_gworld,location target, char masked, short main_win) { - RECT destrec = {0,0,36,28}; +void Draw_Some_Item (sf::Texture& src_gworld, rectangle src_rect, sf::RenderTarget& targ_gworld,location target, char masked, short main_win) { + rectangle destrec = {0,0,36,28}; if((target.x < 0) || (target.y < 0) || (target.x > 8) || (target.y > 8)) return; @@ -1399,8 +1399,8 @@ void Draw_Some_Item (sf::Texture& src_gworld, RECT src_rect, sf::RenderTarget& t } // TODO: This seems to duplicate logic found in graphtool to get a rect from a picture index -RECT coord_to_rect(short i,short j) { - RECT to_return; +rectangle coord_to_rect(short i,short j) { + rectangle to_return; to_return.left = 13 + BITMAP_WIDTH * i; to_return.right = to_return.left + BITMAP_WIDTH; diff --git a/osx/boe.text.h b/osx/boe.text.h index 7f6ea278..e4ca21e2 100644 --- a/osx/boe.text.h +++ b/osx/boe.text.h @@ -4,7 +4,7 @@ void put_pc_screen(); void place_buy_button(short position,short pc_num,short item_num); void put_item_screen(short screen_num,short suppress_buttons); void place_item_bottom_buttons(); -//RECT get_party_template_rect(short pc_num,short mode); +//rectangle get_party_template_rect(short pc_num,short mode); void set_stat_window(short new_stat); void place_item_button(short which_button_to_put,short which_slot,short which_button_position,short extra_val); short first_active_pc(); @@ -38,10 +38,10 @@ void print_buf () ; void restart_printing(); void restore_mode(); void through_sending(); -RECT coord_to_rect(short i,short j); +rectangle coord_to_rect(short i,short j); void make_cursor_sword() ; short calc_day(); bool day_reached(unsigned char which_day, unsigned char which_event); -void Draw_Some_Item (sf::Texture& src_gworld, RECT src_rect, sf::RenderTarget& targ_gworld, location target, char masked, short main_win); -//RECT get_custom_rect (short which_rect); +void Draw_Some_Item (sf::Texture& src_gworld, rectangle src_rect, sf::RenderTarget& targ_gworld, location target, char masked, short main_win); +//rectangle get_custom_rect (short which_rect); diff --git a/osx/boe.town.cpp b/osx/boe.town.cpp index 7afb33a0..f4b4b4ff 100644 --- a/osx/boe.town.cpp +++ b/osx/boe.town.cpp @@ -109,8 +109,8 @@ short town_force = 200,store_which_shop,store_min,store_max,store_shop,store_sel short sell_offset = 0; location town_force_loc; bool shop_button_active[12]; -RECT map_title_rect = {3,50,15,300}; -RECT map_bar_rect = {15,50,27,300}; +rectangle map_title_rect = {3,50,15,300}; +rectangle map_bar_rect = {15,50,27,300}; unsigned char map_graphic_placed[8][64]; // keeps track of what's been filled on map void force_town_enter(short which_town,location where_start) { @@ -1263,7 +1263,7 @@ short get_town_spec_id(location where) { // TODO: I don't think we need this void clear_map() { - RECT map_world_rect(map_gworld); + rectangle map_world_rect(map_gworld); // if(!map_visible) { // return; @@ -1277,22 +1277,22 @@ void clear_map() { void draw_map(bool need_refresh) { if(!map_visible) return; short i,j,pic,pic2; - RECT the_rect,map_world_rect = {0,0,384,384}; + rectangle the_rect,map_world_rect = {0,0,384,384}; location where; location kludge; - RECT draw_rect,orig_draw_rect = {0,0,6,6},ter_temp_from; - RECT dlogpicrect = {6,6,42,42}; + rectangle draw_rect,orig_draw_rect = {0,0,6,6},ter_temp_from; + rectangle dlogpicrect = {6,6,42,42}; bool draw_pcs = true,out_mode; - RECT view_rect= {0,0,48,48},tiny_rect = {0,0,32,32}, + rectangle view_rect= {0,0,48,48},tiny_rect = {0,0,32,32}, redraw_rect = {0,0,48,48},big_rect = {0,0,64,64}; // Rectangle visible in view screen - RECT area_to_draw_from,area_to_draw_on = {29,47,269,287}; + rectangle area_to_draw_from,area_to_draw_on = {29,47,269,287}; short small_adj = 0; ter_num_t what_ter,what_ter2; bool draw_surroundings = false,expl,expl2; short total_size = 48; // if full redraw, use this to figure out everything - RECT area_to_put_on_map_rect; - RECT custom_from; + rectangle area_to_put_on_map_rect; + rectangle custom_from; short town_type = scenario.town_size[univ.town.num]; draw_surroundings = true; @@ -1480,7 +1480,7 @@ void draw_map(bool need_refresh) { style.font = FONT_BOLD; style.pointSize = 10;; - the_rect = RECT(mini_map); + the_rect = rectangle(mini_map); tileImage(mini_map, the_rect,bg[4]); cPict theGraphic(mini_map); theGraphic.setBounds(dlogpicrect); @@ -1568,8 +1568,8 @@ bool is_door(location destination) { void display_map() { // Show the automap if it's not already visible if(map_visible) return; - RECT the_rect; - RECT dlogpicrect = {6,6,42,42}; + rectangle the_rect; + rectangle dlogpicrect = {6,6,42,42}; mini_map.setVisible(true); map_visible = true; diff --git a/osx/classes/location.h b/osx/classes/location.h index 38d11642..3624fc35 100644 --- a/osx/classes/location.h +++ b/osx/classes/location.h @@ -75,8 +75,6 @@ struct rectangle { } }; -using RECT = rectangle; // TODO: A temporary measure, eventually I'll actually replace RECT with rectangle everywhere - bool operator == (location p1,location p2); bool operator != (location p1,location p2); bool operator == (rectangle r1, rectangle r2); diff --git a/osx/classes/regtown.cpp b/osx/classes/regtown.cpp index b1cd2bc5..a9d0780f 100644 --- a/osx/classes/regtown.cpp +++ b/osx/classes/regtown.cpp @@ -333,7 +333,7 @@ unsigned char& cBigTown::lighting(size_t i, size_t r){ cBigTown::cBigTown(){ int i; cCreature dummy_creature;// = {0,0,loc(),0,0,0,0,0,0,0}; - RECT d_rect = {0,0,0,0}; + rectangle d_rect = {0,0,0,0}; for(i = 0; i < 16; i++) { _room_rect[i].top = d_rect.top; _room_rect[i].left = d_rect.left; @@ -348,7 +348,7 @@ cBigTown::cBigTown(){ cMedTown::cMedTown(){ int i; cCreature dummy_creature;// = {0,0,loc(),0,0,0,0,0,0,0}; - RECT d_rect = {0,0,0,0}; + rectangle d_rect = {0,0,0,0}; for(i = 0; i < 16; i++) { _room_rect[i].top = d_rect.top; _room_rect[i].left = d_rect.left; @@ -363,7 +363,7 @@ cMedTown::cMedTown(){ cTinyTown::cTinyTown(){ int i; cCreature dummy_creature;// = {0,0,loc(),0,0,0,0,0,0,0}; - RECT d_rect = {0,0,0,0}; + rectangle d_rect = {0,0,0,0}; for(i = 0; i < 16; i++) { _room_rect[i].top = d_rect.top; _room_rect[i].left = d_rect.left; diff --git a/osx/dialogxml/button.cpp b/osx/dialogxml/button.cpp index 90bfdb6e..be08c10d 100644 --- a/osx/dialogxml/button.cpp +++ b/osx/dialogxml/button.cpp @@ -51,7 +51,7 @@ bool cButton::isClickable(){ } void cButton::draw(){ - RECT from_rect, to_rect; + rectangle from_rect, to_rect; inWindow->setActive(); @@ -124,7 +124,7 @@ size_t cButton::btnGW[14] = { }; sf::Texture cButton::buttons[7]; -RECT cButton::btnRects[13][2]; +rectangle cButton::btnRects[13][2]; void cButton::init(){ static const char*const buttonFiles[7] = { @@ -168,10 +168,10 @@ void cButton::init(){ btnRects[BTN_PUSH][1].offset(30,0); } -RECT cLed::ledRects[3][2]; +rectangle cLed::ledRects[3][2]; void cLed::init(){ - RECT baseLed = {0,0,10,14}; + rectangle baseLed = {0,0,10,14}; for(int i = 0; i < 3; i++) for(int j = 0; j < 2; j++){ ledRects[i][j] = baseLed; @@ -234,7 +234,7 @@ short cLed::getFormat(eFormat prop) throw(xUnsupportedProp){ } void cLed::draw(){ - RECT from_rect, to_rect; + rectangle from_rect, to_rect; inWindow->setActive(); @@ -275,7 +275,7 @@ void cLedGroup::recalcRect(){ ledIter iter = choices.begin(); frame = {INT_MAX, INT_MAX, 0, 0}; while(iter != choices.end()){ - RECT otherFrame = iter->second->getBounds(); + rectangle otherFrame = iter->second->getBounds(); if(otherFrame.right > frame.right) frame.right = otherFrame.right; if(otherFrame.bottom > frame.bottom) diff --git a/osx/dialogxml/button.h b/osx/dialogxml/button.h index 3a865796..e195913e 100644 --- a/osx/dialogxml/button.h +++ b/osx/dialogxml/button.h @@ -85,7 +85,7 @@ private: bool wrapLabel; bool labelWithKey; std::string fromList; - static RECT btnRects[13][2]; + static rectangle btnRects[13][2]; protected: /// The index in buttons of the texture for each button type. static size_t btnGW[14]; @@ -129,7 +129,7 @@ private: eFont textFont; sf::Color color; short textSize; - static RECT ledRects[3][2]; + static rectangle ledRects[3][2]; focus_callback_t onFocus; }; diff --git a/osx/dialogxml/control.cpp b/osx/dialogxml/control.cpp index 82d55d8f..cf9b2b5b 100644 --- a/osx/dialogxml/control.cpp +++ b/osx/dialogxml/control.cpp @@ -25,11 +25,11 @@ std::string cControl::getText(){ return lbl; } -RECT cControl::getBounds() { +rectangle cControl::getBounds() { return frame; } -void cControl::setBounds(RECT newFrame) { +void cControl::setBounds(rectangle newFrame) { frame = newFrame; } @@ -277,7 +277,7 @@ bool cControl::triggerFocusHandler(cDialog&, std::string, bool){ void cControl::drawFrame(short amt, bool med_or_lt){ // dk_gray had a 0..65535 component of 12287, and med_gray had a 0..65535 component of 24574 static sf::Color lt_gray = {224,224,224},dk_gray = {48,48,48},med_gray = {96,96,96}; - RECT rect = frame, ul_rect; + rectangle rect = frame, ul_rect; inWindow->setActive(); diff --git a/osx/dialogxml/control.h b/osx/dialogxml/control.h index 394151f4..0ade653b 100644 --- a/osx/dialogxml/control.h +++ b/osx/dialogxml/control.h @@ -153,10 +153,10 @@ public: virtual std::string getText(); /// Get the bounding rect of this control. /// @return The control's bounding rect. - RECT getBounds(); + rectangle getBounds(); /// Set the bounding rect of this control. /// @param newBounds The new bounding rect. - void setBounds(RECT newBounds); + void setBounds(rectangle newBounds); /// Set the position of this control. /// @param to The new position. void relocate(location to); @@ -231,7 +231,7 @@ protected: /// Whether the control is visible bool visible, depressed = false; ///< Whether the control is depressed; only applicable for clickable controls /// The control's bounding rect. - RECT frame; + rectangle frame; /// The control's frame style. int frameStyle; /// The control's attached key. diff --git a/osx/dialogxml/dialog.cpp b/osx/dialogxml/dialog.cpp index 24d64632..a2e5e716 100644 --- a/osx/dialogxml/dialog.cpp +++ b/osx/dialogxml/dialog.cpp @@ -52,7 +52,7 @@ template<> pair cDialog::parse(Element& who /*pict*/){ ePicType type; bool wide = false, tall = false, custom = false; bool foundTop = false, foundLeft = false, foundType = false, foundNum = false; // required attributes - RECT frame; + rectangle frame; int width = 0, height = 0; p.second = new cPict(*this); for(attr = attr.begin(&who); attr != attr.end(); attr++){ @@ -209,7 +209,7 @@ template<> pair cDialog::parse(Element& who /*text*/){ string name; int width = 0, height = 0; bool foundTop = false, foundLeft = false; // top and left are required attributes - RECT frame; + rectangle frame; p.second = new cTextMsg(*this); if(bg == BG_DARK) p.second->setColour(sf::Color::White); for(attr = attr.begin(&who); attr != attr.end(); attr++){ @@ -357,7 +357,7 @@ template<> pair cDialog::parse(Element& who /*button*/){ bool foundKey = false; std::string keyMod, keyMain; int keyModRow, keyModCol, keyMainRow, keyMainCol; - RECT frame; + rectangle frame; p.second = new cButton(this); for(attr = attr.begin(&who); attr != attr.end(); attr++){ attr->GetName(&name); @@ -561,7 +561,7 @@ template<> pair cDialog::parse(Element& who /*LED*/){ string name; int width = 0, height = 0; bool foundTop = false, foundLeft = false; // requireds - RECT frame; + rectangle frame; p.second = new cLed(this); if(bg == BG_DARK) p.second->setColour(sf::Color::White); for(attr = attr.begin(&who); attr != attr.end(); attr++){ @@ -697,7 +697,7 @@ template<> pair cDialog::parse(Element& who /*field*/){ string name; int width = 0, height = 0; bool foundTop = false, foundLeft = false; // requireds - RECT frame; + rectangle frame; p.second = new cTextField(this); for(attr = attr.begin(&who); attr != attr.end(); attr++){ attr->GetName(&name); @@ -881,7 +881,7 @@ void cDialog::loadFromFile(std::string path){ dialogNotToast = true; if(bg == BG_DARK) defTextClr = sf::Color::White; // now calculate window rect - winRect = RECT(); + winRect = rectangle(); recalcRect(); ctrlIter iter = controls.begin(); currentFocus = ""; @@ -898,7 +898,7 @@ void cDialog::recalcRect(){ ctrlIter iter = controls.begin(); while(iter != controls.end()){ printf("%s \"%s\"\n",typeid(*(iter->second)).name(),iter->first.c_str()); - RECT frame = iter->second->getBounds(); + rectangle frame = iter->second->getBounds(); if(frame.right > winRect.right) winRect.right = frame.right; if(frame.bottom > winRect.bottom) @@ -925,7 +925,7 @@ cDialog::~cDialog(){ win.close(); } -bool cDialog::add(cControl* what, RECT ctrl_frame, std::string key){ +bool cDialog::add(cControl* what, rectangle ctrl_frame, std::string key){ // First make sure the key is not already present. // If it is, we can't add the control, so return false. if(controls.find(key) != controls.end()) return false; @@ -1215,7 +1215,7 @@ void cDialog::attachFocusHandlers(focus_callback_t handler, std::vectorgetControl(key); key += "-label"; - RECT labelRect = ctrl.getBounds(); + rectangle labelRect = ctrl.getBounds(); switch(where) { case LABEL_LEFT: labelRect.right = labelRect.left; diff --git a/osx/dialogxml/dialog.h b/osx/dialogxml/dialog.h index 3bed58b7..ca7df3f9 100644 --- a/osx/dialogxml/dialog.h +++ b/osx/dialogxml/dialog.h @@ -68,7 +68,7 @@ public: /// @param key A key to be used to look up the control later. /// @return false if the key is used, true if the control was added. /// @note This function is intended for internal use, which is why it takes a control pointer instead of a unique key. - bool add(cControl* what, RECT ctrl_frame, std::string key); + bool add(cControl* what, rectangle ctrl_frame, std::string key); /// Remove a control from the dialog. /// @param key The control's unique key. /// @return true if the key existed and the control was removed, false if the key did not exist @@ -164,7 +164,7 @@ public: void attachFocusHandlers(std::function handler, std::vector controls); /// Get the bounding rect of the dialog. /// @return The dialog's bounding rect. - RECT getBounds() {return winRect;} + rectangle getBounds() {return winRect;} /// Sets whether to animate graphics in dialogs. static bool doAnimations; cDialog& operator=(cDialog& other) = delete; @@ -174,7 +174,7 @@ private: std::string process_keystroke(cKey keyHit); std::string process_click(location where); bool dialogNotToast; - RECT winRect; + rectangle winRect; std::string defaultButton; boost::any result; std::string fname; diff --git a/osx/dialogxml/dlogutil.cpp b/osx/dialogxml/dlogutil.cpp index ac7a8e59..ccf20d5b 100644 --- a/osx/dialogxml/dlogutil.cpp +++ b/osx/dialogxml/dlogutil.cpp @@ -329,7 +329,7 @@ cThreeChoice::cThreeChoice void cThreeChoice::init_strings(std::vector& strings, unsigned short left){ TextStyle style; - RECT cur_text_rect = {2, left, 0, 0}; + rectangle cur_text_rect = {2, left, 0, 0}; size_t total_len = 0, str_width, str_height; for(unsigned int i = 0; i < strings.size(); i++) total_len += string_length(strings[i], style); @@ -356,7 +356,7 @@ void cThreeChoice::init_strings(std::vector& strings, unsigned shor void cThreeChoice::init_buttons(cBasicButtonType btn1, cBasicButtonType btn2, cBasicButtonType btn3){ using namespace std::placeholders; - RECT cur_btn_rect = {buttons_top,0,0,buttons_right}; + rectangle cur_btn_rect = {buttons_top,0,0,buttons_right}; if(btn1) btns[0] = btn1; if(btn2) btns[1] = btn2; if(btn3) btns[2] = btn3; diff --git a/osx/dialogxml/field.cpp b/osx/dialogxml/field.cpp index 9bd7ae45..3abcfda9 100644 --- a/osx/dialogxml/field.cpp +++ b/osx/dialogxml/field.cpp @@ -109,12 +109,12 @@ cTextField::~cTextField(){} void cTextField::draw(){ static const sf::Color hiliteClr = {127,127,127}, ipClr = {92, 92, 92}; inWindow->setActive(); - RECT outline = frame; + rectangle outline = frame; outline.inset(-2,-2); fill_rect(*inWindow, outline, sf::Color::White); frame_rect(*inWindow, outline, sf::Color::Black); std::string contents = getText(); - RECT rect = frame; + rectangle rect = frame; rect.inset(2,2); TextStyle style; style.font = FONT_PLAIN; @@ -132,7 +132,7 @@ void cTextField::draw(){ std::string dummy_str = contents + " "; if(tmp_hilite.first >= tmp_hilite.second) tmp_hilite.second = tmp_hilite.first + 1; - std::vector rects = draw_string_hilite(*inWindow, rect, dummy_str, style, {tmp_hilite}, {0,0,0}); + std::vector rects = draw_string_hilite(*inWindow, rect, dummy_str, style, {tmp_hilite}, {0,0,0}); if(!rects.empty()) { // We only care about the first and last rects. Furthermore, we only really need one point location ip_pos = rects[0].centre(), sp_pos = rects[rects.size() - 1].centre(); @@ -172,7 +172,7 @@ void cTextField::draw(){ ip_offset = string_length(pre_ip, style); if(ip_timer.getElapsedTime().asMilliseconds() < 500) { // printf("Blink on (%d); ", ip_timer.getElapsedTime().asMilliseconds()); - RECT ipRect = {0, 0, 15, 1}; + rectangle ipRect = {0, 0, 15, 1}; if(iSnippet >= 0) ipRect.offset(snippets[iSnippet].at.x + ip_offset, snippets[iSnippet].at.y + 1); else ipRect.offset(frame.topLeft()), ipRect.offset(3,2); diff --git a/osx/dialogxml/message.cpp b/osx/dialogxml/message.cpp index 9151744f..5357ced3 100644 --- a/osx/dialogxml/message.cpp +++ b/osx/dialogxml/message.cpp @@ -96,7 +96,7 @@ bool cTextMsg::isClickable(){ } void cTextMsg::draw(){ - RECT to_rect = frame; + rectangle to_rect = frame; inWindow->setActive(); diff --git a/osx/dialogxml/pict.cpp b/osx/dialogxml/pict.cpp index e5668cd1..8a789a71 100644 --- a/osx/dialogxml/pict.cpp +++ b/osx/dialogxml/pict.cpp @@ -62,8 +62,8 @@ void cPict::init(){ drawPict()[PIC_PARTY_MONST_LG] = &cPict::drawPartyMonstLg; } -std::map& cPict::drawPict(){ - static std::map f; +std::map& cPict::drawPict(){ + static std::map f; return f; } @@ -409,7 +409,7 @@ void cPict::advanceAnim() { } void cPict::recalcRect() { - RECT bounds = getBounds(); + rectangle bounds = getBounds(); switch(picType) { case NUM_PIC_TYPES: break; case PIC_TER: case PIC_CUSTOM_TER: @@ -556,7 +556,7 @@ std::shared_ptr cPict::getSheet(eSheetType type, size_t n) { void cPict::draw(){ sf::Color store_color; - RECT rect = frame; + rectangle rect = frame; inWindow->setActive(); if(!visible){ // Erase it @@ -573,18 +573,18 @@ void cPict::draw(){ if(drawFramed) drawFrame(2,frameStyle); } -void cPict::drawPresetTer(short num, RECT to_rect){ +void cPict::drawPresetTer(short num, rectangle to_rect){ printf("Getting terrain icon from sheet %i.\n",num / 50); std::shared_ptr from_gw = getSheet(SHEET_TER, num / 50); num = num % 50; - RECT from_rect = calc_rect(num % 10, num / 10); + rectangle from_rect = calc_rect(num % 10, num / 10); if(to_rect.right - to_rect.left > 28) to_rect.inset(4,0); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPresetTerAnim(short num, RECT to_rect){ - RECT from_rect = calc_rect(4 * (num / 5) + animFrame % 4, num % 5); +void cPict::drawPresetTerAnim(short num, rectangle to_rect){ + rectangle from_rect = calc_rect(4 * (num / 5) + animFrame % 4, num % 5); std::shared_ptr from_gw = getSheet(SHEET_TER_ANIM); printf("Getting animated terrain graphic %i from sheet 20", num); if(to_rect.right - to_rect.left > 28) { @@ -594,8 +594,8 @@ void cPict::drawPresetTerAnim(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -static RECT calcDefMonstRect(short i, short animFrame){ - RECT r = calc_rect(2 * (i / 10), i % 10); +static rectangle calcDefMonstRect(short i, short animFrame){ + rectangle r = calc_rect(2 * (i / 10), i % 10); switch(animFrame % 4){ // Sequence is right-facing, attack, left-facing, attack case 1: r.offset(112,0); @@ -610,25 +610,25 @@ static RECT calcDefMonstRect(short i, short animFrame){ return r; } -void cPict::drawPresetMonstSm(short num, RECT to_rect){ +void cPict::drawPresetMonstSm(short num, rectangle to_rect){ short m_start_pic = m_pic_index[num].i; std::shared_ptr from_gw = getSheet(SHEET_MONST, m_start_pic / 20); m_start_pic = m_start_pic % 20; - RECT from_rect = calcDefMonstRect(m_start_pic, animFrame); + rectangle from_rect = calcDefMonstRect(m_start_pic, animFrame); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawPresetMonstWide(short num, RECT to_rect){ - RECT small_monst_rect = {0,0,18,14}; +void cPict::drawPresetMonstWide(short num, rectangle to_rect){ + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); short m_start_pic = m_pic_index[num].i; std::shared_ptr from_gw = getSheet(SHEET_MONST, m_start_pic / 20); - RECT from_rect = calcDefMonstRect(m_start_pic % 20, animFrame); + rectangle from_rect = calcDefMonstRect(m_start_pic % 20, animFrame); small_monst_rect.offset(to_rect.left,to_rect.top + 7); rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); @@ -639,15 +639,15 @@ void cPict::drawPresetMonstWide(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawPresetMonstTall(short num, RECT to_rect){ - RECT small_monst_rect = {0,0,18,14}; +void cPict::drawPresetMonstTall(short num, rectangle to_rect){ + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); short m_start_pic = m_pic_index[num].i; std::shared_ptr from_gw = getSheet(SHEET_MONST, m_start_pic / 20); - RECT from_rect = calcDefMonstRect(m_start_pic % 20, animFrame); + rectangle from_rect = calcDefMonstRect(m_start_pic % 20, animFrame); small_monst_rect.offset(to_rect.left + 7,to_rect.top); rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); @@ -658,15 +658,15 @@ void cPict::drawPresetMonstTall(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawPresetMonstLg(short num, RECT to_rect){ - RECT small_monst_rect = {0,0,18,14}; +void cPict::drawPresetMonstLg(short num, rectangle to_rect){ + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); short m_start_pic = m_pic_index[num].i; std::shared_ptr from_gw = getSheet(SHEET_MONST, m_start_pic / 20); - RECT from_rect = calcDefMonstRect(m_start_pic % 20, animFrame); + rectangle from_rect = calcDefMonstRect(m_start_pic % 20, animFrame); small_monst_rect.offset(to_rect.left,to_rect.top); rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); @@ -689,58 +689,58 @@ void cPict::drawPresetMonstLg(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawPresetDlog(short num, RECT to_rect){ +void cPict::drawPresetDlog(short num, rectangle to_rect){ to_rect.right = to_rect.left + 36; to_rect.bottom = to_rect.top + 36; std::shared_ptr from_gw = getSheet(SHEET_DLOG); - RECT from_rect = {0,0,36,36}; + rectangle from_rect = {0,0,36,36}; from_rect.offset(36 * (num % 4),36 * (num / 4)); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPresetDlogLg(short num, RECT to_rect){ +void cPict::drawPresetDlogLg(short num, rectangle to_rect){ to_rect.right = to_rect.left + 72; to_rect.bottom = to_rect.top + 72; std::shared_ptr from_gw = getSheet(SHEET_DLOG); - RECT from_rect = {0,0,72,72}; + rectangle from_rect = {0,0,72,72}; from_rect.offset(36 * (num % 4),36 * (num / 4)); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPresetTalk(short num, RECT to_rect){ +void cPict::drawPresetTalk(short num, rectangle to_rect){ num--; to_rect.right = to_rect.left + 32; to_rect.bottom = to_rect.top + 32; std::shared_ptr from_gw = getSheet(SHEET_TALK); - RECT from_rect = {0,0,32,32}; + rectangle from_rect = {0,0,32,32}; from_rect.offset(32 * (num % 10),32 * (num / 10)); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPresetScen(short num, RECT to_rect){ +void cPict::drawPresetScen(short num, rectangle to_rect){ std::shared_ptr from_gw = getSheet(SHEET_SCEN); - RECT from_rect = {0,0,32,32}; + rectangle from_rect = {0,0,32,32}; from_rect.offset(32 * (num % 5),32 * (num / 5)); to_rect.right = to_rect.left + 32; to_rect.bottom = to_rect.top + 32; rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPresetScenLg(short num, RECT to_rect){ +void cPict::drawPresetScenLg(short num, rectangle to_rect){ std::shared_ptr from_gw = getSheet(SHEET_SCEN_LG); to_rect.right = to_rect.left + 64; to_rect.bottom = to_rect.top + 64; - RECT from_rect = {0,0,64,64}; + rectangle from_rect = {0,0,64,64}; from_rect.offset(num * 64, 0); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPresetItem(short num, RECT to_rect){ +void cPict::drawPresetItem(short num, rectangle to_rect){ to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); std::shared_ptr from_gw; - RECT from_rect = {0,0,18,18}; + rectangle from_rect = {0,0,18,18}; if(num < 55) { from_gw = getSheet(SHEET_ITEM); from_rect = calc_rect(num % 5, num / 5); @@ -752,44 +752,44 @@ void cPict::drawPresetItem(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawPresetPc(short num, RECT to_rect){ +void cPict::drawPresetPc(short num, rectangle to_rect){ std::shared_ptr from_gw = getSheet(SHEET_PC); - RECT from_rect = calc_rect(2 * (num / 8), num % 8); + rectangle from_rect = calc_rect(2 * (num / 8), num % 8); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawPresetField(short num, RECT to_rect){ +void cPict::drawPresetField(short num, rectangle to_rect){ std::shared_ptr from_gw = getSheet(SHEET_FIELD); - RECT from_rect = calc_rect(num % 8, num / 8); + rectangle from_rect = calc_rect(num % 8, num / 8); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawPresetBoom(short num, RECT to_rect){ +void cPict::drawPresetBoom(short num, rectangle to_rect){ std::shared_ptr from_gw = getSheet(SHEET_BOOM); - RECT from_rect = calc_rect(num % 8, num / 8); + rectangle from_rect = calc_rect(num % 8, num / 8); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawFullSheet(short num, RECT to_rect){ - RECT from_rect; +void cPict::drawFullSheet(short num, rectangle to_rect){ + rectangle from_rect; std::shared_ptr from_gw = getSheet(SHEET_FULL, num); - from_rect = RECT(*from_gw); + from_rect = rectangle(*from_gw); to_rect.right = to_rect.left + (from_rect.right - from_rect.left); to_rect.bottom = to_rect.top + (from_rect.bottom - from_rect.top); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPresetMissile(short num, RECT to_rect){ - RECT from_rect = {0,0,18,18}; +void cPict::drawPresetMissile(short num, rectangle to_rect){ + rectangle from_rect = {0,0,18,18}; std::shared_ptr from_gw = getSheet(SHEET_MISSILE); to_rect.right = to_rect.left + 18; to_rect.bottom = to_rect.top + 18; @@ -799,8 +799,8 @@ void cPict::drawPresetMissile(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawPresetTerMap(short num, RECT to_rect){ - RECT from_rect = {0,0,12,12}; +void cPict::drawPresetTerMap(short num, rectangle to_rect){ + rectangle from_rect = {0,0,12,12}; std::shared_ptr from_gw = getSheet(SHEET_TER_MAP); // TODO: Should probably fill black somewhere in here...? to_rect.right = to_rect.left + 24; @@ -809,8 +809,8 @@ void cPict::drawPresetTerMap(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawStatusIcon(short num, RECT to_rect){ - RECT from_rect = {0,0,12,12}; +void cPict::drawStatusIcon(short num, rectangle to_rect){ + rectangle from_rect = {0,0,12,12}; std::shared_ptr from_gw = getSheet(SHEET_STATUS); to_rect.right = to_rect.left + 12; to_rect.bottom = to_rect.top + 12; @@ -818,28 +818,28 @@ void cPict::drawStatusIcon(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawCustomTer(short num, RECT to_rect){ +void cPict::drawCustomTer(short num, rectangle to_rect){ printf("Drawing graphic %i as a custom terrain pic.\n",num); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawCustomTerAnim(short num, RECT to_rect){ +void cPict::drawCustomTerAnim(short num, rectangle to_rect){ printf("Drawing graphic %i as a custom animated terrain pic.\n",num); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; num += animFrame % 4; - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawCustomMonstSm(short num, RECT to_rect){ +void cPict::drawCustomMonstSm(short num, rectangle to_rect){ static const short adj[4] = {0, 2, 1, 3}; num += adj[animFrame % 4]; printf("Drawing graphic %i as a custom space pic.\n",num); @@ -847,21 +847,21 @@ void cPict::drawCustomMonstSm(short num, RECT to_rect){ to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawCustomMonstWide(short num, RECT to_rect){ +void cPict::drawCustomMonstWide(short num, rectangle to_rect){ static const short adj[4] = {0, 4, 2, 6}; num += adj[animFrame % 4]; - RECT small_monst_rect = {0,0,18,14}; + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); small_monst_rect.offset(to_rect.left,to_rect.top + 7); @@ -872,15 +872,15 @@ void cPict::drawCustomMonstWide(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawCustomMonstTall(short num, RECT to_rect){ +void cPict::drawCustomMonstTall(short num, rectangle to_rect){ static const short adj[4] = {0, 4, 2, 6}; num += adj[animFrame % 4]; - RECT small_monst_rect = {0,0,18,14}; + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); small_monst_rect.offset(to_rect.left + 7,to_rect.top); @@ -891,15 +891,15 @@ void cPict::drawCustomMonstTall(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawCustomMonstLg(short num, RECT to_rect){ +void cPict::drawCustomMonstLg(short num, rectangle to_rect){ static const short adj[4] = {0, 8, 4, 12}; num += adj[animFrame % 4]; - RECT small_monst_rect = {0,0,18,14}; + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); small_monst_rect.offset(to_rect.left,to_rect.top); @@ -918,8 +918,8 @@ void cPict::drawCustomMonstLg(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawCustomDlog(short num, RECT to_rect){ - RECT from_rect; +void cPict::drawCustomDlog(short num, rectangle to_rect){ + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); to_rect.right = to_rect.left + 18; @@ -935,7 +935,7 @@ void cPict::drawCustomDlog(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawCustomDlogLg(short num, RECT to_rect){ +void cPict::drawCustomDlogLg(short num, rectangle to_rect){ drawCustomDlog(num,to_rect); to_rect.offset(36,0); drawCustomDlog(num + 2,to_rect); @@ -945,8 +945,8 @@ void cPict::drawCustomDlogLg(short num, RECT to_rect){ drawCustomDlog(num + 6,to_rect); } -void cPict::drawCustomTalk(short num, RECT to_rect){ - RECT from_rect; +void cPict::drawCustomTalk(short num, rectangle to_rect){ + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); to_rect.right = to_rect.left + 16; @@ -962,20 +962,20 @@ void cPict::drawCustomTalk(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawCustomItem(short num, RECT to_rect){ +void cPict::drawCustomItem(short num, rectangle to_rect){ printf("Drawing graphic %i as a custom space pic.\n",num); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); fill_rect(*inWindow, to_rect, sf::Color::Black); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawCustomMissile(short num, RECT to_rect){ +void cPict::drawCustomMissile(short num, rectangle to_rect){ num += animFrame % 8; - RECT from_rect; + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); from_rect.right = from_rect.left + 18; @@ -986,8 +986,8 @@ void cPict::drawCustomMissile(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawCustomTerMap(short num, RECT to_rect){ - RECT from_rect; +void cPict::drawCustomTerMap(short num, rectangle to_rect){ + rectangle from_rect; sf::Texture* from_gw; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); from_rect.right = from_rect.left + 12; @@ -999,25 +999,25 @@ void cPict::drawCustomTerMap(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPartyMonstSm(short num, RECT to_rect){ +void cPict::drawPartyMonstSm(short num, rectangle to_rect){ printf("Drawing graphic %i as a custom space pic.\n",num); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; sf::Texture* from_gw; - RECT from_rect; + rectangle from_rect; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num, true); fill_rect(*inWindow, to_rect, sf::Color::Black); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawPartyMonstWide(short num, RECT to_rect){ - RECT small_monst_rect = {0,0,18,14}; +void cPict::drawPartyMonstWide(short num, rectangle to_rect){ + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); sf::Texture* from_gw; - RECT from_rect; + rectangle from_rect; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num, true); small_monst_rect.offset(to_rect.left,to_rect.top + 7); @@ -1028,13 +1028,13 @@ void cPict::drawPartyMonstWide(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawPartyMonstTall(short num, RECT to_rect){ - RECT small_monst_rect = {0,0,18,14}; +void cPict::drawPartyMonstTall(short num, rectangle to_rect){ + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); sf::Texture* from_gw; - RECT from_rect; + rectangle from_rect; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num, true); small_monst_rect.offset(to_rect.left + 7,to_rect.top); @@ -1045,13 +1045,13 @@ void cPict::drawPartyMonstTall(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawPartyMonstLg(short num, RECT to_rect){ - RECT small_monst_rect = {0,0,18,14}; +void cPict::drawPartyMonstLg(short num, rectangle to_rect){ + rectangle small_monst_rect = {0,0,18,14}; to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; fill_rect(*inWindow, to_rect, sf::Color::Black); sf::Texture* from_gw; - RECT from_rect; + rectangle from_rect; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num, true); small_monst_rect.offset(to_rect.left,to_rect.top); @@ -1070,33 +1070,33 @@ void cPict::drawPartyMonstLg(short num, RECT to_rect){ rect_draw_some_item(*from_gw, from_rect, *inWindow, small_monst_rect, sf::BlendAlpha); } -void cPict::drawPartyScen(short num, RECT to_rect){ +void cPict::drawPartyScen(short num, rectangle to_rect){ std::shared_ptr from_gw = getSheet(SHEET_HEADER); - RECT from_rect = {0,0,32,32}; + rectangle from_rect = {0,0,32,32}; from_rect.offset(32 * (num % 5),32 * (num / 5)); to_rect.right = to_rect.left + 32; to_rect.bottom = to_rect.top + 32; rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } -void cPict::drawPartyItem(short num, RECT to_rect){ +void cPict::drawPartyItem(short num, rectangle to_rect){ printf("Drawing graphic %i as a custom space pic.\n",num); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; sf::Texture* from_gw; - RECT from_rect; + rectangle from_rect; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num, true); fill_rect(*inWindow, to_rect, sf::Color::Black); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect, sf::BlendAlpha); } -void cPict::drawPartyPc(short num, RECT to_rect){ +void cPict::drawPartyPc(short num, rectangle to_rect){ printf("Drawing graphic %i as a custom space pic.\n",num); to_rect.right = to_rect.left + 28; to_rect.bottom = to_rect.top + 36; sf::Texture* from_gw; - RECT from_rect; + rectangle from_rect; graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num, true); fill_rect(*inWindow, to_rect, sf::Color::Black); @@ -1105,7 +1105,7 @@ void cPict::drawPartyPc(short num, RECT to_rect){ cPict::~cPict() {} -void cPict::drawAt(sf::RenderWindow& win, RECT dest, pic_num_t which_g, ePicType type_g, bool framed) { +void cPict::drawAt(sf::RenderWindow& win, rectangle dest, pic_num_t which_g, ePicType type_g, bool framed) { cPict pic(win); pic.frame = dest; pic.setPict(which_g, type_g); diff --git a/osx/dialogxml/pict.h b/osx/dialogxml/pict.h index bb8ab54b..69aecae5 100644 --- a/osx/dialogxml/pict.h +++ b/osx/dialogxml/pict.h @@ -155,7 +155,7 @@ public: /// @param which_g The icon to draw. /// @param type_g The type of icon to draw. /// @param framed Whether to draw a frame around the icon. - static void drawAt(sf::RenderWindow& win, RECT dest, pic_num_t which_g, ePicType type_g, bool framed); + static void drawAt(sf::RenderWindow& win, rectangle dest, pic_num_t which_g, ePicType type_g, bool framed); /// A convenience constant that can be passed as the pic number to setPict(pic_num_t num). /// It sets the icon to nothing, showing as just black. static const pic_num_t BLANK; @@ -167,45 +167,45 @@ private: pic_num_t picNum; ePicType picType; bool clickable, drawFramed; - void drawPresetTer(short num, RECT to_rect); - void drawPresetTerAnim(short num, RECT to_rect); - void drawPresetMonstSm(short num, RECT to_rect); - void drawPresetMonstWide(short num, RECT to_rect); - void drawPresetMonstTall(short num, RECT to_rect); - void drawPresetMonstLg(short num, RECT to_rect); - void drawPresetDlog(short num, RECT to_rect); - void drawPresetDlogLg(short num, RECT to_rect); - void drawPresetTalk(short num, RECT to_rect); - void drawPresetScen(short num, RECT to_rect); - void drawPresetScenLg(short num, RECT to_rect); - void drawPresetItem(short num, RECT to_rect); - void drawPresetPc(short num, RECT to_rect); - void drawPresetField(short num, RECT to_rect); - void drawPresetBoom(short num, RECT to_rect); - void drawPresetMissile(short num, RECT to_rect); - void drawPresetTerMap(short num, RECT to_rect); - void drawStatusIcon(short num, RECT to_rect); - void drawFullSheet(short num, RECT to_rect); - void drawCustomTer(short num, RECT to_rect); - void drawCustomTerAnim(short num, RECT to_rect); - void drawCustomMonstSm(short num, RECT to_rect); - void drawCustomMonstWide(short num, RECT to_rect); - void drawCustomMonstTall(short num, RECT to_rect); - void drawCustomMonstLg(short num, RECT to_rect); - void drawCustomDlog(short num, RECT to_rect); - void drawCustomDlogLg(short num, RECT to_rect); - void drawCustomTalk(short num, RECT to_rect); - void drawCustomItem(short num, RECT to_rect); - void drawCustomMissile(short num, RECT to_rect); - void drawCustomTerMap(short num, RECT to_rect); - void drawPartyMonstSm(short num, RECT to_rect); - void drawPartyMonstWide(short num, RECT to_rect); - void drawPartyMonstTall(short num, RECT to_rect); - void drawPartyMonstLg(short num, RECT to_rect); - void drawPartyScen(short num, RECT to_rect); - void drawPartyItem(short num, RECT to_rect); - void drawPartyPc(short num, RECT to_rect); - static std::map& drawPict(); + void drawPresetTer(short num, rectangle to_rect); + void drawPresetTerAnim(short num, rectangle to_rect); + void drawPresetMonstSm(short num, rectangle to_rect); + void drawPresetMonstWide(short num, rectangle to_rect); + void drawPresetMonstTall(short num, rectangle to_rect); + void drawPresetMonstLg(short num, rectangle to_rect); + void drawPresetDlog(short num, rectangle to_rect); + void drawPresetDlogLg(short num, rectangle to_rect); + void drawPresetTalk(short num, rectangle to_rect); + void drawPresetScen(short num, rectangle to_rect); + void drawPresetScenLg(short num, rectangle to_rect); + void drawPresetItem(short num, rectangle to_rect); + void drawPresetPc(short num, rectangle to_rect); + void drawPresetField(short num, rectangle to_rect); + void drawPresetBoom(short num, rectangle to_rect); + void drawPresetMissile(short num, rectangle to_rect); + void drawPresetTerMap(short num, rectangle to_rect); + void drawStatusIcon(short num, rectangle to_rect); + void drawFullSheet(short num, rectangle to_rect); + void drawCustomTer(short num, rectangle to_rect); + void drawCustomTerAnim(short num, rectangle to_rect); + void drawCustomMonstSm(short num, rectangle to_rect); + void drawCustomMonstWide(short num, rectangle to_rect); + void drawCustomMonstTall(short num, rectangle to_rect); + void drawCustomMonstLg(short num, rectangle to_rect); + void drawCustomDlog(short num, rectangle to_rect); + void drawCustomDlogLg(short num, rectangle to_rect); + void drawCustomTalk(short num, rectangle to_rect); + void drawCustomItem(short num, rectangle to_rect); + void drawCustomMissile(short num, rectangle to_rect); + void drawCustomTerMap(short num, rectangle to_rect); + void drawPartyMonstSm(short num, rectangle to_rect); + void drawPartyMonstWide(short num, rectangle to_rect); + void drawPartyMonstTall(short num, rectangle to_rect); + void drawPartyMonstLg(short num, rectangle to_rect); + void drawPartyScen(short num, rectangle to_rect); + void drawPartyItem(short num, rectangle to_rect); + void drawPartyPc(short num, rectangle to_rect); + static std::map& drawPict(); click_callback_t onClick; }; diff --git a/osx/dialogxml/scrollbar.cpp b/osx/dialogxml/scrollbar.cpp index d7206ca5..25683b9f 100644 --- a/osx/dialogxml/scrollbar.cpp +++ b/osx/dialogxml/scrollbar.cpp @@ -20,7 +20,7 @@ cScrollbar::cScrollbar(sf::RenderWindow& parent) : cControl(CTRL_SCROLL, parent) void cScrollbar::init() { scroll_gw.loadFromImage(*ResMgr::get("dlogscroll")); - RECT bar_rect = {0,48,16,64}; + rectangle bar_rect = {0,48,16,64}; bar_tessel[0] = prepareForTiling(scroll_gw, bar_rect); bar_rect.offset(0,16); bar_tessel[1] = prepareForTiling(scroll_gw, bar_rect); @@ -74,7 +74,7 @@ bool cScrollbar::handleClick(location where) { inWindow->setActive(); depressed = true; int bar_height = frame.height() - 32; - RECT thumbRect = frame; + rectangle thumbRect = frame; thumbRect.top += 16 + pos * (bar_height - 16) / max; thumbRect.height() = 16; if(where.y < frame.top + 16) @@ -154,10 +154,10 @@ sf::Color cScrollbar::getColour() throw(xUnsupportedProp) { void cScrollbar::draw() { if(!isVisible()) return; - static const RECT up_rect = {0,0,16,16}, down_rect = {0,16,16,32}, thumb_rect = {0,32,16,48}; + static const rectangle up_rect = {0,0,16,16}, down_rect = {0,16,16,32}, thumb_rect = {0,32,16,48}; int bar_height = frame.height() - 32; inWindow->setActive(); - RECT draw_rect = frame, from_rect = up_rect; + rectangle draw_rect = frame, from_rect = up_rect; draw_rect.height() = 16; if(depressed && pressedPart == PART_UP) from_rect.offset(0,16); diff --git a/osx/pcedit/pc.action.cpp b/osx/pcedit/pc.action.cpp index c1eb4f41..ff6a14ca 100644 --- a/osx/pcedit/pc.action.cpp +++ b/osx/pcedit/pc.action.cpp @@ -41,18 +41,18 @@ extern bool diff_depth_ok; short which_pc_displayed,store_pc_trait_mode,store_which_to_edit; extern short current_active_pc; char empty_string[256] = " "; -extern RECT pc_area_buttons[6][4] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later -extern RECT item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - -extern RECT pc_info_rect; -extern RECT name_rect; +extern rectangle pc_area_buttons[6][4] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later +extern rectangle item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - +extern rectangle pc_info_rect; +extern rectangle name_rect; -extern RECT pc_race_rect; -extern RECT edit_rect[5][2]; +extern rectangle pc_race_rect; +extern rectangle edit_rect[5][2]; -//extern RECT pc_area_buttons[6][6] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later -//extern RECT item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - +//extern rectangle pc_area_buttons[6][6] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later +//extern rectangle item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - //short mode; // ignore, bool handle_action(sf::Event event) { short i; @@ -112,7 +112,7 @@ bool handle_action(sf::Event event) { return to_return; } -void flash_rect(RECT /*to_flash*/) { +void flash_rect(rectangle /*to_flash*/) { // TODO: Think of a good way to do this //InvertRect (&to_flash); diff --git a/osx/pcedit/pc.action.h b/osx/pcedit/pc.action.h index d2c91afd..53293fd7 100644 --- a/osx/pcedit/pc.action.h +++ b/osx/pcedit/pc.action.h @@ -3,7 +3,7 @@ #include "dialog.h" bool handle_action(sf::Event event); -void flash_rect(RECT to_flash); +void flash_rect(rectangle to_flash); void edit_gold_or_food(short which_to_edit); void display_pc(short pc_num,short mode,cDialog* parent); void display_alchemy(bool allowEdit); diff --git a/osx/pcedit/pc.editors.cpp b/osx/pcedit/pc.editors.cpp index 29e307b4..91754906 100644 --- a/osx/pcedit/pc.editors.cpp +++ b/osx/pcedit/pc.editors.cpp @@ -42,7 +42,7 @@ extern short store_flags[3]; extern short current_active_pc; extern sf::RenderWindow mainPtr; -extern RECT d_rects[80]; +extern rectangle d_rects[80]; extern short d_rect_index[80]; extern bool diff_depth_ok,current_file_has_maps; diff --git a/osx/pcedit/pc.graphics.cpp b/osx/pcedit/pc.graphics.cpp index 14e1723a..a72b0217 100644 --- a/osx/pcedit/pc.graphics.cpp +++ b/osx/pcedit/pc.graphics.cpp @@ -31,22 +31,22 @@ sf::Texture title_gworld,pc_gworld,dlogpics_gworld; sf::Texture buttons_gworld,invenbtn_gworld,status_gworld; //GWorldPtr race_dark,train_dark,items_dark,spells_dark; //GWorldPtr race_light,train_light,items_light,spells_light; -RECT whole_win_rect = {0,0,440,590}; -RECT title_from = {0,0,70,380}; -extern RECT pc_area_buttons[6][4] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later -extern RECT item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - -extern RECT pc_info_rect; // Frame that holds a pc's basic info and items -extern RECT name_rect; -extern RECT pc_race_rect; -extern RECT info_area_rect; -extern RECT hp_sp_rect; -extern RECT skill_rect; -extern RECT pc_skills_rect[19]; -extern RECT status_rect; -extern RECT pc_status_rect[10]; -extern RECT traits_rect; -extern RECT pc_traits_rect[16]; -extern RECT edit_rect[5][2]; +rectangle whole_win_rect = {0,0,440,590}; +rectangle title_from = {0,0,70,380}; +extern rectangle pc_area_buttons[6][4] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later +extern rectangle item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - +extern rectangle pc_info_rect; // Frame that holds a pc's basic info and items +extern rectangle name_rect; +extern rectangle pc_race_rect; +extern rectangle info_area_rect; +extern rectangle hp_sp_rect; +extern rectangle skill_rect; +extern rectangle pc_skills_rect[19]; +extern rectangle status_rect; +extern rectangle pc_status_rect[10]; +extern rectangle traits_rect; +extern rectangle pc_traits_rect[16]; +extern rectangle edit_rect[5][2]; short store_str1a; short store_str1b; @@ -54,8 +54,8 @@ short store_str2a; short store_str2b; short store_which_string_dlog; short store_page_on,store_num_i; -// TODO: The duplication of RECT here shouldn't be necessary... -RECT ed_buttons_from[2] = {RECT{0,0,57,57},RECT{0,57,57,114}}; +// TODO: The duplication of rectangle here shouldn't be necessary... +rectangle ed_buttons_from[2] = {rectangle{0,0,57,57},rectangle{0,57,57,114}}; short current_pressed_button = -1; sf::Texture spec_scen_g; // not actually needed; just here to silence compiler because it's reference in fileio.h // (actually, it WILL be needed eventually; the same is true about most of the rest of these.) @@ -68,7 +68,7 @@ void init_main_buttons() { short i; int indent = 0, indent2 = 0; - RECT base_rect; + rectangle base_rect; //whole_win_rect = mainPtr->portRect; //Initialize pc_info_rect in center @@ -244,7 +244,7 @@ void redraw_screen() { mainPtr.display(); } -static void frame_dlog_rect(sf::RenderWindow& target, RECT rect) { +static void frame_dlog_rect(sf::RenderWindow& target, rectangle rect) { cTextMsg text(target); text.setFormat(TXT_FRAME, true); text.setFormat(TXT_FRAMESTYLE, 1); @@ -253,12 +253,12 @@ static void frame_dlog_rect(sf::RenderWindow& target, RECT rect) { } void draw_main_screen() { - RECT source_rect, dest_rec,dest_rect; - RECT reg_rect; + rectangle source_rect, dest_rec,dest_rect; + rectangle reg_rect; tileImage(mainPtr,whole_win_rect,bg[12]); // fill whole window with background texture dest_rec = source_rect = title_from; // initializes, to draw title - // title_from is a RECT constant + // title_from is a rectangle constant dest_rec.offset(20,0); rect_draw_some_item(title_gworld,source_rect,mainPtr,dest_rec,sf::BlendAlpha); @@ -329,13 +329,13 @@ void do_button_action(short /*which_pc*/,short which_button) { redraw_screen(); } -//extern RECT pc_area_buttons[6][6] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later -//extern RECT item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - +//extern rectangle pc_area_buttons[6][6] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later +//extern rectangle item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - //short clear_first; // 0 - redraw over, 1 - don't redraw over void draw_items() { short i; char to_draw[256]; - RECT d_from = {12,28,24,42},i_from = {12,42,24,56},dest_rect; + rectangle d_from = {12,28,24,42},i_from = {12,42,24,56},dest_rect; if(file_in_mem.empty()) // save file loaded return; @@ -394,7 +394,7 @@ void draw_items() { void display_party() { short i,k,string_num, cur_rect=0; char to_draw[256], skill_value[256]; - RECT from_base = {0,0,36,28},from_rect,no_party_rect,temp_rect; + rectangle from_base = {0,0,36,28},from_rect,no_party_rect,temp_rect; TextStyle style; style.lineHeight = 10; @@ -779,19 +779,19 @@ void display_party() { style.colour = sf::Color::Black; // TODO: Maybe find a better place to print this - RECT dest_rect = title_from; + rectangle dest_rect = title_from; dest_rect.offset(100,60); sprintf(to_draw, " Gold: %d Food: %d ",(short) univ.party.gold, (short) univ.party.food); win_draw_string(mainPtr,dest_rect,to_draw,eTextMode::WRAP,style); } } -//void rect_draw_some_item (GWorldPtr src_gworld, RECT src_rect, GWorldPtr targ_gworld,RECT targ_rect, +//void rect_draw_some_item (GWorldPtr src_gworld, rectangle src_rect, GWorldPtr targ_gworld,rectangle targ_rect, //char masked,short main_win) ////char masked; // if 10 - make AddOver ////short main_win; // if 2, drawing onto dialog //{ -// RECT destrec; +// rectangle destrec; // PixMapHandle test1, test2; // const BitMap *store_dest; // GrafPtr cur_port; @@ -859,7 +859,7 @@ void display_party() { // return total_width; //} -//void char_win_draw_string(GrafPtr dest_window,RECT dest_rect,char *str,short mode,short line_height) +//void char_win_draw_string(GrafPtr dest_window,rectangle dest_rect,char *str,short mode,short line_height) //{ // char store_s[256]; // strcpy((char *) store_s,str); @@ -869,7 +869,7 @@ void display_party() { //// mode: 0 - align up and left, 1 - center on one line //// str is a c string, 256 characters //// uses current font -//void win_draw_string(GrafPtr dest_window,RECT dest_rect,Str255 str,short mode,short line_height) +//void win_draw_string(GrafPtr dest_window,rectangle dest_rect,Str255 str,short mode,short line_height) //{ // GrafPtr old_port; // const char* p_str,str_to_draw,str_to_draw2,c_str; diff --git a/osx/pcedit/pc.main.cpp b/osx/pcedit/pc.main.cpp index bbb34703..93a37d8c 100644 --- a/osx/pcedit/pc.main.cpp +++ b/osx/pcedit/pc.main.cpp @@ -19,20 +19,20 @@ cUniverse univ; -RECT pc_area_buttons[6][4] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later -RECT item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - -RECT pc_info_rect; // Frame that holds a pc's basic info and items -RECT name_rect; //Holds pc name inside pc_info_rect -RECT info_area_rect; -RECT hp_sp_rect; // Holds hit points and spells points for pc -RECT skill_rect; // Holds "Skills:" string -RECT pc_skills_rect[19]; //Holds current pc's skill levels -RECT status_rect; //Holds the string "Status:" -RECT pc_status_rect[10]; //Holds first 8 effects on pc -RECT traits_rect; //Holds the string "Traits:" -RECT pc_traits_rect[16]; //Holds pc traits -RECT pc_race_rect; //Holds current pc's race -RECT edit_rect[5][2]; //Buttons that bring up pc edit dialog boxs +rectangle pc_area_buttons[6][4] ; // 0 - whole 1 - pic 2 - name 3 - stat strs 4,5 - later +rectangle item_string_rects[24][4]; // 0 - name 1 - drop 2 - id 3 - +rectangle pc_info_rect; // Frame that holds a pc's basic info and items +rectangle name_rect; //Holds pc name inside pc_info_rect +rectangle info_area_rect; +rectangle hp_sp_rect; // Holds hit points and spells points for pc +rectangle skill_rect; // Holds "Skills:" string +rectangle pc_skills_rect[19]; //Holds current pc's skill levels +rectangle status_rect; //Holds the string "Status:" +rectangle pc_status_rect[10]; //Holds first 8 effects on pc +rectangle traits_rect; //Holds the string "Traits:" +rectangle pc_traits_rect[16]; //Holds pc traits +rectangle pc_race_rect; //Holds current pc's race +rectangle edit_rect[5][2]; //Buttons that bring up pc edit dialog boxs short current_active_pc = 0; //short dialog_answer; @@ -479,7 +479,7 @@ bool verify_restore_quit(bool mode) { // char chr,chr2; // short the_type,wind_hit,item_hit; // Handle the_handle = NULL; -// RECT the_rect,button_rect; +// rectangle the_rect,button_rect; // location the_point; // CWindowPtr w; // RgnHandle updateRgn; diff --git a/osx/scenedit/scen.actions.cpp b/osx/scenedit/scen.actions.cpp index 89638594..6b06df3e 100644 --- a/osx/scenedit/scen.actions.cpp +++ b/osx/scenedit/scen.actions.cpp @@ -23,9 +23,9 @@ #include "scen.btnmg.h" extern char current_string[256]; -RECT world_screen; +rectangle world_screen; // border rects order: top, left, bottom, right // -RECT border_rect[4]; +rectangle border_rect[4]; short current_block_edited = 0; short current_terrain_type = 0; short safety = 0; @@ -56,7 +56,7 @@ cTown::cItem store_place_item = {loc(),-1,0,0,0,0,0}; short flood_count = 0; -RECT terrain_rects[256],terrain_rect_base = {0,0,16,16},command_rects[21]; +rectangle terrain_rects[256],terrain_rect_base = {0,0,16,16},command_rects[21]; extern short cen_x, cen_y, cur_town; @@ -78,12 +78,12 @@ bool small_any_drawn = false; //extern cSpeech talking; extern bool change_made; -RECT left_buttons[NLS][2]; // 0 - whole, 1 - blue button +rectangle left_buttons[NLS][2]; // 0 - whole, 1 - blue button short left_button_status[NLS]; // 0 - clear, 1 - text, 2 - title text, +10 - button short right_button_status[NRS]; -RECT right_buttons[NRSONPAGE]; -RECT palette_buttons_from[71]; -RECT palette_buttons[10][6]; +rectangle right_buttons[NRSONPAGE]; +rectangle palette_buttons_from[71]; +rectangle palette_buttons[10][6]; short current_rs_top = 0; short out_buttons[6][10] = { @@ -120,7 +120,7 @@ bool monst_on_space(location loc,short m_num); void init_current_terrain() { // short i,j; // location d_loc(0,0); -// RECT d_rect = {0,0,0,0}; +// rectangle d_rect = {0,0,0,0}; // cTown::cWandering d_wan = {0,0,0,0}; // cTown::cCreature dummy_creature = {0,0,loc(),0,0,0,0,0,0,0}; // //city_ter_rect_type dummy_ter_rect = {{0,0,0,0},0,0}; @@ -154,7 +154,7 @@ bool handle_action(location the_point,sf::Event /*event*/) { location cur_point,cur_point2; short right_top,right_hit; eScenMode old_mode; - RECT temp_rect; + rectangle temp_rect; //printf("Handling click at {v = %i,h = %i}\n",the_point.v,the_point.h); //GlobalToLocal(&the_point); if(kb::isKeyPressed(kb::LAlt) || kb::isKeyPressed(kb::RAlt)) @@ -1270,7 +1270,7 @@ bool handle_action(location the_point,sf::Event /*event*/) { } -void flash_rect(RECT /*to_flash*/) { +void flash_rect(rectangle /*to_flash*/) { // TODO: Determine a good way to do this // InvertRect (&to_flash); play_sound(37); diff --git a/osx/scenedit/scen.actions.h b/osx/scenedit/scen.actions.h index 194c82b4..d35dc7de 100644 --- a/osx/scenedit/scen.actions.h +++ b/osx/scenedit/scen.actions.h @@ -1,7 +1,7 @@ void init_current_terrain(); void init_screen_locs(); bool handle_action(location the_point,sf::Event event); -void flash_rect(RECT to_flash); +void flash_rect(rectangle to_flash); void swap_terrain(); void set_new_terrain(ter_num_t selected_terrain); void handle_keystroke(char chr,char chr2,sf::Event event); diff --git a/osx/scenedit/scen.btnmg.cpp b/osx/scenedit/scen.btnmg.cpp index 0e637916..34252d97 100644 --- a/osx/scenedit/scen.btnmg.cpp +++ b/osx/scenedit/scen.btnmg.cpp @@ -11,14 +11,14 @@ #include "scrollbar.h" //extern piles_of_stuff_dumping_type *data_store; -extern RECT right_sbar_rect; +extern rectangle right_sbar_rect; -RECT left_button[NLS]; -extern RECT right_buttons[NRSONPAGE]; -RECT right_scrollbar_rect; -RECT right_area_rect; +rectangle left_button[NLS]; +extern rectangle right_buttons[NRSONPAGE]; +rectangle right_scrollbar_rect; +rectangle right_area_rect; extern short current_rs_top; char strings_ls[NLS][40]; char strings_rs[NRS][40]; diff --git a/osx/scenedit/scen.global.h b/osx/scenedit/scen.global.h index 65cc8816..506a8d08 100644 --- a/osx/scenedit/scen.global.h +++ b/osx/scenedit/scen.global.h @@ -113,7 +113,7 @@ enum eDrawMode { // location sign_locs[8]; // out_wandering_type wandering[4],special_enc[4]; // location wandering_locs[4]; -// RECT info_rect[8]; +// rectangle info_rect[8]; // unsigned char strlens[180]; // cSpecial specials[60]; // } outdoor_record_type; @@ -154,7 +154,7 @@ enum eDrawMode { // location start_locs[4]; // location exit_locs[4]; // short exit_specs[4]; -// RECT in_town_rect; +// rectangle in_town_rect; // preset_item_type preset_items[64]; // short max_num_monst; // preset_field_type preset_fields[50]; @@ -169,21 +169,21 @@ enum eDrawMode { // //typedef struct { // unsigned char terrain[64][64]; -// RECT room_rect[16]; +// rectangle room_rect[16]; // creature_start_type creatures[60]; // unsigned char lighting[8][64]; // } big_tr_type; // //typedef struct { // unsigned char terrain[48][48]; -// RECT room_rect[16]; +// rectangle room_rect[16]; // creature_start_type creatures[40]; // unsigned char lighting[6][48]; // } ave_tr_type; // //typedef struct { // unsigned char terrain[32][32]; -// RECT room_rect[16]; +// rectangle room_rect[16]; // creature_start_type creatures[30]; // unsigned char lighting[4][32]; // } tiny_tr_type; @@ -197,7 +197,7 @@ enum eDrawMode { // } city_block_type; // //typedef struct { -// RECT what_rect; +// rectangle what_rect; // unsigned char ter_type; // unsigned char hollow; // } city_ter_rect_type; diff --git a/osx/scenedit/scen.graphics.cpp b/osx/scenedit/scen.graphics.cpp index de2573e0..1b624670 100644 --- a/osx/scenedit/scen.graphics.cpp +++ b/osx/scenedit/scen.graphics.cpp @@ -46,12 +46,12 @@ extern bool editing_town; //extern short max_dim[3]; //extern piles_of_stuff_dumping_type *data_store; extern cScenario scenario; -extern RECT world_screen; +extern rectangle world_screen; extern sf::Texture bg_gworld; -extern RECT left_button[NLS]; -extern RECT right_buttons[NRSONPAGE]; -extern RECT right_scrollbar_rect; -extern RECT right_area_rect; +extern rectangle left_button[NLS]; +extern rectangle right_buttons[NRSONPAGE]; +extern rectangle right_scrollbar_rect; +extern rectangle right_area_rect; extern ter_num_t borders[4][50]; extern std::shared_ptr right_sbar; @@ -89,22 +89,22 @@ sf::Texture pc_gworld; extern tessel_ref_t map_pat[]; // begin new stuff -RECT blue_button_from = {120,91,134,107}; -RECT start_button_from = {120,70,127,91}; -RECT base_small_button_from = {120,0,127,7}; -extern RECT palette_buttons[10][6]; -extern RECT palette_buttons_from[71]; +rectangle blue_button_from = {120,91,134,107}; +rectangle start_button_from = {120,70,127,91}; +rectangle base_small_button_from = {120,0,127,7}; +extern rectangle palette_buttons[10][6]; +extern rectangle palette_buttons_from[71]; extern short town_buttons[6][10], out_buttons[6][10]; extern bool good_palette_buttons[2][6][10]; -RECT palette_button_base = {0,0,18,25}; -RECT terrain_buttons_rect = {0,0,410,294}; -extern RECT left_buttons[NLS][2]; // 0 - whole, 1 - blue button -RECT left_button_base = {5,5,21,200}; -RECT right_button_base = {RIGHT_AREA_UL_Y,RIGHT_AREA_UL_X,17,RIGHT_AREA_UL_Y}; -RECT terrain_rect = {0,0,340,272}; +rectangle palette_button_base = {0,0,18,25}; +rectangle terrain_buttons_rect = {0,0,410,294}; +extern rectangle left_buttons[NLS][2]; // 0 - whole, 1 - blue button +rectangle left_button_base = {5,5,21,200}; +rectangle right_button_base = {RIGHT_AREA_UL_Y,RIGHT_AREA_UL_X,17,RIGHT_AREA_UL_Y}; +rectangle terrain_rect = {0,0,340,272}; char current_string[256] = ""; char current_string2[256] = ""; -extern RECT terrain_rects[256]; +extern rectangle terrain_rects[256]; extern char strings_ls[NLS][40]; extern char strings_rs[NRS][40]; @@ -320,7 +320,7 @@ void Set_up_win () { } void run_startup_g() { - RECT pict_rect = {0,0,480,640}, dest_rect; + rectangle pict_rect = {0,0,480,640}, dest_rect; sf::Texture pict_to_draw; dest_rect = pict_rect; @@ -386,7 +386,7 @@ void load_main_screen() { } void redraw_screen() { - RECT windRect(mainPtr); + rectangle windRect(mainPtr); tileImage(mainPtr,windRect,bg[20]); draw_main_screen(); if(overall_mode < MODE_MAIN_SCREEN); @@ -395,7 +395,7 @@ void redraw_screen() { } void draw_main_screen() { - RECT draw_rect; + rectangle draw_rect; // draw left buttons (always active) @@ -432,7 +432,7 @@ void draw_main_screen() { } void draw_lb() { - RECT temp_rect(mainPtr); + rectangle temp_rect(mainPtr); short i; temp_rect.right = RIGHT_AREA_UL_X - 2; @@ -443,7 +443,7 @@ void draw_lb() { // mode 0 normal 1 click void draw_lb_slot (short which,short mode) { - RECT text_rect,from_rect; + rectangle text_rect,from_rect; tileImage(mainPtr,left_buttons[which][0],bg[20]); if(left_button_status[which] == 0) @@ -479,7 +479,7 @@ void draw_rb() { // mode 0 normal 1 pressed void draw_rb_slot (short which,short mode) { - RECT text_rect; + rectangle text_rect; short pos; pos = right_sbar->getPosition(); @@ -500,10 +500,10 @@ void draw_rb_slot (short which,short mode) { void set_up_terrain_buttons() { short i,j,pic,small_i; - RECT ter_from,ter_from_base = {0,0,36,28}; - RECT tiny_from,tiny_to; + rectangle ter_from,ter_from_base = {0,0,36,28}; + rectangle tiny_from,tiny_to; - RECT palette_from,palette_to = palette_button_base; + rectangle palette_from,palette_to = palette_button_base; tileImage(terrain_buttons_gworld,terrain_buttons_rect,bg[17]); frame_rect(terrain_buttons_gworld, terrain_buttons_rect, sf::Color::Black); @@ -601,10 +601,10 @@ void set_up_terrain_buttons() { void draw_terrain(){ short q,r,x,i,small_i; location which_pt,where_draw; - RECT draw_rect,clipping_rect = {8,8,332,260}; + rectangle draw_rect,clipping_rect = {8,8,332,260}; unsigned char t_to_draw; - RECT source_rect,tiny_to,tiny_to_base = {37,29,44,36},tiny_from,from_rect,to_rect; - RECT boat_rect = {0,0,36,28}; + rectangle source_rect,tiny_to,tiny_to_base = {37,29,44,36},tiny_from,from_rect,to_rect; + rectangle boat_rect = {0,0,36,28}; if(overall_mode >= MODE_MAIN_SCREEN) return; @@ -838,7 +838,7 @@ void draw_terrain(){ void draw_monsts() { short i,k,width,height,m_start_pic; sf::Texture* from_gworld; - RECT source_rect; + rectangle source_rect; location where_draw,store_loc; for(i = 0; i < town->max_monst(); i++) @@ -873,9 +873,9 @@ void draw_monsts() { // Returns rect for drawing an item, if num < 25, rect is in big item template, // otherwise in small item template -// TODO: I have another function that does the same thing but also returns the texture containing the item along with the RECT -RECT get_item_template_rect (short type_wanted) { - RECT store_rect; +// TODO: I have another function that does the same thing but also returns the texture containing the item along with the rectangle +rectangle get_item_template_rect (short type_wanted) { + rectangle store_rect; if(type_wanted < 45) { store_rect.top = (type_wanted / 5) * BITMAP_HEIGHT; @@ -895,7 +895,7 @@ RECT get_item_template_rect (short type_wanted) { void draw_items() { short i; - RECT source_rect,dest_rect; + rectangle source_rect,dest_rect; location where_draw; short pic_num; @@ -947,7 +947,7 @@ void redraw_selected_ter() { void draw_one_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { location where_draw; - RECT source_rect; + rectangle source_rect; short picture_wanted; sf::Texture* source_gworld; @@ -983,7 +983,7 @@ void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { location where_draw; // TODO: Update for new 12x12 map graphics, rather than 4x4 - RECT dest_rect = {0,0,4,4},from_rect = {0,0,4,4}; + rectangle dest_rect = {0,0,4,4},from_rect = {0,0,4,4}; short picture_wanted; sf::Texture* source_gworld; @@ -1041,8 +1041,8 @@ void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { /* Draw a bitmap in the world window. hor in 0 .. 8, vert in 0 .. 8, object is ptr. to bitmap to be drawn, and masking is for Copybits. */ // TODO: Wait, why is targ_gworld unused? -void Draw_Some_Item(sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& /*targ_gworld*/,location target,sf::BlendMode mode) { - RECT destrec; +void Draw_Some_Item(sf::Texture& src_gworld,rectangle src_rect,sf::RenderTarget& /*targ_gworld*/,location target,sf::BlendMode mode) { + rectangle destrec; if((target.x < 0) || (target.x > 8) || (target.y < 0) || (target.y > 8)) return; @@ -1057,10 +1057,10 @@ void Draw_Some_Item(sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& /*ta rect_draw_some_item(src_gworld,src_rect,ter_draw_gworld,destrec,mode); } -/* Input terrain currently trying to draw. Get back RECT in terrain template containing - desired pixmap, or RECT to darkness if desired map not present */ -RECT get_template_rect (unsigned short type_wanted) { - RECT store_rect; +/* Input terrain currently trying to draw. Get back rectangle in terrain template containing + desired pixmap, or rectangle to darkness if desired map not present */ +rectangle get_template_rect (unsigned short type_wanted) { + rectangle store_rect; short picture_wanted; picture_wanted = scenario.ter_types[type_wanted].picture; @@ -1078,7 +1078,7 @@ RECT get_template_rect (unsigned short type_wanted) { void draw_frames() { char q,r,i; location which_pt; - RECT draw_rect; + rectangle draw_rect; for(q = 0; q < 9; q++) { for(r = 0; r < 9; r++) { @@ -1109,8 +1109,8 @@ void draw_frames() { void place_location() { char draw_str[256]; - RECT draw_rect,source_rect,erase_rect; - RECT text_rect = {0,0,12,100}; + rectangle draw_rect,source_rect,erase_rect; + rectangle text_rect = {0,0,12,100}; short picture_wanted; /* @@ -1194,10 +1194,10 @@ void place_location() { terrain_buttons_gworld,draw_rect); } short small_i = get_small_icon(current_terrain_type); - RECT tiny_to = draw_rect; + rectangle tiny_to = draw_rect; tiny_to.top = tiny_to.bottom - 7; tiny_to.left = tiny_to.right - 7; - RECT tiny_from = base_small_button_from; + rectangle tiny_from = base_small_button_from; tiny_from.offset(7 * (small_i % 10),7 * (small_i / 10)); if(small_i > 0 && small_i < 255) rect_draw_some_item(editor_mixed,tiny_from,terrain_buttons_gworld,tiny_to); @@ -1212,7 +1212,7 @@ void place_location() { // klugde for speed ...exactly like place location above, but just writes location void place_just_location() { char draw_str[256]; - RECT from_rect,draw_rect,erase_rect; + rectangle from_rect,draw_rect,erase_rect; erase_rect.left = terrain_rects[255].left + 17; erase_rect.right = RIGHT_AREA_WIDTH - 1; @@ -1253,7 +1253,7 @@ void set_string(const char *string,const char *string2) { /* void draw_cur_string() { - RECT from_rect,draw_rect; + rectangle from_rect,draw_rect; from_rect = terrain_buttons_rect; from_rect.top = from_rect.bottom - 40; diff --git a/osx/scenedit/scen.graphics.h b/osx/scenedit/scen.graphics.h index 19eeabda..52ea08ac 100644 --- a/osx/scenedit/scen.graphics.h +++ b/osx/scenedit/scen.graphics.h @@ -11,14 +11,14 @@ void draw_rb_slot (short which,short mode) ; void set_up_terrain_buttons(); void draw_terrain(); void draw_monsts(); -RECT get_item_template_rect (short type_wanted); +rectangle get_item_template_rect (short type_wanted); void draw_items(); void force_tiny_redraw(); void redraw_selected_ter(); void draw_one_terrain_spot (short i,short j,ter_num_t terrain_to_draw); void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw); -void Draw_Some_Item(sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& targ_gworld,location target,sf::BlendMode mode = sf::BlendNone); -RECT get_template_rect (unsigned short type_wanted); +void Draw_Some_Item(sf::Texture& src_gworld,rectangle src_rect,sf::RenderTarget& targ_gworld,location target,sf::BlendMode mode = sf::BlendNone); +rectangle get_template_rect (unsigned short type_wanted); void draw_frames(); void place_location(); void place_just_location(); @@ -55,6 +55,6 @@ bool container_there(location l); bool is_spot(short i,short j); //void get_str(const char* str,short i, short j); short string_length(char *str); -RECT get_custom_rect (short which_rect); +rectangle get_custom_rect (short which_rect); void init_dialogs(); void record_display_strings(); diff --git a/osx/scenedit/scen.main.cpp b/osx/scenedit/scen.main.cpp index bb1148ce..be102df1 100644 --- a/osx/scenedit/scen.main.cpp +++ b/osx/scenedit/scen.main.cpp @@ -70,7 +70,7 @@ void ding(); cScenario scenario; //piles_of_stuff_dumping_type *data_store; -RECT right_sbar_rect; +rectangle right_sbar_rect; // // Main body of program Exileedit @@ -160,7 +160,7 @@ void Initialize(void) { // The window is full screen size, made smaller to make it more visible. // sf::VideoMode mode = sf::VideoMode::getDesktopMode(); - RECT windRect; + rectangle windRect; windRect.width() = mode.width; windRect.height() = mode.height; diff --git a/osx/tools/graphtool.cpp b/osx/tools/graphtool.cpp index b8343f79..fbadb06e 100644 --- a/osx/tools/graphtool.cpp +++ b/osx/tools/graphtool.cpp @@ -25,9 +25,9 @@ using boost::math::constants::pi; -RECT bg_rects[21]; -RECT map_pat_rects[30]; -RECT bw_rects[6]; +rectangle bg_rects[21]; +rectangle map_pat_rects[30]; +rectangle bw_rects[6]; tessel_ref_t bg[21]; tessel_ref_t map_pat[30]; tessel_ref_t bw_pats[6]; @@ -91,7 +91,7 @@ void init_graph_tool(){ bg_rects[pat_i[i]] = {0,0,64,64}; bg_rects[pat_i[i]].offset(64 * pat_offs[i].x,64 * pat_offs[i].y); } - RECT tmp_rect = bg_rects[19]; + rectangle tmp_rect = bg_rects[19]; tmp_rect.offset(0, 64); bg_rects[0] = bg_rects[1] = bg_rects[18] = map_pat_rects[7] = tmp_rect; bg_rects[0].right -= 32; @@ -131,17 +131,17 @@ void init_graph_tool(){ register_main_patterns(); } -static void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& targ_gworld,RECT targ_rect,sf::RenderStates mode); +static void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,sf::RenderTarget& targ_gworld,rectangle targ_rect,sf::RenderStates mode); -void rect_draw_some_item(sf::RenderTarget& targ_gworld,RECT targ_rect) { +void rect_draw_some_item(sf::RenderTarget& targ_gworld,rectangle targ_rect) { fill_rect(targ_gworld, targ_rect, sf::Color::Black); } -void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& targ_gworld,RECT targ_rect,sf::BlendMode mode){ +void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,sf::RenderTarget& targ_gworld,rectangle targ_rect,sf::BlendMode mode){ rect_draw_some_item(src_gworld, src_rect, targ_gworld, targ_rect, sf::RenderStates(mode)); } -void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& targ_gworld,RECT targ_rect,sf::RenderStates mode) { +void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,sf::RenderTarget& targ_gworld,rectangle targ_rect,sf::RenderStates mode) { setActiveRenderTarget(targ_gworld); sf::Sprite tile(src_gworld, src_rect); tile.setPosition(targ_rect.left, targ_rect.top); @@ -152,15 +152,15 @@ void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,sf::RenderT targ_gworld.draw(tile, mode); } -void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,RECT targ_rect,location offset, sf::BlendMode mode) { +void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,rectangle targ_rect,location offset, sf::BlendMode mode) { targ_rect.offset(offset); rect_draw_some_item(src_gworld,src_rect,mainPtr,targ_rect,mode); } -void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,const sf::Texture& mask_gworld,RECT mask_rect,sf::RenderTarget& targ_gworld,RECT targ_rect) { +void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,const sf::Texture& mask_gworld,rectangle mask_rect,sf::RenderTarget& targ_gworld,rectangle targ_rect) { sf::RenderTexture src; src.create(src_rect.width(), src_rect.height()); - RECT dest_rect = src_rect; + rectangle dest_rect = src_rect; dest_rect.offset(-dest_rect.left,-dest_rect.top); rect_draw_some_item(src_gworld, src_rect, src, dest_rect); src.display(); @@ -208,13 +208,13 @@ struct text_params_t { std::vector hilite_ranges; sf::Color hilite_fg, hilite_bg = sf::Color::Transparent; enum {RECTS, SNIPPETS} returnType; - std::vector returnRects; + std::vector returnRects; std::vector snippets; }; -void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,text_params_t& options); +void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,text_params_t& options); -void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,eTextMode mode,TextStyle style, location offset) { +void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,eTextMode mode,TextStyle style, location offset) { text_params_t params; params.mode = mode; params.style = style; @@ -222,7 +222,7 @@ void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string st win_draw_string(dest_window, dest_rect, str, params); } -std::vector draw_string_hilite(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr) { +std::vector draw_string_hilite(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr) { text_params_t params; params.mode = eTextMode::WRAP; params.hilite_ranges = hilites; @@ -233,7 +233,7 @@ std::vector draw_string_hilite(sf::RenderTarget& dest_window,RECT dest_rec return params.returnRects; } -std::vector draw_string_sel(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr) { +std::vector draw_string_sel(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr) { text_params_t params; params.mode = eTextMode::WRAP; params.showBreaks = true; @@ -284,7 +284,7 @@ static void push_snippets(size_t start, size_t end, text_params_t& options, size } while(start < upper_bound); } -void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,text_params_t& options) { +void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,text_params_t& options) { if(str.empty()) return; // Nothing to do! short line_height = options.style.lineHeight; sf::Text str_to_draw; @@ -366,7 +366,7 @@ void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string st str_to_draw.setString(snippet.text); str_to_draw.setPosition(snippet.at); if(snippet.hilited) { - RECT bounds = str_to_draw.getGlobalBounds(); + rectangle bounds = str_to_draw.getGlobalBounds(); // Adjust so that drawing the same text to // the same rect is positioned exactly right bounds.left = snippet.at.x - 1; @@ -395,10 +395,10 @@ short string_length(std::string str, TextStyle style){ void draw_terrain(){ short q,r,x,y,i,small_i; location which_pt,where_draw; - RECT draw_rect,clipping_rect = {8,8,332,260}; + rectangle draw_rect,clipping_rect = {8,8,332,260}; unsigned char t_to_draw; - RECT source_rect,tiny_to,tiny_to_base = {37,29,44,36},tiny_from,from_rect,to_rect; - RECT boat_rect[4] = {{0,0,36,28}, {0,28,36,56},{0,56,36,84},{0,84,36,112}}; + rectangle source_rect,tiny_to,tiny_to_base = {37,29,44,36},tiny_from,from_rect,to_rect; + rectangle boat_rect[4] = {{0,0,36,28}, {0,28,36,56},{0,56,36,84},{0,84,36,112}}; if(overall_mode >= 60) return; @@ -646,8 +646,8 @@ void draw_terrain(){ rect_draw_some_item(ter_draw_gworld,terrain_rect,ter_draw_gworld,world_screen,0,1); }*/ -RECT calc_rect(short i, short j){ - RECT base_rect = {0,0,36,28}; +rectangle calc_rect(short i, short j){ + rectangle base_rect = {0,0,36,28}; base_rect.offset(i * 28, j * 36); return base_rect; @@ -657,7 +657,7 @@ graf_pos cCustomGraphics::find_graphic(pic_num_t which_rect, bool party) { short sheet = which_rect / 100; if(is_old) sheet = 0; else which_rect %= 100; - RECT store_rect = {0,0,36,28}; + rectangle store_rect = {0,0,36,28}; store_rect.offset(28 * (which_rect % 10),36 * (which_rect / 10)); return std::make_pair(party ? this->party : &sheets[sheet],store_rect); @@ -666,12 +666,12 @@ graf_pos cCustomGraphics::find_graphic(pic_num_t which_rect, bool party) { size_t cCustomGraphics::count() { if(sheets == NULL) return 0; else if(is_old) { - RECT bounds(sheets[0]); + rectangle bounds(sheets[0]); if(bounds.width() < 280) return bounds.width() / 28; return bounds.height() / 36; } else { size_t count = 100 * (numSheets - 1); - RECT bounds(sheets[numSheets - 1]); + rectangle bounds(sheets[numSheets - 1]); if(bounds.width() < 280) count += bounds.width() / 28; else count += bounds.height() / 36; return count; @@ -1003,56 +1003,56 @@ static void frame_shape(sf::RenderTarget& target, sf::Shape& shape, int x, int y target.draw(shape); } -void fill_rect(sf::RenderTarget& target, RECT rect, sf::Color colour) { +void fill_rect(sf::RenderTarget& target, rectangle rect, sf::Color colour) { sf::RectangleShape fill(sf::Vector2f(rect.width(), rect.height())); fill_shape(target, fill, rect.left, rect.top, colour); } -void frame_rect(sf::RenderTarget& target, RECT rect, sf::Color colour) { +void frame_rect(sf::RenderTarget& target, rectangle rect, sf::Color colour) { sf::RectangleShape frame(sf::Vector2f(rect.width(), rect.height())); frame_shape(target, frame, rect.left, rect.top, colour); } -void fill_roundrect(sf::RenderTarget& target, RECT rect, int rad, sf::Color colour) { +void fill_roundrect(sf::RenderTarget& target, rectangle rect, int rad, sf::Color colour) { RoundRect fill(sf::Vector2f(rect.width(), rect.height()), rad); fill_shape(target, fill, rect.left, rect.top, colour); } -void frame_roundrect(sf::RenderTarget& target, RECT rect, int rad, sf::Color colour) { +void frame_roundrect(sf::RenderTarget& target, rectangle rect, int rad, sf::Color colour) { RoundRect frame(sf::Vector2f(rect.width(), rect.height()), rad); frame_shape(target, frame, rect.left, rect.top, colour); } -void fill_circle(sf::RenderTarget& target, RECT rect, sf::Color colour) { +void fill_circle(sf::RenderTarget& target, rectangle rect, sf::Color colour) { Ellipse fill(sf::Vector2f(rect.width(), rect.height())); fill_shape(target, fill, rect.left, rect.top, colour); } -void frame_circle(sf::RenderTarget& target, RECT rect, sf::Color colour) { +void frame_circle(sf::RenderTarget& target, rectangle rect, sf::Color colour) { Ellipse frame(sf::Vector2f(rect.width(), rect.height())); frame_shape(target, frame, rect.left, rect.top, colour); } void fill_region(sf::RenderWindow& target, Region& region, sf::Color colour) { clip_region(target, region); - fill_rect(target, RECT(target), colour); + fill_rect(target, rectangle(target), colour); undo_clip(target); } void frame_region(sf::RenderWindow& target, Region& region, sf::Color colour) { // TODO: Uh, actually, this won't do what it says. Eh, I'll fix it if I ever use it. clip_region(target, region); - frame_rect(target, RECT(target), colour); + frame_rect(target, rectangle(target), colour); undo_clip(target); } -void Region::addEllipse(RECT frame) { +void Region::addEllipse(rectangle frame) { Ellipse* ellipse = new Ellipse(sf::Vector2f(frame.width(), frame.height())); ellipse->setFillColor(sf::Color::Black); shapes.push_back(std::shared_ptr(ellipse)); } -void Region::addRect(RECT rect){ +void Region::addRect(rectangle rect){ sf::RectangleShape* frame = new sf::RectangleShape(sf::Vector2f(rect.width(), rect.height())); frame->setPosition(rect.left, rect.top); frame->setFillColor(sf::Color::Black); @@ -1073,11 +1073,11 @@ void Region::offset(location off) { offset(off.x, off.y); } -RECT Region::getEnclosingRect() { - if(shapes.empty()) return RECT(); - RECT bounds = shapes[0]->getGlobalBounds(); +rectangle Region::getEnclosingRect() { + if(shapes.empty()) return rectangle(); + rectangle bounds = shapes[0]->getGlobalBounds(); for(size_t i = 0; i < shapes.size(); i++) { - RECT shapeRect = shapes[i]->getGlobalBounds(); + rectangle shapeRect = shapes[i]->getGlobalBounds(); if(shapeRect.top < bounds.top) bounds.top = shapeRect.top; if(shapeRect.left < bounds.left) bounds.top = shapeRect.top; if(shapeRect.bottom > bounds.bottom) bounds.top = shapeRect.top; @@ -1110,12 +1110,12 @@ void Region::setStencil(sf::RenderWindow& where) { glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); } -void clip_rect(sf::RenderTarget& where, RECT rect) { - rect |= RECT(where); // Make sure we don't draw out of bounds +void clip_rect(sf::RenderTarget& where, rectangle rect) { + rect |= rectangle(where); // Make sure we don't draw out of bounds // TODO: Make sure this works for the scissor test... setActiveRenderTarget(where); glEnable(GL_SCISSOR_TEST); - glScissor(rect.left, RECT(where).height() - rect.bottom, rect.width(), rect.height()); + glScissor(rect.left, rectangle(where).height() - rect.bottom, rect.width(), rect.height()); } void clip_region(sf::RenderWindow& where, Region& region) { @@ -1151,7 +1151,7 @@ Region& Region::operator-=(Region& other) { struct tessel_t { sf::RenderTexture* tessel; sf::Texture* img; - RECT srcRect; + rectangle srcRect; }; bool operator==(const tessel_ref_t& a, const tessel_ref_t& b) { @@ -1167,13 +1167,13 @@ template<> struct std::hash { std::unordered_map tiling_reservoir; static int tessel_index = 0; -tessel_ref_t prepareForTiling(sf::Texture& srcImg, RECT srcRect) { +tessel_ref_t prepareForTiling(sf::Texture& srcImg, rectangle srcRect) { tessel_ref_t ref = {tessel_index++}; tiling_reservoir[ref].img = &srcImg; tiling_reservoir[ref].srcRect = srcRect; tiling_reservoir[ref].tessel = new sf::RenderTexture; tiling_reservoir[ref].tessel->create(srcRect.width(), srcRect.height()); - RECT tesselRect(*tiling_reservoir[ref].tessel); + rectangle tesselRect(*tiling_reservoir[ref].tessel); rect_draw_some_item(srcImg, srcRect, *tiling_reservoir[ref].tessel, tesselRect); tiling_reservoir[ref].tessel->display(); tiling_reservoir[ref].tessel->setRepeated(true); @@ -1204,15 +1204,15 @@ static void register_main_patterns() { } } -void tileImage(sf::RenderTarget& target, RECT area, tessel_ref_t tessel, sf::BlendMode mode) { +void tileImage(sf::RenderTarget& target, rectangle area, tessel_ref_t tessel, sf::BlendMode mode) { // First, set up a dictionary of all textures ever tiled. // The key type is a pair. // The value type is a Texture. tessel_t& tesselInfo = tiling_reservoir[tessel]; - RECT clipArea = area; + rectangle clipArea = area; area.left -= area.left % tesselInfo.srcRect.width(); area.top -= area.top % tesselInfo.srcRect.height(); - area |= RECT(target); // Make sure we don't draw out of bounds + area |= rectangle(target); // Make sure we don't draw out of bounds sf::RectangleShape tesselShape(sf::Vector2f(area.width(),area.height())); tesselShape.setTexture(&tesselInfo.tessel->getTexture()); diff --git a/osx/tools/graphtool.h b/osx/tools/graphtool.h index f26bbd11..0b368473 100644 --- a/osx/tools/graphtool.h +++ b/osx/tools/graphtool.h @@ -46,19 +46,19 @@ class Region { void setStencil(sf::RenderWindow& where); friend void clip_region(sf::RenderWindow& where, Region& region); public: - void addEllipse(RECT frame); - void addRect(RECT rect); + void addEllipse(rectangle frame); + void addRect(rectangle rect); void clear(); void offset(int x, int y); void offset(location off); Region& operator-=(Region& other); - RECT getEnclosingRect(); + rectangle getEnclosingRect(); }; typedef unsigned short pic_num_t; static const pic_num_t NO_PIC = std::numeric_limits::max(); -using graf_pos = std::pair; -using graf_pos_ref = std::pair; +using graf_pos = std::pair; +using graf_pos_ref = std::pair; using hilite_t = std::pair; struct cCustomGraphics { @@ -100,34 +100,34 @@ enum class eTextMode { }; void init_graph_tool(); -void rect_draw_some_item(sf::RenderTarget& targ_gworld,RECT targ_rect); -void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,sf::RenderTarget& targ_gworld,RECT targ_rect,sf::BlendMode mode = sf::BlendNone); -void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,RECT targ_rect,location offset,sf::BlendMode mode = sf::BlendNone); -void rect_draw_some_item(const sf::Texture& src_gworld,RECT src_rect,const sf::Texture& mask_gworld,RECT mask_rect,sf::RenderTarget& targ_gworld,RECT targ_rect); +void rect_draw_some_item(sf::RenderTarget& targ_gworld,rectangle targ_rect); +void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,sf::RenderTarget& targ_gworld,rectangle targ_rect,sf::BlendMode mode = sf::BlendNone); +void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,rectangle targ_rect,location offset,sf::BlendMode mode = sf::BlendNone); +void rect_draw_some_item(const sf::Texture& src_gworld,rectangle src_rect,const sf::Texture& mask_gworld,rectangle mask_rect,sf::RenderTarget& targ_gworld,rectangle targ_rect); -std::vector draw_string_hilite(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr); -std::vector draw_string_sel(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr); -void win_draw_string(sf::RenderTarget& dest_window,RECT dest_rect,std::string str,eTextMode mode,TextStyle style, location offset = {0,0}); +std::vector draw_string_hilite(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr); +std::vector draw_string_sel(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,TextStyle style,std::vector hilites,sf::Color hiliteClr); +void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,eTextMode mode,TextStyle style, location offset = {0,0}); short string_length(std::string str, TextStyle style); //OSStatus flip_pict(OSType domain, OSType type, short id, void *ptr, UInt32 size, bool isNative, void *refcon); //void draw_terrain(); -RECT calc_rect(short i, short j); +rectangle calc_rect(short i, short j); void setActiveRenderTarget(sf::RenderTarget& where); void flushTessels(sf::Texture& alteredImg); -tessel_ref_t prepareForTiling(sf::Texture& srcImg, RECT srcRect); -void tileImage(sf::RenderTarget& target, RECT area, tessel_ref_t tessel, sf::BlendMode mode = sf::BlendNone); +tessel_ref_t prepareForTiling(sf::Texture& srcImg, rectangle srcRect); +void tileImage(sf::RenderTarget& target, rectangle area, tessel_ref_t tessel, sf::BlendMode mode = sf::BlendNone); void tileImage(sf::RenderWindow& target, Region& rgn, tessel_ref_t tessel, sf::BlendMode mode = sf::BlendNone); -void fill_rect(sf::RenderTarget& target, RECT rect, sf::Color colour); -void frame_rect(sf::RenderTarget& target, RECT rect, sf::Color colour); -void fill_circle(sf::RenderTarget& target, RECT rect, sf::Color colour); -void frame_circle(sf::RenderTarget& target, RECT rect, sf::Color colour); -void fill_roundrect(sf::RenderTarget& target, RECT rect, int rad, sf::Color colour); -void frame_roundrect(sf::RenderTarget& target, RECT rect, int rad, sf::Color colour); +void fill_rect(sf::RenderTarget& target, rectangle rect, sf::Color colour); +void frame_rect(sf::RenderTarget& target, rectangle rect, sf::Color colour); +void fill_circle(sf::RenderTarget& target, rectangle rect, sf::Color colour); +void frame_circle(sf::RenderTarget& target, rectangle rect, sf::Color colour); +void fill_roundrect(sf::RenderTarget& target, rectangle rect, int rad, sf::Color colour); +void frame_roundrect(sf::RenderTarget& target, rectangle rect, int rad, sf::Color colour); void fill_region(sf::RenderWindow& target, Region& region, sf::Color colour); void frame_region(sf::RenderWindow& target, Region& region, sf::Color colour); void draw_line(sf::RenderTarget& target, location from, location to, int thickness, sf::Color colour, sf::BlendMode mode = sf::BlendNone); -void clip_rect(sf::RenderTarget& where, RECT rect); +void clip_rect(sf::RenderTarget& where, rectangle rect); void clip_region(sf::RenderWindow& where, Region& region); void undo_clip(sf::RenderTarget& where);