summaryrefslogtreecommitdiff
path: root/src/mmo/extract.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mmo/extract.cpp')
-rw-r--r--src/mmo/extract.cpp20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/mmo/extract.cpp b/src/mmo/extract.cpp
index 2f8b644..7a00c71 100644
--- a/src/mmo/extract.cpp
+++ b/src/mmo/extract.cpp
@@ -45,6 +45,13 @@ bool extract(XString str, AString *rv)
bool extract(XString str, GlobalReg *var)
{
+ // vars used to be stored signed
+ int compat_value;
+ if (extract(str, record<','>(&var->str, &compat_value)))
+ {
+ var->value = compat_value;
+ return true;
+ }
return extract(str,
record<','>(&var->str, &var->value));
}
@@ -52,11 +59,12 @@ bool extract(XString str, GlobalReg *var)
bool extract(XString str, Item *it)
{
XString ignored;
- return extract(str,
+ XString corruption_hack_amount;
+ bool rv = extract(str,
record<',', 11>(
&ignored,
&it->nameid,
- &it->amount,
+ &corruption_hack_amount,
&it->equip,
&ignored,
&ignored,
@@ -66,6 +74,14 @@ bool extract(XString str, Item *it)
&ignored,
&ignored,
&ignored));
+ if (rv)
+ {
+ if (corruption_hack_amount == "-1"_s)
+ it->amount = 0;
+ else
+ rv = extract(corruption_hack_amount, &it->amount);
+ }
+ return rv;
}
bool extract(XString str, MapName *m)