From a846fdbc4dbdc40a50b388179e8c9ddca570322e Mon Sep 17 00:00:00 2001 From: Fellippe Heitor Date: Fri, 13 Jul 2018 18:03:00 -0300 Subject: [PATCH] OFF/_OFF allowed for _FULLSCREEN and _ALLOWFULLSCREEN (#50) Closes #49 --- internal/c/libqb.cpp | 16 ++++++++-------- source/subs_functions/subs_functions.bas | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp index 0de9943cf..efe473d5a 100644 --- a/internal/c/libqb.cpp +++ b/internal/c/libqb.cpp @@ -22263,30 +22263,30 @@ void sub_put2(int32 i,int64 offset,void *element,int32 passed){ } void sub__fullscreen(int32 method,int32 passed){ - //ref: "[{_OFF|_STRETCH|_SQUAREPIXELS}][, _SMOOTH]" - // 1 2 3 1 + //ref: "[{_OFF|_STRETCH|_SQUAREPIXELS|OFF}][, _SMOOTH]" + // 1 2 3 4 1 int32 x; if (method==0) x=1; - if (method==1) x=0; + if (method==1||method==4) x=0; if (method==2) x=1; if (method==3) x=2; if (passed&1) fullscreen_smooth=1; else fullscreen_smooth=0; if (full_screen!=x) full_screen_set=x; force_display_update=1; } - + void sub__allowfullscreen(int32 method,int32 smooth){ - //ref: "[{_STRETCH|_SQUAREPIXELS|_OFF|_ALL}][, _SMOOTH|_OFF|_ALL]" - // 1 2 3 4 1 2 3 + //ref: "[{_STRETCH|_SQUAREPIXELS|_OFF|_ALL|OFF}][, _SMOOTH|_OFF|_ALL|OFF]" + // 1 2 3 4 5 1 2 3 4 fullscreen_allowedmode=method; - if (method==3) + if (method==3||method==5) fullscreen_allowedmode=-1; if (method==4||method==NULL) fullscreen_allowedmode=0; fullscreen_allowedsmooth=smooth; - if (smooth==2) + if (smooth==2||smooth==4) fullscreen_allowedsmooth=-1; if (smooth==3||smooth==NULL) fullscreen_allowedsmooth=0; diff --git a/source/subs_functions/subs_functions.bas b/source/subs_functions/subs_functions.bas index fe3329054..c80883b08 100644 --- a/source/subs_functions/subs_functions.bas +++ b/source/subs_functions/subs_functions.bas @@ -667,7 +667,7 @@ id.subfunc = 2 id.callname = "sub__fullscreen" id.args = 1 id.arg = MKL$(LONGTYPE - ISPOINTER) -id.specialformat = "[{_OFF|_STRETCH|_SQUAREPIXELS}][,{_SMOOTH}]" +id.specialformat = "[{_OFF|_STRETCH|_SQUAREPIXELS|OFF}][,{_SMOOTH}]" id.NoCloud = 1 regid @@ -677,7 +677,7 @@ id.subfunc = 2 id.callname = "sub__allowfullscreen" id.args = 2 id.arg = MKL$(LONGTYPE - ISPOINTER) + MKL$(LONGTYPE - ISPOINTER) -id.specialformat = "[{_STRETCH|_SQUAREPIXELS|_OFF|_ALL}][,{_SMOOTH|_OFF|_ALL}]" +id.specialformat = "[{_STRETCH|_SQUAREPIXELS|_OFF|_ALL|OFF}][,{_SMOOTH|_OFF|_ALL|OFF}]" id.NoCloud = 1 regid