GOB: Append labels from .IDE file to function names in degob

Syntax: sub_<function offset>[_<function name>]

Author: sdelamarre

engines/gob/degob_script.cpp

@@ -953,15 +953,26 @@ void Script::deGob(int32 offset, bool isLib) {
 }
 
 void Script::deGobFunction() {
+	uint32 pos = getPos();
+	updateOffsetPos(pos);
+	printIndent();
+
+	const char* func_name = nullptr;
 	if (!_funcOffsetsNames.empty()) {
-		auto it = _funcOffsetsNames.find(getPos());
+		auto it = _funcOffsetsNames.find(pos);
 		if (it != _funcOffsetsNames.end()) {
-			print("--- %s ---\n", it->second.c_str());
+			func_name = it->second.c_str();
+			// Skip lib name
+			if (const char* p = strchr(func_name, ' ')) {
+				func_name = p + 1;
+			}
 		}
 	}
-	updateOffsetPos(getPos());
-	printIndent();
-	print("sub_%d {\n", getPos());
+
+	print("sub_%d%s%s {\n",
+		  pos,
+		  func_name ? "_" : "",
+		  func_name ? func_name : "");
 	incIndent();
 
 	funcBlock(2);

engines/gob/degob_script_v1.cpp

@@ -880,8 +880,23 @@ void Script_v1::o1_callSub(FuncParams &params) {
 
 	seek(offset);
 
+	const char* func_name = nullptr;
+	if (!_funcOffsetsNames.empty()) {
+		auto it = _funcOffsetsNames.find(offset);
+		if (it != _funcOffsetsNames.end()) {
+			func_name = it->second.c_str();
+			// Skip lib name
+			if (const char* p = strchr(func_name, ' ')) {
+				func_name = p + 1;
+			}
+		}
+	}
+
 	if (peekUint8() == 1) {
-		print("sub_%d();\n", offset);
+		print("sub_%d%s%s();\n",
+			  offset,
+			  func_name ? "_" : "",
+			  func_name ? func_name : "");
 		if (offset >= 128)
 			addFuncOffset(offset);
 	} else if (peekUint8() == 2) {