diff options
| author | Kahrl <kahrl@gmx.net> | 2013-08-20 22:38:14 +0200 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2013-09-11 00:08:56 +0200 |
| commit | 3c4734d69a44aea133e5bd7df66a5dedb87785fb (patch) | |
| tree | f3961c8855c0d864b672ae79857de9b993c3e95c /src/game.cpp | |
| parent | da9fe6485134ec81cc3628b1bc4847c3b2226c76 (diff) | |
| download | minetest-3c4734d69a44aea133e5bd7df66a5dedb87785fb.tar.xz | |
Change mainmenu texture handling + small misc changes
Texture names must now be escaped in formspec elements image[],
background[], image_button[], image_button_exit[].
Instead of special-case handling of texture loading (and unloading
which was missing) in guiFormSpecMenu.cpp, use the newly created
ISimpleTextureSource interface which is a minimal subset of
ITextureSource. There is an implementation of this interface
used by GUIEngine (MenuTextureSource).
Fix an off-by-one bug in unescape_string; it caused requests for a
texture called "\0".
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp index 5d8365781..f313ae28f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1720,7 +1720,7 @@ void the_game( GUIFormSpecMenu *menu = new GUIFormSpecMenu(device, guiroot, -1, &g_menumgr, - &client, gamedef); + &client, gamedef, tsrc); InventoryLocation inventoryloc; inventoryloc.setCurrentPlayer(); @@ -2259,7 +2259,7 @@ void the_game( GUIFormSpecMenu *menu = new GUIFormSpecMenu(device, guiroot, -1, &g_menumgr, - &client, gamedef); + &client, gamedef, tsrc); menu->setFormSource(current_formspec); menu->setTextDest(current_textdest); menu->drop(); @@ -2755,7 +2755,7 @@ void the_game( GUIFormSpecMenu *menu = new GUIFormSpecMenu(device, guiroot, -1, &g_menumgr, - &client, gamedef); + &client, gamedef, tsrc); menu->setFormSpec(meta->getString("formspec"), inventoryloc); menu->setFormSource(new NodeMetadataFormSource( |