From cff69a38e3cd020bcb3ecdd42dec5ab6a19f4576 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sat, 10 Mar 2012 11:15:44 +0000
Subject: [PATCH] Waitbars should look better on windows
git-svn-id: http://svn.net-core.org/repos/t-engine4@4963 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 2 +-
src/wait.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 57910e8e2d..b78db10a20 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -827,7 +827,7 @@ function _M:doQuake(tg, x, y)
local locs = {}
local ms = {}
self:project(tg, x, y, function(tx, ty)
- if not game.level.map.attrs(tx, ty, "no_teleport") then
+ if not game.level.map.attrs(tx, ty, "no_teleport") and not game.level.map:checkAllEntities(tx, ty, "change_level") then
locs[#locs+1] = {x=tx,y=ty}
ms[#ms+1] = {map=game.level.map.map[tx + ty * w], attrs=game.level.map.attrs[tx + ty * w]}
end
diff --git a/src/wait.c b/src/wait.c
index 837ac08231..1f5f7a1cf3 100644
--- a/src/wait.c
+++ b/src/wait.c
@@ -117,6 +117,8 @@ static int enable(lua_State *L)
manual_ticks_enabled = FALSE;
waited_ticks = SDL_GetTicks();
+ SDL_GL_SwapWindow(window);
+
int w, h;
SDL_GetWindowSize(window, &w, &h);
--
GitLab