[Scummvm-git-logs] scummvm master -> 17b125b479ef2b7a1e9870120dbbbbc6523d4e6a

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b25e58ece6 GRAPHICS: Added more info on 9-patch images
17b125b479 JANITORIAL: Fix indentation


Commit: b25e58ece63993db90daedae553099d64fbe79e8
    https://github.com/scummvm/scummvm/commit/b25e58ece63993db90daedae553099d64fbe79e8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-09T21:50:07+02:00

Commit Message:
GRAPHICS: Added more info on 9-patch images

Changed paths:
    graphics/nine_patch.cpp


diff --git a/graphics/nine_patch.cpp b/graphics/nine_patch.cpp
index 71c8c973e9..d830dca375 100644
--- a/graphics/nine_patch.cpp
+++ b/graphics/nine_patch.cpp
@@ -22,6 +22,9 @@
 /* This code is based on Nine Patch code by Matthew Leverton
    taken from https://github.com/konforce/Allegro-Nine-Patch
 
+   You may read more about the image format here:
+      https://radleymarx.com/2011/simple-guide-to-9-patch
+
    Copyright (C) 2011 Matthew Leverton
 
    Permission is hereby granted, free of charge, to any person obtaining a copy of


Commit: 17b125b479ef2b7a1e9870120dbbbbc6523d4e6a
    https://github.com/scummvm/scummvm/commit/17b125b479ef2b7a1e9870120dbbbbc6523d4e6a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-09T21:51:08+02:00

Commit Message:
JANITORIAL: Fix indentation

Changed paths:
    engines/director/detection.cpp


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index ea063bff08..b13475e443 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -32,89 +32,89 @@
 #include "director/detection_tables.h"
 
 namespace Director {
-	const char *directoryGlobs[] = {
-		"install",
-		"l_zone",
-		"win_data",						// L-ZONE
-		"data",
-		"gadget",						// Gadget
-		"vnc",
-		"vnc2",							// Virtual Nightclub
-		"program",						// Arc Media products
-		"demodata",						// Edmark demos
-		"media",						// Gundam
-		"mvm",							// Master of the Elements
-		"module_1",
-		"module_2",						// Takeru
-		"simpdata",
-		"simpsons",						// Simpsons Cartoon Studio
-		"dane",							// Polish Kontyngent '99 catalog
-		"datas",						// O!KAY! subscription from Domino Verlag
-		"daten",						// Bibi Blocksberg games (German)
-		"source",						// Grand Prix 2006 directory
-		"data_k",
-		"data_1",
-		"data_2",						// JumpStart World
-		"numbers",						// JumpStart Learning Games
-		"xtras",
-		"files",						// Babar
-		"swanlake",						// Barbie Swan Lake
-		"assets",						// Barbie Nail Designer
-		"fjpc",							// Forestia Jr
-		"movies",						// Mulle Meck (Gary Gadget) series
-		"demos",						// Headbone samplers
-		"blender",						// Blender CD-ROM magazines
-		"bilder",
-		"endsoung",
-		"gerhelp",
-		"gervideo",
-		"mausejagd mit ton",			// Rename from Mäusejagd mit Ton
-		"music",
-		"solos",
-		"sounds",
-		"startsnd",						// GGMD German
-		"duthelp",
-		"dutvideo",
-		"endsound",
-		"muizen in \'t hotel, geluid",	// GGMD Dutch
-		"macos9",
-		"macosx",						// Sethi 3
-		"kripos",
-		"strisser",
-		"polis",
-		"poliisi",
-		"cd_data",						// Polis
-		"fusion macintosh folder",		// Fusion
-		"oslo",							// Oslo's Tools & Gadgets
-		"ojo2000",
-		"stuff",						// Abrapalabra
-		"tooned",						// Stay Tooned
-		"sam rupert",					// Who Killed Sam Rupert?
-		"content",
-		"pcinst",						// Gus and the CyberBuds series
-		"p2data",
-		"p2media",
-		"p3media",
-		"annat",						// Pettson & Findus
-		"fctdata",
-		"fct",					   		// Felix the Cat
-		"dayfiles",
-		"xmasfun",						// Fisher-Price Xmas Fun
-		"95instal",						// Fisher-Price Little People
-		"01",					   		// Doing it in C++
-		"freading",
-		"fsetup",						// My First Reading Words (Eureka)
-		"english",
-		"deutsch",
-		"francais",						// Rename from Français
-		"italiano",						// Virtual Tourism Paris
-		"please copy to hd. G3",		// Rename from HDにｺﾋﾟｰして下さい。G3
-		"_files_",						// The Gate
-		"popup",						// Pop Up Computer
-		"alpha",						// Interactive Alphabet
-		"technik",						// Glasklar Technology Interactive
-		0
-	};
+const char *directoryGlobs[] = {
+	"install",
+	"l_zone",
+	"win_data",						// L-ZONE
+	"data",
+	"gadget",						// Gadget
+	"vnc",
+	"vnc2",							// Virtual Nightclub
+	"program",						// Arc Media products
+	"demodata",						// Edmark demos
+	"media",						// Gundam
+	"mvm",							// Master of the Elements
+	"module_1",
+	"module_2",						// Takeru
+	"simpdata",
+	"simpsons",						// Simpsons Cartoon Studio
+	"dane",							// Polish Kontyngent '99 catalog
+	"datas",						// O!KAY! subscription from Domino Verlag
+	"daten",						// Bibi Blocksberg games (German)
+	"source",						// Grand Prix 2006 directory
+	"data_k",
+	"data_1",
+	"data_2",						// JumpStart World
+	"numbers",						// JumpStart Learning Games
+	"xtras",
+	"files",						// Babar
+	"swanlake",						// Barbie Swan Lake
+	"assets",						// Barbie Nail Designer
+	"fjpc",							// Forestia Jr
+	"movies",						// Mulle Meck (Gary Gadget) series
+	"demos",						// Headbone samplers
+	"blender",						// Blender CD-ROM magazines
+	"bilder",
+	"endsoung",
+	"gerhelp",
+	"gervideo",
+	"mausejagd mit ton",			// Rename from Mäusejagd mit Ton
+	"music",
+	"solos",
+	"sounds",
+	"startsnd",						// GGMD German
+	"duthelp",
+	"dutvideo",
+	"endsound",
+	"muizen in \'t hotel, geluid",	// GGMD Dutch
+	"macos9",
+	"macosx",						// Sethi 3
+	"kripos",
+	"strisser",
+	"polis",
+	"poliisi",
+	"cd_data",						// Polis
+	"fusion macintosh folder",		// Fusion
+	"oslo",							// Oslo's Tools & Gadgets
+	"ojo2000",
+	"stuff",						// Abrapalabra
+	"tooned",						// Stay Tooned
+	"sam rupert",					// Who Killed Sam Rupert?
+	"content",
+	"pcinst",						// Gus and the CyberBuds series
+	"p2data",
+	"p2media",
+	"p3media",
+	"annat",						// Pettson & Findus
+	"fctdata",
+	"fct",					   		// Felix the Cat
+	"dayfiles",
+	"xmasfun",						// Fisher-Price Xmas Fun
+	"95instal",						// Fisher-Price Little People
+	"01",					   		// Doing it in C++
+	"freading",
+	"fsetup",						// My First Reading Words (Eureka)
+	"english",
+	"deutsch",
+	"francais",						// Rename from Français
+	"italiano",						// Virtual Tourism Paris
+	"please copy to hd. G3",		// Rename from HDにｺﾋﾟｰして下さい。G3
+	"_files_",						// The Gate
+	"popup",						// Pop Up Computer
+	"alpha",						// Interactive Alphabet
+	"technik",						// Glasklar Technology Interactive
+	0
+};
 }
 
 static const DebugChannelDef debugFlagList[] = {