ver0.3.1

diff --git a/client/GenerateJSON.cpp b/client/GenerateJSON.cpp
index 17b2e3a..1d4dec6 100644 (file)
--- a/client/GenerateJSON.cpp
+++ b/client/GenerateJSON.cpp
@@ -176,7 +176,7 @@ JsonGen::JsonGen()
        DxLib::MATRIX chglcl = {0};\r
 \r
        char pmd_model_name_[256] = {0};\r
-       char pmd_author_name_[256] = {0};\r
+       TCHAR pmd_author_name_[256] = {0};\r
 \r
        int exist_num_pmd_ = 0;\r
 \r
@@ -211,7 +211,7 @@ JsonGen::JsonGen()
                                _tcscpy_s(tcsTmpPath_Pmd,tcsTmpDir);\r
                                _tcscat_s(tcsTmpPath_Pmd,_T("*.pmd"));\r
                                hPmdFind = FindFirstFile(tcsTmpPath_Pmd, &win32fd_pmd);\r
-                               if(hPmdFind < 0)\r
+                               if(hPmdFind == (HANDLE)0xffffffff)\r
                                {\r
                                        FindClose(hPmdFind);\r
                                        continue;\r
@@ -247,22 +247,26 @@ JsonGen::JsonGen()
 \r
                                        // \83\82\83f\83\8b\96¼\8eæ\93¾\r
                                        strcpy_s(pmd_model_name_,pmd_info+7);\r
-\r
-                                       int cnt = 7 + strlen(pmd_info+7);\r
-                                       while(cnt < PMDINFO_SIZE){\r
-                                               if(!strncmp("\83\82\83f\83\8a\83\93\83O",pmd_info+cnt,10))break;\r
+                                       int cnt = 0x1b;\r
+                                       size_t info_size = ADFUNC_DXconvAnsiToWide(0,0,pmd_info+cnt);\r
+                                       TCHAR *pmd_info_t = new TCHAR[info_size + 1];\r
+                                       ADFUNC_DXconvAnsiToWide(info_size,pmd_info_t,pmd_info+cnt);\r
+                                       cnt = 0;\r
+                                       while(cnt < info_size){\r
+                                               if(!_tcsncmp(_T("\83\82\83f\83\8a\83\93\83O"),pmd_info_t+cnt,5))break;\r
                                                else    ++cnt;\r
                                        }\r
-                                       if(cnt == PMDINFO_SIZE)\r
+                                       if(cnt == info_size)\r
                                        {\r
-                                               strcpy_s(pmd_author_name_,"Unknown");\r
+                                               _tcscpy_s(pmd_author_name_,_T("Unknown"));\r
                                        }else{\r
-                                               for(cnt;cnt<PMDINFO_SIZE && (*(pmd_info+cnt) != 0x46 && *(pmd_info+cnt-1) != 0x81);++cnt);\r
+                                               for(cnt;cnt<info_size && *(pmd_info_t+cnt) != _T('\81F'); ++cnt);\r
                                                int tmp_str_cnt = 1;\r
-                                               for(tmp_str_cnt;cnt+tmp_str_cnt<PMDINFO_SIZE && (*(pmd_info+cnt+tmp_str_cnt) != 0x0a && *(pmd_info+cnt+tmp_str_cnt) != 0x20);++tmp_str_cnt);\r
+                                               for(tmp_str_cnt;cnt+tmp_str_cnt<info_size && (*(pmd_info_t+cnt+tmp_str_cnt) != _T('\n') && *(pmd_info_t+cnt+tmp_str_cnt) != _T(' ') && *(pmd_info_t+cnt+tmp_str_cnt) != _T('.'));++tmp_str_cnt);\r
                                                // \8dì\8eÒ\8eæ\93¾\r
-                                               strncpy_s(pmd_author_name_,pmd_info+cnt+1,tmp_str_cnt-1);\r
+                                               _tcsncpy_s(pmd_author_name_,pmd_info_t+cnt+1,tmp_str_cnt-1);\r
                                        }\r
+                                       delete []pmd_info_t;\r
 \r
                                        TCHAR tmp_mv1_path[MAX_PATH] = {0};\r
                                        _tcscpy_s(tmp_mv1_path,pmd_paths[i].c_str());\r
@@ -294,10 +298,10 @@ JsonGen::JsonGen()
                                        ADFUNC_DXconvAnsiToWide(tmp_w_s_m,tmp_w_m,pmd_model_name_);\r
                                        prejson += tmp_w_m;\r
                                        prejson += _T(":");\r
-                                       size_t tmp_w_s_a = ADFUNC_DXconvAnsiToWide(0,0,pmd_author_name_);\r
-                                       TCHAR *tmp_w_a = new TCHAR[tmp_w_s_a + 1];\r
-                                       ADFUNC_DXconvAnsiToWide(tmp_w_s_a,tmp_w_a,pmd_author_name_);\r
-                                       prejson += tmp_w_a;\r
+                                       //size_t tmp_w_s_a = ADFUNC_DXconvAnsiToWide(0,0,pmd_author_name_);\r
+                                       //TCHAR *tmp_w_a = new TCHAR[tmp_w_s_a + 1];\r
+                                       //ADFUNC_DXconvAnsiToWide(tmp_w_s_a,tmp_w_a,pmd_author_name_);\r
+                                       prejson += pmd_author_name_;\r
                                        prejson += _T("\8e®\",\n\t\"character\":\n\t\t{\n\t\t\t\"height\":");\r
                                        TCHAR tmp_f[32];\r
                                        _ftot_s(tmp_f,32,floor(prePos.y*2)/10.0f,2);\r
@@ -305,13 +309,13 @@ JsonGen::JsonGen()
                                        prejson += _T(",\n\t\t\t\"motions\":\n\t\t\t\t{\n\t\t\t\t\t\"stand\":\"basic_stand.vmd\",\n\t\t\t\t\t\"walk\": \t\"basic_walk.vmd\",\n\t\t\t\t\t\"run\":\t\"basic_run.vmd\"\n\t\t\t\t}\n\t\t}\n}");\r
                                        TCHAR tmp_dir[MAX_PATH];\r
                                        _tcscpy_s(tmp_dir,_T(".\\resources\\models\\"));\r
-                                       _tcscat_s(tmp_dir,tmp_w_a);\r
+                                       _tcscat_s(tmp_dir,pmd_author_name_);\r
                                        _tcscat_s(tmp_dir,_T("\8e®"));\r
                                        _tcscat_s(tmp_dir,tmp_w_m);\r
                                        _tcscat_s(tmp_dir,_T("\\"));\r
                                        _wmkdir(tmp_dir);\r
                                        delete [] tmp_w_m;\r
-                                       delete [] tmp_w_a;\r
+                                       //delete [] tmp_w_a;\r
                                        TCHAR json_path[MAX_PATH];\r
                                        _tcscpy_s(json_path,tmp_dir);\r
                                        _tcscat_s(json_path,_T("info.json"));\r
@@ -350,7 +354,7 @@ JsonGen::JsonGen()
                                        _tcscat_s(tmp_type,tmp_cpy);\r
                                        CopyFile(pmd_paths[i].c_str(),tmp_type,TRUE);\r
                                }\r
-\r
+                               pmd_paths.clear();\r
                                DeleteDirectory(tcsTmpDir);\r
                        }\r
                }\r

diff --git a/client/ResourceManager.cpp b/client/ResourceManager.cpp
index 8fe5967..42d87e5 100644 (file)
Binary files a/client/ResourceManager.cpp and b/client/ResourceManager.cpp differ

diff --git a/client/version.hpp b/client/version.hpp
index 161068f..5e1dabe 100644 (file)
--- a/client/version.hpp
+++ b/client/version.hpp
@@ -8,8 +8,8 @@
 #define MMO_VERSION_TOSTRING(val) MMO_VERSION_TOSTRING_(val)
 
 #define MMO_VERSION_MAJOR 0
-#define MMO_VERSION_MINOR 2
-#define MMO_VERSION_REVISION 9
+#define MMO_VERSION_MINOR 3
+#define MMO_VERSION_REVISION 1
 
 #ifdef MMO_VERSION_BUILD
 #define MMO_VERSION_BUILD_TEXT " Build " MMO_VERSION_TOSTRING(MMO_VERSION_BUILD)