Revert "Abstract over data dir"

lheckemann · May 17, 2017 · 5cb8063 · 5cb8063
1 parent ca29d4b
commit 5cb8063
Show file tree

Hide file tree

Showing 12 changed files with 238 additions and 289 deletions.
diff --git a/src/buttons.cpp b/src/buttons.cpp
@@ -313,7 +313,7 @@ void buttonOpen(button_t* my)
 	button->focused = 1;
 
 	// file list
-	if ( (dir = openDataDir("maps/")) != NULL )
+	if ( (dir = opendir("maps/")) != NULL )
 	{
 		while ( (ent = readdir(dir)) != NULL )
 		{
@@ -340,7 +340,7 @@ void buttonOpen(button_t* my)
 			d_names[c] = (char*) malloc(sizeof(char) * FILENAME_MAX);
 		}
 		c = 0;
-		if ( (dir = openDataDir("maps/")) != NULL )
+		if ( (dir = opendir("maps/")) != NULL )
 		{
 			while ( (ent = readdir(dir)) != NULL )
 			{
@@ -484,7 +484,7 @@ void buttonSaveAs(button_t* my)
 	button->focused = 1;
 
 	// file list
-	if ( (dir = openDataDir("maps/")) != NULL )
+	if ( (dir = opendir("maps/")) != NULL )
 	{
 		while ( (ent = readdir(dir)) != NULL )
 		{
@@ -511,7 +511,7 @@ void buttonSaveAs(button_t* my)
 			d_names[c] = (char*) malloc(sizeof(char) * FILENAME_MAX);
 		}
 		c = 0;
-		if ( (dir = openDataDir("maps/")) != NULL )
+		if ( (dir = opendir("maps/")) != NULL )
 		{
 			while ( (ent = readdir(dir)) != NULL )
 			{
@@ -965,4 +965,4 @@ void buttonCloseSubwindow(button_t* my)
 		d_names = NULL;
 	}
 	strcpy(filename, oldfilename);
-}
+}
diff --git a/src/editor.cpp b/src/editor.cpp
@@ -703,7 +703,6 @@ void redo()
 void processCommandLine(int argc, char** argv)
 {
 	int c = 0;
-	strcpy(datadir, "./");
 	if ( argc > 1 )
 	{
 		for ( c = 1; c < argc; c++ )
@@ -715,14 +714,9 @@ void processCommandLine(int argc, char** argv)
 					strcpy(maptoload, argv[c] + 5);
 					loadingmap = true;
 				}
-				else if (!strncmp(argv[c], "-datadir=", 9))
-				{
-					strcpy(datadir, argv[c] + 9);
-				}
 			}
 		}
 	}
-	printlog("Data path is %s", datadir);
 }
 
 /*-------------------------------------------------------------------------------