Merge pull request #810 from WALLOFJUSTICE/dev-23-q1

* hotfixes
TurningWheel · Oct 13, 2023 · 4618f0e · 4618f0e
2 parents 89808f5 + 46f6868
commit 4618f0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lang/en.txt b/lang/en.txt
@@ -3551,7 +3551,7 @@ last of your magic is drained!#
 3201 Bleh! Your body rejects the solids in your stomach!#
 3202 What a horrible night to have a curse...#
 3203 Blecch! This is disgusting!#
-3204 DEPRECATED#
+3204 Unarmed#
 3205 %s is stunned from your blow!#
 3206 The %s is stunned from your blow!#
 3207 You are stunned from %s's blow!#
@@ -3702,7 +3702,7 @@ last of your magic is drained!#
 3337 You have no familiar potions to combine!#
 3338 DEPRECATED#
 3339 Brew#
-3340 DEPRECATED#
+3340 Alchemy#
 3341 Stop Brewing#
 3342 You have no potions left to mix!#
 3343 DEPRECATED#

diff --git a/src/init.cpp b/src/init.cpp
@@ -820,7 +820,7 @@ int Language::loadLanguage(char const * const lang, bool forceLoadBaseDirectory)
 #ifdef NINTENDO
 		langFilepath = std::string(BASE_DATA_DIR) + filename;
 #else
-		langFilepath = filename;
+		langFilepath = std::string(BASE_DATA_DIR) + filename;
 #endif
 	}