Merge pull request #1 from mq1n/main

Fix some build problems
This commit is contained in:
d1str4ught
2025-08-27 15:41:56 +02:00
committed by GitHub
20 changed files with 1035 additions and 116 deletions

View File

@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "Config.h"
CConfig::CConfig()
@@ -67,7 +67,7 @@ bool CConfig::GetWord(FILE *fp, char *tar)
if ((c == ' ' || c == '\t' || c == '\n'))
{
// ÅÜ.
// ÅÜ.
tar[i] = '\0';
return true;
}
@@ -144,7 +144,7 @@ bool CConfig::LoadFile(const char* filename)
}
// ÆÄÀÏ ´Ý´Â ºÎºÐ.
// ÆÄÀÏ ´Ý´Â ºÎºÐ.
fclose(fp);
return true;
}

View File

@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "Marriage.h"
#include "Main.h"
#include "DBManager.h"
@@ -253,7 +253,7 @@ namespace marriage
void CManager::OnSetup(CPeer* peer)
{
// 결혼한 사람들 보내기
// 결혼한 사람들 보내기
for (itertype(m_Marriages) it = m_Marriages.begin(); it != m_Marriages.end(); ++it)
{
TMarriage* pMarriage = *it;
@@ -280,7 +280,7 @@ namespace marriage
}
}
// 결혼식 보내기
// 결혼식 보내기
for (itertype(m_mapRunningWedding) it = m_mapRunningWedding.begin(); it != m_mapRunningWedding.end(); ++it)
{
const TWedding& t = it->second;

View File

@@ -1,4 +1,4 @@
#include "Monarch.h"
#include "Monarch.h"
#include "common/utils.h"
#include "Main.h"
#include "ClientManager.h"
@@ -235,7 +235,7 @@ bool CMonarch::SetMonarch(const char * name)
}
delete pMsg;
//db¿¡ ÀÔ·Â
//db¿¡ ÀÔ·Â
snprintf(szQuery, sizeof(szQuery),
"REPLACE INTO monarch (empire, name, windate, money) VALUES(%d, %d, now(), %lld)", Empire, p->pid[Empire], p->money[Empire]);