Fixing navigation
This commit is contained in:
1 parent
dcdeae75bc
commit
77c8471636
29 files changed
+15148
-139
No files matched your search
+32
-18
@@ -203,36 +203,49 @@ namespace ZL
|
||||
uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues_004.json";
|
||||
|
||||
|
||||
/*
|
||||
uniInteriorParams.navigationJsonPaths = {
|
||||
"resources/navigation/uni_interior3_locked.txt", //0
|
||||
"resources/navigation/uni_interior3_hall.txt",
|
||||
"resources/navigation/uni_interior3_lr_hall.txt",
|
||||
"resources/navigation/uni_interior3_lr_tr_hall.txt",
|
||||
"resources/navigation/uni_interior3_lr_tr_hall_aiperi.txt",
|
||||
"resources/navigation/uni_interior4_unlocked_n2_new.txt", //0
|
||||
"resources/navigation/uni_interior3_n2_hall.txt",
|
||||
"resources/navigation/uni_interior4_n2_lr_hall.txt",
|
||||
"resources/navigation/uni_interior4_n2_lr_tr_hall.txt",
|
||||
"resources/navigation/uni_interior3_n2_lr_tr_hall_aiperi.txt",
|
||||
"resources/navigation/uni_interior3_darklands_all_open.txt",
|
||||
"resources/navigation/uni_interior3_unlocked_hall.txt",
|
||||
"resources/navigation/uni_interior3_unlocked_n3.txt",
|
||||
"resources/navigation/uni_interior3_unlocked_s1.txt",
|
||||
"resources/navigation/uni_interior3_unlocked_s2.txt",
|
||||
"resources/navigation/uni_interior3_unlocked_s3.txt",
|
||||
"resources/navigation/uni_interior3_unlocked_n2.txt"
|
||||
};
|
||||
/*
|
||||
"resources/navigation/uni_interior3_unlocked_n2.txt",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_hall.txt",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_n3.txt",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_n2.txt",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_s2.txt",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_s1.txt",
|
||||
"resources/navigation/uni_interior4_locked.txt" //17
|
||||
};*/
|
||||
|
||||
|
||||
uniInteriorParams.navigationJsonPaths = {
|
||||
"resources/navigation/uni_interior3_locked.json", //0
|
||||
"resources/navigation/uni_interior3_hall.json",
|
||||
"resources/navigation/uni_interior3_lr_hall.json",
|
||||
"resources/navigation/uni_interior3_lr_tr_hall.json",
|
||||
"resources/navigation/uni_interior3_lr_tr_hall_aiperi.json",
|
||||
"resources/navigation/uni_interior3_darklands_all_open.json",
|
||||
"resources/navigation/uni_interior3_unlocked_hall.json",
|
||||
"resources/navigation/uni_interior4_unlocked_n2_new.json", //0
|
||||
"resources/navigation/uni_interior3_n2_hall.json",
|
||||
"resources/navigation/uni_interior4_n2_lr_hall.json",
|
||||
"resources/navigation/uni_interior4_n2_lr_tr_hall.json",
|
||||
"resources/navigation/uni_interior3_n2_lr_tr_hall_aiperi.json",
|
||||
"resources/navigation/uni_interior3_darklands_all_open.json", //5
|
||||
"resources/navigation/uni_interior3_unlocked_hall.json",
|
||||
"resources/navigation/uni_interior3_unlocked_n3.json",
|
||||
"resources/navigation/uni_interior3_unlocked_s1.json",
|
||||
"resources/navigation/uni_interior3_unlocked_s2.json",
|
||||
"resources/navigation/uni_interior3_unlocked_s3.json",
|
||||
"resources/navigation/uni_interior3_unlocked_n2.json"
|
||||
};*/
|
||||
|
||||
"resources/navigation/uni_interior3_unlocked_n2.json", //11
|
||||
"resources/navigation/uni_interior4_unlocked_s3_hall.json",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_n3.json",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_n2.json",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_s2.json",
|
||||
"resources/navigation/uni_interior4_unlocked_s3_s1.json",
|
||||
"resources/navigation/uni_interior4_locked.json" //17
|
||||
};
|
||||
|
||||
/*
|
||||
uniInteriorParams.navigationJsonPaths = {
|
||||
@@ -805,6 +818,7 @@ namespace ZL
|
||||
}
|
||||
break;
|
||||
case SDLK_0:
|
||||
|
||||
if (editorMode == EditorMode::InteractiveObjects && currentLocation) {
|
||||
currentLocation->editor.selectInteractiveObject(event.key.keysym.sym - SDLK_0);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user