Commit 1cfa1a1c authored by 神楽坂玲奈's avatar 神楽坂玲奈 Committed by GitHub

clean abuse of ptr type, compiles on vs x64. (#2370)

parent 545f42bf
...@@ -141,7 +141,7 @@ public: ...@@ -141,7 +141,7 @@ public:
DuelPlayer* host_player; DuelPlayer* host_player;
HostInfo host_info; HostInfo host_info;
int duel_stage; int duel_stage;
unsigned long pduel; intptr_t pduel;
wchar_t name[20]; wchar_t name[20];
wchar_t pass[20]; wchar_t pass[20];
}; };
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
namespace ygo { namespace ygo {
long ReplayMode::pduel = 0; intptr_t ReplayMode::pduel = 0;
Replay ReplayMode::cur_replay; Replay ReplayMode::cur_replay;
bool ReplayMode::is_continuing = true; bool ReplayMode::is_continuing = true;
bool ReplayMode::is_closing = false; bool ReplayMode::is_closing = false;
...@@ -944,7 +944,7 @@ void ReplayMode::ReplayReload() { ...@@ -944,7 +944,7 @@ void ReplayMode::ReplayReload() {
/*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0); /*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0);
mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer); mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
} }
int ReplayMode::MessageHandler(long fduel, int type) { int ReplayMode::MessageHandler(intptr_t fduel, int type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
......
...@@ -11,7 +11,7 @@ namespace ygo { ...@@ -11,7 +11,7 @@ namespace ygo {
class ReplayMode { class ReplayMode {
private: private:
static long pduel; static intptr_t pduel;
static bool is_continuing; static bool is_continuing;
static bool is_closing; static bool is_closing;
static bool is_pausing; static bool is_pausing;
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
static void ReplayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff); static void ReplayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static void ReplayReload(); static void ReplayReload();
static int MessageHandler(long fduel, int type); static int MessageHandler(intptr_t fduel, int type);
}; };
} }
......
...@@ -1565,7 +1565,7 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag) ...@@ -1565,7 +1565,7 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
NetServer::ReSendToPlayer(*pit); NetServer::ReSendToPlayer(*pit);
} }
} }
int SingleDuel::MessageHandler(long fduel, int type) { int SingleDuel::MessageHandler(intptr_t fduel, int type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
......
...@@ -38,7 +38,7 @@ public: ...@@ -38,7 +38,7 @@ public:
void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1); void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1);
void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff); void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static int MessageHandler(long fduel, int type); static int MessageHandler(intptr_t fduel, int type);
static void SingleTimer(evutil_socket_t fd, short events, void* arg); static void SingleTimer(evutil_socket_t fd, short events, void* arg);
protected: protected:
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
namespace ygo { namespace ygo {
long SingleMode::pduel = 0; intptr_t SingleMode::pduel = 0;
bool SingleMode::is_closing = false; bool SingleMode::is_closing = false;
bool SingleMode::is_continuing = false; bool SingleMode::is_continuing = false;
Replay SingleMode::last_replay; Replay SingleMode::last_replay;
...@@ -844,7 +844,7 @@ void SingleMode::SinglePlayReload() { ...@@ -844,7 +844,7 @@ void SingleMode::SinglePlayReload() {
/*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0); /*len = */query_field_card(pduel, 1, LOCATION_REMOVED, flag, queryBuffer, 0);
mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer); mainGame->dField.UpdateFieldCard(mainGame->LocalPlayer(1), LOCATION_REMOVED, (char*)queryBuffer);
} }
int SingleMode::MessageHandler(long fduel, int type) { int SingleMode::MessageHandler(intptr_t fduel, int type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
......
...@@ -7,7 +7,7 @@ namespace ygo { ...@@ -7,7 +7,7 @@ namespace ygo {
class SingleMode { class SingleMode {
private: private:
static long pduel; static intptr_t pduel;
static bool is_closing; static bool is_closing;
static bool is_continuing; static bool is_continuing;
...@@ -26,7 +26,7 @@ public: ...@@ -26,7 +26,7 @@ public:
static void SinglePlayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff); static void SinglePlayRefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static void SinglePlayReload(); static void SinglePlayReload();
static int MessageHandler(long fduel, int type); static int MessageHandler(intptr_t fduel, int type);
protected: protected:
static Replay last_replay; static Replay last_replay;
......
...@@ -1681,7 +1681,7 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) { ...@@ -1681,7 +1681,7 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
} }
} }
} }
int TagDuel::MessageHandler(long fduel, int type) { int TagDuel::MessageHandler(intptr_t fduel, int type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
......
...@@ -38,7 +38,7 @@ public: ...@@ -38,7 +38,7 @@ public:
void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1); void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1);
void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff); void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
static int MessageHandler(long fduel, int type); static int MessageHandler(intptr_t fduel, int type);
static void TagTimer(evutil_socket_t fd, short events, void* arg); static void TagTimer(evutil_socket_t fd, short events, void* arg);
protected: protected:
......
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