atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Drop path_ from path config options

Browse source
This commit is contained in:
GriffinR 2022-10-24 08:03:51 -04:00
parent 5ba3720405
commit 09ce5b5913
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docsrc/manual/project-files.rst
View file

@ -57,7 +57,7 @@ For example if you wanted to rename ``include/constants/items.h`` to ``headers/d
include/constants/metatile_labels.h, yes, yes, ``constants_metatile_labels``, include/constants/metatile_labels.h, yes, yes, ``constants_metatile_labels``,
include/constants/metatile_behaviors.h, yes, no, ``constants_metatile_behaviors``, include/constants/metatile_behaviors.h, yes, no, ``constants_metatile_behaviors``,
include/fieldmap.h, yes, no, ``constants_fieldmap``, reads tileset related constants include/fieldmap.h, yes, no, ``constants_fieldmap``, reads tileset related constants
src/event_object_movement.c, yes, no, ``path_initial_facing_table``, reads ``gInitialMovementTypeFacingDirections`` src/event_object_movement.c, yes, no, ``initial_facing_table``, reads ``gInitialMovementTypeFacingDirections``
src/pokemon_icon.c, yes, no, ``path_pokemon_icon_table``, reads files in ``gMonIconTable`` src/pokemon_icon.c, yes, no, ``pokemon_icon_table``, reads files in ``gMonIconTable``

4
include/config.h
View file

@ -183,8 +183,8 @@ enum ProjectFilePath {
constants_metatile_labels, constants_metatile_labels,
constants_metatile_behaviors, constants_metatile_behaviors,
constants_fieldmap, constants_fieldmap,
path_initial_facing_table, initial_facing_table,
path_pokemon_icon_table, pokemon_icon_table,
}; };
class ProjectConfig: public KeyValueConfigBase class ProjectConfig: public KeyValueConfigBase

4
src/config.cpp
View file

@ -59,8 +59,8 @@ const QMap<ProjectFilePath, std::pair<QString, QString>> defaultPaths = {
{ProjectFilePath::constants_metatile_labels, { "constants_metatile_labels", "include/constants/metatile_labels.h"}}, {ProjectFilePath::constants_metatile_labels, { "constants_metatile_labels", "include/constants/metatile_labels.h"}},
{ProjectFilePath::constants_metatile_behaviors, { "constants_metatile_behaviors", "include/constants/metatile_behaviors.h"}}, {ProjectFilePath::constants_metatile_behaviors, { "constants_metatile_behaviors", "include/constants/metatile_behaviors.h"}},
{ProjectFilePath::constants_fieldmap, { "constants_fieldmap", "include/fieldmap.h"}}, {ProjectFilePath::constants_fieldmap, { "constants_fieldmap", "include/fieldmap.h"}},
{ProjectFilePath::path_pokemon_icon_table, { "path_pokemon_icon_table", "src/pokemon_icon.c"}}, {ProjectFilePath::pokemon_icon_table, { "pokemon_icon_table", "src/pokemon_icon.c"}},
{ProjectFilePath::path_initial_facing_table, { "path_initial_facing_table", "src/event_object_movement.c"}}, {ProjectFilePath::initial_facing_table, { "initial_facing_table", "src/event_object_movement.c"}},
}; };
ProjectFilePath reverseDefaultPaths(QString str) { ProjectFilePath reverseDefaultPaths(QString str) {

4
src/project.cpp
View file

@ -2166,7 +2166,7 @@ bool Project::readMovementTypes() {
} }
bool Project::readInitialFacingDirections() { bool Project::readInitialFacingDirections() {
QString filename = projectConfig.getFilePath(ProjectFilePath::path_initial_facing_table); QString filename = projectConfig.getFilePath(ProjectFilePath::initial_facing_table);
fileWatcher.addPath(root + "/" + filename); fileWatcher.addPath(root + "/" + filename);
facingDirections = parser.readNamedIndexCArray(filename, "gInitialMovementTypeFacingDirections"); facingDirections = parser.readNamedIndexCArray(filename, "gInitialMovementTypeFacingDirections");
if (facingDirections.isEmpty()) { if (facingDirections.isEmpty()) {
@ -2507,7 +2507,7 @@ bool Project::readEventGraphics() {
bool Project::readSpeciesIconPaths() { bool Project::readSpeciesIconPaths() {
speciesToIconPath.clear(); speciesToIconPath.clear();
QString srcfilename = projectConfig.getFilePath(ProjectFilePath::path_pokemon_icon_table); QString srcfilename = projectConfig.getFilePath(ProjectFilePath::pokemon_icon_table);
QString incfilename = projectConfig.getFilePath(ProjectFilePath::data_pokemon_gfx); QString incfilename = projectConfig.getFilePath(ProjectFilePath::data_pokemon_gfx);
fileWatcher.addPath(root + "/" + srcfilename); fileWatcher.addPath(root + "/" + srcfilename);
fileWatcher.addPath(root + "/" + incfilename); fileWatcher.addPath(root + "/" + incfilename);