From 0c641ff1570f7285aeb9fb289f31b880020788bd Mon Sep 17 00:00:00 2001
From: cybermind <iddqd_mail@mail.ru>
Date: Sat, 5 May 2012 19:19:18 +0600
Subject: [PATCH] [-]Fixed chashes introduced in rev.8259
---
src/game/trigger.cpp | 1 -
src/sound/music.cpp | 1 -
src/ui/interface.cpp | 2 --
src/unit/unittype.cpp | 1 +
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/game/trigger.cpp b/src/game/trigger.cpp
index 75804e752..df77a9ab7 100644
--- a/src/game/trigger.cpp
+++ b/src/game/trigger.cpp
@@ -642,7 +642,6 @@ void InitTriggers()
lua_getglobal(Lua, "_triggers_");
if (lua_isnil(Lua, -1)) {
- lua_pop(Lua, 1);
lua_getglobal(Lua, "SinglePlayerTriggers");
LuaCall(0, 1);
}
diff --git a/src/sound/music.cpp b/src/sound/music.cpp
index 21b331ec5..0c2b67ea0 100644
--- a/src/sound/music.cpp
+++ b/src/sound/music.cpp
@@ -95,7 +95,6 @@ void CheckMusicFinished(bool force)
} else {
LuaCall(0, 1);
}
- lua_pop(Lua, 1);
}
}
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 924299a37..2ed081219 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -504,7 +504,6 @@ bool HandleCommandKey(int key)
lua_getglobal(Lua, "HandleCommandKey");
if (!lua_isfunction(Lua, -1)) {
- lua_pop(Lua, 1);
DebugPrint("No HandleCommandKey function in lua.\n");
return false;
}
@@ -779,7 +778,6 @@ int HandleCheats(const std::string &input)
int base = lua_gettop(Lua);
lua_getglobal(Lua, "HandleCheats");
if (!lua_isfunction(Lua, -1)) {
- lua_pop(Lua, 1);
DebugPrint("No HandleCheats function in lua.\n");
return 0;
}
diff --git a/src/unit/unittype.cpp b/src/unit/unittype.cpp
index a473cf184..11162ce5f 100644
--- a/src/unit/unittype.cpp
+++ b/src/unit/unittype.cpp
@@ -260,6 +260,7 @@ void UpdateStats(int reset)
MapFieldBuilding |
MapFieldCoastAllowed |
MapFieldWaterAllowed |
+ MapFieldNoBuilding |
MapFieldUnpassable;
type.FieldFlags = MapFieldNoBuilding;
} else {