From f77972b3806d97991cce27b35327a313c136155f Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 12 Nov 2019 10:01:38 -0500 Subject: [PATCH] gr-sim: tfv: fix build was actually an issue with a non-indexed title.png --- gr-sim/tfv/Makefile | 6 +++--- gr-utils/loadpng.c | 10 ++++++---- tfv/art/title.png | Bin 523 -> 9747 bytes 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gr-sim/tfv/Makefile b/gr-sim/tfv/Makefile index f29ab177..29a2b2b5 100644 --- a/gr-sim/tfv/Makefile +++ b/gr-sim/tfv/Makefile @@ -131,7 +131,7 @@ tfv_multiply.o: tfv_multiply.c $(CC) $(CFLAGS) -c tfv_multiply.c tfv_multiply: tfv_multiply.o - $(CC) $(LFLAGS) -o tfv_multiply tfv_multiply.o + $(CC) -o tfv_multiply tfv_multiply.o $(LFLAGS) tfv.o: tfv.c ../gr-sim.h tfv_backgrounds.h tfv_sprites.h @@ -144,14 +144,14 @@ tfv: tfv.o tfv_backgrounds.o tfv_battle.o tfv_credits.o tfv_dialog.o \ tfv_random.o tfv_sprites.o tfv_textentry.o \ tfv_title.o tfv_worldmap.o tfv_mapinfo.h \ $(GR_SIM) - $(CC) $(LFLAGS) $(SDL_LIBS) -o tfv tfv.o \ + $(CC) -o tfv tfv.o \ tfv_backgrounds.o tfv_battle.o tfv_credits.o tfv_dialog.o \ tfv_ending.o tfv_flying.o \ tfv_game_over.o tfv_help.o tfv_info.o tfv_map.o \ tfv_opener.o tfv_player_select.o \ tfv_random.o tfv_sprites.o tfv_textentry.o \ tfv_title.o tfv_worldmap.o \ - $(GR_SIM) + $(GR_SIM) $(LFLAGS) $(SDL_LIBS) clean: rm -f *~ *.o tfv diff --git a/gr-utils/loadpng.c b/gr-utils/loadpng.c index d8a2965f..e1f6aff0 100644 --- a/gr-utils/loadpng.c +++ b/gr-utils/loadpng.c @@ -15,7 +15,7 @@ #include #include "loadpng.h" -static int convert_color(int color) { +static int convert_color(int color, char *filename) { int c=0; @@ -37,7 +37,9 @@ static int convert_color(int color) { case 0x72ffd0: c=14; break; /* aqua */ case 0xffffff: c=15; break; /* white */ default: - printf("Unknown color %x\n",color); + fprintf(stderr,"Unknown color %x, file %s\n", + color,filename); + exit(-1); break; } @@ -181,7 +183,7 @@ int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize, printf("%x ",color); } - a2_color=convert_color(color); + a2_color=convert_color(color,filename); /* bottom color */ color= (row_pointers[y+1][x*xadd*4]<<16)+ @@ -191,7 +193,7 @@ int loadpng(char *filename, unsigned char **image_ptr, int *xsize, int *ysize, printf("%x ",color); } - a2_color|=(convert_color(color)<<4); + a2_color|=(convert_color(color,filename)<<4); *out_ptr=a2_color; out_ptr++; diff --git a/tfv/art/title.png b/tfv/art/title.png index 5bcb17c398b123b694b4c44cd59e06ecfdbe18a5..9b34384656695681aae8eb40f5718d8f202f1e4e 100644 GIT binary patch literal 9747 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 delta 509 zcmVcrXaY!seX(xt1;$ff{(Y^o9VWN{4lt76fm?s1b+s7T{WPz!Vo~TZ|-V2e2eOnw?;V+YZ4iUN*+fYk2VYmxzS zU)-S^19F-p=`VJZQ(W#cKxsP)7~0Ok76U{FCY`XfVw(ZvCWcm;6cDXYuK(&QPzw+p zS2uvEmvD6z_cflZz%wWfT{x?u@Fosz?fYwB^-5+1X#KZ;2v%l(*(2-v8kg1nUG6Y0dW0V zpmYHk^XqU|6^*{T1WYku`xAe5z#}_c zYk<@}6os*2Z%p}z9%`~@DF7D-m?8+A7BreaoVqrmP+wIs00000NkvXXu0mjfQ|8q5