1 files changed, 53 insertions, 15 deletions

diff --git a/tools/tmxcopy/main.cpp b/tools/tmxcopy/main.cpp
index ac18ce04..4926d69f 100644
--- a/tools/tmxcopy/main.cpp
+++ b/tools/tmxcopy/main.cpp
@@ -1,6 +1,7 @@
 /*
  *  TMXCopy
  *  Copyright (C) 2007  Philipp Sehmisch
+ *  Copyright (C) 2009  Steve Cotton
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,34 +20,70 @@
 
 #include <iostream>
 #include <string>
+#include <unistd.h>
 
 #include "map.hpp"
 
+void printUsage()
+{
+    std::cerr<<"Usage: tmxcopy [-c] [-n] srcFile x y width height tgtFile x y [outfile]"<<std::endl
+             <<"    -c create layers, if they don't already exist in the target"<<std::endl
+             <<"    -n copy layers by number, not name"<<std::endl;
+}
+
 int main(int argc, char * argv[] )
 {
-    // parsing command line options
-    if (argc < 9 || argc > 10)
+    ConfigurationOptions config = {0};
+    int opt;
+    while ((opt = getopt(argc, argv, "cn")) != -1)
+    {
+        switch (opt)
+        {
+            case 'c':
+                config.createMissingLayers = true;
+                break;
+            case 'n':
+                config.copyLayersByOrdinal = true;
+                break;
+            case '?':
+                std::cerr<<"Unrecognized option"<<std::endl;
+                printUsage();
+                return -1;
+        }
+    }
+
+    if ((argc-optind) < 8)
+    {
+        std::cerr<<"Too few args"<<std::endl;
+        printUsage();
+        return -1;
+    }
+    if ((argc-optind) > 9)
     {
-        std::cerr<<"Usage: srcFile x y width height tgtFile x y [outfile]\n";
+        std::cerr<<"Too many args"<<std::endl;
+        printUsage();
         return -1;
     }
 
-    std::string srcFile = argv[1];
-    int srcX= atoi(argv[2]);
-    int srcY= atoi(argv[3]);
-    int width= atoi(argv[4]);
-    int height=atoi(argv[5]);
-    std::string tgtFile = argv[6];
-    int destX=atoi(argv[7]);
-    int destY=atoi(argv[8]);
+    std::string srcFile = argv[optind+0];
+    int srcX= atoi(argv[optind+1]);
+    int srcY= atoi(argv[optind+2]);
+    int width= atoi(argv[optind+3]);
+    int height=atoi(argv[optind+4]);
+    std::string tgtFile = argv[optind+5];
+    int destX=atoi(argv[optind+6]);
+    int destY=atoi(argv[optind+7]);
     std::string outFile = tgtFile;
-    if (argc == 10) outFile = argv[9];
+    if (argc == optind+9)
+    {
+        outFile = argv[optind+8];
+    }
 
     // plausibility check of command line options
     if (height < 1 || width < 1 || srcX < 0 || srcY < 0 || destX < 0 || destY < 0)
     {
         std::cerr<<"Illegal coordinates!"<<std::endl;
-        std::cerr<<"Usage: sourceFile x y height width targetFile x y [outputFile]"<<std::endl;
+        printUsage();
         return -1;
     }
 
@@ -54,16 +91,17 @@ int main(int argc, char * argv[] )
     {
         Map* srcMap = new Map(srcFile);
         Map* tgtMap = new Map(tgtFile);
-        if (tgtMap->overwrite(srcMap, srcX, srcY, width, height, destX, destY))
+        if (tgtMap->overwrite(srcMap, srcX, srcY, width, height, destX, destY, config))
         {
             tgtMap->save(outFile);
         } else {
             return -1;
         }
+        delete srcMap;
+        delete tgtMap;
     }
     catch (int)
     {
         return -1;
     }
-
 }