add crc emit option when crc != script.crc

ate47 · Aug 10, 2024 · a8f82af · a8f82af
1 parent 024842b
commit a8f82af
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/src/acts/compiler/gsc_compiler.cpp b/src/acts/compiler/gsc_compiler.cpp
@@ -805,6 +805,8 @@ namespace acts::compiler {
         std::vector<const char*> m_inputFiles{};
         int64_t crcServer{};
         int64_t crcClient{};
+        int64_t crcEmitServer{};
+        int64_t crcEmitClient{};
         const char* nameServer{ "" };
         const char* nameClient{ "" };
         const char* fileNameSpaceServer{ "" };
@@ -898,6 +900,32 @@ namespace acts::compiler {
                         return false;
                     }
                 }
+                else if (!_strcmpi("--crc-emit", arg)) {
+                    if (i + 1 == endIndex) {
+                        LOG_ERROR("Missing value for param: {}!", arg);
+                        return false;
+                    }
+                    try {
+                        crcEmitServer = std::strtoll(args[++i], nullptr, 16);
+                    }
+                    catch (std::exception& e) {
+                        LOG_ERROR("Invalid crc for {}: {} / {}!", arg, args[i], e.what());
+                        return false;
+                    }
+                }
+                else if (!_strcmpi("--crc-emit-client", arg)) {
+                    if (i + 1 == endIndex) {
+                        LOG_ERROR("Missing value for param: {}!", arg);
+                        return false;
+                    }
+                    try {
+                        crcEmitClient = std::strtoll(args[++i], nullptr, 16);
+                    }
+                    catch (std::exception& e) {
+                        LOG_ERROR("Invalid crc for {}: {} / {}!", arg, args[i], e.what());
+                        return false;
+                    }
+                }
                 else if (!_strcmpi("--name", arg)) {
                     if (i + 1 == endIndex) {
                         LOG_ERROR("Missing value for param: {}!", arg);
@@ -969,6 +997,8 @@ namespace acts::compiler {
                 LOG_WARNING("No game set, please set a game using --game [game]");
                 return false;
             }
+            if (!crcEmitClient) crcEmitClient = crcClient;
+            if (!crcEmitServer) crcEmitServer = crcServer;
             return true;
         }
 
@@ -1285,6 +1315,7 @@ namespace acts::compiler {
         const char* fileNameStr{};
         uint64_t fileNameSpace{};
         int64_t crc{};
+        int64_t crcEmit{};
         std::set<std::string> includes{};
         std::vector<AscmNode*> m_devBlocks{};
         std::unordered_map<uint64_t, FunctionObject> exports{};
@@ -1305,10 +1336,14 @@ namespace acts::compiler {
             : opt(opt), type(file), info(nfo), vmInfo(vmInfo), plt(plt), gscHandler(gscHandler) {
             bool client = type == FILE_CSC;
             crc = client ? opt.crcClient : opt.crcServer;
+            crcEmit = client ? opt.crcEmitClient : opt.crcEmitServer;
 
             if (!crc) {
                 crc = gscHandler->GetDefaultChecksum(client);
             }
+            if (!crcEmit) {
+                crcEmit = crc;
+            }
 
             const char* fn = client ? opt.nameClient : opt.nameServer;
             fileNameStr = fn && *fn ? fn : nullptr;
@@ -1667,11 +1702,11 @@ namespace acts::compiler {
                 f.m_flags = tool::gsc::CLASS_VTABLE;
                 f.m_nodes.push_back(new AscmNodeOpCode(OPCODE_CheckClearParams));
                 f.m_nodes.push_back(new AscmNodeOpCode(OPCODE_PreScriptCall));
-                if (crc < 0) {
-                    f.m_nodes.push_back(crcData.opcode = new AscmNodeData<uint32_t>((uint32_t)(-crc), OPCODE_GetNegUnsignedInteger));
+                if (crcEmit < 0) {
+                    f.m_nodes.push_back(crcData.opcode = new AscmNodeData<uint32_t>((uint32_t)(-crcEmit), OPCODE_GetNegUnsignedInteger));
                 }
                 else {
-                    f.m_nodes.push_back(crcData.opcode = new AscmNodeData<uint32_t>((uint32_t)(crc), OPCODE_GetUnsignedInteger));
+                    f.m_nodes.push_back(crcData.opcode = new AscmNodeData<uint32_t>((uint32_t)(crcEmit), OPCODE_GetUnsignedInteger));
                 }
                 forceDebugHeader = true;
 
@@ -1715,7 +1750,7 @@ namespace acts::compiler {
                 f.m_nodes.push_back(new AscmNodeOpCode(OPCODE_CheckClearParams));
                 f.m_nodes.push_back(new AscmNodeOpCode(OPCODE_PreScriptCall));
 
-                const char* crcStr = utils::va("%lld", crc);
+                const char* crcStr = utils::va("%lld", crcEmit);
 
                 StringObject& strdef = strings[crcStr];
                 auto* getstr = new AscmNodeData<uint32_t>(0xFFFFFFFF, OPCODE_GetString);

diff --git a/src/acts/tools/gsc_vm.hpp b/src/acts/tools/gsc_vm.hpp
@@ -2478,8 +2478,7 @@ class T10GSCOBJHandler : public GSCOBJHandler {
         if ((*str & 0xC0) != 0x80) {
             return str; // not encrypted
         }
-        static char tmp[0x10] {0};
-        return tmp; // should be decrypted before
+        return str + 3; // should be decrypted before
     }
     bool IsValidHeader(size_t size) override {
         return size >= sizeof(GscObj24) && *reinterpret_cast<uint64_t*>(file) == 0xa0d43534706;