From c2b24494e77edd4e3ec328197da5085779ad32d7 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 28 Feb 2012 09:27:38 +0000
Subject: [PATCH] oups
git-svn-id: http://svn.net-core.org/repos/t-engine4@4947 51575b47-30f0-44d4-a5cc-537603b46e54
---
src/core_lua.c | 4 ++--
src/main.c | 2 +-
src/main.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/core_lua.c b/src/core_lua.c
index dbd650026c..05a47fdbd7 100644
--- a/src/core_lua.c
+++ b/src/core_lua.c
@@ -1797,9 +1797,9 @@ static int sdl_set_window_size(lua_State *L)
{
int w = luaL_checknumber(L, 1);
int h = luaL_checknumber(L, 2);
- int fullscreen = lua_tonumber(L, 3);
+ bool fullscreen = lua_toboolean(L, 3);
- printf("Setting resolution to %dx%d (%s)\n", w, h, (fullscreen == 2) ? "fakefull" : ((fullscreen) ? "fullscreen" : "windowed");
+ printf("Setting resolution to %dx%d (%s)\n", w, h, fullscreen ? "fullscreen" : "windowed");
do_resize(w, h, fullscreen);
lua_pushboolean(L, TRUE);
diff --git a/src/main.c b/src/main.c
index 306e7586bb..4d85da6ec4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -743,7 +743,7 @@ void do_resize(int w, int h, bool fullscreen)
if (!window)
{
- window = SDL_CreateWindow("TE4", 0, 0, w, h, SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS);
+ window = SDL_CreateWindow("TE4", 0, 0, w, h, SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | (fullscreen ? SDL_WINDOW_FULLSCREEN : 0));
if (window==NULL) {
printf("error opening screen: %s\n", SDL_GetError());
exit(1);
diff --git a/src/main.h b/src/main.h
index 88bdc6d799..f1bb929481 100644
--- a/src/main.h
+++ b/src/main.h
@@ -34,7 +34,7 @@
#endif
extern int resizeWindow(int width, int height);
-extern void do_resize(int w, int h, int fullscreen);
+extern void do_resize(int w, int h, bool fullscreen);
extern void setupRealtime(float freq);
extern void setupDisplayTimer(int fps);
extern int docall (lua_State *L, int narg, int nret);
--
GitLab