openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Scenario Editor const cleanup

Browse Source
This commit is contained in:
Sylae Corell
2014-07-30 13:33:16 -06:00
parent c56a6c2264
commit 4661b934da
14 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scenedit/buttonmg.cpp
View File

@@ -50,7 +50,7 @@ void reset_lb() {
// is slot >= 0, force that slot // is slot >= 0, force that slot
// if -1, use 1st free 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; short i;
@@ -107,7 +107,7 @@ void reset_rb()
// is slot >= 0, force that slot // is slot >= 0, force that slot
// if -1, use 1st free 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; short i;

4
scenedit/buttonmg.h
View File

@@ -1,6 +1,6 @@
void init_lb(); void init_lb();
void reset_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 init_rb() ;
void reset_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) ;

10
scenedit/dlogtool.cpp
View File

@@ -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,2,2,
2,2,2,2,2,2,2,2,0,0, 2,2,2,2,2,2,2,2,0,0,
1,1,1,1,1,1,0,0,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"," "," ", "Get","1","2","3","4","5","6","Cast"," "," ",
" "," "," ","Buy","Sell","Other Spells","Buy x10"," "," ","Save", " "," "," ","Buy","Sell","Other Spells","Buy x10"," "," ","Save",
"Race","Train","Items","Spells","Heal Party","1","2","3","4","5", "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 // 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; short i;
for (i = 0; i < 80; 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); 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); 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); 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; short dlg_index,item_index,i;
if (cd_get_indices(dlog_num,item_num,&dlg_index,&item_index) < 0) 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 dlg_index,item_index,label_loc = -1;
short i; short i;

8
scenedit/dlogtool.h
View File

@@ -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_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_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_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_item_num(short dlog_num, short item_num, short num);
void cd_set_led(short dlog_num,short item_num,short state); 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); 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 cd_get_text_edit_str(short dlog_num, char *str);
void cdsin(short dlog_num, short item_num, short num); 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 csp(short dlog_num, short item_num, short pict_num, short custom_pic_type);
void ModalDialog(); 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); 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) ; 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 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 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); void draw_custom_dialog_graphic(HWND hDlg, RECT rect, short which_g, Boolean do_frame,short win_or_gworld, short custom_pic);

2
scenedit/global.h
View File

@@ -53,7 +53,7 @@ typedef unsigned char BYTE;
typedef char Boolean; typedef char Boolean;
typedef struct { typedef struct {
char x,y; unsigned char x,y;
} location; } location;
typedef struct { typedef struct {

2
scenedit/graphics.cpp
View File

@@ -1207,7 +1207,7 @@ void place_just_location()
DeleteObject(hdc); 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_string,string);
strcpy((char *)current_string2,string2); strcpy((char *)current_string2,string2);

2
scenedit/graphics.h
View File

@@ -23,7 +23,7 @@ RECT get_template_rect (unsigned char type_wanted);
void draw_frames(); void draw_frames();
void place_location(); void place_location();
void place_just_location(); void place_just_location();
void set_string(char *string,char *string2); void set_string(char const *string,char const *string2);
void undo_clip(); void undo_clip();
Boolean is_special(short i,short j); Boolean is_special(short i,short j);
Boolean is_field_type(short i,short j,short field_type); Boolean is_field_type(short i,short j,short field_type);

2
scenedit/graphutl.cpp
View File

@@ -353,7 +353,7 @@ void paint_pattern(HBITMAP dest,short which_mode,RECT dest_rect,short which_patt
uly = store_uly; uly = store_uly;
} }
HBITMAP ReadBMP(char * fileName) HBITMAP ReadBMP(char const * fileName)
{ {
return (HBITMAP) LoadImage(0, fileName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); return (HBITMAP) LoadImage(0, fileName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
} }

2
scenedit/graphutl.h
View File

@@ -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); void fry_dc(HWND hwnd,HDC dc);
HBITMAP load_pict(short pict_num,HDC model_hdc); HBITMAP load_pict(short pict_num,HDC model_hdc);
void paint_pattern(HBITMAP dest,short which_mode,RECT dest_rect,short which_pattern); void paint_pattern(HBITMAP dest,short which_mode,RECT dest_rect,short which_pattern);
HBITMAP ReadBMP(char * fileName); HBITMAP ReadBMP(char const * fileName);

