mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[3DS] Initial port

pull/1032/head
MrHuu 6 years ago committed by Anders Jenbo
parent
b707b09b18
commit
1fa8b6f4e4
18 changed files with 519 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      3rdParty/StormLib/src/FileStream.cpp
  2. 26
      3rdParty/StormLib/src/StormPort.h
  3. BIN
      Packaging/ctr/audio_silent.wav
  4. BIN
      Packaging/ctr/banner.png
  5. BIN
      Packaging/ctr/banner_hellfire.png
  6. BIN
      Packaging/ctr/hb_logo.bin
  7. BIN
      Packaging/ctr/icon.png
  8. BIN
      Packaging/ctr/icon_hellfire.png
  9. 219
      Packaging/ctr/template.rsf
  10. 219
      Packaging/ctr/template_hellfire.rsf
  11. 4
      Source/nthread.cpp
  12. 4
      SourceS/config.h
  13. 9
      SourceS/sdl2_to_1_2_backports.h
  14. 6
      SourceX/DiabloUI/selhero.cpp
  15. 11
      SourceX/DiabloUI/ttf_render_wrapped.cpp
  16. 4
      SourceX/display.cpp
  17. 3
      SourceX/dx.cpp
  18. 6
      SourceX/main.cpp

22
3rdParty/StormLib/src/FileStream.cpp vendored
Unescape View File

