mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix global variable replacement in dialogue

Browse Source
7220-lua-add-a-general-purpose-lexical-parser
Evil Eye 2 years ago
parent 613453c799
commit 32ac7406ab
1 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File

122
components/interpreter/defines.cpp
Unescape Escape View File

@ -3,176 +3,177 @@
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <string_view>
#include <vector> #include <vector>
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/misc/strings/lower.hpp> #include <components/misc/strings/algorithm.hpp>
namespace Interpreter namespace Interpreter
{ {
bool check(const std::string& str, const std::string& escword, unsigned int* i, unsigned int* start) bool check(std::string_view str, std::string_view escword, size_t& i, size_t& start)
{ {
bool retval = str.find(escword) == 0; bool found = Misc::StringUtils::ciStartsWith(str, escword);
if (retval) if (found)
{ {
(*i) += escword.length(); i += escword.length();
(*start) = (*i) + 1; start = i + 1;
} }
return retval; return found;
} }
std::vector<std::string> globals; std::vector<std::string> globals;
bool longerStr(const std::string& a, const std::string& b) bool longerStr(std::string_view a, std::string_view b)
{ {
return a.length() > b.length(); return a.length() > b.length();
} }
static std::string fixDefinesReal(const std::string& text, bool dialogue, Context& context) static std::string fixDefinesReal(std::string_view text, bool dialogue, Context& context)
{ {
unsigned int start = 0; size_t start = 0;
std::ostringstream retval; std::ostringstream retval;
for (unsigned int i = 0; i < text.length(); i++) for (size_t i = 0; i < text.length(); ++i)
{ {
char eschar = text[i]; char eschar = text[i];
if (eschar == '%' || eschar == '^') if (eschar == '%' || eschar == '^')
{ {
retval << text.substr(start, i - start); retval << text.substr(start, i - start);
std::string temp = Misc::StringUtils::lowerCase(std::string_view(text).substr(i + 1, 100)); std::string_view temp = text.substr(i + 1, 100);
bool found = false; bool found = false;
try try
{ {
if ((found = check(temp, "actionslideright", &i, &start))) if ((found = check(temp, "actionslideright", i, start)))
{ {
retval << context.getActionBinding("#{sRight}"); retval << context.getActionBinding("#{sRight}");
} }
else if ((found = check(temp, "actionreadymagic", &i, &start))) else if ((found = check(temp, "actionreadymagic", i, start)))
{ {
retval << context.getActionBinding("#{sReady_Magic}"); retval << context.getActionBinding("#{sReady_Magic}");
} }
else if ((found = check(temp, "actionprevweapon", &i, &start))) else if ((found = check(temp, "actionprevweapon", i, start)))
{ {
retval << context.getActionBinding("#{sPrevWeapon}"); retval << context.getActionBinding("#{sPrevWeapon}");
} }
else if ((found = check(temp, "actionnextweapon", &i, &start))) else if ((found = check(temp, "actionnextweapon", i, start)))
{ {
retval << context.getActionBinding("#{sNextWeapon}"); retval << context.getActionBinding("#{sNextWeapon}");
} }
else if ((found = check(temp, "actiontogglerun", &i, &start))) else if ((found = check(temp, "actiontogglerun", i, start)))
{ {
retval << context.getActionBinding("#{sAuto_Run}"); retval << context.getActionBinding("#{sAuto_Run}");
} }
else if ((found = check(temp, "actionslideleft", &i, &start))) else if ((found = check(temp, "actionslideleft", i, start)))
{ {
retval << context.getActionBinding("#{sLeft}"); retval << context.getActionBinding("#{sLeft}");
} }
else if ((found = check(temp, "actionreadyitem", &i, &start))) else if ((found = check(temp, "actionreadyitem", i, start)))
{ {
retval << context.getActionBinding("#{sReady_Weapon}"); retval << context.getActionBinding("#{sReady_Weapon}");
} }
else if ((found = check(temp, "actionprevspell", &i, &start))) else if ((found = check(temp, "actionprevspell", i, start)))
{ {
retval << context.getActionBinding("#{sPrevSpell}"); retval << context.getActionBinding("#{sPrevSpell}");
} }
else if ((found = check(temp, "actionnextspell", &i, &start))) else if ((found = check(temp, "actionnextspell", i, start)))
{ {
retval << context.getActionBinding("#{sNextSpell}"); retval << context.getActionBinding("#{sNextSpell}");
} }
else if ((found = check(temp, "actionrestmenu", &i, &start))) else if ((found = check(temp, "actionrestmenu", i, start)))
{ {
retval << context.getActionBinding("#{sRestKey}"); retval << context.getActionBinding("#{sRestKey}");
} }
else if ((found = check(temp, "actionmenumode", &i, &start))) else if ((found = check(temp, "actionmenumode", i, start)))
{ {
retval << context.getActionBinding("#{sInventory}"); retval << context.getActionBinding("#{sInventory}");
} }
else if ((found = check(temp, "actionactivate", &i, &start))) else if ((found = check(temp, "actionactivate", i, start)))
{ {
retval << context.getActionBinding("#{sActivate}"); retval << context.getActionBinding("#{sActivate}");
} }
else if ((found = check(temp, "actionjournal", &i, &start))) else if ((found = check(temp, "actionjournal", i, start)))
{ {
retval << context.getActionBinding("#{sJournal}"); retval << context.getActionBinding("#{sJournal}");
} }
else if ((found = check(temp, "actionforward", &i, &start))) else if ((found = check(temp, "actionforward", i, start)))
{ {
retval << context.getActionBinding("#{sForward}"); retval << context.getActionBinding("#{sForward}");
} }
else if ((found = check(temp, "pccrimelevel", &i, &start))) else if ((found = check(temp, "pccrimelevel", i, start)))
{ {
retval << context.getPCBounty(); retval << context.getPCBounty();
} }
else if ((found = check(temp, "actioncrouch", &i, &start))) else if ((found = check(temp, "actioncrouch", i, start)))
{ {
retval << context.getActionBinding("#{sCrouch_Sneak}"); retval << context.getActionBinding("#{sCrouch_Sneak}");
} }
else if ((found = check(temp, "actionjump", &i, &start))) else if ((found = check(temp, "actionjump", i, start)))
{ {
retval << context.getActionBinding("#{sJump}"); retval << context.getActionBinding("#{sJump}");
} }
else if ((found = check(temp, "actionback", &i, &start))) else if ((found = check(temp, "actionback", i, start)))
{ {
retval << context.getActionBinding("#{sBack}"); retval << context.getActionBinding("#{sBack}");
} }
else if ((found = check(temp, "actionuse", &i, &start))) else if ((found = check(temp, "actionuse", i, start)))
{ {
retval << context.getActionBinding("#{sUse}"); retval << context.getActionBinding("#{sUse}");
} }
else if ((found = check(temp, "actionrun", &i, &start))) else if ((found = check(temp, "actionrun", i, start)))
{ {
retval << context.getActionBinding("#{sRun}"); retval << context.getActionBinding("#{sRun}");
} }
else if ((found = check(temp, "pcclass", &i, &start))) else if ((found = check(temp, "pcclass", i, start)))
{ {
retval << context.getPCClass(); retval << context.getPCClass();
} }
else if ((found = check(temp, "pcrace", &i, &start))) else if ((found = check(temp, "pcrace", i, start)))
{ {
retval << context.getPCRace(); retval << context.getPCRace();
} }
else if ((found = check(temp, "pcname", &i, &start))) else if ((found = check(temp, "pcname", i, start)))
{ {
retval << context.getPCName(); retval << context.getPCName();
} }
else if ((found = check(temp, "cell", &i, &start))) else if ((found = check(temp, "cell", i, start)))
{ {
retval << context.getCurrentCellName(); retval << context.getCurrentCellName();
} }
else if (dialogue) else if (dialogue)
{ // In Dialogue, not messagebox { // In Dialogue, not messagebox
if ((found = check(temp, "faction", &i, &start))) if ((found = check(temp, "faction", i, start)))
{ {
retval << context.getNPCFaction(); retval << context.getNPCFaction();
} }
else if ((found = check(temp, "nextpcrank", &i, &start))) else if ((found = check(temp, "nextpcrank", i, start)))
{ {
retval << context.getPCNextRank(); retval << context.getPCNextRank();
} }
else if ((found = check(temp, "pcnextrank", &i, &start))) else if ((found = check(temp, "pcnextrank", i, start)))
{ {
retval << context.getPCNextRank(); retval << context.getPCNextRank();
} }
else if ((found = check(temp, "pcrank", &i, &start))) else if ((found = check(temp, "pcrank", i, start)))
{ {
retval << context.getPCRank(); retval << context.getPCRank();
} }
else if ((found = check(temp, "rank", &i, &start))) else if ((found = check(temp, "rank", i, start)))
{ {
retval << context.getNPCRank(); retval << context.getNPCRank();
} }
else if ((found = check(temp, "class", &i, &start))) else if ((found = check(temp, "class", i, start)))
{ {
retval << context.getNPCClass(); retval << context.getNPCClass();
} }
else if ((found = check(temp, "race", &i, &start))) else if ((found = check(temp, "race", i, start)))
{ {
retval << context.getNPCRace(); retval << context.getNPCRace();
} }
else if ((found = check(temp, "name", &i, &start))) else if ((found = check(temp, "name", i, start)))
{ {
retval << context.getActorName(); retval << context.getActorName();
} }
@ -181,27 +182,27 @@ namespace Interpreter
{ // In messagebox or book, not dialogue { // In messagebox or book, not dialogue
/* empty outside dialogue */ /* empty outside dialogue */
if ((found = check(temp, "faction", &i, &start))) if ((found = check(temp, "faction", i, start)))
; ;
else if ((found = check(temp, "nextpcrank", &i, &start))) else if ((found = check(temp, "nextpcrank", i, start)))
; ;
else if ((found = check(temp, "pcnextrank", &i, &start))) else if ((found = check(temp, "pcnextrank", i, start)))
; ;
else if ((found = check(temp, "pcrank", &i, &start))) else if ((found = check(temp, "pcrank", i, start)))
; ;
else if ((found = check(temp, "rank", &i, &start))) else if ((found = check(temp, "rank", i, start)))
; ;
/* uses pc in messageboxes */ /* uses pc in messageboxes */
else if ((found = check(temp, "class", &i, &start))) else if ((found = check(temp, "class", i, start)))
{ {
retval << context.getPCClass(); retval << context.getPCClass();
} }
else if ((found = check(temp, "race", &i, &start))) else if ((found = check(temp, "race", i, start)))
{ {
retval << context.getPCRace(); retval << context.getPCRace();
} }
else if ((found = check(temp, "name", &i, &start))) else if ((found = check(temp, "name", i, start)))
{ {
retval << context.getPCName(); retval << context.getPCName();
} }
@ -217,27 +218,26 @@ namespace Interpreter
sort(globals.begin(), globals.end(), longerStr); sort(globals.begin(), globals.end(), longerStr);
} }
for (unsigned int j = 0; j < globals.size(); j++) for (const std::string& global : globals)
{ {
if (globals[j].length() > temp.length()) // Just in case there's a global with a huuuge name if (global.length() > temp.length()) // Just in case there's a global with a huuuge name
temp = Misc::StringUtils::lowerCase( temp = text.substr(i + 1, global.length());
std::string_view(text).substr(i + 1, globals[j].length()));
found = check(temp, globals[j], &i, &start); found = check(temp, global, i, start);
if (found) if (found)
{ {
char type = context.getGlobalType(globals[j]); char type = context.getGlobalType(global);
switch (type) switch (type)
{ {
case 's': case 's':
retval << context.getGlobalShort(globals[j]); retval << context.getGlobalShort(global);
break; break;
case 'l': case 'l':
retval << context.getGlobalLong(globals[j]); retval << context.getGlobalLong(global);
break; break;
case 'f': case 'f':
retval << context.getGlobalFloat(globals[j]); retval << context.getGlobalFloat(global);
break; break;
} }
break; break;

Write Preview
Loading…
Cancel
Save