Skip to content

Commit b990c5e

Browse files
twostarstwostars
committed
Fix gcc builds
1 parent 5ef22a7 commit b990c5e

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎Server/AIServer/AIServerApp.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -486,16 +486,16 @@ bool AIServerApp::GetNpcItemTable()
486486
ModelType* row = rows[i];
487487

488488
_npcItem.m_ppItem[i][0] = row->MonsterId;
489-
_npcItem.m_ppItem[i][1] = row->ItemId1;
490-
_npcItem.m_ppItem[i][2] = row->DropChance1;
491-
_npcItem.m_ppItem[i][3] = row->ItemId2;
492-
_npcItem.m_ppItem[i][4] = row->DropChance2;
493-
_npcItem.m_ppItem[i][5] = row->ItemId3;
494-
_npcItem.m_ppItem[i][6] = row->DropChance3;
495-
_npcItem.m_ppItem[i][7] = row->ItemId4;
496-
_npcItem.m_ppItem[i][8] = row->DropChance4;
497-
_npcItem.m_ppItem[i][9] = row->ItemId5;
498-
_npcItem.m_ppItem[i][10] = row->DropChance5;
489+
_npcItem.m_ppItem[i][1] = row->ItemId[0];
490+
_npcItem.m_ppItem[i][2] = row->DropChance[0];
491+
_npcItem.m_ppItem[i][3] = row->ItemId[1];
492+
_npcItem.m_ppItem[i][4] = row->DropChance[1];
493+
_npcItem.m_ppItem[i][5] = row->ItemId[2];
494+
_npcItem.m_ppItem[i][6] = row->DropChance[2];
495+
_npcItem.m_ppItem[i][7] = row->ItemId[3];
496+
_npcItem.m_ppItem[i][8] = row->DropChance[3];
497+
_npcItem.m_ppItem[i][9] = row->ItemId[4];
498+
_npcItem.m_ppItem[i][10] = row->DropChance[4];
499499

500500
delete row;
501501
}

‎Server/VersionManager/VersionManagerApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ bool VersionManagerApp::LoadConfig(CIni& iniFile)
151151
return false;
152152
}
153153

154-
char key[20] = {};
154+
char key[32] = {};
155155
ServerList.reserve(serverCount);
156156

157157
for (int i = 0; i < serverCount; i++)

‎Server/shared-server/My_3DStruct.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ inline __Matrix44::__Matrix44()
364364

365365
inline __Matrix44::__Matrix44(const __Matrix44& mtx)
366366
{
367-
memcpy(this, &mtx, sizeof(__Matrix44));
367+
memcpy(&m, &mtx.m, sizeof(__Matrix44));
368368
}
369369

370370
inline __Matrix44::__Matrix44(const __Quaternion& qt)
@@ -384,7 +384,7 @@ inline __Matrix44::__Matrix44(const __Quaternion& qt)
384384

385385
inline void __Matrix44::Zero()
386386
{
387-
memset(this, 0, sizeof(__Matrix44));
387+
memset(&m, 0, sizeof(__Matrix44));
388388
}
389389

