Commit f67834ea authored by mercury233's avatar mercury233

update

parent 77cea9dd
......@@ -16,7 +16,7 @@ bool DataManager::LoadDB(const char* file) {
const char* sql = "select * from datas";
#else
const char* sql = "select * from datas,texts where datas.id=texts.id";
#endif //YGOPRO_SERVER_MODE
#endif
if(sqlite3_prepare_v2(pDB, sql, -1, &pStmt, 0) != SQLITE_OK)
return Error(pDB);
CardDataC cd;
......
......@@ -49,7 +49,7 @@ void Game::MainServerLoop() {
#endif
}
}
#else
#else //YGOPRO_SERVER_MODE
bool Game::Initialize() {
srand(time(0));
LoadConfig();
......
......@@ -442,7 +442,7 @@ extern Game* mainGame;
extern unsigned short aServerPort;
extern unsigned short replay_mode;
extern HostInfo game_info;
#endif //YGOPRO_SERVER_MODE
#endif
}
......
......@@ -99,7 +99,7 @@ int main(int argc, char* argv[]) {
ygo::mainGame = &_game;
ygo::mainGame->MainServerLoop();
return 0;
#else
#else //YGOPRO_SERVER_MODE
ygo::mainGame = &_game;
if(!ygo::mainGame->Initialize())
return 0;
......
......@@ -16,7 +16,7 @@ private:
static unsigned short server_port;
#ifndef YGOPRO_SERVER_MODE
static event_base* net_evbase;
#endif //YGOPRO_SERVER_MODE
#endif
static event* broadcast_ev;
static evconnlistener* listener;
static DuelMode* duel_mode;
......
......@@ -6,9 +6,10 @@
namespace ygo {
#ifdef YGOPRO_SERVER_MODE
extern unsigned short aServerPort;
extern unsigned short replay_mode;
#endif
Replay::Replay() {
is_recording = false;
is_replaying = false;
......@@ -22,10 +23,11 @@ Replay::~Replay() {
void Replay::BeginRecord() {
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode > 0) {
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
if(is_recording)
CloseHandle(recording_fp);
#ifdef YGOPRO_SERVER_MODE
time_t nowtime = time(NULL);
struct tm *localedtime = localtime(&nowtime);
wchar_t tmppath[80];
......@@ -33,11 +35,15 @@ void Replay::BeginRecord() {
wchar_t path[80];
myswprintf(path, tmppath, ygo::aServerPort);
recording_fp = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
#else
recording_fp = CreateFileW(L"./replay/_LastReplay.yrp", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
#endif //YGOPRO_SERVER_MODE
if(recording_fp == INVALID_HANDLE_VALUE)
return;
#else
if(is_recording)
fclose(fp);
#ifdef YGOPRO_SERVER_MODE
time_t nowtime = time(NULL);
struct tm *localedtime = localtime(&nowtime);
char tmppath[40];
......@@ -45,6 +51,9 @@ void Replay::BeginRecord() {
char path[40];
sprintf(path, tmppath, ygo::aServerPort);
fp = fopen(path, "wb");
#else
fp = fopen("./replay/_LastReplay.yrp", "wb");
#endif //YGOPRO_SERVER_MODE
if(!fp)
return;
#endif
......@@ -58,7 +67,7 @@ void Replay::WriteHeader(ReplayHeader& header) {
pheader = header;
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode == 0) return;
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
DWORD size;
WriteFile(recording_fp, &header, sizeof(header), &size, NULL);
......@@ -74,7 +83,7 @@ void Replay::WriteData(const void* data, unsigned int length, bool flush) {
pdata += length;
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode == 0) return;
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
DWORD size;
WriteFile(recording_fp, data, length, &size, NULL);
......@@ -91,7 +100,7 @@ void Replay::WriteInt32(int data, bool flush) {
pdata += 4;
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode == 0) return;
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
DWORD size;
WriteFile(recording_fp, &data, sizeof(int), &size, NULL);
......@@ -108,7 +117,7 @@ void Replay::WriteInt16(short data, bool flush) {
pdata += 2;
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode == 0) return;
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
DWORD size;
WriteFile(recording_fp, &data, sizeof(short), &size, NULL);
......@@ -125,7 +134,7 @@ void Replay::WriteInt8(char data, bool flush) {
pdata++;
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode == 0) return;
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
DWORD size;
WriteFile(recording_fp, &data, sizeof(char), &size, NULL);
......@@ -140,7 +149,7 @@ void Replay::Flush() {
return;
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode == 0) return;
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
#else
fflush(fp);
......@@ -151,7 +160,7 @@ void Replay::EndRecord() {
return;
#ifdef YGOPRO_SERVER_MODE
if(ygo::replay_mode > 0) {
#endif //YGOPRO_SERVER_MODE
#endif
#ifdef _WIN32
CloseHandle(recording_fp);
#else
......@@ -159,7 +168,7 @@ void Replay::EndRecord() {
#endif
#ifdef YGOPRO_SERVER_MODE
}
#endif //YGOPRO_SERVER_MODE
#endif
pheader.datasize = pdata - replay_data;
pheader.flag |= REPLAY_COMPRESSED;
size_t propsize = 5;
......
......@@ -110,7 +110,7 @@ void SingleDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
sctc.type = NETPLAYER_TYPE_OBSERVER;
}
else
#endif //YGOPRO_SERVER_MODE
#endif
if(!players[0] || !players[1]) {
STOC_HS_PlayerEnter scpe;
BufferIO::CopyWStr(dp->name, scpe.name, 20);
......
......@@ -90,7 +90,7 @@ void TagDuel::JoinGame(DuelPlayer* dp, void* pdata, bool is_creater) {
sctc.type = NETPLAYER_TYPE_OBSERVER;
}
else
#endif //YGOPRO_SERVER_MODE
#endif
if(!players[0] || !players[1] || !players[2] || !players[3]) {
STOC_HS_PlayerEnter scpe;
BufferIO::CopyWStr(dp->name, scpe.name, 20);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment