wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

osb bugfix #206

This commit is contained in:
olikraus 2017-07-14 07:40:30 +02:00
parent b4d3dc2e43
commit e96514c41a
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/tga/mapgen/gm.map
View File

@ -138,7 +138,7 @@ tile '. $6a # stone 2
tile ': $6b # stone 3
thing 'f $74 # fire
thing 'x $72 # door closed
#thing 'x $72 # door closed
thing '^ $73 # door open
thing 'C $79 # cupboard
thing 'S $7a # bookshelf
@ -150,7 +150,7 @@ thing 'h $9c # chest
thing 'H $92 # hut
thing 'K $93 # kingdom
item normal_door $72 # $72 = door closed
item normal_door $73 # $73 = door open
itemkey normal_door 'x $72 # $72 = door closed
iteminit normal_door

23
sys/tga/mapgen/mapgen.c
View File

@ -649,12 +649,35 @@ void write_tga_map(const char *filename)
static void write_item_onmap()
{
int x, y;
/*
pseudo code:
with all tiles on the map
if the tile is connected to an item
output an item onmap entry
*/
if ( map_phase == PHASE_MAPSTRUCT )
{
if ( out_fp != NULL )
{
fprintf(out_fp, "item_onmap_t item_onmap_list[] = {\n");
for( y = 0; y < map_height; y++ )
{
for( x = 0; x < map_width; x++ )
{
fprintf(out_fp, " { ");
fprintf(out_fp, "map_%s, ", map_name);
fprintf(out_fp, "%ld, ", map_width);
fprintf(out_fp, "%ld ", map_height);
fprintf(out_fp, " },");
}
}
fprintf(out_fp, "}\n\n");
}
}
}
int map_read_tile(const char **s, int is_overwrite, int item_index)

11
tools/font/build/build.c
View File

@ -533,13 +533,22 @@ struct fontinfo fi[] = {
./do_fontsize_a_v2.sh 48 ../ttf/os/OldStandard-Bold.ttf osb35
./do_fontsize_a_v2.sh 55 ../ttf/os/OldStandard-Bold.ttf osb41
*/
/*
bugfix 14 Jul 2017, this is the old (and wrong) code:
{ "-a -r 72 -p 25", "OldStandard-Regular.ttf", "osb18", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 28", "OldStandard-Regular.ttf", "osb21", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 34", "OldStandard-Regular.ttf", "osb26", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 38", "OldStandard-Regular.ttf", "osb29", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 48", "OldStandard-Regular.ttf", "osb35", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 55", "OldStandard-Regular.ttf", "osb41", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
*/
{ "-a -r 72 -p 25", "OldStandard-Bold.ttf", "osb18", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 28", "OldStandard-Bold.ttf", "osb21", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 34", "OldStandard-Bold.ttf", "osb26", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 38", "OldStandard-Bold.ttf", "osb29", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 48", "OldStandard-Bold.ttf", "osb35", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
{ "-a -r 72 -p 55", "OldStandard-Bold.ttf", "osb41", 9, 0, BM_T, FM_C, MM_F|MM_R|MM_N, "", "" },
/*
./do_fontsize_a_v2.sh 26 ../ttf/os/OldStandard-Regular.ttf osr18
./do_fontsize_a_v2.sh 29 ../ttf/os/OldStandard-Regular.ttf osr21