diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-10-11 21:05:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 16:05:36 -0400 |
| commit | 3e9ed72e202b1165152d42f7d160695f9f2f233a (patch) | |
| tree | 6bee7b0772be9c591f076815850e7f52fc255b4b /ZAPD/ZRoom | |
| parent | 1c687a69c1f6b84a3fea1bcab8e141f8a26e16dc (diff) | |
Divide ReadConfigFile into separate functions and move them and the rest of GameConfig to their own file (#168)
* Working as a separate file
* Actually use classes
* Remove init, use invoke
* Change configFilePath to a member of GameConfig
* Remove commented stuff, format
* Fix invoke, maybe? And lighten up the includes
* string_view
* Remove unnecessary std::string initialisations
* Rest of Leo's review
* Format
* Merge remote-tracking branch 'upstream/master' into config
* Fix merge breakages
Diffstat (limited to 'ZAPD/ZRoom')
| -rw-r--r-- | ZAPD/ZRoom/ZRoom.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ZAPD/ZRoom/ZRoom.cpp b/ZAPD/ZRoom/ZRoom.cpp index 4c148ab..af9122f 100644 --- a/ZAPD/ZRoom/ZRoom.cpp +++ b/ZAPD/ZRoom/ZRoom.cpp @@ -1,9 +1,8 @@ #include "ZRoom.h" - #include <algorithm> #include <cassert> #include <chrono> - +#include <string_view> #include "Commands/EndMarker.h" #include "Commands/SetActorCutsceneList.h" #include "Commands/SetActorList.h" @@ -330,9 +329,9 @@ std::string ZRoom::GetDefaultName(const std::string& prefix) const } /* - * There is one room in Ocarina of Time that lacks a header. Room 120, "Syotes", dates back to very - * early in the game's development. Since this room is a special case, declare automatically the - * data its contains whitout the need of a header. + * There is one room in Ocarina of Time that lacks a header. Room 120, "Syotes", dates + * back to very early in the game's development. Since this room is a special case, + * declare automatically the data its contains whitout the need of a header. */ void ZRoom::SyotesRoomHack() { |