Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iOS: minor fixes

This commit is contained in:
MoNTE48 2019-06-04 22:59:30 +03:00
parent f92e728991
commit bdf5acf097
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj Normal file → Executable file
View File

@ -297,7 +297,7 @@
F81F6BE41DDC7D99000B9E21 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = ../deps/intl/libintl.a; sourceTree = "<group>"; }; F81F6BE41DDC7D99000B9E21 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = ../deps/intl/libintl.a; sourceTree = "<group>"; };
F84D3A931DE79AB400ADE1A0 /* ads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ads.h; path = ../../Ads/ads.h; sourceTree = "<group>"; }; F84D3A931DE79AB400ADE1A0 /* ads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ads.h; path = ../../Ads/ads.h; sourceTree = "<group>"; };
F84D3A941DE79AB400ADE1A0 /* ads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ads.mm; path = ../../Ads/ads.mm; sourceTree = "<group>"; }; F84D3A941DE79AB400ADE1A0 /* ads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ads.mm; path = ../../Ads/ads.mm; sourceTree = "<group>"; };
F85119A61F4476FC00BFA9AF /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../deps/libcurl/lib/libcurl.a; sourceTree = "<group>"; }; F85119A61F4476FC00BFA9AF /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../Pods/libCurlPod/lib/libcurl.a; sourceTree = "<group>"; };
F856B5C21F55F7EE00FE9494 /* bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bg.png; path = ../../../../textures/base/bg.png; sourceTree = "<group>"; }; F856B5C21F55F7EE00FE9494 /* bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bg.png; path = ../../../../textures/base/bg.png; sourceTree = "<group>"; };
F85722881DDC74B700308383 /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = ../Pods/LuaJITPod/lib/libluajit.a; sourceTree = "<group>"; }; F85722881DDC74B700308383 /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = ../Pods/LuaJITPod/lib/libluajit.a; sourceTree = "<group>"; };
F87DC8B8210887C600393B64 /* mapgen_v7p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapgen_v7p.h; path = ../../../../src/mapgen_v7p.h; sourceTree = "<group>"; }; F87DC8B8210887C600393B64 /* mapgen_v7p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapgen_v7p.h; path = ../../../../src/mapgen_v7p.h; sourceTree = "<group>"; };
@ -1401,7 +1401,7 @@
}; };
buildConfigurationList = F8E6C4D41DCA3B7900F64426 /* Build configuration list for PBXProject "MultiCraft" */; buildConfigurationList = F8E6C4D41DCA3B7900F64426 /* Build configuration list for PBXProject "MultiCraft" */;
compatibilityVersion = "Xcode 10.0"; compatibilityVersion = "Xcode 10.0";
developmentRegion = English; developmentRegion = en;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
en, en,
@ -1845,7 +1845,7 @@
"${SRCROOT}/../deps/freetype/include/freetype2", "${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../Pods/LuaJITPod/include", "${SRCROOT}/../Pods/LuaJITPod/include",
"${SRCROOT}/../deps/intl/include", "${SRCROOT}/../deps/intl/include",
"${SRCROOT}/../deps/libcurl/include", "${SRCROOT}/../Pods/libCurlPod/include",
); );
INFOPLIST_FILE = MultiCraft/Info.plist; INFOPLIST_FILE = MultiCraft/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@ -1876,7 +1876,7 @@
"-L${SRCROOT}/../deps/freetype/lib", "-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../Pods/LuaJITPod/lib", "-L${SRCROOT}/../Pods/LuaJITPod/lib",
"-L${SRCROOT}/../deps/intl", "-L${SRCROOT}/../deps/intl",
"-L${SRCROOT}/../deps/libcurl/lib", "-L${SRCROOT}/../Pods/libCurlPod/lib",
"-Wl,-dead_strip", "-Wl,-dead_strip",
); );
PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft;
@ -1928,7 +1928,7 @@
"${SRCROOT}/../deps/freetype/include/freetype2", "${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../Pods/LuaJITPod/include", "${SRCROOT}/../Pods/LuaJITPod/include",
"${SRCROOT}/../deps/intl/include", "${SRCROOT}/../deps/intl/include",
"${SRCROOT}/../deps/libcurl/include", "${SRCROOT}/../Pods/libCurlPod/include",
); );
INFOPLIST_FILE = MultiCraft/Info.plist; INFOPLIST_FILE = MultiCraft/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@ -1959,7 +1959,7 @@
"-L${SRCROOT}/../deps/freetype/lib", "-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../Pods/LuaJITPod/lib", "-L${SRCROOT}/../Pods/LuaJITPod/lib",
"-L${SRCROOT}/../deps/intl", "-L${SRCROOT}/../deps/intl",
"-L${SRCROOT}/../deps/libcurl/lib", "-L${SRCROOT}/../Pods/libCurlPod/lib",
"-Wl,-dead_strip", "-Wl,-dead_strip",
); );
PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft; PRODUCT_BUNDLE_IDENTIFIER = mobi.MultiCraft;

