summaryrefslogtreecommitdiff
path: root/core/ustring.cpp
diff options
context:
space:
mode:
authorMarianoGNU <marianognu.easyrpg@gmail.com>2015-10-17 23:38:33 -0300
committerMarianoGNU <marianognu.easyrpg@gmail.com>2015-10-17 23:38:33 -0300
commit4452e262539ad9d52a5980305584d897829986d1 (patch)
treecde7f3bdc36e727a21f55938a131083f84e043a6 /core/ustring.cpp
parent68fb30aaea0acf3ff279831d2d77b2e7129e4b69 (diff)
parent97f483af0a3e040f73c2df957bd092af2f6c085b (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/ustring.cpp')
-rw-r--r--core/ustring.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp
index e5419effcb..7582376fe0 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -3066,7 +3066,7 @@ String String::world_wrap(int p_chars_per_line) const {
} else if (operator[](i)==' ' || operator[](i)=='\t') {
last_space=i;
} else if (operator[](i)=='\n') {
- ret+=substr(from,i-from);
+ ret+=substr(from,i-from)+"\n";
from=i+1;
last_space=-1;
}