Just rename some files

* Fix a server ping issue

src/framework/core/adaptativeframecounter.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/adaptativeframecounter.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/application.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/application.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/binarytree.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/binarytree.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
 
 #include "declarations.h"
 #include <framework/util/databuffer.h>
-#include <otclient/position.h>
+#include <client/position.h>
 #include <boost/concept_check.hpp>
 
 enum {

src/framework/core/clock.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/clock.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/configmanager.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/configmanager.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/consoleapplication.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/consoleapplication.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/declarations.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/event.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/event.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/eventdispatcher.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/eventdispatcher.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/filestream.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/filestream.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
 #include "declarations.h"
 #include <framework/luaengine/luaobject.h>
 #include <framework/util/databuffer.h>
-#include <otclient/position.h>
+#include <client/position.h>
 #include <framework/util/point.h>
 
 struct PHYSFS_File;

src/framework/core/graphicalapplication.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/graphicalapplication.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/inputevent.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/logger.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/logger.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/module.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/module.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/modulemanager.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/modulemanager.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/resourcemanager.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/resourcemanager.cpp.rej

@@ -0,0 +1,30 @@
+--- src/framework/core/resourcemanager.cpp
++++ src/framework/core/resourcemanager.cpp
+@@ -34,19 +35,21 @@
+ void ResourceManager::discoverWorkDir(const std::string& existentFile)
+ {
+     // search for modules directory
+-    std::string sep = PHYSFS_getDirSeparator();
+-    std::string possiblePaths[] = { boost::filesystem::current_path().generic_string() + sep,
+-                                    g_resources.getBaseDir() + ".." + sep};
++    std::string possiblePaths[] = { g_resources.getCurrentDir(),
++                                    g_resources.getBaseDir(),
++                                    g_resources.getBaseDir() + "../" };
+     bool found = false;
+     for(const std::string& dir : possiblePaths) {
+-        // try to directory to modules path to see if it exists
+-        std::ifstream fin(dir + existentFile);
+-        if(fin) {
++        if(!PHYSFS_addToSearchPath(dir.c_str(), 0))
++            continue;
++
++        if(PHYSFS_exists(existentFile.c_str())) {
+             g_logger.debug(stdext::format("Found work dir at '%s'", dir.c_str()));
+             m_workDir = dir;
+             found = true;
+             break;
+         }
++        PHYSFS_removeFromSearchPath(dir.c_str());
+     }
+ 
+     if(!found)

src/framework/core/resourcemanager.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/scheduledevent.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/scheduledevent.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/timer.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

src/framework/core/timer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ * Copyright (c) 2010-2013 OTClient <https://github.com/edubart/otclient>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal