diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-22 08:12:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 08:12:04 +0200 |
| commit | 7f49e2a7a0e74b7de98c4cb176f333f78d6c0e50 (patch) | |
| tree | cde824812428078fa0c258b6a9204c6186f6cec9 /platform/javascript/os_javascript.cpp | |
| parent | 4fc0a2d776cc26a0b372af4c345ccc0f44e47105 (diff) | |
| parent | 63f847b3065bb7c7a130a199731b4d92a7bdfb91 (diff) | |
Merge pull request #10487 from marcelofg55/curscr_as_default
p_screen param from get_screen_* funcs now default to the current screen
Diffstat (limited to 'platform/javascript/os_javascript.cpp')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index d339baf024..f49acb04de 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -687,8 +687,6 @@ OS::VideoMode OS_JavaScript::get_video_mode(int p_screen) const { Size2 OS_JavaScript::get_screen_size(int p_screen) const { - ERR_FAIL_COND_V(p_screen != 0, Size2()); - EmscriptenFullscreenChangeEvent ev; EMSCRIPTEN_RESULT result = emscripten_get_fullscreen_status(&ev); ERR_FAIL_COND_V(result != EMSCRIPTEN_RESULT_SUCCESS, Size2()); |