merge

gframe/game.cpp

@@ -39,8 +39,10 @@ bool Game::Initialize() {
 		params.DriverType = irr::video::EDT_OPENGL;
 	params.WindowSize = irr::core::dimension2d<u32>(gameConf.window_width, gameConf.window_height);
 	device = irr::createDeviceEx(params);
-	if(!device)
+	if(!device) {
+		ErrorLog("Failed to create Irrlicht Engine device!");
 		return false;
+	}
 	// Apply skin
 	if(gameConf.skin_index && gameConf.use_d3d) {
 		wchar_t skin_dir[16];
@@ -81,15 +83,21 @@ bool Game::Initialize() {
 	driver->setTextureCreationFlag(irr::video::ETCF_CREATE_MIP_MAPS, false);
 	driver->setTextureCreationFlag(irr::video::ETCF_OPTIMIZED_FOR_QUALITY, true);
 	imageManager.SetDevice(device);
-	if(!imageManager.Initial())
+	if(!imageManager.Initial()) {
+		ErrorLog("Failed to load textures!");
 		return false;
+	}
 	LoadExpansionDB();
 	if(dataManager.LoadDB(GetLocaleDir("cards.cdb"))) {} else
-	if(!dataManager.LoadDB("cards.cdb"))
+	if(!dataManager.LoadDB("cards.cdb")) {
+		ErrorLog("Failed to load card database (cards.cdb)!");
 		return false;
+	}
 	if(dataManager.LoadStrings(GetLocaleDir("strings.conf"))) {} else
-	if(!dataManager.LoadStrings("strings.conf"))
+	if(!dataManager.LoadStrings("strings.conf")) {
+		ErrorLog("Failed to load strings!");
 		return false;
+	}
 	LoadExpansionStrings();
 	env = device->getGUIEnvironment();
 	numFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 16);
@@ -97,8 +105,10 @@ bool Game::Initialize() {
 	lpcFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.numfont, 48);
 	guiFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
 	textFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize);
-	if(!numFont || !textFont)
+	if(!numFont || !textFont) {
+		ErrorLog("Failed to load font(s)!");
 		return false;
+	}
 	smgr = device->getSceneManager();
 	device->setWindowCaption(L"KoishiPro");
 	device->setResizable(true);
@@ -1795,17 +1805,22 @@ void Game::AddDebugMsg(char* msg)
 		AddChatMsg(wbuf, 9);
 	}
 	if (enable_log & 0x2) {
-		FILE* fp = fopen("error.log", "at");
-		if (!fp)
-			return;
-		time_t nowtime = time(NULL);
-		struct tm *localedtime = localtime(&nowtime);
-		char timebuf[40];
-		strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
-		fprintf(fp, "[%s][Script Error]: %s\n", timebuf, msg);
-		fclose(fp);
+		char msgbuf[1040];
+		sprintf(msgbuf, "[Script Error]: %s", msg);
+		ErrorLog(msgbuf);
 	}
 }
+void Game::ErrorLog(char* msg) {
+	FILE* fp = fopen("error.log", "at");
+	if(!fp)
+		return;
+	time_t nowtime = time(NULL);
+	struct tm *localedtime = localtime(&nowtime);
+	char timebuf[40];
+	strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
+	fprintf(fp, "[%s]%s\n", timebuf, msg);
+	fclose(fp);
+}
 bool Game::MakeDirectory(const std::string folder) {
     std::string folder_builder;
     std::string sub;

gframe/game.h

@@ -160,6 +160,7 @@ public:
 	void AddChatMsg(wchar_t* msg, int player);
 	void ClearChatMsg();
 	void AddDebugMsg(char* msgbuf);
+	void ErrorLog(char* msgbuf);
 	bool MakeDirectory(const std::string folder);
 	void initUtils();
 	void ClearTextures();

ocgcore @ 17c2dfaf

-Subproject commit 71bfee8472a8ae1e2eb3555432a78d6467588abf
+Subproject commit 17c2dfaf1b157fb65e81ab05883106a3cc38e2ae

script @ aaef0a01

-Subproject commit 1a39548609ebe380fff36f34e8561bfd51a3b4c8
+Subproject commit aaef0a01369bd09bf0e4dd812483df1d0f856f3a