Fixed dialogs parsing

# Conflicts: # Source/Common/Dialogs.cpp # Source/Common/Dialogs.h
cvet · Jan 23, 2025 · 849544f · 849544f
1 parent 18f7226
commit 849544f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Source/Common/Dialogs.cpp b/Source/Common/Dialogs.cpp
@@ -346,7 +346,7 @@ auto DialogManager::LoadDemandResult(istringstream& input, bool is_demand) -> Di
     NON_CONST_METHOD_HINT();
 
     uint8 who = DR_WHO_PLAYER;
-    char oper = '=';
+    uint8 oper = '=';
     int values_count = 0;
     string svalue;
     int ivalue = 0;
@@ -517,12 +517,12 @@ auto DialogManager::GetWho(uint8 who) const -> uint8
         return DR_WHO_PLAYER;
     }
     if (who == 'N' || who == 'n') {
-        return DR_WHO_PLAYER;
+        return DR_WHO_NPC;
     }
     return DR_WHO_NONE;
 }
 
-auto DialogManager::CheckOper(char oper) const -> bool
+auto DialogManager::CheckOper(uint8 oper) const -> bool
 {
     STACK_TRACE_ENTRY();
 

diff --git a/Source/Common/Dialogs.h b/Source/Common/Dialogs.h
@@ -75,7 +75,7 @@ struct DialogAnswerReq
     hstring ParamHash {};
     hstring AnswerScriptFuncName {};
     bool NoRecheck {};
-    char Op {};
+    uint8 Op {};
     uint8 ValuesCount {};
     int Value {};
     int ValueExt[5] {};
@@ -146,7 +146,7 @@ class DialogManager final
 private:
     [[nodiscard]] auto GetDrType(string_view str) const -> uint8;
     [[nodiscard]] auto GetWho(uint8 who) const -> uint8;
-    [[nodiscard]] auto CheckOper(char oper) const -> bool;
+    [[nodiscard]] auto CheckOper(uint8 oper) const -> bool;
 
     auto ParseDialog(string_view pack_name, string_view data) -> DialogPack*;
     auto LoadDemandResult(istringstream& input, bool is_demand) -> DialogAnswerReq;