Merge pull request #27 from ejt1/stability

UTF8

CMakeLists.txt

@@ -29,7 +29,6 @@ project(d2bs)
 
 option(MOZJS_USE_PREBUILT "Use the prebuilt release library of mozjs (vendor/mozjs-prebuilt)" OFF)
 
-#add_subdirectory(sandbox)
 add_subdirectory(vendor)
 
 if (NOT CMAKE_BUILD_TYPE)
@@ -106,7 +105,7 @@ set(D2BS_SRCS
 
 add_library(D2BS SHARED ${D2BS_SRCS})
 
-target_compile_options(D2BS PRIVATE /W4)
+target_compile_options(D2BS PRIVATE /W4 /utf-8)
 
 target_include_directories(D2BS PRIVATE
 	"${CMAKE_CURRENT_SOURCE_DIR}/src"

CMakePresets.json

@@ -10,8 +10,7 @@
       "installDir": "${sourceDir}/out/install/${presetName}",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "cl.exe",
-        "CMAKE_CXX_COMPILER": "cl.exe",
-        "MOZJS_USE_PREBUILT": true
+        "CMAKE_CXX_COMPILER": "cl.exe"
       },
       "condition": {
         "type": "equals",
@@ -35,7 +34,10 @@
       "displayName": "x86 Distribute",
       "description": "Target Windows (32-bit) with the Visual Studio development environment.",
       "inherits": "x86-debug",
-      "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" }
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "MOZJS_USE_PREBUILT": true
+      }
     },
     {
       "name": "x86-relwithdebinfo",

dist/d2bs/kolbot/libs/SoloPlay/Functions/AttackOverrides.js

@@ -1633,7 +1633,10 @@ Attack.pwnDia = function () {
         if (me.mp > manaStatic + manaTP + manaTP
           && diabloMissiles.length < 3 && !dia.attacking
           && dia.hpPercent > Config.CastStatic) {
-          let [x, y] = me;
+          // BUG: me is not iterable
+          //let [x, y] = me;
+          let x = me.x;
+          let y = me.y;
           ClassAttack.switchCurse(dia, true); // curse him if we can
           // re-check his mode
           if (!dia.attacking) {

src/Engine.cc

@@ -227,7 +227,7 @@ void Engine::OnGameEntered() {
   if (!Vars.bUseProfileScript) {
     const char* starter = GetStarterScriptName();
     if (starter != NULL) {
-      Print("ÿc2D2BSÿc0 :: Starting %s", starter);
+      Print("\u00FFc2D2BS\u00FFc0 :: Starting %s", starter);
       if (StartScript(starter, GetStarterScriptState()))
         Print("ÿc2D2BSÿc0 :: %s running.", starter);
       else
@@ -240,7 +240,7 @@ void Engine::OnMenuEntered(bool beginStarter) {
   if (beginStarter && !Vars.bUseProfileScript) {
     const char* starter = GetStarterScriptName();
     if (starter != NULL) {
-      Print("ÿc2D2BSÿc0 :: Starting %s", starter);
+      Print("\u00FFc2D2BS\u00FFc0 :: Starting %s", starter);
       if (StartScript(starter, GetStarterScriptState()))
         Print("ÿc2D2BSÿc0 :: %s running.", starter);
       else
@@ -281,14 +281,10 @@ void Engine::FlushPrint() {
         std::wstring wstr = AnsiToWide(*it);
         D2CLIENT_PrintGameString(wstr.c_str(), 0);
       }
-      /*} else if (Vars.bUseGamePrint && ClientState() == ClientStateMenu && findControl(4, (const wchar_t*)NULL, -1, 28, 410, 354, 298)) {
-          while (getline(ss, temp))
-              SplitLines(temp, Console::MaxWidth() - 100, ' ', lines);
-              // TODO: Double check this function, make sure it is working as intended.
-              for (list<string>::iterator it = lines.begin(); it != lines.end(); ++it)
-                  D2MULTI_PrintChannelText((char*)it->c_str(), 0);*/
     } else {
-      while (getline(ss, temp)) Console::AddLine(temp);
+      while (getline(ss, temp)) {
+        Console::AddLine(temp);
+      }
     }
 
     clean.pop();

src/Spidermonkey Engine/Core/JS/JSControl.cpp

@@ -2,6 +2,7 @@
 
 #include "Bindings.h"
 #include "D2Helpers.h"  // ClientState
+#include "StringWrap.h"
 
 JSObject* ControlWrap::Instantiate(JSContext* ctx, D2WinControlStrc* control) {
   JS::RootedObject global(ctx, JS::CurrentGlobalOrNull(ctx));
@@ -100,12 +101,11 @@ bool ControlWrap::SetText(JSContext* ctx, JS::CallArgs& args) {
   UNWRAP_CONTROL_OR_ERROR(ctx, &ctrl, args.thisv());
 
   if (ctrl->dwType == 1 && args[0].isString()) {
-    char* szText = JS_EncodeString(ctx, args[0].toString());
+    StringWrap szText(ctx, args[0]);
     if (!szText) {
       THROW_ERROR(ctx, "failed to encode string");
     }
     setControlText(ctrl, szText);
-    JS_free(ctx, szText);
   }
   args.rval().setUndefined();
   return true;
@@ -362,13 +362,12 @@ bool ControlWrap::FreeSetText(JSContext* ctx, JS::CallArgs& args) {
     return true;
   }
 
-  char* szText = JS_EncodeString(ctx, args[0].toString());
+  StringWrap szText(ctx, args[0]);
   if (!szText) {
     args.rval().setUndefined();
     return true;
   }
   setControlText(pControl, szText);
-  JS_free(ctx, szText);
   args.rval().setUndefined();
   return true;
 }