Merge pull request #70 from mercury233/patch-1

change priority of loading scripts

Merge pull request #70 from mercury233/patch-1
change priority of loading scripts
ccbe898d · lllyasviel · GitHub · b755234b · 6a267566 · ccbe898d
Commit ccbe898d authored Dec 30, 2016 by lllyasviel Committed by GitHub Dec 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

interpreter.cpp interpreter.cpp +2 -2

No files found.
--- a/interpreter.cpp
+++ b/interpreter.cpp
@@ -680,9 +680,9 @@ int32 interpreter::load_card_script(uint32 code) {
 		lua_pushvalue(current_state, -2);
 		lua_rawset(current_state, -3);
 		//load extra scripts
-		sprintf(script_name, "./script/c%d.lua", code);
+		sprintf(script_name, "./expansions/script/c%d.lua", code);
 		if (!load_script(script_name)) {
-			sprintf(script_name, "./expansions/script/c%d.lua", code);
+			sprintf(script_name, "./script/c%d.lua", code);
 	 		if (!load_script(script_name)) {
 	 			return OPERATION_FAIL;
 			}