summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-02-19 11:57:14 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-02-19 11:57:14 -0300
commitd7d65fa2f2b51d03f7bdfcbceedca99188ce979c (patch)
treefecdf1bfa39ba5a4895b4dbf340a3b68098c109a /main
parent8c1731b67995add31361ae526b0e6af76346181e (diff)
-improved physics ccd
-html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 21fb61c81e..87713b9b3b 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1037,18 +1037,24 @@ bool Main::start() {
if (!absolute) {
- int sep=local_game_path.find_last("/");
+ if (Globals::get_singleton()->is_using_datapack()) {
- if (sep==-1) {
- DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
- local_game_path=da->get_current_dir()+"/"+local_game_path;
- memdelete(da) ;
- } else {
+ local_game_path="res://"+local_game_path;
- DirAccess *da = DirAccess::open(local_game_path.substr(0,sep));
- if (da) {
- local_game_path=da->get_current_dir()+"/"+local_game_path.substr(sep+1,local_game_path.length());;
- memdelete(da);
+ } else {
+ int sep=local_game_path.find_last("/");
+
+ if (sep==-1) {
+ DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+ local_game_path=da->get_current_dir()+"/"+local_game_path;
+ memdelete(da) ;
+ } else {
+
+ DirAccess *da = DirAccess::open(local_game_path.substr(0,sep));
+ if (da) {
+ local_game_path=da->get_current_dir()+"/"+local_game_path.substr(sep+1,local_game_path.length());;
+ memdelete(da);
+ }
}
}