Changed files to tme

6 files changed, 40 insertions, 39 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c2ef4cd..d7dcbc7a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
 SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
-SET(FLAGS "${FLAGS} -DTMW_DATADIR=\\\"${PKG_DATADIR}/\\\"")
+SET(FLAGS "${FLAGS} -DTME_DATADIR=\\\"${PKG_DATADIR}/\\\"")
 
 SET(GUICHAN_COMPONENTS "SDL")
 IF (WITH_OPENGL)
@@ -339,9 +339,9 @@ SET(SRCS
     vector.h
     )
 
-ADD_EXECUTABLE(tmw ${SRCS})
+ADD_EXECUTABLE(tme ${SRCS})
 
-TARGET_LINK_LIBRARIES(tmw
+TARGET_LINK_LIBRARIES(tme
     ${SDL_LIBRARY}
     ${SDLIMAGE_LIBRARY}
     ${SDLMIXER_LIBRARY}
@@ -354,6 +354,6 @@ TARGET_LINK_LIBRARIES(tmw
     ${OPENGL_LIBRARIES}
     )
 
-INSTALL(TARGETS tmw RUNTIME DESTINATION ${PKG_BINDIR})
+INSTALL(TARGETS tme RUNTIME DESTINATION ${PKG_BINDIR})
 
-SET_TARGET_PROPERTIES(tmw PROPERTIES COMPILE_FLAGS "${FLAGS}")
+SET_TARGET_PROPERTIES(tme PROPERTIES COMPILE_FLAGS "${FLAGS}")
diff --git a/src/Makefile.am b/src/Makefile.am
index f1352f9e..e750e214 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
               gui/widgets/dropdown.h \
               gui/widgets/resizegrip.cpp \
 	      gui/widgets/resizegrip.h \
-	      gui/box.h \
 	      gui/box.cpp \
+	      gui/box.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/button.cpp \
@@ -17,10 +17,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/buysell.h \
 	      gui/chargedialog.cpp \
 	      gui/chargedialog.h \
-	      gui/char_server.cpp \
-	      gui/char_server.h \
 	      gui/char_select.cpp \
 	      gui/char_select.h \
+	      gui/char_server.cpp \
+	      gui/char_server.h \
 	      gui/chat.cpp \
 	      gui/chat.h \
 	      gui/chatinput.cpp \
@@ -41,8 +41,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/gccontainer.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/hbox.h \
 	      gui/hbox.cpp \
+	      gui/hbox.h \
 	      gui/help.cpp \
 	      gui/help.h \
 	      gui/inttextbox.h \
@@ -117,10 +117,10 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/status.h \
 	      gui/tabbedcontainer.cpp \
 	      gui/tabbedcontainer.h \
-	      gui/table.h \
 	      gui/table.cpp \
-	      gui/table_model.h \
+	      gui/table.h \
 	      gui/table_model.cpp \
+	      gui/table_model.h \
 	      gui/textbox.cpp \
 	      gui/textbox.h \
 	      gui/textfield.cpp \
@@ -181,6 +181,8 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/ambientoverlay.h \
 	      resources/animation.cpp \
 	      resources/animation.h \
+	      resources/buddylist.cpp \
+	      resources/buddylist.h \
 	      resources/dye.cpp \
 	      resources/dye.h \
 	      resources/image.cpp \
@@ -213,8 +215,6 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/soundeffect.cpp \
 	      resources/spritedef.h \
 	      resources/spritedef.cpp \
-	      resources/buddylist.h \
-	      resources/buddylist.cpp \
 	      utils/base64.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
@@ -311,7 +311,7 @@ tme_SOURCES = gui/widgets/dropdown.cpp \
 # set the include path found by configure
 INCLUDES =					\
 	$(all_includes)				\
-	-DTMW_DATADIR=\""$(pkgdatadir)/"\"
+	-DTME_DATADIR=\""$(pkgdatadir)/"\"
 
 # the library search path.
 tme_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0`
diff --git a/src/main.cpp b/src/main.cpp
index 213e2939..cc30ec0a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -205,7 +205,7 @@ void init_engine(const Options &options)
 #elif defined __APPLE__
     // Use Application Directory instead of .tme
     homeDir = std::string(PHYSFS_getUserDir()) +
-        "/Library/Application Support/The Mana World";
+        "/Library/Application Support/The Mana Experiment";
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
 #else
@@ -224,9 +224,9 @@ void init_engine(const Options &options)
     logger->setLogFile(homeDir + std::string("/tme.log"));
 
     #ifdef PACKAGE_VERSION
-        logger->log("Starting The Mana World Version %s", PACKAGE_VERSION);
+        logger->log("Starting The Mana Experiment Version %s", PACKAGE_VERSION);
     #else
-        logger->log("Starting The Mana World - Version not defined");
+        logger->log("Starting The Mana Experiment - Version not defined");
     #endif
 
     // Initialize SDL
@@ -268,7 +268,7 @@ void init_engine(const Options &options)
     strncat(path, "/data", PATH_MAX - 1);
     resman->addToSearchPath(path, true);
 #else
-    resman->addToSearchPath(TMW_DATADIR "data", true);
+    resman->addToSearchPath(TME_DATADIR "data", true);
 #endif
 
     // Fill configuration with defaults
@@ -294,24 +294,24 @@ void init_engine(const Options &options)
 
     // Checking if the configuration file exists... otherwise creates it with
     // default options !
-    FILE *tmwFile = 0;
+    FILE *tmeFile = 0;
     std::string configPath = options.configPath;
 
     if (configPath.empty())
         configPath = homeDir + "/config.xml";
 
-    tmwFile = fopen(configPath.c_str(), "r");
+    tmeFile = fopen(configPath.c_str(), "r");
 
     // If we can't read it, it doesn't exist !
-    if (tmwFile == NULL) {
+    if (tmeFile == NULL) {
         // We reopen the file in write mode and we create it
-        tmwFile = fopen(configPath.c_str(), "wt");
+        tmeFile = fopen(configPath.c_str(), "wt");
     }
-    if (tmwFile == NULL) {
+    if (tmeFile == NULL) {
         std::cout << "Can't create " << configPath << ". "
             "Using Defaults." << std::endl;
     } else {
-        fclose(tmwFile);
+        fclose(tmeFile);
         config.init(configPath);
     }
 
@@ -325,7 +325,7 @@ void init_engine(const Options &options)
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
+    SDL_Surface *icon = IMG_Load(TME_DATADIR "data/icons/tme.png");
     if (icon)
     {
         SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
@@ -422,7 +422,7 @@ void exit_engine()
 void printHelp()
 {
     std::cout
-        << "tmw" << std::endl << std::endl
+        << "tme" << std::endl << std::endl
         << "Options: " << std::endl
         << "  -h --help       : Display this help" << std::endl
         << "  -v --version    : Display the version" << std::endl
@@ -439,9 +439,10 @@ void printHelp()
 void printVersion()
 {
 #ifdef PACKAGE_VERSION
-    std::cout << "The Mana World version " << PACKAGE_VERSION << std::endl;
+    std::cout << "The Mana Experiment version " << PACKAGE_VERSION <<
+        std::endl;
 #else
-    std::cout << "The Mana World version " <<
+    std::cout << "The Mana Experiment version " <<
              "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
 #endif
 }
diff --git a/src/main.h b/src/main.h
index af59ea26..1f9aa9d0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -32,8 +32,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TMW_DATADIR
-#define TMW_DATADIR ""
+#ifndef TME_DATADIR
+#define TME_DATADIR ""
 #endif
 
 /*
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 6b45c9d7..ae255144 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -210,7 +210,7 @@ ResourceManager::getPath(const std::string &file)
     // get the real path to the file
     const char* tmp = PHYSFS_getRealDir(file.c_str());
     std::string path;
-    
+
     // if the file is not in the search path, then its NULL
     if (tmp)
     {
@@ -219,9 +219,9 @@ ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TMW_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(TME_DATADIR) + std::string("data") + "/" + file;
     }
-    
+
     return path;
 }
 
diff --git a/src/tmw.rc b/src/tme.rc
index 673b2387..495d0675 100644
--- a/src/tmw.rc
+++ b/src/tme.rc
@@ -2,7 +2,7 @@
 

 #include "winver.h"

 

-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"

+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tme.ico"

 

 1 VERSIONINFO

 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

@@ -10,12 +10,12 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
 FILETYPE VFT_APP {

     BLOCK "StringFileInfo" {

         BLOCK "040904E4" {

-            VALUE "CompanyName", "The Mana World Development Team"

+            VALUE "CompanyName", "The Mana Experiment Development Team"

             VALUE "FileVersion", PACKAGE_VERSION

-            VALUE "FileDescription", "The Mana World"

-            VALUE "LegalCopyright", "2004-2006 (C)"

-            VALUE "OriginalFilename", "tmw.exe"

-            VALUE "ProductName", "The Mana World MMORPG"

+            VALUE "FileDescription", "The Mana Experiment"

+            VALUE "LegalCopyright", "2008 (C)"

+            VALUE "OriginalFilename", "tme.exe"

+            VALUE "ProductName", "The Mana Experiment MMORPG"

             VALUE "ProductVersion", PACKAGE_VERSION

         }

     }