From 4661b934da6b5fd01f630bd36d6440486400e8bc Mon Sep 17 00:00:00 2001 From: Sylae Corell Date: Wed, 30 Jul 2014 13:33:16 -0600 Subject: [PATCH] Scenario Editor const cleanup --- scenedit/buttonmg.cpp | 4 ++-- scenedit/buttonmg.h | 4 ++-- scenedit/dlogtool.cpp | 10 +++++----- scenedit/dlogtool.h | 8 ++++---- scenedit/global.h | 30 +++++++++++++++--------------- scenedit/graphics.cpp | 2 +- scenedit/graphics.h | 2 +- scenedit/graphutl.cpp | 2 +- scenedit/graphutl.h | 2 +- scenedit/keydlgs.cpp | 10 +++++----- scenedit/keydlgs.h | 10 +++++----- scenedit/scenario.cpp | 8 ++++---- scenedit/tfileio.cpp | 4 ++-- scenedit/townout.cpp | 8 ++++---- 14 files changed, 52 insertions(+), 52 deletions(-) diff --git a/scenedit/buttonmg.cpp b/scenedit/buttonmg.cpp index 3bd947d4..97ffbbca 100644 --- a/scenedit/buttonmg.cpp +++ b/scenedit/buttonmg.cpp @@ -50,7 +50,7 @@ void reset_lb() { // is slot >= 0, force that slot // if -1, use 1st free slot -void set_lb(short slot, short mode, char *label, short do_draw) +void set_lb(short slot, short mode, char const *label, short do_draw) { short i; @@ -107,7 +107,7 @@ void reset_rb() // is slot >= 0, force that slot // if -1, use 1st free slot -void set_rb(short slot, short mode, char *label, short do_draw) +void set_rb(short slot, short mode, char const *label, short do_draw) { short i; diff --git a/scenedit/buttonmg.h b/scenedit/buttonmg.h index 2835bd29..117102dc 100644 --- a/scenedit/buttonmg.h +++ b/scenedit/buttonmg.h @@ -1,6 +1,6 @@ void init_lb(); void reset_lb(); -void set_lb(short slot, short mode, char *label, short do_draw) ; +void set_lb(short slot, short mode, char const *label, short do_draw) ; void init_rb() ; void reset_rb() ; -void set_rb(short slot, short mode, char *label, short do_draw) ; +void set_rb(short slot, short mode, char const *label, short do_draw) ; diff --git a/scenedit/dlogtool.cpp b/scenedit/dlogtool.cpp index cac10850..38ca69ac 100644 --- a/scenedit/dlogtool.cpp +++ b/scenedit/dlogtool.cpp @@ -95,7 +95,7 @@ short button_type[140] = {1,1,4,5,1,1,0,0,1,1, 2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,0,0, 1,1,1,1,1,1,0,0,0,0}; -char *button_strs[140] = {"Done ","Ask"," "," ","Keep", "Cancel","+","-","Buy","Leave", +char const *button_strs[140] = {"Done ","Ask"," "," ","Keep", "Cancel","+","-","Buy","Leave", "Get","1","2","3","4","5","6","Cast"," "," ", " "," "," ","Buy","Sell","Other Spells","Buy x10"," "," ","Save", "Race","Train","Items","Spells","Heal Party","1","2","3","4","5", @@ -807,7 +807,7 @@ short cd_retrieve_text_edit_num(short dlog_num, short item_num) // NOTE!!! Expects a c string -void cd_set_text_edit_str(short dlog_num, short item_num, char *str) +void cd_set_text_edit_str(short dlog_num, short item_num, char const *str) { short i; for (i = 0; i < 80; i++) @@ -839,7 +839,7 @@ void cdsin(short dlog_num, short item_num, short num) cd_set_item_num( dlog_num, item_num, num); } -void csit(short dlog_num, short item_num, char *str) +void csit(short dlog_num, short item_num, char const *str) { cd_set_item_text( dlog_num, item_num, str); } @@ -848,7 +848,7 @@ void csp(short dlog_num, short item_num, short pict_num, short custom_pic_type) cd_set_pict( dlog_num, item_num, pict_num, custom_pic_type); } -void cd_set_item_text(short dlog_num, short item_num, char *str) +void cd_set_item_text(short dlog_num, short item_num, char const *str) { short dlg_index,item_index,i; if (cd_get_indices(dlog_num,item_num,&dlg_index,&item_index) < 0) @@ -963,7 +963,7 @@ short cd_get_led_range(short dlog_num,short first_led,short last_led) } -void cd_add_label(short dlog_num, short item_num, char *label, short label_flag) +void cd_add_label(short dlog_num, short item_num, char const *label, short label_flag) { short dlg_index,item_index,label_loc = -1; short i; diff --git a/scenedit/dlogtool.h b/scenedit/dlogtool.h index 3f999372..97fc861d 100644 --- a/scenedit/dlogtool.h +++ b/scenedit/dlogtool.h @@ -22,11 +22,11 @@ void cd_attach_key(short dlog_num,short item_num,char key); void cd_set_pict(short dlog_num, short item_num, short pict_num, short custom_pic_type); void cd_activate_item(short dlog_num, short item_num, short status); void cd_get_item_text(short dlog_num, short item_num, char *str); -void cd_set_item_text(short dlog_num, short item_num, char *str); +void cd_set_item_text(short dlog_num, short item_num, char const *str); void cd_set_item_num(short dlog_num, short item_num, short num); void cd_set_led(short dlog_num,short item_num,short state); -void cd_add_label(short dlog_num, short item_num, char *label, short label_flag); +void cd_add_label(short dlog_num, short item_num, char const *label, short label_flag); void cd_draw_item(short dlog_num,short item_num); @@ -48,7 +48,7 @@ void showcursor(Boolean a); void cd_get_text_edit_str(short dlog_num, char *str); void cdsin(short dlog_num, short item_num, short num); -void csit(short dlog_num, short item_num, char *str); +void csit(short dlog_num, short item_num, char const *str); void csp(short dlog_num, short item_num, short pict_num, short custom_pic_type); void ModalDialog(); @@ -56,7 +56,7 @@ RECT calc_rect(short i, short j); void cd_retrieve_text_edit_str(short dlog_num, short item_num, char *str); short cd_retrieve_text_edit_num(short dlog_num, short item_num) ; -void cd_set_text_edit_str(short dlog_num, short item_num, char *str) ; +void cd_set_text_edit_str(short dlog_num, short item_num, char const *str) ; void cd_set_text_edit_num(short dlog_num, short item_num, short num, bool highlight = false); void InsetRect(RECT *rect,short x, short y); void draw_custom_dialog_graphic(HWND hDlg, RECT rect, short which_g, Boolean do_frame,short win_or_gworld, short custom_pic); diff --git a/scenedit/global.h b/scenedit/global.h index fc0f7add..c4c94d4b 100644 --- a/scenedit/global.h +++ b/scenedit/global.h @@ -39,7 +39,7 @@ struct RECT16 short top; short right; short bottom; - + RECT rect32(); RECT16 () {} RECT16 (const RECT & ); @@ -48,12 +48,12 @@ struct RECT16 extern POINT MAKEPOINT(LONG lparam); -typedef unsigned char BYTE; +typedef unsigned char BYTE; typedef char Boolean; typedef struct { - char x,y; + unsigned char x,y; } location; typedef struct { @@ -76,7 +76,7 @@ typedef struct { unsigned char blockage,flag1,flag2,special,trans_to_what,fly_over,boat_over; unsigned char block_horse,light_radius,step_sound,shortcut_key,res1,res2,res3; } terrain_type_type; - + typedef struct { unsigned char monst[4]; } wandering_type; @@ -113,7 +113,7 @@ typedef struct { char spec_enc_code,time_code; short monster_time,personality; short special_on_kill,facial_pic; - + } creature_start_type; @@ -146,12 +146,12 @@ typedef struct { short item_code,ability; unsigned char charges,always_there,property,contained; } preset_item_type; - + typedef struct { location field_loc; short field_type; } preset_field_type; - + typedef struct { short town_chop_time,town_chop_key; wandering_type wandering[4]; @@ -190,13 +190,13 @@ typedef struct { creature_start_type creatures[40]; unsigned char lighting[6][48]; } ave_tr_type; - + typedef struct { unsigned char terrain[32][32]; RECT16 room_rect[16]; creature_start_type creatures[30]; unsigned char lighting[4][32]; - } tiny_tr_type; + } tiny_tr_type; typedef struct { short block_type; @@ -205,13 +205,13 @@ typedef struct { char block_key_time; location block_loc; } city_block_type; - + typedef struct { RECT16 what_rect; unsigned char ter_type; unsigned char hollow; } city_ter_rect_type; - + typedef struct { creature_start_type creatures[30]; city_block_type city_block[15]; @@ -240,9 +240,9 @@ typedef struct { unsigned char direction,immunities,x_width,y_width,radiate_1,radiate_2; unsigned char default_attitude,summon_type,default_facial_pic,res1,res2,res3; short picture_num; - + } monster_record_type; - + typedef struct { location horse_loc,horse_loc_in_sec,horse_sector; short which_town; @@ -322,7 +322,7 @@ typedef struct { Boolean exists; short direction; out_wandering_type what_monst; - location which_sector,m_loc; + location which_sector,m_loc; } outdoor_creature_type; typedef struct { @@ -331,7 +331,7 @@ typedef struct { char out_strs[120][256]; } piles_of_stuff_dumping_type; - + short get_ran (short times,short min,short max); short s_pow(short x,short y); short dist(location p1,location p2); diff --git a/scenedit/graphics.cpp b/scenedit/graphics.cpp index ced5b406..17289dd1 100644 --- a/scenedit/graphics.cpp +++ b/scenedit/graphics.cpp @@ -1207,7 +1207,7 @@ void place_just_location() DeleteObject(hdc); } -void set_string(char *string,char *string2) +void set_string(char const *string,char const *string2) { strcpy((char *)current_string,string); strcpy((char *)current_string2,string2); diff --git a/scenedit/graphics.h b/scenedit/graphics.h index 160c819e..5e6ad9fd 100644 --- a/scenedit/graphics.h +++ b/scenedit/graphics.h @@ -23,7 +23,7 @@ RECT get_template_rect (unsigned char type_wanted); void draw_frames(); void place_location(); void place_just_location(); -void set_string(char *string,char *string2); +void set_string(char const *string,char const *string2); void undo_clip(); Boolean is_special(short i,short j); Boolean is_field_type(short i,short j,short field_type); diff --git a/scenedit/graphutl.cpp b/scenedit/graphutl.cpp index bf5f6ce4..b7170e90 100644 --- a/scenedit/graphutl.cpp +++ b/scenedit/graphutl.cpp @@ -353,7 +353,7 @@ void paint_pattern(HBITMAP dest,short which_mode,RECT dest_rect,short which_patt uly = store_uly; } -HBITMAP ReadBMP(char * fileName) +HBITMAP ReadBMP(char const * fileName) { return (HBITMAP) LoadImage(0, fileName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); } diff --git a/scenedit/graphutl.h b/scenedit/graphutl.h index 0aa99178..57f9f4d0 100644 --- a/scenedit/graphutl.h +++ b/scenedit/graphutl.h @@ -4,4 +4,4 @@ void rect_draw_some_item(HBITMAP src,RECT src_rect,HBITMAP dest,RECT dest_rect, void fry_dc(HWND hwnd,HDC dc); HBITMAP load_pict(short pict_num,HDC model_hdc); void paint_pattern(HBITMAP dest,short which_mode,RECT dest_rect,short which_pattern); -HBITMAP ReadBMP(char * fileName); +HBITMAP ReadBMP(char const * fileName); diff --git a/scenedit/keydlgs.cpp b/scenedit/keydlgs.cpp index 3f9baa7a..89934471 100644 --- a/scenedit/keydlgs.cpp +++ b/scenedit/keydlgs.cpp @@ -197,7 +197,7 @@ short fancy_choice_dialog(short which_dlog,short parent) //cre = check range error -Boolean cre(short val,short min,short max,char *text1, char *text2,short parent_num) +Boolean cre(short val,short min,short max,char const *text1, char const *text2,short parent_num) { if ((val < min) || (val > max)) { give_error(text1,text2,parent_num); @@ -206,7 +206,7 @@ Boolean cre(short val,short min,short max,char *text1, char *text2,short parent_ return FALSE; } -void give_error(char *text1, char *text2,short parent_num) +void give_error(char const *text1, char const *text2,short parent_num) { display_strings(text1,text2,"Error!",57,716,parent_num); } @@ -221,8 +221,8 @@ void display_strings_event_filter (short item_hit) } } -void display_strings(char *text1, char *text2, - char *title,short sound_num,short graphic_num,short parent_num) +void display_strings(char const *text1, char const *text2, + char const *title,short sound_num,short graphic_num,short parent_num) { //make_cursor_sword(); @@ -394,7 +394,7 @@ void put_text_res() } -short choose_text_res(short res_list,short first_t,short last_t,short cur_choice,short parent_num,char *title) +short choose_text_res(short res_list,short first_t,short last_t,short cur_choice,short parent_num,char const *title) { //make_cursor_sword(); diff --git a/scenedit/keydlgs.h b/scenedit/keydlgs.h index f70e7505..aa9005eb 100644 --- a/scenedit/keydlgs.h +++ b/scenedit/keydlgs.h @@ -1,16 +1,16 @@ void fancy_choice_dialog_event_filter (short item_hit); short fancy_choice_dialog(short which_dlog,short parent); void display_strings_event_filter (short item_hit); -Boolean cre(short val,short min,short max,char *text1, char *text2,short parent_num) ; -void give_error(char *text1, char *text2,short parent_num); +Boolean cre(short val,short min,short max,char const *text1, char const *text2,short parent_num) ; +void give_error(char const *text1, char const *text2,short parent_num); -void display_strings(char *text1, char *text2, - char *title,short sound_num,short graphic_num,short parent_num); +void display_strings(char const *text1, char const *text2, + char const *title,short sound_num,short graphic_num,short parent_num); void choose_graphic_event_filter (short item_hit); void put_choice_pics(); short choose_graphic(short first_g,short last_g,short cur_choice,short parent_num); void put_text_res(); -short choose_text_res(short res_list,short first_t,short last_t,short cur_choice,short parent_num,char *title); +short choose_text_res(short res_list,short first_t,short last_t,short cur_choice,short parent_num,char const *title); void choose_text_res_event_filter (short item_hit); void edit_text_event_filter (short item_hit); void edit_text_str(short which_str,short mode); diff --git a/scenedit/scenario.cpp b/scenedit/scenario.cpp index 3e8f3ef5..778ae893 100644 --- a/scenedit/scenario.cpp +++ b/scenedit/scenario.cpp @@ -49,7 +49,7 @@ RECT source_rect,draw_rect; extern GWorldPtr terrain_buttons_gworld; - char *item_types[] = {"No Item","1-Handed weapon","2-Handed weapon","Gold","Bow","Arrows","Thrown missile", + char const *item_types[] = {"No Item","1-Handed weapon","2-Handed weapon","Gold","Bow","Arrows","Thrown missile", "Potion/Magic Item","Scroll/Magic Item","Wand","Tool","Food","Shield","Armor","Helm", "Gloves","Shield","Boots","Ring","Necklace", "Weapon Poison","Non-Use Object","Pants","Crossbow","Bolts","Missile (no ammo)","Unused","Unused"}; @@ -1089,9 +1089,9 @@ short edit_ter_type(short which_ter) { short i; char temp_str[256]; - char *blocked_strs[6] = {"Clear","Walk through, Opaque","Clear, Special","Clear, Blocked","Blocked, Obstructed", + char const *blocked_strs[6] = {"Clear","Walk through, Opaque","Clear, Special","Clear, Blocked","Blocked, Obstructed", "Blocked, Opaque"}; - char *sound_strs[4] = {"Footstep","Squish","Crunch","Silence"}; + char const *sound_strs[4] = {"Footstep","Squish","Crunch","Silence"}; store_which_ter = which_ter; store_ter = scenario.ter_types[which_ter]; @@ -1324,7 +1324,7 @@ short edit_monst_type(short which_monst) // ignore parent in Mac version { short i; - char *attitude[4] = {"Friendly, Docile","Hostile, Type A","Friendly, Will Fight","Hostile, Type B"}; + char const *attitude[4] = {"Friendly, Docile","Hostile, Type A","Friendly, Will Fight","Hostile, Type B"}; store_which_monst = which_monst; store_monst = scenario.scen_monsters[which_monst]; diff --git a/scenedit/tfileio.cpp b/scenedit/tfileio.cpp index dd02e673..96097f41 100644 --- a/scenedit/tfileio.cpp +++ b/scenedit/tfileio.cpp @@ -65,7 +65,7 @@ SCROLLINFO lpsi; OFSTRUCT store; Boolean suppress_load_file_name = FALSE; -char *field_names[22] = {"Blank","Unknown","Unknown","Web","Crate","Barrel","Fire Barrier","Force Barrier","Quickfire","Unknown","Unknown","Unknown","Unknown","Unknown","Small Blood Stain","Medium Blood Stain","Large Blood Stain","Small Slime Pool","Large Slime Pool","Ash","Bones","Rocks"}; +char const *field_names[22] = {"Blank","Unknown","Unknown","Web","Crate","Barrel","Fire Barrier","Force Barrier","Quickfire","Unknown","Unknown","Unknown","Unknown","Unknown","Small Blood Stain","Medium Blood Stain","Large Blood Stain","Small Slime Pool","Large Slime Pool","Ash","Bones","Rocks"}; void print_write_position (); @@ -93,7 +93,7 @@ path[i+1]='\0'; // close the argument string after the last '\' void file_initialize() { -static char *szFilter[] = {"Blades of Exile Scenarios (*.EXS)","*.exs", +static char const *szFilter[] = {"Blades of Exile Scenarios (*.EXS)","*.exs", "Text Files (*.TXT)","*.txt","All Files (*.*)","*.*",""}; diff --git a/scenedit/townout.cpp b/scenedit/townout.cpp index d09feeae..ffebfec3 100644 --- a/scenedit/townout.cpp +++ b/scenedit/townout.cpp @@ -42,9 +42,9 @@ short a,b,c; short store_which_out_wand,store_out_wand_mode; out_wandering_type store_out_wand; -char *day_str_1[] = {"Unused","Day creature appears","Day creature disappears", +char const *day_str_1[] = {"Unused","Day creature appears","Day creature disappears", "Unused","Unused","Unused","Unused","Unused"}; -char *day_str_2[] = {"Unused","Event code (0 - no event)","Event code (0 - no event)", +char const *day_str_2[] = {"Unused","Event code (0 - no event)","Event code (0 - no event)", "Unused","Unused","Unused", "Event code (0 - no event)","Event code (0 - no event)"}; @@ -279,7 +279,7 @@ void edit_placed_monst(short which_m) { short i; - char *attitude[4] = {"Friendly, Docile","Hostile, Type A","Friendly, Will Fight","Hostile, Type B"}; + char const *attitude[4] = {"Friendly, Docile","Hostile, Type A","Friendly, Will Fight","Hostile, Type B"}; store_placed_monst = t_d.creatures[which_m]; store_which_placed_monst = which_m; @@ -370,7 +370,7 @@ creature_start_type edit_placed_monst_adv(creature_start_type monst_record) short i; char temp_str[256]; - char *time_labels[] = {"Always here","Appear on given day","Disappear on day", + char const *time_labels[] = {"Always here","Appear on given day","Disappear on day", "Sometimes here A","Sometimes here B","Sometimes here C", "Appear when event","Disappear when event"};