* Mobile GUI tweaks

* Added option to disable screen scroll transitions, one of my Android test devices has the slowest glread in the world, it's like 1 full second to walk to the next screen because of it.  This might make dmods that 
use timing (Myster island camera sequence for example) easier though, not sure.
* Fixed issue where behavior of two load_sequence commands in a row on the same sequence differed from 1.08 (in 1.08, max frame is set to the second one as long as the first one wasn't actually loaded yet.  key now shows up in TGKA)
* Fixed regression where offsets in Mayhem were incorrect on the hand mouse pointer
* Upped max frames per seq to 100 instead of 50, fixes Echoes of the Ancient.  I should probably make it dynamic but changing one const number is much easier!
* Now gives a clear warning in the log.txt if a seq tries to go beyond what it can handle and will truncate it (better than breaking the whole sequence as it did before)
* Added support for a weird bmp header type, fixes incorrect palette issue in the dmod The Orb of Darkness
* Fixed life/exp/health to correctly interpolate between values like the original dink, huge thanks to Dan's detailed bug report on this, he even made a mod which made testing the fix a breeze!

git-svn-id: svn://rtsoft.com/rtsvn/projects/RTDink@1520 353e56fe-9613-0410-8469-b96ad8e6f29c

Info.plist

@@ -17,7 +17,7 @@
 		<string>icon@2x.png</string>
 	</array>
 	<key>CFBundleIdentifier</key>
-	<string>com.rtsoft.${PRODUCT_NAME:identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -25,7 +25,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.2</string>
+	<string>1.8.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

OSX/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.7</string>
+	<string>1.8.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.7</string>
+	<string>1.8.8</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>

RTDink.xcodeproj/project.pbxproj

@@ -196,7 +196,9 @@
 		5DD878261261BDC000EB4365 /* FileManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878201261BDC000EB4365 /* FileManager.cpp */; };
 		5DD878391261BEC500EB4365 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878351261BEC500EB4365 /* unzip.c */; };
 		5DD8783A1261BEC500EB4365 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DD878371261BEC500EB4365 /* ioapi.c */; };
-		5DD87D1A1263069600EB4365 /* dmods in Resources */ = {isa = PBXBuildFile; fileRef = 5DD8791A1263069200EB4365 /* dmods */; };
+		5DDA4DEF1F8609EF0079D738 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA4DEE1F8609EE0079D738 /* Default-568h@2x.png */; };
+		5DDA4DF21F862F3F0079D738 /* RenderScissorComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDA4DF01F862F3E0079D738 /* RenderScissorComponent.cpp */; };
+		5DDA5C781F8642080079D738 /* dmods_include in Resources */ = {isa = PBXBuildFile; fileRef = 5DDA5C771F8642080079D738 /* dmods_include */; };
 		5DDEC25F1294E63200C42C5E /* ExpiredMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DDEC25E1294E63200C42C5E /* ExpiredMenu.cpp */; };
 		5DE39F1114C3F9B300163EA1 /* dink in Resources */ = {isa = PBXBuildFile; fileRef = 5DE39F1014C3F9B300163EA1 /* dink */; };
 		5DE5068310EC800400CEAA3C /* FFReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE5068110EC800400CEAA3C /* FFReader.cpp */; };
@@ -542,8 +544,11 @@
 		5DD878361261BEC500EB4365 /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ioapi.h; path = util/unzip/ioapi.h; sourceTree = "<group>"; };
 		5DD878371261BEC500EB4365 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = util/unzip/ioapi.c; sourceTree = "<group>"; };
 		5DD878381261BEC500EB4365 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt.h; path = util/unzip/crypt.h; sourceTree = "<group>"; };
