vs

gframe/config.h

@@ -5,25 +5,9 @@
 
 #define _IRR_STATIC_LIB_
 
-#include <irrlicht.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#include "CGUITTFont.h"
-#include "CGUIImageButton.h"
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <sys/time.h>
-#include "bufferio.h"
-#include "mymutex.h"
-#include "mysignal.h"
-#include "mythread.h"
-#include "../ocgcore/ocgapi.h"
-#include "../ocgcore/card.h"
-
 #ifdef _WIN32
 
+#include <WinSock2.h>
 #include <windows.h>
 #define myswprintf swprintf
 
@@ -53,6 +37,23 @@ inline int _wtoi(const wchar_t * s) {
 }
 #endif
 
+#include <irrlicht.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include "CGUITTFont.h"
+#include "CGUIImageButton.h"
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <time.h>
+#include "bufferio.h"
+#include "mymutex.h"
+#include "mysignal.h"
+#include "mythread.h"
+#include "../ocgcore/ocgapi.h"
+#include "../ocgcore/card.h"
+
 using namespace irr;
 using namespace core;
 using namespace scene;

gframe/duelclient.cpp

@@ -174,6 +174,7 @@ int DuelClient::ClientThread(void* param) {
 	client_bev = 0;
 	client_base = 0;
 	connect_state = 0;
+	return 0;
 }
 void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 	char* pdata = data;
@@ -2589,6 +2590,7 @@ int DuelClient::RefreshThread(void* arg) {
 	event_free(resp_event);
 	event_base_free(broadev);
 	is_refreshing = false;
+	return 0;
 }
 void DuelClient::BroadcastReply(evutil_socket_t fd, short events, void* arg) {
 	if(events & EV_TIMEOUT) {

gframe/game.cpp

@@ -722,7 +722,7 @@ void Game::ShowCardInfo(int code) {
 	wchar_t formatBuffer[256];
 	dataManager.GetData(code, &cd);
 	imgCard->setImage(imageManager.GetTexture(code));
-	imgCard->setScaleImage(true); //I don't know weather check size or not will be faster; if Irrlicht don't check size internal and cause slow, check size like Game::DrawThumb()
+	imgCard->setScaleImage(true);
 	if(cd.alias != 0 && (cd.alias - code < 10 || code - cd.alias < 10))
 		myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(cd.alias), cd.alias);
 	else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code);
@@ -732,7 +732,7 @@ void Game::ShowCardInfo(int code) {
 		stInfo->setText(formatBuffer);
 		formatBuffer[0] = L'[';
 		for(int i = 1; i <= cd.level; ++i)
-			formatBuffer[i] = L'★';
+			formatBuffer[i] = 0x2605;
 		formatBuffer[cd.level + 1] = L']';
 		formatBuffer[cd.level + 2] = L' ';
 		if(cd.attack < 0 && cd.defence < 0)

gframe/gframe.cpp

@@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
 	 * -j: join host (host info from system.conf)
 	 * -d: deck edit
 	 * -r: replay */
-		else if(!strcmp(argv[1], "-j") or !strcmp(argv[1], "-d") or !strcmp(argv[1], "-r")) {
+		else if(!strcmp(argv[1], "-j") || !strcmp(argv[1], "-d") || !strcmp(argv[1], "-r")) {
 			exit_on_return = true;
 			irr::SEvent event;
 			event.EventType = irr::EET_GUI_EVENT;

gframe/replay.cpp

@@ -20,7 +20,7 @@ void Replay::BeginRecord() {
 #ifdef _WIN32
 	if(is_recording)
 		CloseHandle(recording_fp);
-	recording_fp = CreateFile("./replay/_LastReplay.yrp", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
+	recording_fp = CreateFileW(L"./replay/_LastReplay.yrp", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
 	if(recording_fp == INVALID_HANDLE_VALUE)
 		return;
 #else

gframe/replay.h

@@ -2,7 +2,7 @@
 #define REPLAY_H
 
 #include "config.h"
-#include <sys/time.h>
+#include <time.h>
 
 namespace ygo {