diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-04-26 22:03:15 +0300 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-26 22:03:15 +0300 |
commit | f0890b11122291a22d6a65f349281cf1aed49bd0 (patch) | |
tree | 3b418b522c5fd097abac916693e59808ea4f5b4f /src/rw/NodeName.cpp | |
parent | 3e460d94acd6e08301b0be2d4de58fe8f65aff57 (diff) | |
parent | 4dc2f307910c6d5dcf3c910b3da2e2d943ac1003 (diff) |
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/core/MenuScreens.h
# src/render/Font.cpp
# src/render/Font.h
# src/text/Messages.cpp
# src/text/Text.cpp
Diffstat (limited to 'src/rw/NodeName.cpp')
-rw-r--r-- | src/rw/NodeName.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rw/NodeName.cpp b/src/rw/NodeName.cpp index 2aea3c83..d62884f7 100644 --- a/src/rw/NodeName.cpp +++ b/src/rw/NodeName.cpp @@ -1,8 +1,8 @@ #include "common.h" -#include "patcher.h" + #include "NodeName.h" -static int32 &gPluginOffset = *(int32*)0x64C610; +static int32 gPluginOffset; enum { |