-		5DD8791A1263069200EB4365 /* dmods */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dmods; path = bin/dmods; sourceTree = "<group>"; };
 		5DD9544D0E960962004E403D /* PlatformSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformSetup.h; sourceTree = "<group>"; };
+		5DDA4DEE1F8609EE0079D738 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+		5DDA4DF01F862F3E0079D738 /* RenderScissorComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RenderScissorComponent.cpp; path = Entity/RenderScissorComponent.cpp; sourceTree = "<group>"; };
+		5DDA4DF11F862F3F0079D738 /* RenderScissorComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RenderScissorComponent.h; path = Entity/RenderScissorComponent.h; sourceTree = "<group>"; };
+		5DDA5C771F8642080079D738 /* dmods_include */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dmods_include; path = bin/dmods_include; sourceTree = "<group>"; };
 		5DDEC25D1294E63200C42C5E /* ExpiredMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExpiredMenu.h; path = source/GUI/ExpiredMenu.h; sourceTree = "<group>"; };
 		5DDEC25E1294E63200C42C5E /* ExpiredMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExpiredMenu.cpp; path = source/GUI/ExpiredMenu.cpp; sourceTree = "<group>"; };
 		5DE39F1014C3F9B300163EA1 /* dink */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dink; path = bin/dink; sourceTree = "<group>"; };
@@ -624,6 +629,7 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				5DDA4DEE1F8609EE0079D738 /* Default-568h@2x.png */,
 				5D2F53D515A7F29700B8CED1 /* SystemConfiguration.framework */,
 				5DC692580E947EBD00E5AC44 /* shared */,
 				29B97315FDCFA39411CA2CEA /* Source */,
@@ -640,6 +646,7 @@
 		29B97315FDCFA39411CA2CEA /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				5DDA5C771F8642080079D738 /* dmods_include */,
 				5D7AB8F010CF3ED000398F0F /* Dink */,
 				5DF1D5771045019100826147 /* Component */,
 				5D4760860FBB1D04008400E3 /* GUI */,
