[Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.17,1.18

[Pawe? Ko?odziejski]

Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv29048

Modified Files:
	file.cpp 
Log Message:
cleanup array

Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- file.cpp	22 Oct 2002 11:35:45 -0000	1.17
+++ file.cpp	22 Oct 2002 20:40:51 -0000	1.18
@@ -41,14 +41,14 @@
 	if (file)
 		return file;
 
-	char dirs[7][10];
-	dirs[0][0] = 0;
-	strcpy(dirs[1], "video/");
-	strcpy(dirs[2], "VIDEO/");
-	strcpy(dirs[3], "data/");
-	strcpy(dirs[4], "DATA/");
-	strcpy(dirs[5], "resource/");
-	strcpy(dirs[6], "RESOURCE/");
+	struct t_dirs {
+		char dir[20];
+	} dirs[] = {
+		"",
+		"video/",			"VIDEO/",
+		"data/",			"DATA/",
+		"resource/",	"RESOURCE/"
+	};
 
 	for (uint8 l = 0; l < 7; l++) {
 		strcpy(buf, directory);
@@ -59,7 +59,7 @@
 #endif
 			strcat(buf, "/");
 		}
-		strcat(buf, dirs[l]);
+		strcat(buf, dirs[l].dir);
 		int8 len = strlen(buf);
 		strcat(buf, filename);