temporary fix for getd (#2163)

this will be reverted in the next release and a proper fix will be added
HerculesWS · Jul 30, 2018 · 6696ad9 · 6696ad9
1 parent f3b156e
commit 6696ad9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ and this project does not adhere to [Semantic Versioning](http://semver.org/spec
 If you are reading this in a text editor, simply ignore this section
 -->
 
+## [v2018.07.29+1] `Jul 29 2018` `PATCH 1`
+### Fixed
+- Added a temporary patch for getd when variable types are C_NOP. (#2163)
+
 ## [v2018.07.29] `Jul 29 2018`
 ### Added
 - Added support for the Achievements system and the Titles system. (#2067, #2157, #2161)
@@ -365,6 +369,7 @@ If you are reading this in a text editor, simply ignore this section
 - New versioning scheme and project changelogs/release notes (#1853)
 
 [Unreleased]: https://github.com/HerculesWS/Hercules/compare/stable...master
+[v2018.07.29+1]: https://github.com/HerculesWS/Hercules/compare/v2018.07.29...v2018.07.29+1
 [v2018.07.29]: https://github.com/HerculesWS/Hercules/compare/v2018.07.01+1...v2018.07.29
 [v2018.07.01+1]: https://github.com/HerculesWS/Hercules/compare/v2018.07.01...v2018.07.01+1
 [v2018.07.01]: https://github.com/HerculesWS/Hercules/compare/v2018.06.03...v2018.07.01

diff --git a/src/map/script.c b/src/map/script.c
@@ -17800,7 +17800,7 @@ static BUILDIN(getd)
 
 	id = script->search_str(varname);
 
-	if (id < 0) {
+	if (id < 0 || script->str_data[id].type == C_NOP) {
 		id = script->add_str(varname);
 		script->str_data[id].type = C_NAME;
 	} else if (script->str_data[id].type != C_NAME) {