5
build/iOS/Podfile
View File

@ -6,8 +6,9 @@ target 'MultiCraft' do
source 'https://github.com/appodeal/CocoaPods.git' source 'https://github.com/appodeal/CocoaPods.git'
pod 'SSZipArchive' pod 'SSZipArchive'
pod 'SDVersion', :git => 'https://github.com/MoNTE48/SDVersion' pod 'SDVersion', :git => 'https://github.com/MoNTE48/SDVersion'
pod 'LuaJITPod', :git => 'https://github.com/MoNTE48/LuaJITPod' pod 'LuaJITPod', :git => 'https://github.com/MoNTE48/LuaJITPod'
pod 'libCurlPod', :git => 'https://github.com/MoNTE48/libCurlPod'
pod 'Appodeal/Interstitial', '2.5.4-Beta' pod 'Appodeal/Interstitial', '2.5.4-Beta'
pod 'PersonalizedAdConsent', :git => 'https://github.com/MultiCraftProject/googleads-consent-sdk-ios' pod 'PersonalizedAdConsent', :git => 'https://github.com/MultiCraftProject/googleads-consent-sdk-ios'

2
build/iOS/deps/libraries.sh
View File

@ -7,7 +7,7 @@
./freetype.sh ./freetype.sh
#./luajit.sh #./luajit.sh
./intl.sh ./intl.sh
./libcurl.sh #./libcurl.sh
echo echo
echo "All libraries were built!" echo "All libraries were built!"

14
src/game.cpp
View File

@ -2292,7 +2292,11 @@ bool Game::getServerContent(bool *aborted)
std::stringstream message; std::stringstream message;
std::fixed(message); std::fixed(message);
message.precision(0); message.precision(0);
message << gettext("Media...") << " " << (client->mediaReceiveProgress()*100) << "%"; if (client->mediaReceiveProgress() > 0) {
message << gettext("Media... ") << (client->mediaReceiveProgress() * 100) << "%";
} else {
message << gettext("Media...");
}
message.precision(2); message.precision(2);
if ((USE_CURL == 0) || if ((USE_CURL == 0) ||
@ -4150,7 +4154,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
if (draw_control->range_all) { if (draw_control->range_all) {
runData.fog_range = 100000 * BS; runData.fog_range = 100000 * BS;
#if defined(__ANDROID__) || defined(__IOS__) #if defined(__ANDROID__) || defined(__IOS__)
runData.fog_range = 0.9 * draw_control->wanted_range * 4 * BS; runData.fog_range = 4 * draw_control->wanted_range * BS;
#endif #endif
} else { } else {
runData.fog_range = draw_control->wanted_range * BS; runData.fog_range = draw_control->wanted_range * BS;
@ -4492,11 +4496,7 @@ void Game::updateGui(const RunStats &stats, f32 dtime, const CameraOrientation &
if (!m_statustext.empty()) { if (!m_statustext.empty()) {
s32 status_width = guitext_status->getTextWidth(); s32 status_width = guitext_status->getTextWidth();
s32 status_height = guitext_status->getTextHeight(); s32 status_height = guitext_status->getTextHeight();
#if defined(__ANDROID__) || defined(__IOS__) s32 status_y = screensize.Y - 150 * g_settings->getFloat("hud_scaling");
s32 status_y = screensize.Y - 250 * g_settings->getFloat("hud_scaling");
#else
s32 status_y = screensize.Y - 150;
#endif
s32 status_x = (screensize.X - status_width) / 2; s32 status_x = (screensize.X - status_width) / 2;
core::rect<s32> rect( core::rect<s32> rect(
status_x , status_y - status_height, status_x , status_y - status_height,