Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
Citra2018
Commits
2d250dbf
Commit
2d250dbf
authored
Jul 03, 2017
by
James
Browse files
Add messages for in-game emulation errors
parent
0c0d3dc7
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/citra_libretro/citra_libretro.cpp
View file @
2d250dbf
...
...
@@ -261,7 +261,26 @@ void retro_run() {
UpdateSettings
(
false
);
while
(
!
emu_window
->
HasSubmittedFrame
())
{
system_core
.
RunLoop
();
auto
result
=
system_core
.
RunLoop
();
if
(
result
!=
Core
::
System
::
ResultStatus
::
Success
)
{
std
::
string
errorContent
=
Core
::
System
::
GetInstance
().
GetStatusDetails
();
std
::
string
msg
;
switch
(
result
)
{
case
Core
::
System
::
ResultStatus
::
ErrorSystemFiles
:
msg
=
"Citra was unable to locate a 3DS system archive: "
+
errorContent
;
break
;
case
Core
::
System
::
ResultStatus
::
ErrorSharedFont
:
msg
=
"Citra was unable to locate the 3DS shared fonts."
;
break
;
default:
msg
=
"Fatal Error encountered: "
+
errorContent
;
break
;
}
LibRetro
::
DisplayMessage
(
msg
.
c_str
());
}
}
}
...
...
src/citra_libretro/environment.cpp
View file @
2d250dbf
...
...
@@ -69,7 +69,7 @@ bool Shutdown() {
bool
DisplayMessage
(
const
char
*
sg
)
{
retro_message
msg
;
msg
.
msg
=
sg
;
msg
.
frames
=
1
8
0
;
msg
.
frames
=
60
*
10
;
return
environ_cb
(
RETRO_ENVIRONMENT_SET_MESSAGE
,
&
msg
);
}
...
...
@@ -122,8 +122,6 @@ void retro_set_input_state(retro_input_state_t cb) {
}
void
retro_get_system_av_info
(
struct
retro_system_av_info
*
info
)
{
LOG_INFO
(
Frontend
,
"Av go!"
);
// These are placeholders until we get control.
info
->
timing
.
fps
=
60.0
;
info
->
timing
.
sample_rate
=
41000
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment