ich777/CorsixTH
1
0
Fork 0
mirror of https://github.com/CorsixTH/CorsixTH.git synced 2025-07-23 04:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert r1264 for beta6 and add r1266.

Browse Source
This commit is contained in:
Edvin Linge
2011-03-24 19:00:09 +00:00
parent a0baf8c319
commit 99b1348a8e
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CorsixTH/Lua/objects/bed.lua
View File

@@ -84,7 +84,7 @@ object.orientations = {
south = {
footprint = { {1, 0, only_passable = true}, {-1, -1}, {0, -1}, {-1, 0}, {0, 0} },
use_position = {1, 0},
early_list = true,
render_attach_position = {{-2,0},{-1,0},{0,0},{0,-1,}},
},
west = {
footprint = { {-1, 1, only_passable = true}, {-1, -1}, {0, -1}, {-1, 0}, {0, 0} },

2
CorsixTH/Lua/objects/crash_trolley.lua
View File

@@ -53,6 +53,7 @@ object.multi_usage_animations = {
}
object.orientations = {
north = {
render_attach_position = { {0, 0}, {-1, 1} },
footprint = { {-1, 0}, {-1, 1, only_passable = true},
{0, 0, only_passable = true}, {0, 1, only_passable = true} },
use_position = {-1, 1},
@@ -60,6 +61,7 @@ object.orientations = {
list_bottom = true,
},
east = {
render_attach_position = { {0, 0}, {1, -1} },
footprint = { {0, -1}, {0, 0, only_passable = true},
{1, -1, only_passable = true}, {1, 0, only_passable = true} },
use_position = {1, -1},

2
CorsixTH/Lua/objects/sofa.lua
View File

@@ -97,6 +97,7 @@ anim_mgr:setMarker(object.usage_animations.east.finish_use, 0, kf1, 1, kf1, 3, k
object.orientations = {
north = {
footprint = { {-1, 0}, {0, 0}, {-1, -1, only_passable = true} },
render_attach_position = {-1, 0},
use_position = "passable",
},
east = {
@@ -104,6 +105,7 @@ object.orientations = {
use_position = "passable",
},
south = {
render_attach_position = { {0, 0}, {-1, 1} },
footprint = { {-1, 0}, {0, 0}, {-1, 1, only_passable = true} },
use_position = "passable",
},

4
MapEdit/Src/frmMain.cpp
View File

@@ -334,7 +334,7 @@ void frmMain::_populateParcelGallery(wxRibbonGallery* pGallery)
pBlocksSheet = reinterpret_cast<THSpriteSheet*>(lua_touserdata(L, -1));
luaT_execute(L, "return TheApp.map.cell_outline");
pOutlineSheet = reinterpret_cast<THSpriteSheet*>(lua_touserdata(L, -1));
luaT_execute(L, "return TheApp.map.debug_font");
luaT_execute(L, "return TheApp.gfx:loadBuiltinFont()");
pFontSheet = reinterpret_cast<THBitmapFont*>(lua_touserdata(L, -1))
->getSpriteSheet();
lua_pop(L, 3);
@@ -491,7 +491,7 @@ void frmMain::_applyViewOverlay()
if(m_bViewFlags || m_bViewParcels)
{
lua_State *L = m_pGamePanel->getLua();
luaT_execute(L, "return TheApp.map.debug_font, TheApp.map.cell_outline");
luaT_execute(L, "return TheApp.gfx:loadBuiltinFont(), TheApp.map.cell_outline");
THFont *pFont = reinterpret_cast<THFont*>(lua_touserdata(L, -2));
THSpriteSheet *pSprites = reinterpret_cast<THSpriteSheet*>(lua_touserdata(L, -1));
lua_pop(L, 2);