Skip to content

Commit b735242

Browse files
committed
Add new CommandElements.cpp file to project (contain Default commands helper),removed BSFile from NiNodes.h(moved to GameData.h and integrated), minor nitpicks
1 parent fd17f34 commit b735242

File tree

5 files changed

+8
-49
lines changed

5 files changed

+8
-49
lines changed

obse/obse/GameTypes.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ class tListBase
258258
Iterator() : m_cur(NULL) {}
259259
Iterator(_Node* node) : m_cur(node) { }
260260
Iterator operator++() { if (!End()) m_cur = m_cur->Next(); return *this;}
261+
Iterator operator++(int) = delete;
262+
261263
bool End() { return m_cur == NULL; }
262264
Item* operator->() { return (m_cur) ? m_cur->Item() : NULL; }
263265
const Item* operator*() { return (m_cur) ? m_cur->Item() : NULL; }

obse/obse/Hooks_SaveLoad.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "Tasks.h"
1111
#include "GameObjects.h"
1212
#include "Script.h"
13+
#include <obse/GameData.h>
1314

1415
UInt32 g_gameLoaded = 0;
1516

obse/obse/NiNodes.h

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -988,55 +988,6 @@ class TESAnimGroup
988988
static UInt32 AnimGroupForString(const char* groupName);
989989
};
990990

991-
// derived from NiFile, which derives from NiBinaryStream
992-
// 154
993-
class BSFile
994-
{
995-
public:
996-
BSFile();
997-
~BSFile();
998-
999-
virtual void Destructor(bool freeMemory); // 00
1000-
virtual void Unk_01(void); // 04
1001-
virtual void Unk_02(void); // 08
1002-
virtual void Unk_03(void); // 0C
1003-
virtual void Unk_04(void); // 10
1004-
virtual void DumpAttributes(NiTArray <char *> * dst); // 14
1005-
virtual UInt32 GetSize(void); // 18
1006-
virtual void Unk_07(void); // 1C
1007-
virtual void Unk_08(void); // 20
1008-
virtual void Unk_09(void); // 24
1009-
virtual void Unk_0A(void); // 28
1010-
virtual void Unk_0B(void); // 2C
1011-
virtual void Unk_0C(void); // 30
1012-
virtual void Unk_Read(void); // 34
1013-
virtual void Unk_Write(void); // 38
1014-
1015-
// void ** m_vtbl; // 000
1016-
void * m_readProc; // 004 - function pointer
1017-
void * m_writeProc; // 008 - function pointer
1018-
UInt32 m_bufSize; // 00C
1019-
UInt32 m_unk010; // 010 - init'd to m_bufSize
1020-
UInt32 m_unk014; // 014
1021-
void * m_buf; // 018
1022-
FILE * m_file; // 01C
1023-
UInt32 m_writeAccess; // 020
1024-
UInt8 m_good; // 024
1025-
UInt8 m_pad025[3]; // 025
1026-
UInt8 m_unk028; // 028
1027-
UInt8 m_pad029[3]; // 029
1028-
UInt32 m_unk02C; // 02C
1029-
UInt32 m_pos; // 030
1030-
UInt32 m_unk034; // 034
1031-
UInt32 m_unk038; // 038
1032-
char m_path[0x104]; // 03C
1033-
UInt32 m_unk140; // 140
1034-
UInt32 m_unk144; // 144
1035-
UInt32 m_pos2; // 148 - used if m_pos is 0xFFFFFFFF
1036-
UInt32 m_unk14C; // 14C
1037-
UInt32 m_fileSize; // 150
1038-
};
1039-
1040991
/**** misc non-NiObjects ****/
1041992

1042993
// 30

obse/obse/obse.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<LanguageStandard_C>stdc17</LanguageStandard_C>
9090
<ConformanceMode>true</ConformanceMode>
9191
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
92+
<SmallerTypeCheck>false</SmallerTypeCheck>
9293
</ClCompile>
9394
<Link>
9495
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -160,6 +161,7 @@
160161
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 1_2_0_416|Win32'">Create</PrecompiledHeader>
161162
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 1_2_0_416|Win32'">Create</PrecompiledHeader>
162163
</ClCompile>
164+
<ClCompile Include="CommandElements.cpp" />
163165
<ClCompile Include="containers.cpp" />
164166
<ClCompile Include="ExpressionEvaluator.cpp" />
165167
<ClCompile Include="GameActorValues.cpp" />

obse/obse/obse.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@
326326
<ClCompile Include="utility.cpp">
327327
<Filter>internals</Filter>
328328
</ClCompile>
329+
<ClCompile Include="CommandElements.cpp">
330+
<Filter>internals</Filter>
331+
</ClCompile>
329332
</ItemGroup>
330333
<ItemGroup>
331334
<ClInclude Include="GameActorValues.h">

0 commit comments

Comments
 (0)