From 41d4e29c490ffb13b6362fe0131f12f9d23dfc88 Mon Sep 17 00:00:00 2001 From: Darks Date: Mon, 1 Jun 2020 19:03:13 +0200 Subject: [PATCH] Synchro between computers. WIP --- Makefile | 2 +- assets-cg/fonts/{touhou.png => touhou.png.next} | Bin include/config.h | 16 ++++++++++++++++ include/engine.h | 9 +++++++++ src/engine.c | 3 +++ src/main.c | 5 +---- 6 files changed, 30 insertions(+), 5 deletions(-) rename assets-cg/fonts/{touhou.png => touhou.png.next} (100%) create mode 100644 include/config.h create mode 100644 include/engine.h create mode 100644 src/engine.c diff --git a/Makefile b/Makefile index aab0bac..1f9d4ee 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ build-fx/assets/fonts/%.o: assets-fx/fonts/% build-cg/assets/fonts/%.o: assets-cg/fonts/% @ mkdir -p $(dir $@) fxconv -f $< -o $@ $(FXCONVCG) name:font_$(basename $*) $(FONT.$*) \ - charset:print grid.size:14x14 grid.padding:0 propotional:true profile:p4 + charset:print grid.size:14x14 grid.padding:0 proportional:true profile:p4 # Binaries build-fx/assets/bin/%.o: assets-fx/bin/% diff --git a/assets-cg/fonts/touhou.png b/assets-cg/fonts/touhou.png.next similarity index 100% rename from assets-cg/fonts/touhou.png rename to assets-cg/fonts/touhou.png.next diff --git a/include/config.h b/include/config.h new file mode 100644 index 0000000..a69cc32 --- /dev/null +++ b/include/config.h @@ -0,0 +1,16 @@ +#ifndef _CONFIG_H +#define _CONFIG_H + +enum { + WITCH_1 = 0, + WITCH_2, + WITCH_3, + WITCH_4, + WITCH_5, + WITCH_6, + WITCH_7, + WITCH_8, + N_WITCHES +}; + +#endif diff --git a/include/engine.h b/include/engine.h new file mode 100644 index 0000000..73e5ca0 --- /dev/null +++ b/include/engine.h @@ -0,0 +1,9 @@ +#ifndef _ENGINE_H +#define _ENGINE_H + +struct player_s { + char witch_id; + +}; + +#endif diff --git a/src/engine.c b/src/engine.c new file mode 100644 index 0000000..4d28e17 --- /dev/null +++ b/src/engine.c @@ -0,0 +1,3 @@ +#include +#include +#include diff --git a/src/main.c b/src/main.c index 7bf7ff0..8d84c02 100644 --- a/src/main.c +++ b/src/main.c @@ -29,12 +29,9 @@ void draw() { } int main(void) -{ - extern font_t font_touhou; +{ prof_init(1, 0); - // dfont(&font_touhou); - for(int i = 0; i < 100; i++) { draw(); }