fix

gframe/data_manager.cpp

@@ -7,7 +7,7 @@ const wchar_t* DataManager::unknown_string = L"???";
 wchar_t DataManager::strBuffer[2048];
 DataManager dataManager;
 
-bool DataManager::LoadDates(const char* file) {
+bool DataManager::LoadDB(const char* file) {
 	sqlite3* pDB;
 	if(sqlite3_open(file, &pDB) != SQLITE_OK)
 		return Error(pDB);
@@ -15,8 +15,6 @@ bool DataManager::LoadDates(const char* file) {
 	const char* sql = "select * from datas,texts where datas.id=texts.id";
 	if(sqlite3_prepare_v2(pDB, sql, -1, &pStmt, 0) != SQLITE_OK)
 		return Error(pDB);
-	for(int i = 0; i < 2048; ++i)
-		_sysStrings[i] = 0;
 	CardDataC cd;
 	CardString cs;
 	for(int i = 0; i < 16; ++i) cs.desc[i] = 0;
@@ -63,9 +61,14 @@ bool DataManager::LoadDates(const char* file) {
 	} while(step != SQLITE_DONE);
 	sqlite3_finalize(pStmt);
 	sqlite3_close(pDB);
-	FILE* fp = fopen("strings.conf", "r");
+	return true;
+}
+bool DataManager::LoadStrings(const char* file) {
+	FILE* fp = fopen(file, "r");
 	if(!fp)
 		return false;
+	for(int i = 0; i < 2048; ++i)
+		_sysStrings[i] = 0;
 	char linebuf[256];
 	char strbuf[256];
 	int value;

gframe/data_manager.h

@@ -11,7 +11,8 @@ namespace ygo {
 class DataManager {
 public:
 	DataManager(): _datas(8192), _strings(8192) {}
-	bool LoadDates(const char* file);
+	bool LoadDB(const char* file);
+	bool LoadStrings(const char* file);
 	bool Error(sqlite3* pDB, sqlite3_stmt* pStmt = 0);
 	bool GetData(int code, CardData* pData);
 	code_pointer GetCodePointer(int code);

gframe/game.cpp

@@ -14,7 +14,7 @@
 #include <dirent.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x12e1;
+const unsigned short PRO_VERSION = 0x12f0;
 
 namespace ygo {
 
@@ -51,7 +51,9 @@ bool Game::Initialize() {
 	imageManager.SetDevice(device);
 	if(!imageManager.Initial())
 		return false;
-	if(!dataManager.LoadDates("cards.cdb"))
+	if(!dataManager.LoadDB("cards.cdb"))
+		return false;
+	if(!dataManager.LoadStrings("strings.conf"))
 		return false;
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);

gframe/gframe.cpp

 #include "config.h"
 #include "game.h"
+#include "data_manager.h"
 #include <event2/thread.h>
 
 int enable_log = 0;
@@ -20,26 +21,28 @@ int main(int argc, char* argv[]) {
 	if(!ygo::mainGame->Initialize())
 		return 0;
 
-	if(argc >= 2) {
+	for(int i = 1; i < argc; ++i) {
 		/*command line args:
 		 * -j: join host (host info from system.conf)
 		 * -d: deck edit
 		 * -r: replay */
-		if(!strcmp(argv[1], "-j") || !strcmp(argv[1], "-d") || !strcmp(argv[1], "-r")) {
+		if(argv[i][0] == '-' && argv[i][1] == 'e') {
+			ygo::dataManager.LoadDB(&argv[i][2]);
+		} else if(!strcmp(argv[i], "-j") || !strcmp(argv[i], "-d") || !strcmp(argv[i], "-r")) {
 			exit_on_return = true;
 			irr::SEvent event;
 			event.EventType = irr::EET_GUI_EVENT;
 			event.GUIEvent.EventType = irr::gui::EGET_BUTTON_CLICKED;
-			if(!strcmp(argv[1], "-j")) {
+			if(!strcmp(argv[i], "-j")) {
 				event.GUIEvent.Caller = ygo::mainGame->btnLanMode;
 				ygo::mainGame->device->postEventFromUser(event);
 				//TODO: wait for wLanWindow show. if network connection faster than wLanWindow, wLanWindow will still show on duel scene.
 				event.GUIEvent.Caller = ygo::mainGame->btnJoinHost;
 				ygo::mainGame->device->postEventFromUser(event);
-			} else if(!strcmp(argv[1], "-d")) {
+			} else if(!strcmp(argv[i], "-d")) {
 				event.GUIEvent.Caller = ygo::mainGame->btnDeckEdit;
 				ygo::mainGame->device->postEventFromUser(event);
-			} else if(!strcmp(argv[1], "-r")) {
+			} else if(!strcmp(argv[i], "-r")) {
 				event.GUIEvent.Caller = ygo::mainGame->btnReplayMode;
 				ygo::mainGame->device->postEventFromUser(event);
 				ygo::mainGame->lstReplayList->setSelected(0);

script/c19870120.lua

@@ -18,6 +18,7 @@ function c19870120.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetTarget(c19870120.target)
@@ -26,6 +27,7 @@ function c19870120.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e4:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e4:SetRange(LOCATION_SZONE)
 	e4:SetTargetRange(LOCATION_MZONE,0)
 	e4:SetTarget(c19870120.target)

script/c21767650.lua

@@ -24,7 +24,7 @@ function c21767650.lvtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c21767650.lvop(e,tp,eg,ep,ev,re,r,rp)
 	local opt=e:GetLabel()
-	local g=Duel.GetMatchingGroup(c21767650.filter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
+	local g=Duel.GetMatchingGroup(c21767650.filter,tp,LOCATION_MZONE,0,nil)
 	local tc=g:GetFirst()
 	while tc do
 		local e1=Effect.CreateEffect(e:GetHandler())

script/c23776077.lua

@@ -76,5 +76,5 @@ function c23776077.tgvalue(e,re,rp)
 	return rp~=e:GetHandlerPlayer()
 end
 function c23776077.indcon(e)
-	return e:GetHandler():GetOverlayCount()>=5
+	return e:GetHandler():GetOverlayCount()==5
 end

script/c23998625.lua

@@ -57,8 +57,9 @@ function c23998625.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	else return false end
 end
 function c23998625.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsReason(REASON_EFFECT) and e:GetHandler():GetOverlayCount()==0
-		and e:GetHandler():IsLocation(LOCATION_GRAVE)
+	local c=e:GetHandler()
+	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsReason(REASON_EFFECT) and c:GetOverlayCount()==0
+		and c:IsLocation(LOCATION_GRAVE)
 end
 function c23998625.spfilter(c,e,tp)
 	return c:IsCode(97403510) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)

script/c31863912.lua

@@ -20,7 +20,7 @@ function c31863912.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c31863912.cfilter(c,sp)
-	return c:IsFaceup() and c:GetSummonPlayer()==sp and c:GetLevel()>0 and c:IsAbleToHand()
+	return c:IsFaceup() and c:GetSummonPlayer()==sp
 end
 function c31863912.target1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

script/c57836546.lua

@@ -16,7 +16,7 @@ function c57836546.condition(e,tp,eg,ep,ev,re,r,rp)
 end
 function c57836546.filter1(c,e,tp,turn)
 	return c:IsType(TYPE_XYZ) and c:IsReason(REASON_DESTROY) and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE)
-		and c:GetTurnID()==turn and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+		and c:IsPreviousPosition(POS_FACEUP) and c:GetTurnID()==turn and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 		and Duel.IsExistingTarget(c57836546.filter2,tp,LOCATION_GRAVE,0,1,c,e,tp,c:GetAttack())
 end
 function c57836546.filter2(c,e,tp,atk)