iOS minor fix

This commit is contained in:
Maksim Gamarnik 2017-08-29 23:05:03 +03:00
parent 4e05929a8b
commit 099ba7bea9
4 changed files with 5 additions and 9 deletions

View File

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.12</string>
<string>1.0.13</string>
<key>CFBundleVersion</key>
<string>18</string>
<string>19</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

View File

@ -30,11 +30,9 @@ local function get_formspec(tabview, name, tabdata)
tonumber(core.settings:get("mainmenu_last_selected_world"))
)
if PLATFORM ~= "iOS" then
retval = retval ..
"button[3.5,4.5;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
"button[6,4.5;2.8,0.5;world_create;".. fgettext("New") .. "]"
end
retval = retval ..
"button[8.7,4.5;3.30,0.5;play;".. fgettext("Play") .. "]" ..
"checkbox[0.0,4.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..

View File

@ -404,7 +404,7 @@ msgstr "Настроить"
#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
msgid "Creative Mode"
msgstr "Режим творчества"
msgstr "Креатив"
#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
msgid "Enable Damage"
@ -419,8 +419,8 @@ msgid "Host Server"
msgstr "Запустить сервер"
#: builtin/mainmenu/tab_local.lua
msgid "Local Game"
msgstr "Локальная игра"
msgid "Single Player"
msgstr "Одиночная"
#: builtin/mainmenu/tab_local.lua
msgid "Name/Password"

View File

@ -2313,7 +2313,6 @@ bool Game::getServerContent(bool *aborted)
delete[] text;
} else {
std::stringstream message;
#ifndef __IOS__
std::fixed(message);
message.precision(0);
message << gettext("Media...") << " " << (client->mediaReceiveProgress()*100) << "%";
@ -2331,7 +2330,6 @@ bool Game::getServerContent(bool *aborted)
message << " (" << cur << ' ' << cur_unit << ")";
}
#endif
progress = 30 + client->mediaReceiveProgress() * 35 + 0.5;
draw_load_screen(utf8_to_wide(message.str()), device,
guienv, texture_src, dtime, progress);