Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust with nnheaders - #27 #133

Merged
merged 1 commit into from
May 6, 2024
Merged

Adjust with nnheaders - #27 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/filedevice/nin/seadNinFileDeviceBaseNin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <nn/fs.h>
#include <nn/fs/fs_types.h>
#include "filedevice/seadFileDevice.h"
#include "prim/seadSafeString.h"

Expand Down
7 changes: 5 additions & 2 deletions modules/src/filedevice/nin/seadNinFileDeviceBaseNin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#include "filedevice/nin/seadNinFileDeviceBaseNin.h"
#include "filedevice/seadPath.h"

#include <nn/fs/fs_directories.h>
#include <nn/fs/fs_files.h>

namespace sead
{
struct NinFileDeviceBase::FileHandleInner
Expand Down Expand Up @@ -398,8 +401,8 @@ bool NinFileDeviceBase::doReadDirectory_(u32* entries_read, DirectoryHandle* han
return true;
}

entries[i].name = entry.name;
entries[i].is_directory = entry.type == nn::fs::DirectoryEntryType_Directory;
entries[i].name = entry.mName;
entries[i].is_directory = entry.mTypeByte == nn::fs::DirectoryEntryType_Directory;
}

if (entries_read)
Expand Down
2 changes: 2 additions & 0 deletions modules/src/filedevice/nin/seadNinSaveFileDeviceNin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "filedevice/nin/seadNinSaveFileDeviceNin.h"

#include <nn/fs/fs_save.h>

namespace sead
{
NinSaveFileDevice::NinSaveFileDevice(const SafeString& mount) : NinFileDeviceBase("save", mount) {}
Expand Down
4 changes: 3 additions & 1 deletion modules/src/filedevice/seadFileDeviceMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
#endif // cafe

#ifdef NNSDK
#include <nn/fs.h>
#include <nn/fs/fs_mount.h>
#include <nn/fs/fs_rom.h>
#include <nn/fs/fs_save.h>
#endif

#include <basis/seadNew.h>
Expand Down
Loading