diff --git a/Makefile b/Makefile index 6c642ef..209de3c 100755 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ $(OBJDIR)/%.bmp.o: $(IMGDIR)/%.bmp ## Compile fonts $(OBJDIR)/%.bmp.o: $(FONTDIR)/%.bmp - fxconv $< -o $@ --font -n $(patsubst %.bmp,font_%,$(notdir $<)) + fxconv $< -o $@ -n $(basename $(notdir $<)) --font ## Make an object file out of an ASM source file $(OBJDIR)/%.s.o: $(SRCDIR)/%.s diff --git a/Makefile.config b/Makefile.config index 9d50496..89aaf2e 100755 --- a/Makefile.config +++ b/Makefile.config @@ -41,10 +41,4 @@ SRC = $(notdir $(wildcard $(SRCDIR)/*.[cs])) # INCLUDES INC = $(notdir $(wildcard $(INCDIR)/*.h)) -# SPRITES -IMG = $(notdir $(wildcard $(IMGDIR)/*.bmp)) - -# FONTS -FONT = $(notdir $(wildcard $(FONTDIR)/*.bmp)) - # END OF FILE diff --git a/font/modern.bmp b/font/modern.bmp index e69de29..0340f76 100644 Binary files a/font/modern.bmp and b/font/modern.bmp differ diff --git a/font/system.bmp b/font/system.bmp deleted file mode 100644 index e69de29..0000000 diff --git a/modern.bmp b/modern.bmp new file mode 100644 index 0000000..0340f76 Binary files /dev/null and b/modern.bmp differ diff --git a/obj/modern.bmp.o b/obj/modern.bmp.o new file mode 100644 index 0000000..959c5ee Binary files /dev/null and b/obj/modern.bmp.o differ diff --git a/obj/periodiq.c.o b/obj/periodiq.c.o new file mode 100644 index 0000000..9e023c7 Binary files /dev/null and b/obj/periodiq.c.o differ diff --git a/src/periodiq.c b/src/periodiq.c index 958089b..e862673 100644 --- a/src/periodiq.c +++ b/src/periodiq.c @@ -14,6 +14,7 @@ #include "stdio.h" #include "ctype.h" #include "keyboard.h" +#include "tales.h" //#include @@ -197,9 +198,6 @@ char *etat[9]={ {"inconnu"}, //3 }; -extern Font font_modern; - - int main() { @@ -221,14 +219,13 @@ void Mini(char* chaine, int n ) // fonc defini le numero de la fonction int tableauElement(int chang) { + extern Font modern; short decalx = 0, decaly = 0; unsigned char x = 1, y = 1; unsigned char i; - -text_configure(font_modern, color_black); - +text_configure(&modern, color_black); while(1) {