- Merged two classes (cPopulation::cCreature and cTown::cCreature)

- Changes some C-strings to STL-strings
- Fixed the problem where the spiderweb logo would not fully appear if ShowStartupSplash is disabled

git-svn-id: http://openexile.googlecode.com/svn/trunk@54 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
2009-05-07 02:50:16 +00:00
parent 68dcf3cdef
commit 4dc75d51c0
46 changed files with 932 additions and 831 deletions

View File

@@ -250,7 +250,7 @@ void put_pc_graphics()
else cd_set_led(991,i,0);
}
cd_set_item_text(991,69,ADVEN[which_pc_displayed].name);
cd_set_item_text(991,69,ADVEN[which_pc_displayed].name.c_str());
}
void display_pc_event_filter (short item_hit)
{
@@ -411,7 +411,7 @@ void do_xp_draw()
pc_num = store_train_pc;
sprintf((char *) get_text, "%s",(char *) ADVEN[pc_num].name);
sprintf((char *) get_text, "%s",(char *) ADVEN[pc_num].name.c_str());
cd_set_item_text (1010, 51,get_text);

View File

@@ -211,7 +211,7 @@ short char_select_pc(short active_only,short free_inv_only,char *title)
cd_activate_item(1018, 3 + i, 0);
}
if (ADVEN[i].main_status != 0) {
csit(1018,9 + i,ADVEN[i].name);
csit(1018,9 + i,ADVEN[i].name.c_str());
}
else cd_activate_item(1018, 9 + i, 0);
}

View File

@@ -551,13 +551,13 @@ void display_party(short mode,short clear_first)
//frame_dlog_rect(GetWindowPort(mainPtr),pc_area_buttons[i][1],0);
// draw name
TextSize(9);
if( (strlen(ADVEN[i].name)) >= 10) {
if( (ADVEN[i].name.length()) >= 10) {
TextFace(0);
sprintf((char *) to_draw, "%-s ", (char *) ADVEN[i].name);
sprintf((char *) to_draw, "%-s ", (char *) ADVEN[i].name.c_str());
TextSize(6);
}
else {
sprintf((char *) to_draw, "%-s ", (char *) ADVEN[i].name);
sprintf((char *) to_draw, "%-s ", (char *) ADVEN[i].name.c_str());
}
ForeColor(whiteColor);
@@ -566,8 +566,8 @@ void display_party(short mode,short clear_first)
TextSize(10);
if (i == current_active_pc){
sprintf((char *) to_draw, "%-.18s ", (char *) ADVEN[i].name);
if( (strlen(ADVEN[i].name)) > 12)
sprintf((char *) to_draw, "%-.18s ", (char *) ADVEN[i].name.c_str());
if( (ADVEN[i].name.length()) > 12)
TextSize(8);
ForeColor(blackColor);
win_draw_string(GetWindowPort(mainPtr),name_rect,to_draw,1,10,true);