Numerous changes to terrain and trim. The changes to the scneario editor work as expected.

- New way of drawing walkway (doesn't work yet)
- New way of drawing roads (doesn't yet work correctly)
- New way of drawing trim (not tested yet)
- New way of handling marked specials (works in editor but not in game)
- New way of handling two-space rubble in the editor (works as expected)
- Merged several terrain special properties
- Deprecated several terrain graphics
- Completed (probably) the import & convert code for old-format terrain
- Probably other things that I have forgotten that have something to do with terrain
- A few other little things, bugfixes, etc

git-svn-id: http://openexile.googlecode.com/svn/trunk@56 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
2009-05-09 14:11:39 +00:00
parent 7bc95dc7c8
commit 28f4368651
38 changed files with 1435 additions and 636 deletions

View File

@@ -355,12 +355,12 @@ void put_item_screen(short screen_num,short suppress_buttons)
////
if (!ADVEN[pc].items[i_num].is_ident())
sprintf((char *) to_draw, "%s ",ADVEN[pc].items[i_num].name);
sprintf((char *) to_draw, "%s ",ADVEN[pc].items[i_num].name.c_str());
else { /// Don't place # of charges when Sell button up and space tight
if ((ADVEN[pc].items[i_num].charges > 0) && (ADVEN[pc].items[i_num].type != 2)
&& (stat_screen_mode <= 1))
sprintf((char *) to_draw, "%s (%d)",ADVEN[pc].items[i_num].full_name,ADVEN[pc].items[i_num].charges);
else sprintf((char *) to_draw, "%s",ADVEN[pc].items[i_num].full_name);
sprintf((char *) to_draw, "%s (%d)",ADVEN[pc].items[i_num].full_name.c_str(),ADVEN[pc].items[i_num].charges);
else sprintf((char *) to_draw, "%s",ADVEN[pc].items[i_num].full_name.c_str());
}
dest_rect.left -= 2;
win_draw_string( item_stats_gworld,dest_rect,to_draw,0,10,false);