Merge pull request #3 from purerosefallen/script_reader

update script reader

Classes/gframe/replay_mode.cpp

@@ -65,13 +65,13 @@ int ReplayMode::ReplayThread(void* param) {
 	mainGame->dInfo.tag_player[1] = false;
 	if(mainGame->dInfo.isSingleMode) {
 #ifdef _IRR_ANDROID_PLATFORM_
-	set_script_reader(irr::android::android_script_reader);
+	set_script_reader((script_reader)SingleMode::ScriptReaderEx);
 #endif
 		set_card_reader((card_reader)DataManager::CardReader);
 		set_message_handler((message_handler)MessageHandler);
 	} else {
 #ifdef _IRR_ANDROID_PLATFORM_
-	set_script_reader(irr::android::android_script_reader);
+	set_script_reader((script_reader)ScriptReaderEx);
 #endif
 		set_card_reader((card_reader)DataManager::CardReader);
 		set_message_handler((message_handler)MessageHandler);
@@ -942,11 +942,11 @@ void ReplayMode::ReplayReload() {
 byte* ReplayMode::ScriptReaderEx(const char* script_name, int* slen) {
 	char sname[256] = "./expansions";
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	byte* buffer = default_script_reader(sname, slen);
+	byte* buffer = irr::android::android_script_reader(sname, slen);
 	if(buffer)
 		return buffer;
 	else
-		return default_script_reader(script_name, slen);
+		return irr::android::android_script_reader(script_name, slen);
 }
 int ReplayMode::MessageHandler(long fduel, int type) {
 	if(!enable_log)

Classes/gframe/single_duel.cpp

@@ -407,7 +407,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	time_limit[0] = host_info.time_limit;
 	time_limit[1] = host_info.time_limit;
 #ifdef _IRR_ANDROID_PLATFORM_
-	set_script_reader(irr::android::android_script_reader);
+	set_script_reader((script_reader)ScriptReaderEx);
 #endif
 	set_card_reader((card_reader)DataManager::CardReader);
 	set_message_handler((message_handler)SingleDuel::MessageHandler);
@@ -1550,11 +1550,11 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
 byte* SingleDuel::ScriptReaderEx(const char* script_name, int* slen) {
 	char sname[256] = "./expansions";
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	byte* buffer = default_script_reader(sname, slen);
+	byte* buffer = irr::android::android_script_reader(sname, slen);
 	if(buffer)
 		return buffer;
 	else
-		return default_script_reader(script_name, slen);
+		return irr::android::android_script_reader(script_name, slen);
 }
 int SingleDuel::MessageHandler(long fduel, int type) {
 	if(!enable_log)

Classes/gframe/single_mode.cpp

@@ -39,7 +39,7 @@ int SingleMode::SinglePlayThread(void* param) {
 	time_t seed = time(0);
 	rnd.reset(seed);
 #ifdef _IRR_ANDROID_PLATFORM_
-	set_script_reader(irr::android::android_script_reader);
+	set_script_reader((script_reader)ScriptReaderEx);
 #endif
 	set_card_reader((card_reader)DataManager::CardReader);
 	set_message_handler((message_handler)MessageHandler);
@@ -848,10 +848,11 @@ void SingleMode::SinglePlayReload() {
 byte* SingleMode::ScriptReaderEx(const char* script_name, int* slen) {
 	char sname[256] = "./expansions";
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	if(ScriptReader(sname, slen))
+	byte* buffer = irr::android::android_script_reader(sname, slen);
+	if(buffer)
 		return buffer;
 	else
-		return ScriptReader(script_name, slen);
+		return irr::android::android_script_reader(script_name, slen);
 }
 byte* SingleMode::ScriptReader(const char* script_name, int* slen) {
 	FILE *fp;

Classes/gframe/tag_duel.cpp

@@ -382,7 +382,7 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	time_limit[0] = host_info.time_limit;
 	time_limit[1] = host_info.time_limit;
 #ifdef _IRR_ANDROID_PLATFORM_
-	set_script_reader(irr::android::android_script_reader);
+	set_script_reader((script_reader)ScriptReaderEx);
 #endif
 	set_card_reader((card_reader)DataManager::CardReader);
 	set_message_handler((message_handler)TagDuel::MessageHandler);
@@ -1667,11 +1667,11 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
 byte* TagDuel::ScriptReaderEx(const char* script_name, int* slen) {
 	char sname[256] = "./expansions";
 	strcat(sname, script_name + 1);//default script name: ./script/c%d.lua
-	byte* buffer = default_script_reader(sname, slen);
+	byte* buffer = irr::android::android_script_reader(sname, slen);
 	if(buffer)
 		return buffer;
 	else
-		return default_script_reader(script_name, slen);
+		return irr::android::android_script_reader(script_name, slen);
 }
 int TagDuel::MessageHandler(long fduel, int type) {
 	if(!enable_log)