From e2049647774232ffce5fc8fb9816310a0b8c126d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 22 Oct 2012 09:23:57 +0000
Subject: [PATCH] oups!
git-svn-id: http://svn.net-core.org/repos/t-engine4@5740 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/damage_types.lua | 2 +-
src/main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index a101a61f92..13f239a5a5 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -21,7 +21,7 @@
setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
if not game.level.map:isBound(x, y) then return 0 end
local terrain = game.level.map(x, y, Map.TERRAIN)
- if terrain then terrain:check("da", src, x, y, type, dam) end
+ if terrain then terrain:check("damage_project", src, x, y, type, dam) end
local target = game.level.map(x, y, Map.ACTOR)
if target then
diff --git a/src/main.c b/src/main.c
index 49829e7220..bf2c67bb5e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -736,7 +736,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_RESIZABLE | (fullscreen ? SDL_WINDOW_FULLSCREEN : 0));
+ window = SDL_CreateWindow("TE4", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 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);
--
GitLab