thcrap_tasofro: Adapt 12.3 code to use new VFS changes correctly

thpatch · Jul 30, 2024 · 1160616 · 1160616
1 parent 69edd97
commit 1160616
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/thcrap_tasofro/src/nsml.cpp b/thcrap_tasofro/src/nsml.cpp
@@ -96,7 +96,7 @@ int nsml_init()
 	if (game_id == TH105) {
 		char *bgm_fn = fn_for_game("data/csv/system/music.cv1.jdiff");
 		jsonvfs_add(bgm_fn, { "themes.js" }, bgm_generator);
-		SAFE_FREE(bgm_fn);
+		free(bgm_fn);
 
 		jsonvfs_game_add_map("data/csv/*/spellcard.cv1.jdiff", { "spells.js" });
 		jsonvfs_game_add_map("data/csv/*/storyspell.cv1.jdiff", { "spells.js" });
@@ -112,19 +112,19 @@ int nsml_init()
 
 		char *bgm_fn = fn_for_game("data/csv/system/music*.cv1.jdiff");
 		jsonvfs_add_map(bgm_fn, { "themes.js" });
-		SAFE_FREE(bgm_fn);
+		free(bgm_fn);
 
 		char *pattern_spell = fn_for_game("data/csv/*/spellcard.cv1.jdiff");
 		char *pattern_story = fn_for_game("data/csv/*/storyspell.cv1.jdiff");
 		char *spells_th123 = fn_for_game("spells.js");
 		char *spellcomments_th123 = fn_for_game("spellcomments.js");
-		jsonvfs_add_map(pattern_spell, { spells_th123, "th105/spells.js"});
-		jsonvfs_add_map(pattern_story, { spells_th123, "th105/spells.js" });
+		jsonvfs_add_map(pattern_spell, { "th105/spells.js", spells_th123 });
+		jsonvfs_add_map(pattern_story, { "th105/spells.js", spells_th123 });
 		jsonvfs_add(pattern_spell, { "th105/spellcomments.js", spellcomments_th123 }, th105_spellcomment_generator);
-		SAFE_FREE(pattern_spell);
-		SAFE_FREE(pattern_story);
-		SAFE_FREE(spells_th123);
-		SAFE_FREE(spellcomments_th123);
+		free(pattern_spell);
+		free(pattern_story);
+		free(spells_th123);
+		free(spellcomments_th123);
 	}
 	return 0;
 }