Updates after feedback #1 on this branch

livecodepanos · livecodepanos · commit e69da3bd1077 · 2013-09-03T17:10:58.000+01:00
diff --git a/engine/src/stack3.cpp b/engine/src/stack3.cpp
@@ -172,7 +172,7 @@ IO_stat MCStack::load_stack(IO_handle stream, const char *version)
 			//   stack title will be UTF-8 already.
 			if (strncmp(version, "5.5", 3) >= 0)
 			{
-				if ((stat = IO_read_stringref(title, stream, true)) != IO_NORMAL)
+				if ((stat = IO_read_stringref(title, stream, false)) != IO_NORMAL)
 					return stat;
 			}
 			else
@@ -218,7 +218,7 @@ IO_stat MCStack::load_stack(IO_handle stream, const char *version)
 		if (maxwidth == 1280 && maxheight == 1024)
 			maxwidth = maxheight = MAXUINT2;
 	}
-	if ((stat = IO_read_stringref(externalfiles, stream, true)) != IO_NORMAL)
+	if ((stat = IO_read_stringref(externalfiles, stream, false)) != IO_NORMAL)
 		return stat;
 	if (strncmp(version, "1.3", 3) > 0)
 	{
@@ -555,7 +555,7 @@ IO_stat MCStack::save_stack(IO_handle stream, uint4 p_part, bool p_force_ext)
 		//   write out UTF-8 directly.
 		if (MCstackfileversion >= 5500)
 		{
-			if ((stat = IO_write_stringref(title, stream, true)) != IO_NORMAL)
+			if ((stat = IO_write_stringref_utf8(title, stream)) != IO_NORMAL)
 				return stat;
 		}
 		else

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ IO_stat MCStack::load_stack(IO_handle stream, const char *version)`
`172`	`172`	`// stack title will be UTF-8 already.`
`173`	`173`	`if (strncmp(version, "5.5", 3) >= 0)`
`174`	`174`	`{`
`175`		`- if ((stat = IO_read_stringref(title, stream, true)) != IO_NORMAL)`
	`175`	`+ if ((stat = IO_read_stringref(title, stream, false)) != IO_NORMAL)`
`176`	`176`	`return stat;`
`177`	`177`	`}`
`178`	`178`	`else`
`@@ -218,7 +218,7 @@ IO_stat MCStack::load_stack(IO_handle stream, const char *version)`
`218`	`218`	`if (maxwidth == 1280 && maxheight == 1024)`
`219`	`219`	`maxwidth = maxheight = MAXUINT2;`
`220`	`220`	`}`
`221`		`- if ((stat = IO_read_stringref(externalfiles, stream, true)) != IO_NORMAL)`
	`221`	`+ if ((stat = IO_read_stringref(externalfiles, stream, false)) != IO_NORMAL)`
`222`	`222`	`return stat;`
`223`	`223`	`if (strncmp(version, "1.3", 3) > 0)`
`224`	`224`	`{`
`@@ -555,7 +555,7 @@ IO_stat MCStack::save_stack(IO_handle stream, uint4 p_part, bool p_force_ext)`
`555`	`555`	`// write out UTF-8 directly.`
`556`	`556`	`if (MCstackfileversion >= 5500)`
`557`	`557`	`{`
`558`		`- if ((stat = IO_write_stringref(title, stream, true)) != IO_NORMAL)`
	`558`	`+ if ((stat = IO_write_stringref_utf8(title, stream)) != IO_NORMAL)`
`559`	`559`	`return stat;`
`560`	`560`	`}`
`561`	`561`	`else`