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

Fix Mac build by eliminating more sprintf calls

Browse Source
This commit is contained in:
Celtic Minstrel
2015-01-11 13:49:11 -05:00
parent bd531f9ac4
commit 1a069b4d71
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/scenedit/scen.actions.cpp
View File

@@ -3220,7 +3220,7 @@ extern size_t num_strs(short mode); // defined in scen.keydlgs.cpp
// if just_redo_text not 0, simply need to update text portions // if just_redo_text not 0, simply need to update text portions
void start_string_editing(short mode,short just_redo_text) { void start_string_editing(short mode,short just_redo_text) {
long pos; long pos;
char str[256]; std::ostringstream str;
bool draw_full = false; bool draw_full = false;
if(just_redo_text == 0) { if(just_redo_text == 0) {
@@ -3237,28 +3237,28 @@ void start_string_editing(short mode,short just_redo_text) {
for(size_t i = 0; i < num_strs(mode); i++) { for(size_t i = 0; i < num_strs(mode); i++) {
switch(mode) { switch(mode) {
case 0: case 0:
sprintf((char *) str,"%d - %-30.30s",i,scenario.spec_strs[i].c_str()); str << i << " - " << scenario.spec_strs[i].substr(0,30);
set_rb(i,7000 + i,(char *) str,0); set_rb(i,7000 + i,str.str().c_str(),0);
break; break;
case 1: case 1:
sprintf((char *) str,"%d - %-30.30s",i,current_terrain->spec_strs[i].c_str()); str << i << " - " << current_terrain->spec_strs[i].substr(0,30);
set_rb(i,8000 + i,(char *) str,0); set_rb(i,8000 + i,str.str().c_str(),0);
break; break;
case 2: case 2:
sprintf((char *) str,"%d - %-30.30s",i, town->spec_strs[i].c_str()); str << i << " - " << town->spec_strs[i].substr(0,30);
set_rb(i,9000 + i,(char *) str,0); set_rb(i,9000 + i,str.str().c_str(),0);
break; break;
case 3: // TODO: This is currently inaccessible - add menu option? case 3:
sprintf((char *) str,"%d - %-30.30s",i,scenario.journal_strs[i].c_str()); str << i << " - " << scenario.journal_strs[i].substr(0,30);
set_rb(i,11000 + i,str,0); set_rb(i,11000 + i,str.str().c_str(),0);
break; break;
case 4: // TODO: This is currently inaccessible - add menu option? case 4:
sprintf((char *) str,"%d - %-30.30s",i,current_terrain->sign_strs[i].c_str()); str << i << " - " << current_terrain->sign_strs[i].substr(0,30);
set_rb(i,14000 + i,str,0); set_rb(i,14000 + i,str.str().c_str(),0);
break; break;
case 5: // TODO: This is currently inaccessible - add menu option? case 5:
sprintf((char *) str,"%d - %-30.30s",i,town->sign_strs[i].c_str()); str << i << " - " << town->sign_strs[i].substr(0,30);
set_rb(i,15000 + i,str,0); set_rb(i,15000 + i,str.str().c_str(),0);
break; break;
} }
} }