LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.4a: corrected inverted logic in messages after previous change

Browse Source
This commit is contained in:
Evan Debenham 2016-02-16 21:42:16 -05:00
parent 82b30e1228
commit ca9be8830c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java
View File

@ -120,6 +120,9 @@ public class Messages {
key = k; key = k;
if (strings.containsKey(key.toLowerCase(Locale.ENGLISH))){ if (strings.containsKey(key.toLowerCase(Locale.ENGLISH))){
if (args.length > 0) return format(strings.get(key.toLowerCase(Locale.ENGLISH)), args);
else return strings.get(key.toLowerCase(Locale.ENGLISH));
} else {
//this is so child classes can inherit properties from their parents. //this is so child classes can inherit properties from their parents.
//in cases where text is commonly grabbed as a utility from classes that aren't mean to be instantiated //in cases where text is commonly grabbed as a utility from classes that aren't mean to be instantiated
//(e.g. flavourbuff.dispTurns()) using .class directly is probably smarter to prevent unnecessary recursive calls. //(e.g. flavourbuff.dispTurns()) using .class directly is probably smarter to prevent unnecessary recursive calls.
@ -128,9 +131,6 @@ public class Messages {
} else { } else {
return "!!!NO TEXT FOUND!!!"; return "!!!NO TEXT FOUND!!!";
} }
} else {
if (args.length > 0) return format(strings.get(key.toLowerCase(Locale.ENGLISH)), args);
else return strings.get(key.toLowerCase(Locale.ENGLISH));
} }
} }