@ -91,7 +91,7 @@ static bool BaseFile_Create(TFileStream * pStream)
} }
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
{ {
intptr_t handle; intptr_t handle;
@ -141,7 +141,7 @@ static bool BaseFile_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
} }
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
{ {
struct stat64 fileinfo; struct stat64 fileinfo;
int oflag = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? O_RDONLY : O_RDWR; int oflag = (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? O_RDONLY : O_RDWR;
@ -212,7 +212,7 @@ static bool BaseFile_Read(
} }
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
{ {
ssize_t bytes_read; ssize_t bytes_read;
@ -283,7 +283,7 @@ static bool BaseFile_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const
} }
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
{ {
ssize_t bytes_written; ssize_t bytes_written;
@ -350,7 +350,7 @@ static bool BaseFile_Resize(TFileStream * pStream, ULONGLONG NewFileSize)
} }
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
{ {
if(ftruncate64((intptr_t)pStream->Base.File.hFile, (off64_t)NewFileSize) == -1) if(ftruncate64((intptr_t)pStream->Base.File.hFile, (off64_t)NewFileSize) == -1)
{ {
@ -394,7 +394,7 @@ static bool BaseFile_Replace(TFileStream * pStream, TFileStream * pNewStream)
return (bool)MoveFile(pNewStream->szFileName, pStream->szFileName); return (bool)MoveFile(pNewStream->szFileName, pStream->szFileName);
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
// "rename" on Linux also works if the target file exists // "rename" on Linux also works if the target file exists
if(rename(pNewStream->szFileName, pStream->szFileName) == -1) if(rename(pNewStream->szFileName, pStream->szFileName) == -1)
{ {
@ -414,7 +414,7 @@ static void BaseFile_Close(TFileStream * pStream)
CloseHandle(pStream->Base.File.hFile); CloseHandle(pStream->Base.File.hFile);
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
close((intptr_t)pStream->Base.File.hFile); close((intptr_t)pStream->Base.File.hFile);
#endif #endif
} }
@ -493,7 +493,7 @@ static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
return false; return false;
#endif #endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
struct stat64 fileinfo; struct stat64 fileinfo;
intptr_t handle; intptr_t handle;
bool bResult = false; bool bResult = false;
@ -506,7 +506,7 @@ static bool BaseMap_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
if(fstat64(handle, &fileinfo) != -1) if(fstat64(handle, &fileinfo) != -1)
{ {
#if !defined(PLATFORM_AMIGA) #if !defined(PLATFORM_AMIGA)
#if defined(PLATFORM_SWITCH) #if defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
pStream->Base.Map.pbFile = (LPBYTE)malloc((size_t)fileinfo.st_size); pStream->Base.Map.pbFile = (LPBYTE)malloc((size_t)fileinfo.st_size);
#else #else
pStream->Base.Map.pbFile = (LPBYTE)mmap(NULL, (size_t)fileinfo.st_size, PROT_READ, MAP_PRIVATE, handle, 0); pStream->Base.Map.pbFile = (LPBYTE)mmap(NULL, (size_t)fileinfo.st_size, PROT_READ, MAP_PRIVATE, handle, 0);
@ -568,11 +568,11 @@ static void BaseMap_Close(TFileStream * pStream)
UnmapViewOfFile(pStream->Base.Map.pbFile); UnmapViewOfFile(pStream->Base.Map.pbFile);
#endif #endif
#if (defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU)) && !defined(PLATFORM_AMIGA) && !defined(PLATFORM_SWITCH) #if (defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU)) && !defined(PLATFORM_AMIGA) && !defined(PLATFORM_SWITCH) && !defined(PLATFORM_CTR)
//Todo(Amiga): Fix a proper solution for this //Todo(Amiga): Fix a proper solution for this
if(pStream->Base.Map.pbFile != NULL) if(pStream->Base.Map.pbFile != NULL)
munmap(pStream->Base.Map.pbFile, (size_t )pStream->Base.Map.FileSize); munmap(pStream->Base.Map.pbFile, (size_t )pStream->Base.Map.FileSize);
#elif defined(PLATFORM_SWITCH) #elif defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
if(pStream->Base.Map.pbFile != NULL) if(pStream->Base.Map.pbFile != NULL)
free(pStream->Base.Map.pbFile); free(pStream->Base.Map.pbFile);
#endif #endif

26
3rdParty/StormLib/src/StormPort.h vendored
Unescape View File

@ -174,6 +174,28 @@
#define PLATFORM_DEFINED #define PLATFORM_DEFINED
#endif #endif
#if !defined(PLATFORM_DEFINED) && defined(__3DS__)
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <strings.h>
#include <ctype.h>
#include <assert.h>
#include <errno.h>
#define PLATFORM_LITTLE_ENDIAN
#define PLATFORM_CTR
#define PLATFORM_DEFINED
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Assumption: we are not on Windows nor Macintosh, so this must be linux *grin* // Assumption: we are not on Windows nor Macintosh, so this must be linux *grin*
@ -275,7 +297,7 @@
#endif // !PLATFORM_WINDOWS #endif // !PLATFORM_WINDOWS
// 64-bit calls are supplied by "normal" calls on Mac // 64-bit calls are supplied by "normal" calls on Mac
#if defined(PLATFORM_MAC) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
#define stat64 stat #define stat64 stat
#define fstat64 fstat #define fstat64 fstat
#define lseek64 lseek #define lseek64 lseek
@ -285,7 +307,7 @@
#endif #endif
// Platform-specific error codes for UNIX-based platforms // Platform-specific error codes for UNIX-based platforms
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) #if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH) || defined(PLATFORM_CTR)
#define ERROR_SUCCESS 0 #define ERROR_SUCCESS 0
#define ERROR_FILE_NOT_FOUND ENOENT #define ERROR_FILE_NOT_FOUND ENOENT
#define ERROR_ACCESS_DENIED EPERM #define ERROR_ACCESS_DENIED EPERM

BIN
Packaging/ctr/audio_silent.wav
View File

Binary file not shown.

BIN
Packaging/ctr/banner.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
Packaging/ctr/banner_hellfire.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
Packaging/ctr/hb_logo.bin
View File

Binary file not shown.

BIN
Packaging/ctr/icon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 968 B

BIN
Packaging/ctr/icon_hellfire.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

219
Packaging/ctr/template.rsf
Unescape View File

@ -0,0 +1,219 @@
BasicInfo:
Title : DevilutionX
ProductCode : CTR-P-DIABLO
Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
RomFs:
# Specifies the root path of the read only file system to include in the ROM.
RootPath : build/romfs
TitleInfo:
Category : Application
UniqueId : 0x3F395
Option:
UseOnSD : true # true if App is to be installed to SD
FreeProductCode : true # Removes limitations on ProductCode
MediaFootPadding : false # If true CCI files are created with padding
EnableCrypt : false # Enables encryption for NCCH and CIA
EnableCompress : true # Compresses where applicable (currently only exefs:/.code)
AccessControlInfo:
CoreVersion : 2
# Exheader Format Version
DescVersion : 2
# Minimum Required Kernel Version (below is for 4.5.0)
ReleaseKernelMajor : "02"
ReleaseKernelMinor : "33"
# ExtData
UseExtSaveData : false # enables ExtData
#ExtSaveDataId : 0x300 # only set this when the ID is different to the UniqueId
# FS:USER Archive Access Permissions
# Uncomment as required
FileSystemAccess:
#- CategorySystemApplication
#- CategoryHardwareCheck
- CategoryFileSystemTool
#- Debug
#- TwlCardBackup
#- TwlNandData
#- Boss
- DirectSdmc
#- Core
#- CtrNandRo
#- CtrNandRw
#- CtrNandRoWrite
#- CategorySystemSettings
#- CardBoard
#- ExportImportIvs
#- DirectSdmcWrite
#- SwitchCleanup
#- SaveDataMove
#- Shop
#- Shell
#- CategoryHomeMenu
# Process Settings
MemoryType : Application # Application/System/Base
SystemMode : 96MB # 64MB(Default)/96MB/80MB/72MB/32MB
IdealProcessor : 0
AffinityMask : 1
Priority : 16
MaxCpu : 0x9E # Default
HandleTableSize : 0x200
DisableDebug : false
EnableForceDebug : false
CanWriteSharedPage : true
CanUsePrivilegedPriority : false
CanUseNonAlphabetAndNumber : true
PermitMainFunctionArgument : true
CanShareDeviceMemory : true
RunnableOnSleep : false
SpecialMemoryArrange : true
# New3DS Exclusive Process Settings
SystemModeExt : 124MB # Legacy(Default)/124MB/178MB Legacy:Use Old3DS SystemMode
CpuSpeed : 804MHz # 256MHz(Default)/804MHz
EnableL2Cache : true # false(default)/true
CanAccessCore2 : true
# Virtual Address Mappings
IORegisterMapping:
- 1ff00000-1ff7ffff # DSP memory
MemoryMapping:
- 1f000000-1f5fffff:r # VRAM
# Accessible SVCs, <Name>:<ID>
SystemCallAccess:
ArbitrateAddress: 34
Backdoor: 123
Break: 60
CancelTimer: 28
ClearEvent: 25
ClearTimer: 29
CloseHandle: 35
ConnectToPort: 45
ControlMemory: 1
ControlProcessMemory: 112
CreateAddressArbiter: 33
CreateEvent: 23
CreateMemoryBlock: 30
CreateMutex: 19
CreateSemaphore: 21
CreateThread: 8
CreateTimer: 26
DuplicateHandle: 39
ExitProcess: 3
ExitThread: 9
GetCurrentProcessorNumber: 17
GetHandleInfo: 41
GetProcessId: 53
GetProcessIdOfThread: 54
GetProcessIdealProcessor: 6
GetProcessInfo: 43
GetResourceLimit: 56
GetResourceLimitCurrentValues: 58
GetResourceLimitLimitValues: 57
GetSystemInfo: 42
GetSystemTick: 40
GetThreadContext: 59
GetThreadId: 55
GetThreadIdealProcessor: 15
GetThreadInfo: 44
GetThreadPriority: 11
MapMemoryBlock: 31
OutputDebugString: 61
QueryMemory: 2
ReleaseMutex: 20
ReleaseSemaphore: 22
SendSyncRequest1: 46
SendSyncRequest2: 47
SendSyncRequest3: 48
SendSyncRequest4: 49
SendSyncRequest: 50
SetThreadPriority: 12
SetTimer: 27
SignalEvent: 24
SleepThread: 10
UnmapMemoryBlock: 32
WaitSynchronization1: 36
WaitSynchronizationN: 37
# Service List
# Maximum 34 services (32 if firmware is prior to 9.6.0)
ServiceAccessControl:
- APT:U
- ac:u
- am:net
- boss:U
- cam:u
- cecd:u
- cfg:nor
- cfg:u
- csnd:SND
- dsp::DSP
- frd:u
- fs:USER
- gsp::Gpu
- hid:USER
- http:C
- ir:rst
- ir:u
- ir:USER
- mic:u
- ndm:u
- news:u
- nwm::UDS
- ptm:u
- pxi:dev
- soc:U
- ssl:C
- y2r:u
SystemControlInfo:
SaveDataSize: 0KB # Change if the app uses savedata
RemasterVersion: 2
StackSize: 0x40000
# Modules that run services listed above should be included below
# Maximum 48 dependencies
# <module name>:<module titleid>
Dependency:
ac: 0x0004013000002402
act: 0x0004013000003802
am: 0x0004013000001502
boss: 0x0004013000003402
camera: 0x0004013000001602
cecd: 0x0004013000002602
cfg: 0x0004013000001702
codec: 0x0004013000001802
csnd: 0x0004013000002702
dlp: 0x0004013000002802
dsp: 0x0004013000001a02
friends: 0x0004013000003202
gpio: 0x0004013000001b02
gsp: 0x0004013000001c02
hid: 0x0004013000001d02
http: 0x0004013000002902
i2c: 0x0004013000001e02
ir: 0x0004013000003302
mcu: 0x0004013000001f02
mic: 0x0004013000002002
ndm: 0x0004013000002b02
news: 0x0004013000003502
nfc: 0x0004013000004002
nim: 0x0004013000002c02
nwm: 0x0004013000002d02
pdn: 0x0004013000002102
ps: 0x0004013000003102
ptm: 0x0004013000002202
qtm: 0x0004013020004202
ro: 0x0004013000003702
socket: 0x0004013000002e02
spi: 0x0004013000002302
ssl: 0x0004013000002f02

219
Packaging/ctr/template_hellfire.rsf
Unescape View File

@ -0,0 +1,219 @@
BasicInfo:
Title : DevilutionX
ProductCode : CTR-P-HELLFIRE
Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
RomFs:
# Specifies the root path of the read only file system to include in the ROM.
RootPath : build/romfs
TitleInfo:
Category : Application
UniqueId : 0x3F396
Option:
UseOnSD : true # true if App is to be installed to SD
FreeProductCode : true # Removes limitations on ProductCode
MediaFootPadding : false # If true CCI files are created with padding
EnableCrypt : false # Enables encryption for NCCH and CIA
EnableCompress : true # Compresses where applicable (currently only exefs:/.code)
AccessControlInfo:
CoreVersion : 2
# Exheader Format Version
DescVersion : 2
# Minimum Required Kernel Version (below is for 4.5.0)
ReleaseKernelMajor : "02"
ReleaseKernelMinor : "33"
# ExtData
UseExtSaveData : false # enables ExtData
#ExtSaveDataId : 0x300 # only set this when the ID is different to the UniqueId
# FS:USER Archive Access Permissions
# Uncomment as required
FileSystemAccess:
#- CategorySystemApplication
#- CategoryHardwareCheck
- CategoryFileSystemTool
#- Debug
#- TwlCardBackup
#- TwlNandData
#- Boss
- DirectSdmc
#- Core
#- CtrNandRo
#- CtrNandRw
#- CtrNandRoWrite
#- CategorySystemSettings
#- CardBoard
#- ExportImportIvs
#- DirectSdmcWrite
#- SwitchCleanup
#- SaveDataMove
#- Shop
#- Shell
#- CategoryHomeMenu
# Process Settings
MemoryType : Application # Application/System/Base
SystemMode : 96MB # 64MB(Default)/96MB/80MB/72MB/32MB
IdealProcessor : 0
AffinityMask : 1
Priority : 16
MaxCpu : 0x9E # Default
HandleTableSize : 0x200
DisableDebug : false
EnableForceDebug : false
CanWriteSharedPage : true
CanUsePrivilegedPriority : false
CanUseNonAlphabetAndNumber : true
PermitMainFunctionArgument : true
CanShareDeviceMemory : true
RunnableOnSleep : false
SpecialMemoryArrange : true
# New3DS Exclusive Process Settings
SystemModeExt : 124MB # Legacy(Default)/124MB/178MB Legacy:Use Old3DS SystemMode
CpuSpeed : 804MHz # 256MHz(Default)/804MHz
EnableL2Cache : true # false(default)/true
CanAccessCore2 : true
# Virtual Address Mappings
IORegisterMapping:
- 1ff00000-1ff7ffff # DSP memory
MemoryMapping:
- 1f000000-1f5fffff:r # VRAM
# Accessible SVCs, <Name>:<ID>
SystemCallAccess:
ArbitrateAddress: 34
Backdoor: 123
Break: 60
CancelTimer: 28
ClearEvent: 25
ClearTimer: 29
CloseHandle: 35
ConnectToPort: 45
ControlMemory: 1
ControlProcessMemory: 112
CreateAddressArbiter: 33
CreateEvent: 23
CreateMemoryBlock: 30
CreateMutex: 19
CreateSemaphore: 21
CreateThread: 8
CreateTimer: 26
DuplicateHandle: 39
ExitProcess: 3
ExitThread: 9
GetCurrentProcessorNumber: 17
GetHandleInfo: 41
GetProcessId: 53
GetProcessIdOfThread: 54
GetProcessIdealProcessor: 6
GetProcessInfo: 43
GetResourceLimit: 56
GetResourceLimitCurrentValues: 58
GetResourceLimitLimitValues: 57
GetSystemInfo: 42
GetSystemTick: 40
GetThreadContext: 59
GetThreadId: 55
GetThreadIdealProcessor: 15
GetThreadInfo: 44
GetThreadPriority: 11
MapMemoryBlock: 31
OutputDebugString: 61
QueryMemory: 2
ReleaseMutex: 20
ReleaseSemaphore: 22
SendSyncRequest1: 46
SendSyncRequest2: 47
SendSyncRequest3: 48
SendSyncRequest4: 49
SendSyncRequest: 50
SetThreadPriority: 12
SetTimer: 27
SignalEvent: 24
SleepThread: 10
UnmapMemoryBlock: 32
WaitSynchronization1: 36
WaitSynchronizationN: 37
# Service List
# Maximum 34 services (32 if firmware is prior to 9.6.0)
ServiceAccessControl:
- APT:U
- ac:u
- am:net
- boss:U
- cam:u
- cecd:u
- cfg:nor
- cfg:u
- csnd:SND
- dsp::DSP
- frd:u
- fs:USER
- gsp::Gpu
- hid:USER
- http:C
- ir:rst
- ir:u
- ir:USER
- mic:u
- ndm:u
- news:u
- nwm::UDS
- ptm:u
- pxi:dev
- soc:U
- ssl:C
- y2r:u
SystemControlInfo:
SaveDataSize: 0KB # Change if the app uses savedata
RemasterVersion: 2
StackSize: 0x40000
# Modules that run services listed above should be included below
# Maximum 48 dependencies
# <module name>:<module titleid>
Dependency:
ac: 0x0004013000002402
act: 0x0004013000003802
am: 0x0004013000001502
boss: 0x0004013000003402
camera: 0x0004013000001602
cecd: 0x0004013000002602
cfg: 0x0004013000001702
codec: 0x0004013000001802
csnd: 0x0004013000002702
dlp: 0x0004013000002802
dsp: 0x0004013000001a02
friends: 0x0004013000003202
gpio: 0x0004013000001b02
gsp: 0x0004013000001c02
hid: 0x0004013000001d02
http: 0x0004013000002902
i2c: 0x0004013000001e02
ir: 0x0004013000003302
mcu: 0x0004013000001f02
mic: 0x0004013000002002
ndm: 0x0004013000002b02
news: 0x0004013000003502
nfc: 0x0004013000004002
nim: 0x0004013000002c02
nwm: 0x0004013000002d02
pdn: 0x0004013000002102
ps: 0x0004013000003102
ptm: 0x0004013000002202
qtm: 0x0004013020004202
ro: 0x0004013000003702
socket: 0x0004013000002e02
spi: 0x0004013000002302
ssl: 0x0004013000002f02

4
Source/nthread.cpp
Unescape View File

@ -89,6 +89,9 @@ BOOL nthread_recv_turns(BOOL *pfSendAsync)
last_tick += tick_delay; last_tick += tick_delay;
return TRUE; return TRUE;
} }
#ifdef __3DS__
return FALSE;
#else
if (!SNetReceiveTurns(0, MAX_PLRS, (char **)glpMsgTbl, gdwMsgLenTbl, (LPDWORD)player_state)) { if (!SNetReceiveTurns(0, MAX_PLRS, (char **)glpMsgTbl, gdwMsgLenTbl, (LPDWORD)player_state)) {
if (SErrGetLastError() != STORM_ERROR_NO_MESSAGES_WAITING) if (SErrGetLastError() != STORM_ERROR_NO_MESSAGES_WAITING)
nthread_terminate_game("SNetReceiveTurns"); nthread_terminate_game("SNetReceiveTurns");
@ -107,6 +110,7 @@ BOOL nthread_recv_turns(BOOL *pfSendAsync)
last_tick += tick_delay; last_tick += tick_delay;
return TRUE; return TRUE;
} }
#endif
} }
static unsigned int nthread_handler(void *data) static unsigned int nthread_handler(void *data)

4
SourceS/config.h
Unescape View File

@ -0,0 +1,4 @@
#pragma once
#define PROJECT_NAME "DevilutionX"
#define PROJECT_VERSION "ctr_v1"

9
SourceS/sdl2_to_1_2_backports.h
Unescape View File

@ -759,6 +759,10 @@ inline char *SDL_GetBasePath()
} }
} }
#endif #endif
#if defined(__3DS__)
retval = SDL_strdup("file:sdmc:/3ds/devilutionx/");
return retval;
#endif
/* is a Linux-style /proc filesystem available? */ /* is a Linux-style /proc filesystem available? */
if (!retval && (access("/proc", F_OK) == 0)) { if (!retval && (access("/proc", F_OK) == 0)) {
@ -825,6 +829,11 @@ inline char *SDL_GetPrefPath(const char *org, const char *app)
char *ptr = NULL; char *ptr = NULL;
size_t len = 0; size_t len = 0;
#if defined(__3DS__)
retval = SDL_strdup("sdmc:/3ds/devilutionx/");
return retval;
#endif
if (!app) { if (!app) {
SDL_InvalidParamError("app"); SDL_InvalidParamError("app");
return NULL; return NULL;

6
SourceX/DiabloUI/selhero.cpp
Unescape View File

@ -13,6 +13,10 @@
#include "DiabloUI/selok.h" #include "DiabloUI/selok.h"
#include "DiabloUI/selgame.h" #include "DiabloUI/selgame.h"
#ifdef __3DS__
#include "../platform/ctr/keyboard.h"
#endif
namespace dvl { namespace dvl {
const char *selhero_GenerateName(uint8_t hero_class); const char *selhero_GenerateName(uint8_t hero_class);
@ -362,6 +366,8 @@ void selhero_ClassSelector_Select(int value)
memset(selhero_heroInfo.name, '\0', sizeof(selhero_heroInfo.name)); memset(selhero_heroInfo.name, '\0', sizeof(selhero_heroInfo.name));
#ifdef PREFILL_PLAYER_NAME #ifdef PREFILL_PLAYER_NAME
strncpy(selhero_heroInfo.name, selhero_GenerateName(selhero_heroInfo.heroclass), sizeof(selhero_heroInfo.name) - 1); strncpy(selhero_heroInfo.name, selhero_GenerateName(selhero_heroInfo.heroclass), sizeof(selhero_heroInfo.name) - 1);
#elif defined __3DS__
ctr_vkbdInput("Enter Hero name..", selhero_GenerateName(selhero_heroInfo.heroclass), selhero_heroInfo.name);
#endif #endif
selhero_FreeDlgItems(); selhero_FreeDlgItems();
SDL_Rect rect1 = { PANEL_LEFT + 264, (UI_OFFSET_Y + 211), 320, 33 }; SDL_Rect rect1 = { PANEL_LEFT + 264, (UI_OFFSET_Y + 211), 320, 33 };

11
SourceX/DiabloUI/ttf_render_wrapped.cpp
Unescape View File

@ -1,6 +1,9 @@
#include "DiabloUI/ttf_render_wrapped.h" #include "DiabloUI/ttf_render_wrapped.h"
#include <cstddef> #include <cstddef>
#ifdef __3DS__
#include <string.h>
#endif
namespace dvl { namespace dvl {
@ -40,7 +43,11 @@ SDL_Surface *RenderUTF8_Solid_Wrapped(TTF_Font *font, const char *text, SDL_Colo
int w, h; int w, h;
char *spot, *tok, *next_tok, *end; char *spot, *tok, *next_tok, *end;
char delim; char delim;
#ifdef __3DS__
size_t str_len = strlen(text);
#else
size_t str_len = SDL_strlen(text); size_t str_len = SDL_strlen(text);
#endif
numLines = 0; numLines = 0;
@ -50,7 +57,11 @@ SDL_Surface *RenderUTF8_Solid_Wrapped(TTF_Font *font, const char *text, SDL_Colo
return NULL; return NULL;
} }
#ifdef __3DS__
memcpy(str, text, str_len + 1);
#else
SDL_strlcpy(str, text, str_len + 1); SDL_strlcpy(str, text, str_len + 1);
#endif
tok = str; tok = str;
end = str + str_len; end = str + str_len;
do { do {

4
SourceX/display.cpp
Unescape View File

@ -116,7 +116,11 @@ void CalculatePreferdWindowSize(int &width, int &height, bool useIntegerScaling)
bool SpawnWindow(const char *lpWindowName) bool SpawnWindow(const char *lpWindowName)
{ {
#ifdef __3DS__
if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) <= -1) {
#else
if (SDL_Init(SDL_INIT_EVERYTHING & ~SDL_INIT_HAPTIC) <= -1) { if (SDL_Init(SDL_INIT_EVERYTHING & ~SDL_INIT_HAPTIC) <= -1) {
#endif
ErrSdl(); ErrSdl();
} }

3
SourceX/dx.cpp
Unescape View File

@ -252,8 +252,9 @@ void LimitFrameRate()
void RenderPresent() void RenderPresent()
{ {
SDL_Surface *surface = GetOutputSurface(); SDL_Surface *surface = GetOutputSurface();
#if !defined(__3DS__)
assert(!SDL_MUSTLOCK(surface)); assert(!SDL_MUSTLOCK(surface));
#endif
if (!gbActive) { if (!gbActive) {
LimitFrameRate(); LimitFrameRate();
return; return;

6
SourceX/main.cpp
Unescape View File

@ -2,6 +2,9 @@
#ifdef __SWITCH__ #ifdef __SWITCH__
#include "platform/switch/network.h" #include "platform/switch/network.h"
#endif #endif
#ifdef __3DS__
#include "platform/ctr/system.h"
#endif
#ifdef RUN_TESTS #ifdef RUN_TESTS
#include <gtest/gtest.h> #include <gtest/gtest.h>
#endif #endif
@ -24,6 +27,9 @@ int main(int argc, char **argv)
#ifdef __SWITCH__ #ifdef __SWITCH__
switch_enable_network(); switch_enable_network();
#endif #endif
#ifdef __3DS__
ctr_sys_init();
#endif
return dvl::DiabloMain(argc, argv); return dvl::DiabloMain(argc, argv);
} }

Write Preview
Loading…
Cancel
Save