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

Some more gcc deprecation cleanups

Browse Source
This commit is contained in:
Sylae Corell
2014-07-30 11:03:01 -06:00
parent 864eba5928
commit 26971cf0c8
9 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Win32/game/boe.infodlg.cpp
View File

@@ -1205,9 +1205,9 @@ void display_strings_event_filter (short item_hit)
// str_label_1 & str_label_2 used for saving button for journal
// 1000 + x scen 2000 + x out 3000 + x town
void display_strings(char *text1, char *text2,short str_label_1,short str_label_2,short str_label_1b,
void display_strings(char const *text1, char const *text2,short str_label_1,short str_label_2,short str_label_1b,
short str_label_2b,
char *title,short sound_num,short graphic_num,short parent_num)
char const *title,short sound_num,short graphic_num,short parent_num)
{
SetCursor(sword_curs);
@@ -1226,9 +1226,9 @@ void display_strings(char *text1, char *text2,short str_label_1,short str_label_
csp(store_which_string_dlog,store_which_string_dlog,graphic_num);
csit(store_which_string_dlog,4,(char *) text1);
csit(store_which_string_dlog,4,text1);
if (text2 != NULL) {
csit(store_which_string_dlog,5,(char *) text2);
csit(store_which_string_dlog,5,text2);
}
if (strlen(title) > 0)
csit(store_which_string_dlog,6,title);
@@ -1243,7 +1243,7 @@ void display_strings(char *text1, char *text2,short str_label_1,short str_label_
final_process_dialog(store_which_string_dlog);
}
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,-1,-1,-1,-1,"Error!",57,716,parent_num);
}
@@ -1257,6 +1257,6 @@ void display_strings_with_nums(short a1,short a2, short b1, short b2,
GetIndString(str1,a1,a2);
if ((b1 > 0) && (b2 > 0))
GetIndString(str2,b1,b2);
display_strings((char *) str1,(char *) str2,-1,-1,-1,-1,
display_strings(str1, str2,-1,-1,-1,-1,
title, sound_num, graphic_num, parent_num);
}