1
0

Merge pull request #3261 from Seadragon91/patch-1

Changed Hopper to wtHopper and adjusted .gitignore.
This commit is contained in:
Mattes D 2016-07-12 22:49:58 +02:00 committed by GitHub
commit 69ef7f7158
2 changed files with 3 additions and 2 deletions

3
.gitignore vendored
View File

@ -88,7 +88,8 @@ src/AllFiles.lst
*.opensdf *.opensdf
*.sdf *.sdf
*.sln *.sln
*.opendb *.VC.opendb
*.VC.db
*.idb *.idb
# cmake output folders and files # cmake output folders and files

View File

@ -1640,7 +1640,7 @@ end
-- Set window contents: -- Set window contents:
-- a_Player is a cPlayer object received from the outside of this code fragment -- a_Player is a cPlayer object received from the outside of this code fragment
local Window = cLuaWindow(cWindow.Hopper, 3, 3, "TestWnd"); local Window = cLuaWindow(cWindow.wtHopper, 3, 3, "TestWnd");
Window:SetSlot(a_Player, 0, cItem(E_ITEM_DIAMOND, 64)); Window:SetSlot(a_Player, 0, cItem(E_ITEM_DIAMOND, 64));
Window:SetOnClosing(OnClosing); Window:SetOnClosing(OnClosing);
Window:SetOnSlotChanged(OnSlotChanged); Window:SetOnSlotChanged(OnSlotChanged);