diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..03b75c6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*:Zone.Identifier diff --git a/Module.mk b/Module.mk index eed7581..ef3c380 100644 --- a/Module.mk +++ b/Module.mk @@ -14,17 +14,15 @@ include popnhax/Module.mk # zipdir := $(BUILDDIR)/zip +popnhax_version := $(shell grep "define PROGRAM_VERSION" popnhax/dllmain.cc | cut -d'"' -f2) -$(zipdir)/: - mkdir -p $@ +$(BUILDDIR)/popnhax_$(popnhax_version).zip: \ + build/bin/avs2_1508-32/popnhax.dll + @echo ... $@ + @mkdir -p $(zipdir) + @cp -a -p build/bin/avs2_1508-32/popnhax.dll $(zipdir) + @cp -r -a -p dist/popnhax/* $(zipdir) + @cd $(zipdir) \ + && zip -r ../popnhax_$(popnhax_version).zip ./* -$(BUILDDIR)/popnhax.zip: \ - build/bin/avs2_1508-32/popnhax.dll \ - dist/popnhax/popnhax.xml \ - dist/popnhax/D3d9.dll \ - dist/popnhax/ifs_hook.dll \ - | $(zipdir)/ - echo ... $@ - zip -j $@ $^ - -all: $(BUILDDIR)/popnhax.zip +all: $(BUILDDIR)/popnhax_$(popnhax_version).zip diff --git a/dist/popnhax/data_mods/_popnhax_assets/tex/system24/ms_ifs/cate_cc.png b/dist/popnhax/data_mods/_popnhax_assets/tex/system24/ms_ifs/cate_cc.png new file mode 100644 index 0000000..253f569 Binary files /dev/null and b/dist/popnhax/data_mods/_popnhax_assets/tex/system24/ms_ifs/cate_cc.png differ diff --git a/dist/popnhax/data_mods/_popnhax_assets/tex/system25/ms_ifs/cate_cc.png b/dist/popnhax/data_mods/_popnhax_assets/tex/system25/ms_ifs/cate_cc.png new file mode 100644 index 0000000..171275e Binary files /dev/null and b/dist/popnhax/data_mods/_popnhax_assets/tex/system25/ms_ifs/cate_cc.png differ diff --git a/dist/popnhax/data_mods/_popnhax_assets/tex/system26/ms_ifs/cate_cc.png b/dist/popnhax/data_mods/_popnhax_assets/tex/system26/ms_ifs/cate_cc.png new file mode 100644 index 0000000..171275e Binary files /dev/null and b/dist/popnhax/data_mods/_popnhax_assets/tex/system26/ms_ifs/cate_cc.png differ diff --git a/dist/popnhax/data_mods/_popnhax_assets/tex/system27/ms_ifs/cate_cc.png b/dist/popnhax/data_mods/_popnhax_assets/tex/system27/ms_ifs/cate_cc.png new file mode 100644 index 0000000..d17adcd Binary files /dev/null and b/dist/popnhax/data_mods/_popnhax_assets/tex/system27/ms_ifs/cate_cc.png differ diff --git a/popnhax/dllmain.cc b/popnhax/dllmain.cc index 8c0702b..4d8e4f8 100644 --- a/popnhax/dllmain.cc +++ b/popnhax/dllmain.cc @@ -32,7 +32,7 @@ #include "SearchFile.h" -#define PROGRAM_VERSION "1.11" +#define PROGRAM_VERSION "1.11.beta2" const char *g_game_dll_fn = NULL; const char *g_config_fn = NULL; diff --git a/popnhax/loader.cc b/popnhax/loader.cc index b8d1d77..66f3f61 100644 --- a/popnhax/loader.cc +++ b/popnhax/loader.cc @@ -917,7 +917,7 @@ void parse_musicdb(const char *input_filename, const char *target, struct popnha } //force loading background for unilab - m->mask |= 0x100; + //m->mask |= 0x100; if ( config->custom_categ && config->custom_exclude_from_version