CrazyRedMachine/popnhax
1
0
Fork 0
forked from Popn_Tools/popnhax
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move subcateg creation to loader.cc

Browse Source
This commit is contained in:
CrazyRedMachine 2024-05-21 22:50:15 +02:00
parent 193c9efe88
commit 8806af339f
3 changed files with 72 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
popnhax/custom_categs.cc
View File

@ -23,6 +23,13 @@
#define F_OK 0
//game code takes array start address from offset 0xC and the address after the list end from offset 0x10
typedef struct songlist_s {
uint32_t dummy[3];
uint32_t array_start;
uint32_t array_end;
} songlist_t;
uint8_t g_game_version;
uint32_t g_playerdata_ptr_addr; //pointer to the playerdata memory zone (offset 0x08 is popn friend ID as ascii (12 char long), offset 0x1A5 is "is logged in" flag)
char *g_current_friendid;
@ -31,12 +38,6 @@ uint32_t g_current_songid;
bst_t *g_customs_bst = NULL;
void (*add_song_in_list)();
//game code takes array start address from offset 0xC and the address after the list end from offset 0x10
typedef struct songlist_s {
uint32_t dummy[3];
uint32_t array_start;
uint32_t array_end;
} songlist_t;
bool g_subcategmode = false;
uint32_t g_min_id = 4000;
@ -243,12 +244,6 @@ uint32_t songlist_count = 0;
songlist_t songlist_struct;
uint32_t songlist_struct_addr = (uint32_t)&songlist_struct;
typedef struct {
char *name;
uint32_t size;
uint32_t *songlist;
} subcategory_s;
subcategory_s* subcategories;
uint32_t g_subcateg_count = 0;
//subcategories[0] is the "ALL SONGS" virtual subcategory,
@ -266,7 +261,7 @@ static bool subcateg_has_songid(uint32_t songid, subcategory_s* subcateg)
return false;
}
static void add_song_to_subcateg(uint32_t songid, subcategory_s* subcateg)
void add_song_to_subcateg(uint32_t songid, subcategory_s* subcateg)
{
if ( is_a_custom(songid)
&& !subcateg_has_songid(songid, subcateg) )
@ -284,7 +279,7 @@ static void add_song_to_subcateg(uint32_t songid, subcategory_s* subcateg)
}
}
static subcategory_s* get_subcateg(const char *title)
subcategory_s* get_subcateg(const char *title)
{
for (uint32_t i = 0; i < g_subcateg_count; i++)
{
@ -292,7 +287,15 @@ static subcategory_s* get_subcateg(const char *title)
if (strcmp(title, subcategories[i+1].name) == 0)
return &(subcategories[i+1]);
}
return NULL;
//not found, allocate a new one
subcategories = (subcategory_s*)realloc(subcategories, sizeof(subcategory_s)*((++g_subcateg_count)+1));
subcategory_s *subcateg = &(subcategories[g_subcateg_count]);
subcateg->name = strdup(title);
subcateg->songlist = NULL;
subcateg->size = 0;
return subcateg;
}
void (*categ_inject_songlist)();
@ -511,6 +514,7 @@ void hook_categ_reinit_songlist()
real_categ_reinit_songlist();
}
// in simple category mode, the game itself builds the full list by checking songids on the fly
void (*real_categ_build_songlist)();
void hook_categ_build_songlist()
{
@ -919,68 +923,13 @@ sprintf(formatted_title, g_categformat, g_categname);
return true;
}
//extract folder name (cut "data_mods")
static char *get_folder_name(const char* path) {
size_t len = (size_t)(strchr(path+10, '\\')-(path+10));
char *categ_name = (char*) malloc(len+1);
strncpy(categ_name, path+10, len);
categ_name[len] = '\0';
return categ_name;
}
bool is_excluded_folder(const char *input_filename)
{
return (input_filename[strlen("data_mods/")] == '_');
}
static void parse_musicdb(const char *input_filename) {
char *title = get_folder_name(input_filename);
subcategory_s *subcateg = get_subcateg(title);
if ( subcateg == NULL )
{
subcategories = (subcategory_s*)realloc(subcategories, sizeof(subcategory_s)*((++g_subcateg_count)+1));
subcateg = &(subcategories[g_subcateg_count]);
subcateg->name = strdup(title);
subcateg->songlist = NULL;
subcateg->size = 0;
}
property* musicdb = load_prop_file(input_filename);
//iterate over all music id
property_node *prop = NULL;
if ((prop = property_search(musicdb, NULL, "/database/music"))) {
for (; prop != NULL; prop = property_node_traversal(prop, TRAVERSE_NEXT_SEARCH_RESULT)) {
char idxStr[256] = {};
property_node_refer(musicdb, prop, "id@", PROPERTY_TYPE_ATTR, idxStr,
sizeof(idxStr));
uint32_t songid = atoi(idxStr);
add_song_to_subcateg(songid, subcateg);
}
}
free(title);
}
static void load_databases() {
SearchFile s;
g_subcateg_count = 0;
subcategories = (subcategory_s*)realloc(subcategories, sizeof(subcategory_s)*(1));
subcategories[0].name = strdup("ALL SONGS");
subcategories[0].songlist = NULL;
subcategories[0].size = 0;
s.search("data_mods", "xml", true);
auto result = s.getResult();
for(uint16_t i=0;i<result.size();i++)
{
if ( (strstr(result[i].c_str(), "musicdb") == NULL)
|| is_excluded_folder(result[i].c_str()) )
continue;
parse_musicdb(result[i].c_str());
}
void init_subcategories() {
g_subcategmode = true;
g_subcateg_count = 0;
subcategories = (subcategory_s*)realloc(subcategories, sizeof(subcategory_s)*(1));
subcategories[0].name = strdup("ALL SONGS");
subcategories[0].songlist = NULL;
subcategories[0].size = 0;
}
static void print_databases() {
@ -1059,11 +1008,8 @@ bool patch_custom_categs(const char *dllFilename, struct popnhax_config *config)
g_categicon = "cate_13";
}
if (mode == 2)
if (mode == 1)
{
g_subcategmode = true;
load_databases();
} else {
songlist = (uint32_t*)calloc(1,5); //for some reason it crashes without that 4 cells extra margin
}

11
popnhax/custom_categs.h
View File

@ -5,10 +5,19 @@
#include "popnhax/config.h"
#include "util/bst.h"
typedef struct {
char *name;
uint32_t size;
uint32_t *songlist; //really is a (songlist_t *) pointer
} subcategory_s;
extern uint32_t g_max_id;
extern bst_t *g_customs_bst;
bool is_excluded_folder(const char *input_filename);
void init_subcategories();
void add_song_to_subcateg(uint32_t songid, subcategory_s* subcateg);
subcategory_s* get_subcateg(const char *title);
bool patch_custom_categs(const char *dllFilename, struct popnhax_config *config);
bool patch_local_favorites(const char *dllFilename, uint8_t version);

36
popnhax/loader.cc
View File

@ -821,12 +821,34 @@ void parse_charadb(const char *input_filename, const char *target) {
free(config_xml);
}
//extract folder name (cut "data_mods")
static char *get_folder_name(const char* path) {
size_t len = (size_t)(strchr(path+10, '\\')-(path+10));
char *categ_name = (char*) malloc(len+1);
strncpy(categ_name, path+10, len);
categ_name[len] = '\0';
return categ_name;
}
static bool is_excluded_folder(const char *input_filename)
{
return (input_filename[strlen("data_mods/")] == '_');
}
void parse_musicdb(const char *input_filename, const char *target, struct popnhax_config *config) {
if (!file_exists(input_filename)) {
printf("Couldn't find %s, skipping...\n", input_filename);
return;
}
char *subcateg_title = NULL;
subcategory_s *subcateg = NULL;
if (config->custom_categ == 2)
{
subcateg_title = get_folder_name(input_filename);
subcateg = get_subcateg(subcateg_title); //will return a new one if not found
}
property *config_xml = load_prop_file(input_filename);
if (target && strlen(target) > 0) {
@ -878,7 +900,11 @@ void parse_musicdb(const char *input_filename, const char *target, struct popnha
{
g_customs_bst = bst_insert(g_customs_bst, idx);
//LOG("%d inserted into customs bst\n", idx);
//TODO: handle custom category creation here as well while we're at it (beware: maybe we should still consider !is_gone charts as custom?)
//TODO: (beware: maybe we should still consider !is_gone charts as custom?)
if (config->custom_categ == 2)
{
add_song_to_subcateg(idx, subcateg);
}
} else {
//LOG("%d already present in customs bst\n", idx);
}
@ -1023,6 +1049,11 @@ void parse_musicdb(const char *input_filename, const char *target, struct popnha
}
free(config_xml);
if (config->custom_categ == 2)
{
free(subcateg_title);
}
}
void load_databases(const char *target_datecode, struct popnhax_config *config) {
@ -1041,6 +1072,9 @@ void load_databases(const char *target_datecode, struct popnhax_config *config)
parse_charadb(result[i].c_str(), target_datecode);
}
if (config->custom_categ == 2)
init_subcategories();
for(uint16_t i=0;i<result.size();i++)
{
if ( strstr(result[i].c_str(), "musicdb") == NULL )