Add v1.07 changes

clickteam-plugin · Nov 14, 2013 · ea304c2 · ea304c2
1 parent ab4817c
commit ea304c2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/Data.h b/Data.h
@@ -21,8 +21,8 @@ typedef rRundata * LPRRDATA;
 typedef headerObject object;
 typedef hash_map<string,float> variables;
 typedef pair<string,float> variable;
-typedef hash_map<int,variables> variable_map;
-typedef pair<int,variables> objvar_pair;
+typedef hash_map<unsigned int,variables> variable_map;
+typedef pair<unsigned int,variables> objvar_pair;
 typedef struct tagRDATA
 {
 	#include "MagicRDATA.h"

diff --git a/DynExt.h b/DynExt.h
@@ -29,7 +29,7 @@ void InitOiListItemSize(LPMV pMv);
 #define NextOILPtr(oiListItemPtr) PtrAddBytes(oiListItemPtr, oiListItemSize)
 
 // Convert a fixed value to an object
-inline headerObject* Fixed2Object(LPRDATA rdPtr, int fixed)
+inline headerObject* Fixed2Object(LPRDATA rdPtr, unsigned int fixed)
 {
 	LPOBL ObjectList = rdPtr->rHo.hoAdRunHeader->rhObjectList;
 	headerObject* pObject = ObjectList[0x0000FFFF&fixed].oblOffset;
@@ -44,7 +44,7 @@ inline headerObject* Fixed2Object(LPRDATA rdPtr, int fixed)
 }
 
 // Convert an object to a fixed value
-inline int Object2Fixed(headerObject* object)
+inline unsigned int Object2Fixed(headerObject* object)
 {
 	return (object->hoCreationId<<16) + object->hoNumber;
 }

diff --git a/Ext.rc b/Ext.rc
@@ -19,8 +19,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 #ifndef _MAC
 
 1 VERSIONINFO
- FILEVERSION 1,6,0,0
- PRODUCTVERSION 1,6,0,0
+ FILEVERSION 1,7,0,0
+ PRODUCTVERSION 1,7,0,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -36,8 +36,8 @@ BEGIN
         BLOCK "080004e4"
         BEGIN
             VALUE "FileDescription", "Value-Add Object For Clickteam's MMF2"
-            VALUE "FileVersion", "v1.06.0"
-            VALUE "LegalCopyright", "Copyright � 2008-2009 Dynamic Arcade"
+            VALUE "FileVersion", "v1.07.0"
+            VALUE "LegalCopyright", "Copyright � 2008-2010 Dynamic Arcade"
             VALUE "OriginalFilename", "ValueAdd.mfx"
         END
     END

diff --git a/Information.h b/Information.h
@@ -10,7 +10,7 @@
 // Basic object details
 #define	ObjectName			"Value-Add Object"
 #define	ObjectAuthor		"Gareth Ben Martin of Dynamic Arcade"
-#define	ObjectCopyright		"Copyright © 2008-2009 Dynamic Arcade"
+#define	ObjectCopyright		"Copyright © 2008-2010 Dynamic Arcade"
 #define	ObjectComment		"Unlimited Alterable Values for all objects"
 #define	ObjectURL			"http://www.dynamicarcade.co.uk"
 #define	ObjectHelp			"Help\\ValueAdd\\ValueAdd.html"
@@ -21,8 +21,8 @@
 // Change N,O,N,E to 4 unique characters (MMF currently still uses this to keep track)
 #define	IDENTIFIER MAKEID(D,A,V,A)
 
-// Version 1.06.0
-#define	VERSION 160
+// Version 1.07.0
+#define	VERSION 170
 
 // --------------------
 // Version information

diff --git a/Main.cpp b/Main.cpp
@@ -304,7 +304,7 @@ EXPRESSION(
 	/* Flags */			0,
 	/* Params */			(2,EXPPARAM_NUMBER,"Fixed Value of Object",EXPPARAM_STRING,"Extended Alt. Value's Name")
 ) {
-	int p1 = ExParam(TYPE_INT);
+	unsigned int p1 = ExParam(TYPE_INT);
 	char* p2 = (char*)ExParam(TYPE_STRING);
 
 	variable_map::iterator i = rdPtr->pVariableMap->find(p1);

diff --git a/rSDK.vcproj b/rSDK.vcproj
@@ -1215,6 +1215,10 @@
 				RelativePath="Resource.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Docs\ValueAdd.html"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="MMF Headers"