390390
inline void __Matrix44::Identity()
@@ -544,7 +544,7 @@ inline void __Matrix44::operator *= (const __Matrix44& mtx)
544544
{
545545
__Matrix44 mtxTmp;
546546

547-
memcpy(&mtxTmp, this, sizeof(__Matrix44));
547+
memcpy(&mtxTmp.m, &m, sizeof(__Matrix44));
548548

549549
_11 = mtxTmp._11 * mtx._11 + mtxTmp._12 * mtx._21 + mtxTmp._13 * mtx._31 + mtxTmp._14 * mtx._41;
550550
_12 = mtxTmp._11 * mtx._12 + mtxTmp._12 * mtx._22 + mtxTmp._13 * mtx._32 + mtxTmp._14 * mtx._42;

‎deps/db-modules‎

‎deps/db-modules-cmake/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ add_library(db-modules STATIC
1111
${DB_MODULES_DIR}/Aujard/model/AujardModel.h
1212
${DB_MODULES_DIR}/BinderUtil/BinderUtil.cpp
1313
${DB_MODULES_DIR}/BinderUtil/BinderUtil.h
14+
${DB_MODULES_DIR}/detail/StoredProc/StoredProcedure.cpp
15+
${DB_MODULES_DIR}/detail/StoredProc/StoredProcedure.h
1416
${DB_MODULES_DIR}/Ebenezer/binder/EbenezerBinder.cpp
1517
${DB_MODULES_DIR}/Ebenezer/binder/EbenezerBinder.h
1618
${DB_MODULES_DIR}/Ebenezer/model/EbenezerModel.cpp
@@ -23,8 +25,6 @@ add_library(db-modules STATIC
2325
${DB_MODULES_DIR}/ModelUtil/ModelUtil.h
2426
${DB_MODULES_DIR}/StoredProc/StoredProc.cpp
2527
${DB_MODULES_DIR}/StoredProc/StoredProc.h
26-
${DB_MODULES_DIR}/StoredProc/detail/StoredProcedure.cpp
27-
${DB_MODULES_DIR}/StoredProc/detail/StoredProcedure.h
2828
${DB_MODULES_DIR}/VersionManager/binder/VersionManagerBinder.cpp
2929
${DB_MODULES_DIR}/VersionManager/binder/VersionManagerBinder.h
3030
${DB_MODULES_DIR}/VersionManager/model/VersionManagerModel.cpp

‎deps/db-modules-msvc/db-modules.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@
107107
<ClCompile Include="..\db-modules\Aujard\binder\AujardBinder.cpp" />
108108
<ClCompile Include="..\db-modules\Aujard\model\AujardModel.cpp" />
109109
<ClCompile Include="..\db-modules\BinderUtil\BinderUtil.cpp" />
110+
<ClCompile Include="..\db-modules\detail\StoredProc\StoredProcedure.cpp" />
110111
<ClCompile Include="..\db-modules\Ebenezer\binder\EbenezerBinder.cpp" />
111112
<ClCompile Include="..\db-modules\Ebenezer\model\EbenezerModel.cpp" />
112113
<ClCompile Include="..\db-modules\Full\binder\FullBinder.cpp" />
113114
<ClCompile Include="..\db-modules\Full\model\FullModel.cpp" />
114115
<ClCompile Include="..\db-modules\ModelUtil\ModelUtil.cpp" />
115116
<ClCompile Include="..\db-modules\StoredProc\StoredProc.cpp" />
116-
<ClCompile Include="..\db-modules\StoredProc\detail\StoredProcedure.cpp" />
117117
<ClCompile Include="..\db-modules\VersionManager\binder\VersionManagerBinder.cpp" />
118118
<ClCompile Include="..\db-modules\VersionManager\model\VersionManagerModel.cpp" />
119119
</ItemGroup>
@@ -123,13 +123,13 @@
123123
<ClInclude Include="..\db-modules\Aujard\binder\AujardBinder.h" />
124124
<ClInclude Include="..\db-modules\Aujard\model\AujardModel.h" />
125125
<ClInclude Include="..\db-modules\BinderUtil\BinderUtil.h" />
126+
<ClInclude Include="..\db-modules\detail\StoredProc\StoredProcedure.h" />
126127
<ClInclude Include="..\db-modules\Ebenezer\binder\EbenezerBinder.h" />
127128
<ClInclude Include="..\db-modules\Ebenezer\model\EbenezerModel.h" />
128129
<ClInclude Include="..\db-modules\Full\binder\FullBinder.h" />
129130
<ClInclude Include="..\db-modules\Full\model\FullModel.h" />
130131
<ClInclude Include="..\db-modules\ModelUtil\ModelUtil.h" />
131132
<ClInclude Include="..\db-modules\StoredProc\StoredProc.h" />
132-
<ClInclude Include="..\db-modules\StoredProc\detail\StoredProcedure.h" />
133133
<ClInclude Include="..\db-modules\VersionManager\binder\VersionManagerBinder.h" />
134134
<ClInclude Include="..\db-modules\VersionManager\model\VersionManagerModel.h" />
135135
</ItemGroup>

0 commit comments

Comments
 (0)