@@ -654,7 +661,6 @@
 			isa = PBXGroup;
 			children = (
 				5DE39F1014C3F9B300163EA1 /* dink */,
-				5DD8791A1263069200EB4365 /* dmods */,
 				5D10469D1224D9E700BFC249 /* Icon-72.png */,
 				5D6E8C18121A75F2008F1D26 /* icon@2x.png */,
 				5D6E8C1A121A75F2008F1D26 /* Default@2x.png */,
@@ -876,6 +882,8 @@
 		5D82C88E0FF4BB660082EBE7 /* Components */ = {
 			isa = PBXGroup;
 			children = (
+				5DDA4DF01F862F3E0079D738 /* RenderScissorComponent.cpp */,
+				5DDA4DF11F862F3F0079D738 /* RenderScissorComponent.h */,
 				5DEB1A0212CC6FAD00A3A6DB /* EmitVirtualKeyComponent.h */,
 				5DEB1A0312CC6FAD00A3A6DB /* EmitVirtualKeyComponent.cpp */,
 				5D8CA6AD128ACA3E00188DA6 /* CustomInputComponent.h */,
@@ -1258,6 +1266,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 0900;
 				TargetAttributes = {
 					1D6058900D05DD3D006BFB54 = {
 						ProvisioningStyle = Automatic;
@@ -1296,11 +1305,12 @@
 				5D82C8C50FF4C1500082EBE7 /* audio in Resources */,
 				5D7C32B910BBB755009C5324 /* game in Resources */,
 				5D9BA548116232830008E859 /* MainWindow-iPad.xib in Resources */,
+				5DDA4DEF1F8609EF0079D738 /* Default-568h@2x.png in Resources */,
 				5D6E8C1B121A75F2008F1D26 /* icon@2x.png in Resources */,
 				5D6E8C1D121A75F2008F1D26 /* Default@2x.png in Resources */,
 				5D6E8C1F121A765F008F1D26 /* Default-Landscape.png in Resources */,
 				5D10469E1224D9E700BFC249 /* Icon-72.png in Resources */,
-				5DD87D1A1263069600EB4365 /* dmods in Resources */,
+				5DDA5C781F8642080079D738 /* dmods_include in Resources */,
 				5DE39F1114C3F9B300163EA1 /* dink in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1412,6 +1422,7 @@
 				5D7B11C510FC50D800997135 /* CursorComponent.cpp in Sources */,
 				5D7B11DA10FCD26400997135 /* InventoryComponent.cpp in Sources */,
 				5D2E40151109B94800A76983 /* LogMenu.cpp in Sources */,
+				5DDA4DF21F862F3F0079D738 /* RenderScissorComponent.cpp in Sources */,
 				5D8A5321110B0E7A007F5CF4 /* ScriptAccelerator.cpp in Sources */,
 				5DBFC66F11144967009195F6 /* vec1.cpp in Sources */,
 				5DBFC70411144AFD009195F6 /* mat3.cpp in Sources */,
@@ -1508,7 +1519,6 @@
 		1D6058940D05DD3E006BFB54 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "iPhone Developer: Seth Robinson (MX6953T2FS)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -1539,6 +1549,7 @@
 				);
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-lfmod_$PLATFORM_NAME";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.rtsoft.${PRODUCT_NAME:identifier}";
 				PRODUCT_NAME = RTDink;
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1548,16 +1559,30 @@
 		5D8733740FA9A0BC001DB559 /* AdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-					armv7,
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-					armv6,
+				CLANG_WARN_BOOL_CONVERSION = YES;
-				);
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
 				CODE_SIGN_IDENTITY = "Don't Code Sign";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Seth Robinson (638X6EAY9H)";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_AUTO_VECTORIZATION = YES;
-				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ../shared/PlatformPrecomp.h;
@@ -1569,7 +1594,11 @@
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					source,
@@ -1604,7 +1633,6 @@
 		5D8733750FA9A0BC001DB559 /* AdHoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "iPhone Developer: Seth Robinson (MX6953T2FS)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
@@ -1638,6 +1666,7 @@
 					/Users/Seth/dev/rtsvn/projects/proton/api/lowlevel/lib,
 				);
 				OTHER_LDFLAGS = "-lfmod_$PLATFORM_NAME";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.rtsoft.${PRODUCT_NAME:identifier}";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -1646,11 +1675,29 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Seth Robinson (638X6EAY9H)";
-				GCC_C_LANGUAGE_STANDARD = c99;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = c11;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ../shared/PlatformPrecomp.h;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1661,7 +1708,11 @@
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					source,
@@ -1673,7 +1724,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = ../shared/iOS/fmod/api/lib;
-				ONLY_ACTIVE_ARCH = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lfmodex_$PLATFORM_NAME",
 					"-weak_library",

android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rtsoft.rtdink"
       android:versionCode="9"
-      android:versionName="1.8.7"
+      android:versionName="1.8.8"
       android:installLocation="preferExternal"
       >
 

script/win_installer/readme.txt

@@ -269,4 +269,16 @@ a specific speed, but by choosing rather snappy speed hopefully mystery island a
 * Some tweaks with when mouse buttons are processed (only in mouse cursor modes or a dialog menu)
 * Misc work on touch controls to prepare for the mobile releases
 * Added some names to credits (if you notice I added anybody twice or would rather be credited a different way or not at all, let me know!)
-* Fixed bug that could sort of over-write random data if more than 100 sprites were active.. wow, bad
+* Fixed bug that could sort of over-write random data if more than 100 sprites were active.. wow, bad
+
+------ Change log for 1.8.8 ----------
+
+* Mobile GUI tweaks
+* Added option to disable screen scroll transitions, one of my Android test devices has the slowest glread in the world, it's like 1 full second to walk to the next screen because of it.  This might make dmods that 
+use timing (Myster island camera sequence for example) easier though, not sure.
+* Fixed issue where behavior of two load_sequence commands in a row on the same sequence differed from 1.08 (in 1.08, max frame is set to the second one as long as the first one wasn't actually loaded yet.  key now shows up in TGKA)
+* Fixed regression where offsets in Mayhem were incorrect on the hand mouse pointer
+* Upped max frames per seq to 100 instead of 50, fixes Echoes of the Ancient.  I should probably make it dynamic but changing one const number is much easier!
+* Now gives a clear warning in the log.txt if a seq tries to go beyond what it can handle and will truncate it (better than breaking the whole sequence as it did before)
+* Added support for a weird bmp header type, fixes incorrect palette issue in the dmod The Orb of Darkness
+* Fixed life/exp/health to correctly interpolate between values like the original dink, huge thanks to Dan's detailed bug report on this, he even made a mod which made testing the fix a breeze!

source/App.cpp

@@ -184,8 +184,8 @@ App::App()
 	m_bDidPostInit = false;
 	m_bHasDMODSupport = true;
 	//for mobiles
-	m_version = 1.87f;
+	m_version = 1.88f;
-	m_versionString = "V1.8.7";
+	m_versionString = "V1.8.8";
 	m_build = 1;
 	m_bCheatsEnabled = false;
 

source/Component/ActionButtonComponent.cpp

@@ -76,7 +76,7 @@ void ActionButtonComponent::OnRender(VariantList *pVList)
 		if (IsLargeScreen())
 		{
 
-			dstRect = rtRectf(0,0, 90,90);
+			dstRect = rtRectf(0,0, 68,68);
 
 		} else
 		{
@@ -88,7 +88,7 @@ void ActionButtonComponent::OnRender(VariantList *pVList)
 		dstRect.AdjustPosition(vFinalPos.x, vFinalPos.y);
 		if (IsLargeScreen())
 		{
-			dstRect.AdjustPosition(19, 25);
+			dstRect.AdjustPosition(30, 31);
 		} else
 		{
 			dstRect.AdjustPosition(9, 12);

source/GUI/AboutMenu.cpp

@@ -191,7 +191,7 @@ void AboutMenuAddScrollContent(Entity *pParent)
 	
 
 	string msg =
-		GetAppName()+string("`$ ")+GetApp()->GetVersionString()+" Build "+toString(GetApp()->GetBuild())+"``\nCopyright (c) 2012 Robinson Technologies\n"\
+		GetAppName()+string("`$ ")+GetApp()->GetVersionString()+" Build "+toString(GetApp()->GetBuild())+"``\nCopyright (c) 1997-2017 Robinson Technologies\n"\
 		"\nDink Script Version: `$1.10``\n\n"\
 		;
 
@@ -432,8 +432,8 @@ msg += \
 		"Chris Black\n"\
 		"Erik Harrison\n"\
 		"James Hutt\n" \
-		"Robj\n"\
+		"Robert J. Deans\n"\
-		"liquid141\n"\
+		"liquidsnakehpks\n"\
 		"Tal\n"\
 		"Quiztis\n"\
 		"rabidwolf9\n"\

source/GUI/BrowseMenu.cpp

@@ -268,6 +268,16 @@ void UpdateBrowseControlButtons(Entity *pParent)
 
 }
 
+bool DmodEntrySortByName(const DMODEntry& lhs, const DMODEntry& rhs)
+{
+	return lhs.m_name < rhs.m_name;
+}
+
+bool DmodEntrySortByDate(const DMODEntry& lhs, const DMODEntry& rhs)
+{
+	return lhs.m_date < rhs.m_date;
+}
+
 void BrowseMenuAddScrollContent(Entity *pParent, TextScanner *t)
 {
 	pParent = pParent->GetEntityByName("scroll_child");
@@ -339,18 +349,12 @@ void BrowseMenuAddScrollContent(Entity *pParent, TextScanner *t)
 	{
 
 	case DMOD_SORT_ALPHABETICAL:
-		sort(g_dmodData.begin(), g_dmodData.end(), [](const DMODEntry& lhs, const DMODEntry& rhs)
+		sort(g_dmodData.begin(), g_dmodData.end(), DmodEntrySortByName);
-		{
-			return lhs.m_name < rhs.m_name;
-		});
 		break;
 
 	case DMOD_SORT_DATE:
 
-		sort(g_dmodData.rbegin(), g_dmodData.rend(), [](const DMODEntry& lhs, const DMODEntry& rhs)
+		sort(g_dmodData.rbegin(), g_dmodData.rend(), DmodEntrySortByDate);
-		{
-			return lhs.m_date < rhs.m_date;
-		});
 		break;
 
 	default:

source/GUI/DebugMenu.cpp

@@ -4,6 +4,7 @@
 #include "dink/dink.h"
 #include "LogMenu.h"
 #include "GameMenu.h"
+#include "PopUpMenu.h"
 
 extern bool g_script_debug_mode;
 
@@ -135,6 +136,7 @@ Entity * DebugMenuCreate(Entity *pParentEnt)
 	//Entity *pBG = CreateOverlayEntity(pParentEnt, "DebugMenu", "interface/generic_bg.rttex", 0,0);
 	
 	Entity *pBG = CreateOverlayRectEntity(pParentEnt, CL_Vec2f(0,0), GetScreenSize(), MAKE_RGBA(0,0,0,140));
+	pBG->SetName("CheatMenu");
 
 	AddFocusIfNeeded(pBG);
 
@@ -198,6 +200,13 @@ if (GetApp()->GetCheatsEnabled())
 	}
 	SlideScreen(pBG, true, 500);
 	
+	if (GetApp()->GetVarWithDefault("cheat_warning", uint32(0))->GetUINT32() == 0)
+	{
+		GetApp()->GetVar("cheat_warning")->Set(uint32(1));
+
+		PopUpCreate(pBG, "`4WARNING!``\n\nUsing cheats may break the game in strange ways and is only for testing or if you're desperate!", "", "cancel", "I get it", "", "", true);
+	}
+
 
 	return pBG;
 }

source/GUI/GameMenu.cpp

@@ -131,6 +131,14 @@ void GameOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity sent fr
 			}
 		}
 
+		//clicked the attack button
+		if (g_dglo.m_lastSubGameMode == DINK_SUB_GAME_MODE_DIALOG)
+		{
+			//meh, skip it.  On dialog menus we have a button labeled "select" over the punch button we use instead
+			return;
+		}
+
+		
 		g_dglo.m_dirInput[DINK_INPUT_BUTTON1] = true;
 		return;
 	}
@@ -546,7 +554,10 @@ void BuildInventoryControls(float fadeTimeMS)
 		float trans = 0.0f;	
 		Entity *pButtonEntity;
 
-		pButtonEntity =  CreateButtonHotspot(pBG, "attack", iPhoneMap(113, 272), iPhoneMap(55, 46));
+		CL_Vec2f vButtonSize = DinkToNativeCoords(CL_Vec2f(152 + 64, 412 + 54)) - DinkToNativeCoords(CL_Vec2f(152, 412));
+
+		pButtonEntity = CreateButtonHotspot(pBG, "magic", DinkToNativeCoords(CL_Vec2f(152, 412)), vButtonSize);
+
 		pButtonEntity->GetVar("alpha")->Set(trans);
 		pButtonEntity->GetShared()->GetFunction("OnOverStart")->sig_function.connect(&GameOnSelect);
 		pButtonEntity->GetShared()->GetFunction("OnOverEnd")->sig_function.connect(&GameOnStopSelect);
@@ -554,8 +565,8 @@ void BuildInventoryControls(float fadeTimeMS)
 		SetButtonClickSound(pButtonEntity, ""); //no sound
 
 		//I made this touchspot too big on purpose, easier to hit it.
-		pButtonEntity =  CreateButtonHotspot(pBG, "attack", iPhoneMap(412, 272), iPhoneMap(62, 46));
+		pButtonEntity = CreateButtonHotspot(pBG, "attack", DinkToNativeCoords(CL_Vec2f(556, 412)), vButtonSize);
-		
+
 		pButtonEntity->GetVar("alpha")->Set(trans);
 		pButtonEntity->GetShared()->GetFunction("OnOverStart")->sig_function.connect(&GameOnSelect);
 		pButtonEntity->GetShared()->GetFunction("OnOverEnd")->sig_function.connect(&GameOnStopSelect);
@@ -693,17 +704,6 @@ void BuildControls(float fadeTimeMS)
 	if (g_dglo.GetActiveView() != DinkGlobals::VIEW_ZOOMED && IsDrawingDinkStatusBar())
 	{
 		//make it so touching the actual game icons on the bottom of the screen do stuff
-#ifdef _DEBUG
-		//trans = 0.7f;
-#endif
-		
-		/*
-		RecomputeAspectRatio();
-		ApplyAspectRatioGLMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPopMatrix();
-		*/
-		
 
 		CL_Vec2f vButtonSize = DinkToNativeCoords(CL_Vec2f(152+64, 412+54)) - DinkToNativeCoords(CL_Vec2f(152, 412));
 		pButtonEntity =  CreateButtonHotspot(pBG, "magic", DinkToNativeCoords(CL_Vec2f(152, 412)), vButtonSize, Button2DComponent::BUTTON_STYLE_CLICK_ON_TOUCH);
@@ -813,6 +813,8 @@ void BuildControls(float fadeTimeMS)
 
 void BuildDialogModeControls(float fadeTimeMS)
 {
+
+	
 	Entity *pBG = GetEntityRoot()->GetEntityByName("GameMenu");
 
 	if (!pBG)
@@ -938,12 +940,22 @@ void BuildDialogModeControls(float fadeTimeMS)
 		if (IsDrawingDinkStatusBar())
 		{
 			//let's let the punch icon also select, it just feels natural
-			pButtonEntity =  CreateButtonHotspot(pBG, "select", CL_Vec2f(iPhoneMapX(412), iPhoneMapY(272)), CL_Vec2f(iPhoneMapX(62), iPhoneMapY(46)));
+			//pButtonEntity =  CreateButtonHotspot(pBG, "select", CL_Vec2f(iPhoneMapX(412), iPhoneMapY(272)), CL_Vec2f(iPhoneMapX(62), iPhoneMapY(46)));
-			
+		
+			CL_Vec2f vButtonSize = DinkToNativeCoords(CL_Vec2f(152 + 64, 412 + 54)) - DinkToNativeCoords(CL_Vec2f(152, 412));
+
+			pButtonEntity = CreateButtonHotspot(pBG, "select", DinkToNativeCoords(CL_Vec2f(556, 412)), vButtonSize);
+
+
+
 			pButtonEntity->GetVar("alpha")->Set(trans);
-			pButtonEntity->GetShared()->GetFunction("OnOverStart")->sig_function.connect(&GameOnSelect);
+			pButtonEntity->GetShared()->GetFunction("OnButtonSelected")->sig_function.connect(&GameOnSelect);
-			pButtonEntity->GetShared()->GetFunction("OnOverEnd")->sig_function.connect(&GameOnStopSelect);
+		//	pButtonEntity->GetShared()->GetFunction("OnOverEnd")->sig_function.connect(&GameOnStopSelect);
 			SetButtonClickSound(pButtonEntity, ""); //no sound
+
+			DisableComponentByName(pButtonEntity, "Button2D");
+			EnableComponentByName(pButtonEntity, "Button2D", 1000);
+
 		}
 	} 
 

source/GUI/OptionsMenu.cpp

@@ -105,6 +105,7 @@ void OptionsMenuOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity
 		GetApp()->UpdateVideoSettings();
 	}
 
+
 	if (pEntClicked->GetName() == "smoothing_0")
 	{
 		GetApp()->GetShared()->GetVar("smoothing")->Set(uint32(1));
@@ -144,6 +145,17 @@ void OptionsMenuOnSelect(VariantList *pVList) //0=vec2 point of click, 1=entity
 		DinkOnForeground();
 	}
 
+	//if (GetEmulatedPlatformID() == PLATFORM_ID_ANDROID)
+	{
+		if (pEntClicked->GetName() == "allow_glread")
+		{
+			bool bChecked = IsCheckboxChecked(pEntClicked);
+			GetApp()->GetVar("disable_glread")->Set(uint32(!bChecked));
+		}
+	}
+	
+
+
 #ifdef WINAPI
 	if (pEntClicked->GetName() == "check_borderless")
 	{
@@ -331,7 +343,7 @@ void OptionsMenuAddScrollContent(Entity *pParent)
 	float startX = iPhoneMapX(28);
 	float offsetX = iPhoneMapX(0);
 	float spacerX = iPhoneMapX(46);
-	float spacerY = iPhoneMapY(40);
+	float spacerY = iPhoneMapY(27.5);
 	float columnX = 140;
 
 	eFont fontID = FONT_SMALL;
@@ -482,6 +494,13 @@ void OptionsMenuAddScrollContent(Entity *pParent)
 	y += GetSize2DEntity(pEnt).y;
 	y += spacerY;
 
+	bool bDisableRead = GetApp()->GetVar("disable_glread")->GetUINT32() != 0;
+	pEnt = CreateCheckbox(pBG, "allow_glread", "Enable screen scroll effect", startX, y, !bDisableRead, FONT_SMALL, 1.0f);
+	pEnt->GetFunction("OnButtonSelected")->sig_function.connect(&OptionsMenuOnSelect);
+	y += GetSize2DEntity(pEnt).y;
+	y += spacerY;
+
+
 	/*
 	//fps limit
 	pEnt = CreateTextLabelEntity(pBG, "", startX, y, "Lock to 30 FPS:");
@@ -503,7 +522,7 @@ void OptionsMenuAddScrollContent(Entity *pParent)
 
 	if (GetPlatformID() != PLATFORM_ID_IOS)
 	{
-		y += spacerY;
+		//y += spacerY;
 		//audio on/off button
 
 		pEnt = CreateTextLabelEntity(pBG, "", startX, y, "Audio:");

source/dink/dink.h

@@ -178,7 +178,7 @@ const int32 C_MAX_SPRITES_AT_ONCE = 300; //don't change, there are still hardcod
 const int32 C_MAX_SCRIPT_CALLBACKS = 100;
 const int32 max_vars = 250;
 
-#define C_MAX_SPRITE_FRAMES 51
+#define C_MAX_SPRITE_FRAMES 100
 #define C_SPRITE_MAX_FILENAME_SIZE 64
 const int32 C_MAX_SCRIPTS = 200;
 
@@ -206,6 +206,8 @@ struct sequence
 	byte m_spaceAllowed;
 	byte m_bFrameSetUsed;
 	byte m_bIsAnim;
+	byte m_bDidFileScan;
+	
 };
 
 const int32 C_DINK_VERSION = 110;

source/video_gl.cpp

@@ -293,6 +293,8 @@ void IDirectDrawSurface::UpdateShadowSurface()
 
 		if (m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_PALETTE_8BIT)
 		{
+			
+			
 			SoftSurface s;
 			s.Init(m_pSurf->GetWidth(), m_pSurf->GetHeight(), SoftSurface::SURFACE_RGBA);
 			s.FillColor(glColorBytes(0,0,0,0));
@@ -318,6 +320,7 @@ void IDirectDrawSurface::UpdateShadowSurface()
 		} 
 	else
 		{
+
 			assert(m_pSurf);
 			assert(m_pGLSurf);
 			assert(m_pSurf->GetSurfaceType() == SoftSurface::SURFACE_RGBA);

windows_vs2017/winRTDink.vcxproj.user

@@ -7,7 +7,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GL|Win32'">
     <LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-game dmods/tdabeta</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-game dmods/status</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Common Debug|Win32'">
     <LocalDebuggerCommandArguments>