10
scenedit/keydlgs.cpp
View File

@@ -197,7 +197,7 @@ short fancy_choice_dialog(short which_dlog,short parent)
//cre = check range error //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)) { if ((val < min) || (val > max)) {
give_error(text1,text2,parent_num); 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; 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); 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, void display_strings(char const *text1, char const *text2,
char *title,short sound_num,short graphic_num,short parent_num) char const *title,short sound_num,short graphic_num,short parent_num)
{ {
//make_cursor_sword(); //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(); //make_cursor_sword();

10
scenedit/keydlgs.h
View File

@@ -1,16 +1,16 @@
void fancy_choice_dialog_event_filter (short item_hit); void fancy_choice_dialog_event_filter (short item_hit);
short fancy_choice_dialog(short which_dlog,short parent); short fancy_choice_dialog(short which_dlog,short parent);
void display_strings_event_filter (short item_hit); void display_strings_event_filter (short item_hit);
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) ;
void give_error(char *text1, char *text2,short parent_num); void give_error(char const *text1, char const *text2,short parent_num);
void display_strings(char *text1, char *text2, void display_strings(char const *text1, char const *text2,
char *title,short sound_num,short graphic_num,short parent_num); char const *title,short sound_num,short graphic_num,short parent_num);
void choose_graphic_event_filter (short item_hit); void choose_graphic_event_filter (short item_hit);
void put_choice_pics(); void put_choice_pics();
short choose_graphic(short first_g,short last_g,short cur_choice,short parent_num); short choose_graphic(short first_g,short last_g,short cur_choice,short parent_num);
void put_text_res(); 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 choose_text_res_event_filter (short item_hit);
void edit_text_event_filter (short item_hit); void edit_text_event_filter (short item_hit);
void edit_text_str(short which_str,short mode); void edit_text_str(short which_str,short mode);

8
scenedit/scenario.cpp
View File

@@ -49,7 +49,7 @@ RECT source_rect,draw_rect;
extern GWorldPtr terrain_buttons_gworld; 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", "Potion/Magic Item","Scroll/Magic Item","Wand","Tool","Food","Shield","Armor","Helm",
"Gloves","Shield","Boots","Ring","Necklace", "Gloves","Shield","Boots","Ring","Necklace",
"Weapon Poison","Non-Use Object","Pants","Crossbow","Bolts","Missile (no ammo)","Unused","Unused"}; "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; short i;
char temp_str[256]; 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"}; "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_which_ter = which_ter;
store_ter = scenario.ter_types[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 // ignore parent in Mac version
{ {
short i; 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_which_monst = which_monst;
store_monst = scenario.scen_monsters[which_monst]; store_monst = scenario.scen_monsters[which_monst];

4
scenedit/tfileio.cpp
View File

@@ -65,7 +65,7 @@ SCROLLINFO lpsi;
OFSTRUCT store; OFSTRUCT store;
Boolean suppress_load_file_name = FALSE; 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 (); void print_write_position ();
@@ -93,7 +93,7 @@ path[i+1]='\0'; // close the argument string after the last '\'
void file_initialize() 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 (*.*)","*.*",""}; "Text Files (*.TXT)","*.txt","All Files (*.*)","*.*",""};

8
scenedit/townout.cpp
View File

@@ -42,9 +42,9 @@ short a,b,c;
short store_which_out_wand,store_out_wand_mode; short store_which_out_wand,store_out_wand_mode;
out_wandering_type store_out_wand; 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"}; "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", "Unused","Unused","Unused",
"Event code (0 - no event)","Event code (0 - no event)"}; "Event code (0 - no event)","Event code (0 - no event)"};
@@ -279,7 +279,7 @@ void edit_placed_monst(short which_m)
{ {
short i; 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_placed_monst = t_d.creatures[which_m];
store_which_placed_monst = 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; short i;
char temp_str[256]; 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", "Sometimes here A","Sometimes here B","Sometimes here C",
"Appear when event","Disappear when event"}; "Appear when event","Disappear when event"};