Merge pull request #46 from Tianchenglipu/patch-4

load script from expansions/script/

Merge pull request #46 from Tianchenglipu/patch-4
load script from expansions/script/
913da5e9 · 独孤朲 · GitHub · 696ec1e7 · f146e9ae · 913da5e9
Commit 913da5e9 authored Jun 19, 2016 by 独孤朲 Committed by GitHub Jun 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

interpreter.cpp interpreter.cpp +6 -3

No files found.
--- a/interpreter.cpp
+++ b/interpreter.cpp
@@ -673,10 +673,13 @@ 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)) {
-			return OPERATION_FAIL;
-		}
+			sprintf(script_name, "./script/c%d.lua", code);
+	 		if (!load_script(script_name)) {
+	 			return OPERATION_FAIL;
+ 			}
+  		}
 	}
 	return OPERATION_SUCCESS;
 }