compile error fixes
This commit is contained in:
@@ -896,7 +896,7 @@ PyObject * playerSetItemCount(PyObject* poSelf, PyObject* poArgs)
|
||||
if (!PyTuple_GetInteger(poArgs, 0, &iSlotIndex))
|
||||
return Py_BuildException();
|
||||
|
||||
BYTE bCount;
|
||||
uint8_t bCount;
|
||||
if (!PyTuple_GetInteger(poArgs, 1, &bCount))
|
||||
return Py_BuildException();
|
||||
|
||||
@@ -915,7 +915,7 @@ PyObject * playerSetItemCount(PyObject* poSelf, PyObject* poArgs)
|
||||
if (!PyTuple_GetInteger(poArgs, 1, &Cell.cell))
|
||||
return Py_BuildException();
|
||||
|
||||
BYTE bCount;
|
||||
uint8_t bCount;
|
||||
if (!PyTuple_GetInteger(poArgs, 2, &bCount))
|
||||
return Py_BuildException();
|
||||
|
||||
@@ -1290,7 +1290,7 @@ PyObject * playerIsEquipmentSlot(PyObject* poSelf, PyObject* poArgs)
|
||||
|
||||
PyObject * playerIsDSEquipmentSlot(PyObject* poSelf, PyObject* poArgs)
|
||||
{
|
||||
BYTE bWindowType;
|
||||
uint8_t bWindowType;
|
||||
if (!PyTuple_GetInteger(poArgs, 0, &bWindowType))
|
||||
return Py_BuildException();
|
||||
int iSlotIndex;
|
||||
@@ -2124,7 +2124,7 @@ PyObject * playerIsAvailableBeltInventoryCell(PyObject* poSelf, PyObject* poArgs
|
||||
// 용혼석 강화
|
||||
PyObject* playerSendDragonSoulRefine(PyObject* poSelf, PyObject* poArgs)
|
||||
{
|
||||
BYTE bSubHeader;
|
||||
uint8_t bSubHeader;
|
||||
PyObject* pDic;
|
||||
TItemPos RefineItemPoses[DS_REFINE_WINDOW_MAX_NUM];
|
||||
if (!PyTuple_GetByte(poArgs, 0, &bSubHeader))
|
||||
@@ -2139,7 +2139,7 @@ PyObject* playerSendDragonSoulRefine(PyObject* poSelf, PyObject* poArgs)
|
||||
{
|
||||
if (!PyTuple_GetObject(poArgs, 1, &pDic))
|
||||
return Py_BuildException();
|
||||
int pos = 0;
|
||||
Py_ssize_t pos = 0;
|
||||
PyObject* key, *value;
|
||||
int size = PyDict_Size(pDic);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ PyObject * sndPlayMusic(PyObject * poSelf, PyObject * poArgs)
|
||||
return Py_BuildException();
|
||||
|
||||
CSoundManager& rkSndMgr=CSoundManager::Instance();
|
||||
rkSndMgr.PlayMusic(szFileName);
|
||||
rkSndMgr.PlaySound2D(szFileName);
|
||||
return Py_BuildNone();
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ PyObject * sndSetSoundVolumef(PyObject * poSelf, PyObject * poArgs)
|
||||
return Py_BuildException();
|
||||
|
||||
CSoundManager& rkSndMgr=CSoundManager::Instance();
|
||||
rkSndMgr.SetSoundVolumeRatio(fVolume);
|
||||
rkSndMgr.SetSoundVolume(fVolume);
|
||||
return Py_BuildNone();
|
||||
}
|
||||
|
||||
@@ -124,7 +124,7 @@ PyObject * sndSetSoundVolume(PyObject * poSelf, PyObject * poArgs)
|
||||
return Py_BuildException();
|
||||
|
||||
CSoundManager& rkSndMgr=CSoundManager::Instance();
|
||||
rkSndMgr.SetSoundVolumeGrade(iVolume);
|
||||
rkSndMgr.SetSoundVolume(iVolume);
|
||||
return Py_BuildNone();
|
||||
}
|
||||
|
||||
|
||||
@@ -649,7 +649,7 @@ void CPythonSystem::ChangeSystem()
|
||||
else
|
||||
fVoiceVolume = (float)pow(10.0f, (-1.0f + (float)m_Config.voice_volume / 5.0f));
|
||||
*/
|
||||
rkSndMgr.SetSoundVolumeGrade(m_Config.voice_volume);
|
||||
rkSndMgr.SetSoundVolume(m_Config.voice_volume);
|
||||
}
|
||||
|
||||
void CPythonSystem::Clear()
|
||||
|
||||
@@ -45,7 +45,6 @@ extern "C" { FILE __iob_func[3] = { *stdin,*stdout,*stderr }; }
|
||||
#pragma comment( lib, "dmoguids.lib" )
|
||||
//#pragma comment( lib, "wsock32.lib" )
|
||||
#include <stdlib.h>
|
||||
#include <cryptopp/cryptoppLibLink.h>
|
||||
bool __IS_TEST_SERVER_MODE__=false;
|
||||
|
||||
extern bool SetDefaultCodePage(DWORD codePage);
|
||||
@@ -218,8 +217,6 @@ bool PackInitialize(const char * c_pszFolder)
|
||||
CEterPackManager::Instance().SetCacheMode();
|
||||
CEterPackManager::Instance().SetSearchMode(bPackFirst);
|
||||
|
||||
CSoundData::SetPackMode(); // Miles 파일 콜백을 셋팅
|
||||
|
||||
std::string strPackName, strTexCachePackName;
|
||||
for (DWORD i = 1; i < TextLoader.GetLineCount() - 1; i += 2)
|
||||
{
|
||||
@@ -385,9 +382,7 @@ bool Main(HINSTANCE hInstance, LPSTR lpCmdLine)
|
||||
system("patchupdater.exe");
|
||||
return false;
|
||||
}
|
||||
#ifndef __VTUNE__
|
||||
ilInit();
|
||||
#endif
|
||||
|
||||
if (!Setup(lpCmdLine))
|
||||
return false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user